svn commit: r1032662 - in /ofbiz/trunk/applications/order/widget/ordermgr: CustRequestForms.xml CustRequestScreens.xml

[buscob]

Author: buscob
Date: Mon Nov  8 18:32:10 2010
New Revision: 1032662

URL: http://svn.apache.org/viewvc?rev=1032662&view=rev
Log:
Used FindScreenDecorator in FindRequest screen.
Also used proper button style (create), separated RequestId and RequestName columns and enabled column sorting.

Modified:
    ofbiz/trunk/applications/order/widget/ordermgr/CustRequestForms.xml
    ofbiz/trunk/applications/order/widget/ordermgr/CustRequestScreens.xml

Modified: ofbiz/trunk/applications/order/widget/ordermgr/CustRequestForms.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/order/widget/ordermgr/CustRequestForms.xml?rev=1032662&r1=1032661&r2=1032662&view=diff
==============================================================================
--- ofbiz/trunk/applications/order/widget/ordermgr/CustRequestForms.xml (original)
+++ ofbiz/trunk/applications/order/widget/ordermgr/CustRequestForms.xml Mon Nov  8 18:32:10 2010
@@ -76,7 +76,7 @@ under the License.
           <service service-name="performFind" result-map="result" result-map-list="listIt">
             <field-map field-name="inputFields" from-field="parameters"/>
             <field-map field-name="entityName" from-field="entityName"/>
-            <field-map field-name="orderBy" value="-lastModifiedDate"/>
+            <field-map field-name="orderBy" from-field="parameters.sortField"/>
             <field-map field-name="viewIndex" from-field="viewIndex"/>
             <field-map field-name="viewSize" from-field="viewSize"/>
           </service>
@@ -85,25 +85,25 @@ under the License.
 
     <form name="ListRequestList" type="list" use-row-submit="true" list-name="custRequests" title="List of customer requests"
         odd-row-style="alternate-row" header-row-style="header-row-2" default-table-style="basic-table hover-bar">
-        <field name="custRequestId"><hidden/></field>
-        <field name="custRequestName">
-            <hyperlink description="${custRequestName} [${custRequestId}]" target="ViewRequest">
+        <field name="custRequestId" sort-field="true">
+            <hyperlink description="${custRequestId}" target="ViewRequest">
                 <parameter param-name="custRequestId"/>
             </hyperlink>
         </field>
-        <field name="priority"><display/></field>
-        <field name="responseRequiredDate"><display/></field>
-        <field name="fromPartyId">
+        <field name="custRequestName" sort-field="true"><display/></field>
+        <field name="priority" sort-field="true"><display/></field>
+        <field name="responseRequiredDate" sort-field="true"><display/></field>
+        <field name="fromPartyId" sort-field="true">
             <display-entity entity-name="PartyNameView" key-field-name="partyId" description="${firstName} ${middleName} ${lastName} ${groupName}">
                 <sub-hyperlink description="[${fromPartyId}]" target="/partymgr/control/viewprofile" target-type="inter-app">
                     <parameter param-name="partyId" from-field="fromPartyId"/>
                 </sub-hyperlink>
             </display-entity>
         </field>
-        <field name="statusId">
+        <field name="statusId" sort-field="true">
             <display-entity also-hidden="false" entity-name="StatusItem"/>
         </field>
-        <field name="lastModifiedDate"><display/></field>
+        <field name="lastModifiedDate" sort-field="true"><display/></field>
         <!--field name="statusId"><hidden value="CRQ_REJECTED"/></field-->
         <field name="rejectButton">
             <hyperlink target="setCustRequestStatus" description="${uiLabelMap.FormFieldTitle_rejectButton}">

Modified: ofbiz/trunk/applications/order/widget/ordermgr/CustRequestScreens.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/order/widget/ordermgr/CustRequestScreens.xml?rev=1032662&r1=1032661&r2=1032662&view=diff
==============================================================================
--- ofbiz/trunk/applications/order/widget/ordermgr/CustRequestScreens.xml (original)
+++ ofbiz/trunk/applications/order/widget/ordermgr/CustRequestScreens.xml Mon Nov  8 18:32:10 2010
@@ -30,13 +30,19 @@ under the License.
             <widgets>
                 <decorator-screen name="main-decorator" location="${parameters.mainDecoratorLocation}">
                     <decorator-section name="body">
-                        <screenlet title="${uiLabelMap.OrderFindRequests}" collapsible="true" id="findRequests">
-                            <link target="request" text="${uiLabelMap.OrderNewRequest}" style="buttontext"/>
-                            <include-form name="FindRequests" location="component://order/widget/ordermgr/CustRequestForms.xml"/>
-                        </screenlet>
-                        <screenlet title="${uiLabelMap.OrderRequestList}" navigation-form-name="ListRequests" >
-                            <include-form name="ListRequests" location="component://order/widget/ordermgr/CustRequestForms.xml"/>
-                        </screenlet>
+                        <decorator-screen name="FindScreenDecorator" location="component://common/widget/CommonScreens.xml">
+                            <decorator-section name="menu-bar">
+                                <container style="button-bar">
+                                    <link target="request" text="${uiLabelMap.OrderNewRequest}" style="buttontext create"/>
+                                </container>
+                            </decorator-section>
+                            <decorator-section name="search-options">
+                                <include-form name="FindRequests" location="component://order/widget/ordermgr/CustRequestForms.xml"/>
+                            </decorator-section>
+                            <decorator-section name="search-results">
+                                <include-form name="ListRequests" location="component://order/widget/ordermgr/CustRequestForms.xml"/>
+                            </decorator-section>
+                        </decorator-screen>
                     </decorator-section>
                 </decorator-screen>
             </widgets>