svn commit: r677024 - in /ofbiz/trunk/applications/order: servicedef/services_request.xml webapp/ordermgr/request/RequestForms.xml widget/ordermgr/RequestScreens.xml

[hansbak-2]

Author: hansbak
Date: Tue Jul 15 13:14:42 2008
New Revision: 677024

URL: http://svn.apache.org/viewvc?rev=677024&view=rev
Log:
request screenlet conversion and findscreen collapse and reorganize, automatic request id generation

Modified:
    ofbiz/trunk/applications/order/servicedef/services_request.xml
    ofbiz/trunk/applications/order/webapp/ordermgr/request/RequestForms.xml
    ofbiz/trunk/applications/order/widget/ordermgr/RequestScreens.xml

Modified: ofbiz/trunk/applications/order/servicedef/services_request.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/order/servicedef/services_request.xml?rev=677024&r1=677023&r2=677024&view=diff
==============================================================================
--- ofbiz/trunk/applications/order/servicedef/services_request.xml (original)
+++ ofbiz/trunk/applications/order/servicedef/services_request.xml Tue Jul 15 13:14:42 2008
@@ -29,8 +29,7 @@
             location="org/ofbiz/order/request/CustRequestServices.xml" invoke="createCustRequest" auth="true">
         <description>Create a custRequest record</description>
         <auto-attributes include="nonpk" mode="IN" optional="true"/>
-        <auto-attributes include="pk" mode="OUT" optional="true"/>
-        <attribute name="custRequestTypeId" type="String" mode="IN" optional="false"/>
+        <auto-attributes include="pk" mode="INOUT" optional="true"/>
     </service>
     <service name="updateCustRequest" engine="simple" default-entity-name="CustRequest"
             location="org/ofbiz/order/request/CustRequestServices.xml" invoke="updateCustRequest" auth="true">

Modified: ofbiz/trunk/applications/order/webapp/ordermgr/request/RequestForms.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/order/webapp/ordermgr/request/RequestForms.xml?rev=677024&r1=677023&r2=677024&view=diff
==============================================================================
--- ofbiz/trunk/applications/order/webapp/ordermgr/request/RequestForms.xml (original)
+++ ofbiz/trunk/applications/order/webapp/ordermgr/request/RequestForms.xml Tue Jul 15 13:14:42 2008
@@ -23,7 +23,7 @@
     <form name="FindRequests" target="FindRequest" title="" type="single" default-map-name="parameters"
         header-row-style="header-row" default-table-style="basic-table">
         <auto-fields-entity entity-name="CustRequest" default-field-type="find"/>
-        <field name="custRequestTypeId">
+        <field name="custRequestTypeId" position="2">
             <drop-down allow-empty="true">
                 <entity-options description="${description}" entity-name="CustRequestType" key-field-name="custRequestTypeId"/>
             </drop-down>
@@ -36,7 +36,7 @@
                 </entity-options>
             </drop-down>
         </field>
-        <field name="salesChannelEnumId" title="${uiLabelMap.OrderSalesChannel}">
+        <field name="salesChannelEnumId" title="${uiLabelMap.OrderSalesChannel}" position="2">
             <drop-down allow-empty="true">
                 <entity-options entity-name="Enumeration" description="${description}" key-field-name="enumId">
                     <entity-constraint name="enumTypeId" value="ORDER_SALES_CHANNEL"/>
@@ -44,14 +44,20 @@
                 </entity-options>
             </drop-down>
         </field>
-        <field name="fromPartyId"><lookup target-form-name="LookupPartyName"/></field>
-        <field name="custRequestCategoryId"><hidden/></field>
-        <field name="priority"><hidden/></field>
-        <field name="description"><hidden/></field>
-        <field name="createdDate"><hidden/></field>
-        <field name="createdByUserLogin"><hidden/></field>
-        <field name="lastModifiedDate"><hidden/></field>
-        <field name="lastModifiedByUserLogin"><hidden/></field>
+        <field name="fromPartyId" position="2"><lookup target-form-name="LookupPartyName"/></field>
+        <field name="maximumAmountUomId"><ignored/></field>
+        <field name="custRequestCategoryId"><ignored/></field>
+        <field name="fulfillContactMechId"><ignored/></field>
+        <field name="priority"><ignored/></field>
+        <field name="priority"><ignored/></field>
+        <field name="priority"><ignored/></field>
+        <field name="description"><ignored/></field>
+        <field name="createdDate"><ignored/></field>
+        <field name="createdByUserLogin"><ignored/></field>
+        <field name="lastModifiedDate"><ignored/></field>
+        <field name="lastModifiedByUserLogin"><ignored/></field>
+        <field name="closedDateTime" position="2"><date-find/></field>
+        <field name="responseRequiredDate" position="2"><date-find/></field>
         <field name="productStoreId" title="${uiLabelMap.ProductProductStore}">
             <drop-down allow-empty="true">
                 <entity-options description="${storeName}" entity-name="ProductStore" key-field-name="productStoreId">
@@ -59,6 +65,7 @@
                 </entity-options>
             </drop-down>
         </field>
+        <field name="reason" position="2"><text/></field>
         <field name="submitButton" title="${uiLabelMap.CommonFind}" widget-style="smallSubmit">
             <submit button-type="button"/>
         </field>

Modified: ofbiz/trunk/applications/order/widget/ordermgr/RequestScreens.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/order/widget/ordermgr/RequestScreens.xml?rev=677024&r1=677023&r2=677024&view=diff
==============================================================================
--- ofbiz/trunk/applications/order/widget/ordermgr/RequestScreens.xml (original)
+++ ofbiz/trunk/applications/order/widget/ordermgr/RequestScreens.xml Tue Jul 15 13:14:42 2008
@@ -64,23 +64,10 @@
             <widgets>
                 <decorator-screen name="main-decorator" location="${parameters.mainDecoratorLocation}">
                     <decorator-section name="body">
-                        <container style="screenlet">
-                            <container style="screenlet-title-bar">
-                                <container style="h3">
-                                    <label text="${uiLabelMap.OrderFindRequests}"/>
-                                </container>
-                            </container>
-                            <container style="screenlet-body">
-                                <section>
-                                    <widgets>
-                                        <container>
-                                            <link target="request" text="${uiLabelMap.OrderNewRequest}" style="buttontext"/>
-                                        </container>
-                                        <include-form name="FindRequests" location="component://order/webapp/ordermgr/request/RequestForms.xml"/>                                        
-                                    </widgets>
-                                </section>
-                            </container>
-                        </container>
+                        <screenlet title="${uiLabelMap.OrderFindRequests}" collapsible="true" id="findRequests">
+                            <link target="request" text="${uiLabelMap.OrderNewRequest}" style="buttontext"/>
+                            <include-form name="FindRequests" location="component://order/webapp/ordermgr/request/RequestForms.xml"/>                                        
+                        </screenlet>
                         <container style="screenlet">
                             <container style="screenlet-title-bar">
                                 <container style="h3">