svn commit: r939607 - in /ofbiz/trunk/applications/manufacturing: webapp/manufacturing/jobshopmgt/ProductionRunForms.xml widget/manufacturing/JobshopScreens.xml

[jacopoc]

Author: jacopoc
Date: Fri Apr 30 09:42:51 2010
New Revision: 939607

URL: http://svn.apache.org/viewvc?rev=939607&view=rev
Log:
Added ability to sort the list of "shipment plans".

Modified:
    ofbiz/trunk/applications/manufacturing/webapp/manufacturing/jobshopmgt/ProductionRunForms.xml
    ofbiz/trunk/applications/manufacturing/widget/manufacturing/JobshopScreens.xml

Modified: ofbiz/trunk/applications/manufacturing/webapp/manufacturing/jobshopmgt/ProductionRunForms.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/manufacturing/webapp/manufacturing/jobshopmgt/ProductionRunForms.xml?rev=939607&r1=939606&r2=939607&view=diff
==============================================================================
--- ofbiz/trunk/applications/manufacturing/webapp/manufacturing/jobshopmgt/ProductionRunForms.xml (original)
+++ ofbiz/trunk/applications/manufacturing/webapp/manufacturing/jobshopmgt/ProductionRunForms.xml Fri Apr 30 09:42:51 2010
@@ -773,8 +773,8 @@ under the License.
     </form>
 
     <form name="listShipmentPlans" type="list" target="" title="" list-name="shipmentPlans"
-        odd-row-style="alternate-row" default-table-style="basic-table hover-bar">
-        <field name="shipmentId" widget-style="buttontext">
+        odd-row-style="alternate-row" default-table-style="basic-table hover-bar" header-row-style="header-row-2">
+        <field name="shipmentId" widget-style="buttontext" sort-field="true">
             <hyperlink target="/facility/control/ViewShipment" target-type="inter-app" description="${shipmentId}">
                 <parameter param-name="shipmentId" from-field="shipmentId"/>
             </hyperlink>
@@ -782,7 +782,7 @@ under the License.
         <field name="statusId">
             <display-entity entity-name="StatusItem" key-field-name="statusId" description="${description}"/>
         </field>
-        <field name="estimatedShipDate"><display/></field>
+        <field name="estimatedShipDate" sort-field="true"><display/></field>
         <field name="viewShipmentPlanLink" title="${uiLabelMap.CommonEmptyHeader}" widget-style="buttontext">
             <hyperlink target="WorkWithShipmentPlans" description="${uiLabelMap.CommonView}" also-hidden="false">
                 <parameter param-name="shipmentId"/>

Modified: ofbiz/trunk/applications/manufacturing/widget/manufacturing/JobshopScreens.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/manufacturing/widget/manufacturing/JobshopScreens.xml?rev=939607&r1=939606&r2=939607&view=diff
==============================================================================
--- ofbiz/trunk/applications/manufacturing/widget/manufacturing/JobshopScreens.xml (original)
+++ ofbiz/trunk/applications/manufacturing/widget/manufacturing/JobshopScreens.xml Fri Apr 30 09:42:51 2010
@@ -473,12 +473,14 @@ under the License.
                 <set field="titleProperty" value="ManufacturingWorkWithShipmentPlans"/>
                 <set field="headerItem" value="ShipmentPlans"/>
                 <set field="shipmentId" from-field="parameters.shipmentId"/>
+                <set field="sortField" from-field="parameters.sortField" default-value="estimatedShipDate"/>
                 <entity-one entity-name="Shipment" value-field="shipment"/>
                 <entity-condition entity-name="Shipment" list="shipmentPlans">
                     <condition-list>
                         <condition-expr field-name="shipmentTypeId" value="SALES_SHIPMENT"/>
                         <condition-expr field-name="statusId" value="SHIPMENT_SCHEDULED"/>
                     </condition-list>
+                    <order-by field-name="${sortField}"/>
                 </entity-condition>
                 <script location="component://manufacturing/webapp/manufacturing/WEB-INF/actions/jobshopmgt/WorkWithShipmentPlans.groovy"/>
             </actions>