svn commit: r687011 - in /ofbiz/trunk/specialpurpose/projectmgr/widget: RequestScreens.xml forms/RequestForms.xml

[hansbak-2]

Author: hansbak
Date: Tue Aug 19 03:13:10 2008
New Revision: 687011

URL: http://svn.apache.org/viewvc?rev=687011&view=rev
Log:
add status field to customer request and cnvert to screenlet

Modified:
    ofbiz/trunk/specialpurpose/projectmgr/widget/RequestScreens.xml
    ofbiz/trunk/specialpurpose/projectmgr/widget/forms/RequestForms.xml

Modified: ofbiz/trunk/specialpurpose/projectmgr/widget/RequestScreens.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/specialpurpose/projectmgr/widget/RequestScreens.xml?rev=687011&r1=687010&r2=687011&view=diff
==============================================================================
--- ofbiz/trunk/specialpurpose/projectmgr/widget/RequestScreens.xml (original)
+++ ofbiz/trunk/specialpurpose/projectmgr/widget/RequestScreens.xml Tue Aug 19 03:13:10 2008
@@ -62,20 +62,9 @@
             <widgets>
                 <decorator-screen name="CommonRequestDecorator" location="${parameters.mainDecoratorLocation}">
                     <decorator-section name="body">
-                        <container style="screenlet">
-                            <container style="screenlet-title-bar">
-                                <container style="h3">
-                                    <label text="${uiLabelMap.OrderRequest}"/>
-                                </container>
-                            </container>
-                            <container style="screenlet-body">
-                                <section>
-                                    <widgets>    
-                                        <include-form name="EditCustRequest" location="component://projectmgr/widget/forms/RequestForms.xml"/>
-                                    </widgets>
-                                </section>
-                            </container>
-                        </container>
+                        <screenlet title="${uiLabelMap.OrderRequest}">
+                            <include-form name="EditCustRequest" location="component://projectmgr/widget/forms/RequestForms.xml"/>
+                        </screenlet>
                     </decorator-section>
                 </decorator-screen>
             </widgets>

Modified: ofbiz/trunk/specialpurpose/projectmgr/widget/forms/RequestForms.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/specialpurpose/projectmgr/widget/forms/RequestForms.xml?rev=687011&r1=687010&r2=687011&view=diff
==============================================================================
--- ofbiz/trunk/specialpurpose/projectmgr/widget/forms/RequestForms.xml (original)
+++ ofbiz/trunk/specialpurpose/projectmgr/widget/forms/RequestForms.xml Tue Aug 19 03:13:10 2008
@@ -33,13 +33,21 @@
             <lookup target-form-name="LookupPartyName"/>
         </field>
         <field name="custRequestName" title="${uiLabelMap.CommonTitle}"><text/></field>
-        <field name="description" parameter-name="story"><textarea cols="60" rows="12"/></field>
+        <field name="description" parameter-name="story" use-when="custRequest==null"><textarea cols="60" rows="12"/></field>
         <field name="custRequestTypeId">
             <drop-down allow-empty="false">
                 <entity-options entity-name="CustRequestType" description="${description}"/>
             </drop-down>
         </field>
-        <field name="statusId"><hidden value="CRQ_ACCEPTED"/></field>
+        <field use-when="custRequest!=null" name="statusId">
+            <drop-down allow-empty="false" current="first-in-list" current-description="${currentStatus.description}">
+                <entity-options entity-name="StatusValidChangeToDetail" key-field-name="statusIdTo" description="${transitionName} (${description})">
+                    <entity-constraint name="statusId" value="${custRequest.statusId}"/>
+                    <entity-order-by field-name="sequenceId"/>
+                </entity-options>
+            </drop-down>
+        </field>
+        <field name="statusId" use-when="custRequest==null"><hidden value="CRQ_ACCEPTED"/></field>
         <field name="priority">
             <drop-down allow-empty="true">
                 <option key="9"/>