svn commit: r433555 - in /incubator/ofbiz/trunk/applications/manufacturing: webapp/manufacturing/WEB-INF/actions/jobshopmgt/ webapp/manufacturing/jobshopmgt/ widget/manufacturing/

Previous Topic Next Topic
 
classic Classic list List threaded Threaded
1 message Options
Reply | Threaded
Open this post in threaded view
|

svn commit: r433555 - in /incubator/ofbiz/trunk/applications/manufacturing: webapp/manufacturing/WEB-INF/actions/jobshopmgt/ webapp/manufacturing/jobshopmgt/ widget/manufacturing/

jacopoc
Author: jacopoc
Date: Tue Aug 22 00:47:40 2006
New Revision: 433555

URL: http://svn.apache.org/viewvc?rev=433555&view=rev
Log:
Applied patch from Scott Gray to convert the existing bsh/ftl based "create production run" screen to form widgets (OFBIZ-174)..

Removed:
    incubator/ofbiz/trunk/applications/manufacturing/webapp/manufacturing/WEB-INF/actions/jobshopmgt/CreateProductionRun.bsh
    incubator/ofbiz/trunk/applications/manufacturing/webapp/manufacturing/jobshopmgt/CreateProductionRun.ftl
Modified:
    incubator/ofbiz/trunk/applications/manufacturing/webapp/manufacturing/jobshopmgt/ProductionRunForms.xml
    incubator/ofbiz/trunk/applications/manufacturing/widget/manufacturing/JobshopScreens.xml

Modified: incubator/ofbiz/trunk/applications/manufacturing/webapp/manufacturing/jobshopmgt/ProductionRunForms.xml
URL: http://svn.apache.org/viewvc/incubator/ofbiz/trunk/applications/manufacturing/webapp/manufacturing/jobshopmgt/ProductionRunForms.xml?rev=433555&r1=433554&r2=433555&view=diff
==============================================================================
--- incubator/ofbiz/trunk/applications/manufacturing/webapp/manufacturing/jobshopmgt/ProductionRunForms.xml (original)
+++ incubator/ofbiz/trunk/applications/manufacturing/webapp/manufacturing/jobshopmgt/ProductionRunForms.xml Tue Aug 22 00:47:40 2006
@@ -18,6 +18,25 @@
 
 <forms xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
         xsi:noNamespaceSchemaLocation="http://www.ofbiz.org/dtds/widget-form.xsd">
+    <form name="CreateProductionRun" target="CreateProductionRunGo" title="" type="single"
+            default-title-style="tableheadtext" default-tooltip-style="tabletext" default-widget-style="inputBox">
+        <field name="productId" title="${uiLabelMap.ProductProductId}"><lookup target-form-name="LookupProduct" size="16"/></field>
+        <field name="pRQuantity" title="${uiLabelMap.ManufacturingQuantity}"><text size="6"/></field>
+        <field name="startDate" title="${uiLabelMap.ManufacturingStartDate}"><date-time/></field>
+        <field name="facilityId">
+            <drop-down allow-empty="false">
+                <entity-options entity-name="Facility" description="${facilityName} [${facilityId}]">
+                    <entity-constraint name="facilityTypeId" value="WAREHOUSE"/>
+                </entity-options>
+            </drop-down>
+        </field>
+        <field name="routingId"><lookup target-form-name="LookupRouting" size="16"/></field>
+        <field name="workEffortName" title="${uiLabelMap.ManufacturingProductionRunName}"><text size="30"/></field>
+        <field name="description" title="${uiLabelMap.CommonDescription}"><text size="50"/></field>
+        <field name="submitButton" title="${uiLabelMap.CommonSubmit}" widget-style="smallSubmit">
+            <submit button-type="button"/>
+        </field>
+    </form>
     <form name="findProductionRun" target="FindProductionRun" title="" type="single"
             default-title-style="tableheadtext" default-tooltip-style="tabletext" default-widget-style="inputBox">
         <field name="workEffortTypeId"><hidden value="PROD_ORDER_HEADER"/></field>

Modified: incubator/ofbiz/trunk/applications/manufacturing/widget/manufacturing/JobshopScreens.xml
URL: http://svn.apache.org/viewvc/incubator/ofbiz/trunk/applications/manufacturing/widget/manufacturing/JobshopScreens.xml?rev=433555&r1=433554&r2=433555&view=diff
==============================================================================
--- incubator/ofbiz/trunk/applications/manufacturing/widget/manufacturing/JobshopScreens.xml (original)
+++ incubator/ofbiz/trunk/applications/manufacturing/widget/manufacturing/JobshopScreens.xml Tue Aug 22 00:47:40 2006
@@ -59,15 +59,14 @@
                 <set field="title" value="Create a Production Run"/>
                 <set field="titleProperty" value="ManufacturingCreateProductionRun"/>
                 <set field="headerItem" value="jobshop"/>
-
-                <script location="component://manufacturing/webapp/manufacturing/WEB-INF/actions/jobshopmgt/CreateProductionRun.bsh"/>
             </actions>
             <widgets>
                 <decorator-screen name="main-decorator" location="component://manufacturing/widget/manufacturing/CommonScreens.xml">
                     <decorator-section name="body">
-                        <platform-specific>
-                            <html><html-template location="component://manufacturing/webapp/manufacturing/jobshopmgt/CreateProductionRun.ftl"/></html>
-                        </platform-specific>
+                        <container>
+                            <label style="head1" text="${uiLabelMap.ManufacturingCreateProductionRun}"/>
+                        </container>
+                        <include-form name="CreateProductionRun" location="component://manufacturing/webapp/manufacturing/jobshopmgt/ProductionRunForms.xml"></include-form>
                     </decorator-section>
                 </decorator-screen>
             </widgets>