svn commit: r696922 - in /ofbiz/trunk: applications/order/webapp/ordermgr/request/ applications/order/widget/ordermgr/ specialpurpose/projectmgr/widget/

[hansbak-2]

Author: hansbak
Date: Thu Sep 18 22:10:23 2008
New Revision: 696922

URL: http://svn.apache.org/viewvc?rev=696922&view=rev
Log:
ftl to form conversion

Removed:
    ofbiz/trunk/applications/order/webapp/ordermgr/request/requestInfo.ftl
Modified:
    ofbiz/trunk/applications/order/webapp/ordermgr/request/RequestForms.xml
    ofbiz/trunk/applications/order/widget/ordermgr/RequestScreens.xml
    ofbiz/trunk/specialpurpose/projectmgr/widget/RequestScreens.xml

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=696922&r1=696921&r2=696922&view=diff
==============================================================================
--- ofbiz/trunk/applications/order/webapp/ordermgr/request/RequestForms.xml (original)
+++ ofbiz/trunk/applications/order/webapp/ordermgr/request/RequestForms.xml Thu Sep 18 22:10:23 2008
@@ -241,7 +241,7 @@
                 <option key="1"/>
             </drop-down>
         </field>
-        <field name="maximumAmountUomId" title="${uiLabelMap.CommonCurrency}">
+        <field name="maximumAmountUomId">
             <drop-down allow-empty="true">
                 <entity-options key-field-name="uomId" description="${abbreviation} - ${description}" entity-name="Uom">
                     <entity-constraint name="uomTypeId" operator="equals" value="CURRENCY_MEASURE"/>
@@ -263,6 +263,14 @@
         <field name="fulfillContactMechId">
             <lookup target-form-name="LookupPreferredContactMech" target-parameter="fromPartyId"/>
         </field>
+        <field name="currencyUomId" title="${uiLabelMap.CommonCurrency}">
+            <drop-down allow-empty="true">
+                <entity-options key-field-name="uomId" description="${abbreviation} - ${description}" entity-name="Uom">
+                    <entity-constraint name="uomTypeId" operator="equals" value="CURRENCY_MEASURE"/>
+                    <entity-order-by field-name="abbreviation"/>
+                </entity-options>
+            </drop-down>
+        </field>
         <field name="createdDate"><hidden/></field>
         <field name="createdByUserLogin"><hidden/></field>
         <field name="lastModifiedDate"><hidden/></field>
@@ -447,4 +455,30 @@
         
         <field name="submitButton" title="${uiLabelMap.CommonAdd}" widget-style="smallSubmit"><submit button-type="button"/></field>
     </form>
+    
+    <!-- request form -->  
+    <form name="requestInfo" type="single" title="request information" default-map-name="custRequest"
+        header-row-style="header-row" default-table-style="basic-table">
+        <actions>    
+            <service service-name="getPartyNameForDate" result-map-name="partyNameResultTo">
+                <field-map field-name="partyId" env-name="custRequest.fromPartyId"/>
+                <field-map field-name="compareDate" env-name="custRequest.custRequestDate"/>
+                <field-map field-name="lastNameFirst" value="Y"/>
+            </service>
+        </actions>
+        <field name="custRequestId"><hidden/></field>
+        <field name="custRequestTypeId" title="${uiLabelMap.CommonType}"><display-entity entity-name="CustRequestType" description="${description}"/></field>  
+        <field name="statusId" title="${uiLabelMap.CommonStatus}"><display-entity entity-name="StatusItem" description="${description}"/></field>
+        <field name="fromPartyId" title="${uiLabelMap.PartyPartyId}"><hyperlink target="/partymgr/control/viewprofile?partyId=${custRequest.fromPartyId}" target-type="inter-app" description="${partyNameResultTo.fullName} [${custRequest.fromPartyId}]"/></field>
+        <field name="custRequestName" title="${uiLabelMap.CommonName}"><display/></field>
+        <field name="description" title="${uiLabelMap.CommonDescription}"><display/></field>
+        <field name="productStoreId" title="${uiLabelMap.ProductProductStore}"><display-entity entity-name="ProductStore" description="${storeName}"/></field>
+        <field name="internalComment" title="${uiLabelMap.CommonInternalComment}"><display/></field>
+        <field name="reason" title="${uiLabelMap.CommonReason}"><display/></field>
+        <field name="custRequestDate" title="${uiLabelMap.OrderRequestDate}"><display/></field>
+        <field name="createdDate" title="${uiLabelMap.OrderRequestCreatedDate}"><display/></field>
+        <field name="lastModifiedDate" title="${uiLabelMap.OrderRequestLastModifiedDate}"><display/></field>      
+    </form>
+    
+    
 </forms>
\ No newline at end of file

Modified: ofbiz/trunk/applications/order/widget/ordermgr/RequestScreens.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/order/widget/ordermgr/RequestScreens.xml?rev=696922&r1=696921&r2=696922&view=diff
==============================================================================
--- ofbiz/trunk/applications/order/widget/ordermgr/RequestScreens.xml (original)
+++ ofbiz/trunk/applications/order/widget/ordermgr/RequestScreens.xml Thu Sep 18 22:10:23 2008
@@ -76,9 +76,9 @@
                 <decorator-screen name="CommonRequestDecorator" location="${parameters.mainDecoratorLocation}">
                     <decorator-section name="body">
                 <container style="lefthalf">
-                <platform-specific>
-                    <html><html-template location="component://order/webapp/ordermgr/request/requestInfo.ftl"/></html>
-                </platform-specific>
+                    <screenlet title="${uiLabelMap.OrderRequest} ${custRequest.custRequestId} ${uiLabelMap.CommonInformation}">
+                        <include-form name="requestInfo" location="component://order/webapp/ordermgr/request/RequestForms.xml"/>
+                    </screenlet>
                             <screenlet title="${uiLabelMap.PageTitleRequestItems}">
                                 <include-form name="OverviewRequestItems" location="component://order/webapp/ordermgr/request/RequestForms.xml"/>
                             </screenlet>
@@ -86,10 +86,7 @@
                                 <include-form name="ListRequestItemNotes" location="component://order/webapp/ordermgr/request/RequestForms.xml"/>
                             </screenlet>
                 </container>
-                <container style="righthalf">
-                <platform-specific>
-                    <html><html-template location="component://order/webapp/ordermgr/request/requestDate.ftl"/></html>
-                </platform-specific>
+                <container style="righthalf">                
                 <platform-specific>
                     <html><html-template location="component://order/webapp/ordermgr/request/requestContactMech.ftl"/></html>
                 </platform-specific>

Modified: ofbiz/trunk/specialpurpose/projectmgr/widget/RequestScreens.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/specialpurpose/projectmgr/widget/RequestScreens.xml?rev=696922&r1=696921&r2=696922&view=diff
==============================================================================
--- ofbiz/trunk/specialpurpose/projectmgr/widget/RequestScreens.xml (original)
+++ ofbiz/trunk/specialpurpose/projectmgr/widget/RequestScreens.xml Thu Sep 18 22:10:23 2008
@@ -104,9 +104,9 @@
                 <decorator-screen name="CommonRequestDecorator" location="${parameters.mainDecoratorLocation}">
                     <decorator-section name="body">
                         <container style="lefthalf">
-                            <platform-specific>
-                                <html><html-template location="component://order/webapp/ordermgr/request/requestInfo.ftl"/></html>
-                            </platform-specific>
+                            <screenlet title="${uiLabelMap.OrderRequest} ${custRequest.custRequestId} ${uiLabelMap.CommonInformation}">
+                                <include-form name="requestInfo" location="component://order/webapp/ordermgr/request/RequestForms.xml"/>
+                            </screenlet>
                             <screenlet title="${uiLabelMap.PageTitleRequestItems}">
                                 <include-form name="OverviewRequestItems" location="component://projectmgr/widget/forms/RequestForms.xml"/>
                             </screenlet>
@@ -114,10 +114,7 @@
                                 <include-form name="ListRequestItemNotes" location="component://projectmgr/widget/forms/RequestForms.xml"/>
                             </screenlet>
                         </container>
-                        <container style="righthalf">
-                            <platform-specific>
-                                <html><html-template location="component://order/webapp/ordermgr/request/requestDate.ftl"/></html>
-                            </platform-specific>
+                        <container style="righthalf">                          
                             <platform-specific>
                                 <html><html-template location="component://order/webapp/ordermgr/request/requestContactMech.ftl"/></html>
                             </platform-specific>