svn commit: r609235 [4/4] - in /ofbiz/trunk/applications/prod
Locked
 
|
Modified: ofbiz/trunk/applications/product/webapp/facility/shipment/ViewShipmentRouteInfo.ftl
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/product/webapp/facility/shipment/ViewShipmentRouteInfo.ftl?rev=609235&r1=609234&r2=609235&view=diff ============================================================================== --- ofbiz/trunk/applications/product/webapp/facility/shipment/ViewShipmentRouteInfo.ftl (original) +++ ofbiz/trunk/applications/product/webapp/facility/shipment/ViewShipmentRouteInfo.ftl Sat Jan 5 15:17:57 2008 @@ -17,97 +17,107 @@ under the License. --> <#if shipmentRouteSegmentDatas?has_content> -<br/> -<table width="100%" cellspacing="0" cellpadding="2" border="1"> - <tr> - <td><div class="tableheadtext">${uiLabelMap.ProductSegment}</div></td> - <td> - <div class="tableheadtext">${uiLabelMap.ProductCarrierShipmentMethod}</div> - <div class="tableheadtext">${uiLabelMap.ProductOriginDestinationFacility}</div> - <div class="tableheadtext">${uiLabelMap.ProductOriginDestinationAddressId}</div> - <div class="tableheadtext">${uiLabelMap.ProductOriginDestinationPhoneId}</div> - </td> - <td> - <div class="tableheadtext">${uiLabelMap.ProductCarrierStatus}</div> - <div class="tableheadtext">${uiLabelMap.ProductTrackingNumber}</div> - <div class="tableheadtext">${uiLabelMap.ProductEstimatedStartArrive}</div> - <div class="tableheadtext">${uiLabelMap.ProductActualStartArrive}</div> - </td> - <td> - <div class="tableheadtext">${uiLabelMap.ProductBillingWeightUom}</div> - <div class="tableheadtext">${uiLabelMap.ProductCurrencyUom}</div> - <div class="tableheadtext">${uiLabelMap.ProductActualTransport}</div> - <div class="tableheadtext">${uiLabelMap.ProductActualServices}</div> - <div class="tableheadtext">${uiLabelMap.ProductActualOther}</div> - <div class="tableheadtext">${uiLabelMap.ProductActualTotal}</div> - </td> - </tr> -<#list shipmentRouteSegmentDatas as shipmentRouteSegmentData> - <#assign shipmentRouteSegment = shipmentRouteSegmentData.shipmentRouteSegment> - <#assign shipmentPackageRouteSegs = shipmentRouteSegmentData.shipmentPackageRouteSegs?if_exists> - <#assign originFacility = shipmentRouteSegmentData.originFacility?if_exists> - <#assign destFacility = shipmentRouteSegmentData.destFacility?if_exists> - <#assign shipmentMethodType = shipmentRouteSegmentData.shipmentMethodType?if_exists> - <#assign carrierPerson = shipmentRouteSegmentData.carrierPerson?if_exists> - <#assign carrierPartyGroup = shipmentRouteSegmentData.carrierPartyGroup?if_exists> - <#assign originPostalAddress = shipmentRouteSegmentData.originPostalAddress?if_exists> - <#assign destPostalAddress = shipmentRouteSegmentData.destPostalAddress?if_exists> - <#assign originTelecomNumber = shipmentRouteSegmentData.originTelecomNumber?if_exists> - <#assign destTelecomNumber = shipmentRouteSegmentData.destTelecomNumber?if_exists> - <#assign carrierServiceStatusItem = shipmentRouteSegmentData.carrierServiceStatusItem?if_exists> - <#assign currencyUom = shipmentRouteSegmentData.currencyUom?if_exists> - <#assign billingWeightUom = shipmentRouteSegmentData.billingWeightUom?if_exists> - <#assign carrierServiceStatusValidChangeToDetails = shipmentRouteSegmentData.carrierServiceStatusValidChangeToDetails?if_exists> - <tr> - <td><div class="tabletext">${shipmentRouteSegment.shipmentRouteSegmentId}</div></td> - <td> - <span class="tabletext">${(carrierPerson.firstName)?if_exists} ${(carrierPerson.middleName)?if_exists} ${(carrierPerson.lastName)?if_exists} ${(carrierPartyGroup.groupName)?if_exists} [${shipmentRouteSegment.carrierPartyId?if_exists}]</span> - <span class="tabletext">${shipmentMethodType.description?default(shipmentRouteSegment.shipmentMethodTypeId?if_exists)}</span> - <br/> - <span class="tabletext">${uiLabelMap.ProductOrigin} : ${(originFacility.facilityName)?if_exists} [${originFacility.facilityId?if_exists}]</span> - <span class="tabletext">${uiLabelMap.ProductDest} : ${(destFacility.facilityName)?if_exists} [${destFacility.facilityId?if_exists}]</span> - <br/> - <div class="tabletext"> - ${uiLabelMap.ProductOrigin} : <b>${shipmentRouteSegment.originContactMechId?if_exists}</b> - <#if originPostalAddress?has_content>[${uiLabelMap.CommonTo} : ${originPostalAddress.toName?if_exists}, ${uiLabelMap.CommonAttn} : ${originPostalAddress.attnName?if_exists}, ${originPostalAddress.address1?if_exists}, ${originPostalAddress.address2?if_exists}, ${originPostalAddress.city?if_exists}, ${originPostalAddress.stateProvinceGeoId?if_exists}, ${originPostalAddress.postalCode?if_exists}, ${originPostalAddress.countryGeoId?if_exists}]</#if> - </div> - <div class="tabletext"> - ${uiLabelMap.ProductDest}: <b>${shipmentRouteSegment.destContactMechId?if_exists}</b> - <#if destPostalAddress?has_content>[${uiLabelMap.CommonTo} : ${destPostalAddress.toName?if_exists}, ${uiLabelMap.CommonAttn} : ${destPostalAddress.attnName?if_exists}, ${destPostalAddress.address1?if_exists}, ${destPostalAddress.address2?if_exists}, ${destPostalAddress.city?if_exists}, ${destPostalAddress.stateProvinceGeoId?if_exists}, ${destPostalAddress.postalCode?if_exists}, ${destPostalAddress.countryGeoId?if_exists}]</#if> - </div> - <div class="tabletext"> - ${uiLabelMap.ProductOrigin} : <b>${shipmentRouteSegment.originTelecomNumberId?if_exists}</b> - <#if originTelecomNumber?has_content>[${originTelecomNumber.countryCode?if_exists} ${originTelecomNumber.areaCode?if_exists} ${originTelecomNumber.contactNumber?if_exists}]</#if> - </div> - <div class="tabletext"> - ${uiLabelMap.ProductDest} : <b>${shipmentRouteSegment.destTelecomNumberId?if_exists}</b> - <#if destTelecomNumber?has_content>[${destTelecomNumber.countryCode?if_exists} ${destTelecomNumber.areaCode?if_exists} ${destTelecomNumber.contactNumber?if_exists}]</#if> - </div> - </td> - <td> - - <div class="tabletext">${(carrierServiceStatus.description)?default(" ")}</div> - <div class="tabletext">${shipmentRouteSegment.trackingIdNumber?default(" ")}</div> - <div class="tabletext">[${(shipmentRouteSegment.estimatedStartDate.toString())?if_exists} - ${(shipmentRouteSegment.estimatedArrivalDate.toString())?if_exists}]</span> - <div class="tabletext">[${(shipmentRouteSegment.actualStartDate.toString())?if_exists} - ${(shipmentRouteSegment.actualArrivalDate.toString())?if_exists}]</span> - </td> - <td> - <div class="tabletext">${shipmentRouteSegment.billingWeight?if_exists} ${(billingWeightUom.get("description",locale))?if_exists} [${(billingWeightUom.abbreviation)?if_exists}]</div> - <div class="tabletext">${(currencyUom.get("description",locale))?default(" ")}</div> - <div class="tabletext">${(shipmentRouteSegment.actualTransportCost)?default(" ")}</div> - <div class="tabletext">${(shipmentRouteSegment.actualServiceCost)?default(" ")}</div> - <div class="tabletext">${(shipmentRouteSegment.actualOtherCost)?default(" ")}</div> - <div class="tabletext">${(shipmentRouteSegment.actualCost)?default(" ")}</div> - </td> - </tr> - <#list shipmentPackageRouteSegs as shipmentPackageRouteSeg> - <tr> - <td><div class="tabletext"> </div></td> - <td><div class="tabletext">${uiLabelMap.ProductPackage} :${shipmentPackageRouteSeg.shipmentPackageSeqId}</div></td> - <td><span class="tabletext">${uiLabelMap.ProductTracking} : ${shipmentPackageRouteSeg.trackingCode?if_exists}</span></td> - <td><span class="tabletext">${uiLabelMap.ProductBox} : ${shipmentPackageRouteSeg.boxNumber?if_exists}</span></td> - </tr> - </#list> -</#list> -</table> -</#if> +<div class="screenlet"> + <div class="screenlet-title-bar"> + <ul> + <li class="head3">${uiLabelMap.PageTitleViewShipmentRouteInfo}</li> + </ul> + <br class="clear"/> + </div> + <div class="screenlet-body"> + <table cellspacing="0" cellpadding="2" class="basic-table"> + <tr class="header-row"> + <td>${uiLabelMap.ProductSegment}</td> + <td> + <div>${uiLabelMap.ProductCarrierShipmentMethod}</div> + <div>${uiLabelMap.ProductOriginDestinationFacility}</div> + <div>${uiLabelMap.ProductOriginDestinationAddressId}</div> + <div>${uiLabelMap.ProductOriginDestinationPhoneId}</div> + </td> + <td> + <div>${uiLabelMap.ProductCarrierStatus}</div> + <div>${uiLabelMap.ProductTrackingNumber}</div> + <div>${uiLabelMap.ProductEstimatedStartArrive}</div> + <div>${uiLabelMap.ProductActualStartArrive}</div> + </td> + <td> + <div>${uiLabelMap.ProductBillingWeightUom}</div> + <div>${uiLabelMap.ProductCurrencyUom}</div> + <div>${uiLabelMap.ProductActualTransport}</div> + <div>${uiLabelMap.ProductActualServices}</div> + <div>${uiLabelMap.ProductActualOther}</div> + <div>${uiLabelMap.ProductActualTotal}</div> + </td> + </tr> + <#assign alt_row = false> + <#list shipmentRouteSegmentDatas as shipmentRouteSegmentData> + <#assign shipmentRouteSegment = shipmentRouteSegmentData.shipmentRouteSegment> + <#assign shipmentPackageRouteSegs = shipmentRouteSegmentData.shipmentPackageRouteSegs?if_exists> + <#assign originFacility = shipmentRouteSegmentData.originFacility?if_exists> + <#assign destFacility = shipmentRouteSegmentData.destFacility?if_exists> + <#assign shipmentMethodType = shipmentRouteSegmentData.shipmentMethodType?if_exists> + <#assign carrierPerson = shipmentRouteSegmentData.carrierPerson?if_exists> + <#assign carrierPartyGroup = shipmentRouteSegmentData.carrierPartyGroup?if_exists> + <#assign originPostalAddress = shipmentRouteSegmentData.originPostalAddress?if_exists> + <#assign destPostalAddress = shipmentRouteSegmentData.destPostalAddress?if_exists> + <#assign originTelecomNumber = shipmentRouteSegmentData.originTelecomNumber?if_exists> + <#assign destTelecomNumber = shipmentRouteSegmentData.destTelecomNumber?if_exists> + <#assign carrierServiceStatusItem = shipmentRouteSegmentData.carrierServiceStatusItem?if_exists> + <#assign currencyUom = shipmentRouteSegmentData.currencyUom?if_exists> + <#assign billingWeightUom = shipmentRouteSegmentData.billingWeightUom?if_exists> + <#assign carrierServiceStatusValidChangeToDetails = shipmentRouteSegmentData.carrierServiceStatusValidChangeToDetails?if_exists> + <tr valign="middle"<#if alt_row> class="alternate-row"</#if>> + <td>${shipmentRouteSegment.shipmentRouteSegmentId}</td> + <td> + <span>${(carrierPerson.firstName)?if_exists} ${(carrierPerson.middleName)?if_exists} ${(carrierPerson.lastName)?if_exists} ${(carrierPartyGroup.groupName)?if_exists} [${shipmentRouteSegment.carrierPartyId?if_exists}]</span> + <span>${shipmentMethodType.description?default(shipmentRouteSegment.shipmentMethodTypeId?if_exists)}</span> + <br/> + <span class="label">${uiLabelMap.ProductOrigin}</span> + <span>${(originFacility.facilityName)?if_exists} [${originFacility.facilityId?if_exists}]</span> + <br/> + <span class="label">${uiLabelMap.ProductDest}</span> + <span>${(destFacility.facilityName)?if_exists} [${destFacility.facilityId?if_exists}]</span> + <br/> + <span class="label">${uiLabelMap.ProductOrigin}</span> + <span><#if originPostalAddress?has_content>${uiLabelMap.CommonTo} : ${originPostalAddress.toName?if_exists}, ${uiLabelMap.CommonAttn} : ${originPostalAddress.attnName?if_exists}, ${originPostalAddress.address1?if_exists}, ${originPostalAddress.address2?if_exists}, ${originPostalAddress.city?if_exists}, ${originPostalAddress.stateProvinceGeoId?if_exists}, ${originPostalAddress.postalCode?if_exists}, ${originPostalAddress.countryGeoId?if_exists}</#if> [${shipmentRouteSegment.originContactMechId?if_exists}]</span> + <br/> + <span class="label">${uiLabelMap.ProductDest}</span> + <span><#if destPostalAddress?has_content>${uiLabelMap.CommonTo} : ${destPostalAddress.toName?if_exists}, ${uiLabelMap.CommonAttn} : ${destPostalAddress.attnName?if_exists}, ${destPostalAddress.address1?if_exists}, ${destPostalAddress.address2?if_exists}, ${destPostalAddress.city?if_exists}, ${destPostalAddress.stateProvinceGeoId?if_exists}, ${destPostalAddress.postalCode?if_exists}, ${destPostalAddress.countryGeoId?if_exists}</#if> [${shipmentRouteSegment.destContactMechId?if_exists}]</span> + <br/> + <span class="label">${uiLabelMap.ProductOrigin}</span> + <span><#if originTelecomNumber?has_content>${originTelecomNumber.countryCode?if_exists} ${originTelecomNumber.areaCode?if_exists} ${originTelecomNumber.contactNumber?if_exists}</#if> [${shipmentRouteSegment.originTelecomNumberId?if_exists}]</span> + <br/> + <span class="label">${uiLabelMap.ProductDest}</span> + <span><#if destTelecomNumber?has_content>${destTelecomNumber.countryCode?if_exists} ${destTelecomNumber.areaCode?if_exists} ${destTelecomNumber.contactNumber?if_exists}</#if> [${shipmentRouteSegment.destTelecomNumberId?if_exists}]</span> + <br/> + </td> + <td> + <div>${(carrierServiceStatus.description)?default(" ")}</div> + <div>${shipmentRouteSegment.trackingIdNumber?default(" ")}</div> + <div>${(shipmentRouteSegment.estimatedStartDate.toString())?if_exists} - ${(shipmentRouteSegment.estimatedArrivalDate.toString())?if_exists}</div> + <div>${(shipmentRouteSegment.actualStartDate.toString())?if_exists} - ${(shipmentRouteSegment.actualArrivalDate.toString())?if_exists}</div> + </td> + <td> + <div>${shipmentRouteSegment.billingWeight?if_exists} ${(billingWeightUom.get("description",locale))?if_exists} [${(billingWeightUom.abbreviation)?if_exists}]</div> + <div>${(currencyUom.get("description",locale))?default(" ")}</div> + <div>${(shipmentRouteSegment.actualTransportCost)?default(" ")}</div> + <div>${(shipmentRouteSegment.actualServiceCost)?default(" ")}</div> + <div>${(shipmentRouteSegment.actualOtherCost)?default(" ")}</div> + <div>${(shipmentRouteSegment.actualCost)?default(" ")}</div> + </td> + </tr> + <#list shipmentPackageRouteSegs as shipmentPackageRouteSeg> + <tr valign="middle"<#if alt_row> class="alternate-row"</#if>> + <td> </td> + <td><span class="label">${uiLabelMap.ProductPackage}</span> ${shipmentPackageRouteSeg.shipmentPackageSeqId}</td> + <td><span class="label">${uiLabelMap.ProductTracking}</span> ${shipmentPackageRouteSeg.trackingCode?if_exists}</td> + <td><span class="label">${uiLabelMap.ProductBox}</span> ${shipmentPackageRouteSeg.boxNumber?if_exists}</td> + </tr> + </#list> + <#-- toggle the row color --> + <#assign alt_row = !alt_row> + </#list> + </table> + </div> +</div> +</#if> \ No newline at end of file Modified: ofbiz/trunk/applications/product/widget/facility/FacilityScreens.xml URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/product/widget/facility/FacilityScreens.xml?rev=609235&r1=609234&r2=609235&view=diff ============================================================================== --- ofbiz/trunk/applications/product/widget/facility/FacilityScreens.xml (original) +++ ofbiz/trunk/applications/product/widget/facility/FacilityScreens.xml Sat Jan 5 15:17:57 2008 @@ -564,7 +564,20 @@ <if-compare field-name="parameters.reportType" operator="equals" value="BY_PRODUCT"/> </condition> <widgets> - <include-form name="ListFacilityInventoryItemsDetailsByProduct" location="component://product/webapp/facility/facility/FacilityForms.xml"/> + <container style="screenlet"> + <container style="screenlet-title-bar"> + <container style="head4"> + <label text="${uiLabelMap.PageTitleViewFacilityInventoryItemsDetails}"/> + </container> + </container> + <container style="screenlet-body"> + <section> + <widgets> + <include-form name="ListFacilityInventoryItemsDetailsByProduct" location="component://product/webapp/facility/facility/FacilityForms.xml"/> + </widgets> + </section> + </container> + </container> </widgets> </section> <section> @@ -572,7 +585,21 @@ <if-compare field-name="parameters.reportType" operator="equals" value="BY_DATE"/> </condition> <widgets> - <include-form name="ListFacilityInventoryItemsDetailsByDate" location="component://product/webapp/facility/facility/FacilityForms.xml"/> + <container style="screenlet"> + <container style="screenlet-title-bar"> + <container style="head4"> + <label text="${uiLabelMap.PageTitleViewFacilityInventoryItemsDetails}"/> + </container> + </container> + <container style="screenlet-body"> + <section> + <widgets> + <include-form name="ListFacilityInventoryItemsDetailsByDate" location="component://product/webapp/facility/facility/FacilityForms.xml"/> + </widgets> + </section> + </container> + </container> + </widgets> </section> </decorator-section> @@ -1297,13 +1324,9 @@ <decorator-section name="body"> <section> <widgets> - <container> - <label style="head1">${uiLabelMap.PageTitlePackageShipmentScheduling}</label> - </container> <platform-specific> <html><html-template location="component://product/webapp/facility/facility/FacilityScheduleTabBar.ftl"/></html> </platform-specific> - <decorator-section-include name="schedule-body"/> </widgets> </section> @@ -1342,8 +1365,19 @@ <widgets> <decorator-screen name="CommonFacilityScheduleDecorator"> <decorator-section name="schedule-body"> - <container> - <include-form name="SchedulingList" location="component://product/webapp/facility/facility/FacilityForms.xml"/> + <container style="screenlet"> + <container style="screenlet-title-bar"> + <container style="head4"> + <label text="${uiLabelMap.PageTitlePackageShipmentScheduling}"/> + </container> + </container> + <container style="screenlet-body"> + <section> + <widgets> + <include-form name="SchedulingList" location="component://product/webapp/facility/facility/FacilityForms.xml"/> + </widgets> + </section> + </container> </container> </decorator-section> </decorator-screen> @@ -1372,11 +1406,22 @@ <widgets> <decorator-screen name="CommonFacilityScheduleDecorator"> <decorator-section name="schedule-body"> - <container> - <include-form name="Labels" location="component://product/webapp/facility/facility/FacilityForms.xml"/> - <platform-specific> - <html><html-template location="component://product/webapp/facility/facility/batchPrintMarkAsAccepted.ftl"/></html> - </platform-specific> + <container style="screenlet"> + <container style="screenlet-title-bar"> + <container style="head4"> + <label text="${uiLabelMap.PageTitleLabelPrinting}"/> + </container> + </container> + <container style="screenlet-body"> + <section> + <widgets> + <include-form name="Labels" location="component://product/webapp/facility/facility/FacilityForms.xml"/> + <platform-specific> + <html><html-template location="component://product/webapp/facility/facility/batchPrintMarkAsAccepted.ftl"/></html> + </platform-specific> + </widgets> + </section> + </container> </container> </decorator-section> </decorator-screen> |
«
Return to OFBiz - Commits
|
1 view|%1 views
| Free forum by Nabble | Edit this page |