Author: mbrohl
Date: Fri Sep 16 20:58:32 2016
New Revision: 1761086
URL: http://svn.apache.org/viewvc?rev=1761086&view=rev
Log:
Improved: Manufacturing: Consistent form name.
(OFBIZ-8068)
Change all form names to upper camel case for consistency.
Thanks: Tanmay Muley for reporting and providing the patch.
Modified:
ofbiz/trunk/applications/manufacturing/widget/manufacturing/BomForms.xml
ofbiz/trunk/applications/manufacturing/widget/manufacturing/BomScreens.xml
ofbiz/trunk/applications/manufacturing/widget/manufacturing/FieldLookupForms.xml
ofbiz/trunk/applications/manufacturing/widget/manufacturing/JobshopScreens.xml
ofbiz/trunk/applications/manufacturing/widget/manufacturing/LookupScreens.xml
ofbiz/trunk/applications/manufacturing/widget/manufacturing/ProductionRunForms.xml
Modified:
ofbiz/trunk/applications/manufacturing/widget/manufacturing/BomForms.xml
URL:
http://svn.apache.org/viewvc/ofbiz/trunk/applications/manufacturing/widget/manufacturing/BomForms.xml?rev=1761086&r1=1761085&r2=1761086&view=diff
==============================================================================
--- ofbiz/trunk/applications/manufacturing/widget/manufacturing/BomForms.xml
(original)
+++ ofbiz/trunk/applications/manufacturing/widget/manufacturing/BomForms.xml
Fri Sep 16 20:58:32 2016
@@ -128,7 +128,7 @@ under the License.
<submit button-type="button"/>
</field>
</form>
- <form name="findBom" type="single" target="FindBom" title="">
+ <form name="FindBom" type="single" target="FindBom" title="">
<field name="productId"><lookup
target-form-name="LookupProduct"/></field>
<field name="productIdTo"
title="${uiLabelMap.ProductProductIdTo}"><lookup
target-form-name="LookupProduct"/></field>
<field name="productAssocTypeId"
title="${uiLabelMap.ManufacturingBomType}">
Modified:
ofbiz/trunk/applications/manufacturing/widget/manufacturing/BomScreens.xml
URL:
http://svn.apache.org/viewvc/ofbiz/trunk/applications/manufacturing/widget/manufacturing/BomScreens.xml?rev=1761086&r1=1761085&r2=1761086&view=diff
==============================================================================
--- ofbiz/trunk/applications/manufacturing/widget/manufacturing/BomScreens.xml
(original)
+++ ofbiz/trunk/applications/manufacturing/widget/manufacturing/BomScreens.xml
Fri Sep 16 20:58:32 2016
@@ -146,7 +146,7 @@ under the License.
<container style="button-bar"><link
target="EditProductBom" text="${uiLabelMap.ManufacturingCreateBom}"
style="buttontext"/></container>
</decorator-section>
<decorator-section name="search-options">
- <include-form name="findBom"
location="component://manufacturing/widget/manufacturing/BomForms.xml"/>
+ <include-form name="FindBom"
location="component://manufacturing/widget/manufacturing/BomForms.xml"/>
</decorator-section>
<decorator-section name="search-results">
<include-form name="ListBom"
location="component://manufacturing/widget/manufacturing/BomForms.xml"/>
Modified:
ofbiz/trunk/applications/manufacturing/widget/manufacturing/FieldLookupForms.xml
URL:
http://svn.apache.org/viewvc/ofbiz/trunk/applications/manufacturing/widget/manufacturing/FieldLookupForms.xml?rev=1761086&r1=1761085&r2=1761086&view=diff
==============================================================================
---
ofbiz/trunk/applications/manufacturing/widget/manufacturing/FieldLookupForms.xml
(original)
+++
ofbiz/trunk/applications/manufacturing/widget/manufacturing/FieldLookupForms.xml
Fri Sep 16 20:58:32 2016
@@ -20,7 +20,7 @@ under the License.
<forms xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance";
xmlns="http://ofbiz.apache.org/Widget-Form";
xsi:schemaLocation="http://ofbiz.apache.org/Widget-Form
http://ofbiz.apache.org/dtds/widget-form.xsd";>
- <form name="lookupRouting" target="LookupRouting" title="" type="single"
+ <form name="LookupRouting" target="LookupRouting" title="" type="single"
header-row-style="header-row" default-table-style="basic-table">
<auto-fields-service service-name="lookupRoutingTask"
default-field-type="hidden"/>
<field name="workEffortName"
title="${uiLabelMap.ManufacturingTaskName}"><text-find/></field>
@@ -30,7 +30,7 @@ under the License.
<field name="noConditionFind"><hidden value="Y"/><!-- if this isn't
there then with all fields empty no query will be done --></field>
<field name="submitButton" title="${uiLabelMap.CommonFind}"><submit
button-type="button"/></field>
</form>
- <form name="listLookupRouting" list-name="listIt" title="" type="list"
+ <form name="ListLookupRouting" list-name="listIt" title="" type="list"
paginate-target="LookupRouting" odd-row-style="alternate-row"
default-table-style="basic-table hover-bar">
<actions>
<service service-name="performFind" result-map="result"
result-map-list="listIt">
@@ -48,7 +48,7 @@ under the License.
<field name="quantityToProduce"
title="${uiLabelMap.ManufacturingQuantityMinimum}"><display/></field>
</form>
- <form name="lookupRoutingTask" target="LookupRoutingTask" title=""
type="single"
+ <form name="LookupRoutingTask" target="LookupRoutingTask" title=""
type="single"
header-row-style="header-row" default-table-style="basic-table">
<auto-fields-service service-name="lookupRoutingTask"
default-field-type="find"/>
<field name="workEffortTypeId"><hidden value="ROU_TASK"/></field>
@@ -65,7 +65,7 @@ under the License.
<field name="noConditionFind"><hidden value="Y"/><!-- if this isn't
there then with all fields empty no query will be done --></field>
<field name="submitButton" title="${uiLabelMap.CommonFind}"><submit
button-type="button"/></field>
</form>
- <form name="listLookupRoutingTask" list-name="listIt" title="" type="list"
+ <form name="ListLookupRoutingTask" list-name="listIt" title="" type="list"
paginate-target="LookupRoutingTask" odd-row-style="alternate-row"
default-table-style="basic-table hover-bar">
<actions>
<service service-name="performFind" result-map="result"
result-map-list="listIt">
Modified:
ofbiz/trunk/applications/manufacturing/widget/manufacturing/JobshopScreens.xml
URL:
http://svn.apache.org/viewvc/ofbiz/trunk/applications/manufacturing/widget/manufacturing/JobshopScreens.xml?rev=1761086&r1=1761085&r2=1761086&view=diff
==============================================================================
---
ofbiz/trunk/applications/manufacturing/widget/manufacturing/JobshopScreens.xml
(original)
+++
ofbiz/trunk/applications/manufacturing/widget/manufacturing/JobshopScreens.xml
Fri Sep 16 20:58:32 2016
@@ -122,7 +122,7 @@ under the License.
</condition>
<widgets>
<screenlet
title="${uiLabelMap.ManufacturingPrecedingProductionRun}">
- <include-form name="mandatoryWorkEfforts"
location="component://manufacturing/widget/manufacturing/ProductionRunForms.xml"/>
+ <include-form name="MandatoryWorkEfforts"
location="component://manufacturing/widget/manufacturing/ProductionRunForms.xml"/>
</screenlet>
</widgets>
</section>
@@ -132,7 +132,7 @@ under the License.
</condition>
<widgets>
<screenlet
title="${uiLabelMap.ManufacturingSucceedingProductionRun}">
- <include-form name="dependentWorkEfforts"
location="component://manufacturing/widget/manufacturing/ProductionRunForms.xml"/>
+ <include-form name="DependentWorkEfforts"
location="component://manufacturing/widget/manufacturing/ProductionRunForms.xml"/>
</screenlet>
</widgets>
</section>
@@ -225,7 +225,7 @@ under the License.
</condition>
<widgets>
<screenlet
title="${uiLabelMap.ManufacturingMandatoryWorkEfforts}">
- <include-form name="mandatoryWorkEfforts"
location="component://manufacturing/widget/manufacturing/ProductionRunForms.xml"/>
+ <include-form name="MandatoryWorkEfforts"
location="component://manufacturing/widget/manufacturing/ProductionRunForms.xml"/>
</screenlet>
</widgets>
</section>
@@ -235,7 +235,7 @@ under the License.
</condition>
<widgets>
<screenlet
title="${uiLabelMap.ManufacturingDependentWorkEfforts}">
- <include-form name="dependentWorkEfforts"
location="component://manufacturing/widget/manufacturing/ProductionRunForms.xml"/>
+ <include-form name="DependentWorkEfforts"
location="component://manufacturing/widget/manufacturing/ProductionRunForms.xml"/>
</screenlet>
</widgets>
</section>
@@ -344,10 +344,10 @@ under the License.
<decorator-screen name="CommonJobshopDecorator"
location="${parameters.commonJobshopDecorator}">
<decorator-section name="body">
<screenlet
title="${uiLabelMap.ManufacturingPrecedingProductionRun}">
- <include-form name="mandatoryWorkEfforts"
location="component://manufacturing/widget/manufacturing/ProductionRunForms.xml"/>
+ <include-form name="MandatoryWorkEfforts"
location="component://manufacturing/widget/manufacturing/ProductionRunForms.xml"/>
</screenlet>
<screenlet
title="${uiLabelMap.ManufacturingSucceedingProductionRun}">
- <include-form name="dependentWorkEfforts"
location="component://manufacturing/widget/manufacturing/ProductionRunForms.xml"/>
+ <include-form name="DependentWorkEfforts"
location="component://manufacturing/widget/manufacturing/ProductionRunForms.xml"/>
</screenlet>
</decorator-section>
</decorator-screen>
@@ -667,7 +667,7 @@ under the License.
<decorator-screen name="CommonJobshopDecorator"
location="${parameters.commonJobshopDecorator}">
<decorator-section name="body">
<screenlet
title="${uiLabelMap.PageTitleProductionRunLink}">
- <include-form name="linkProductionRun"
location="component://manufacturing/widget/manufacturing/ProductionRunForms.xml"/>
+ <include-form name="LinkProductionRun"
location="component://manufacturing/widget/manufacturing/ProductionRunForms.xml"/>
</screenlet>
</decorator-section>
</decorator-screen>
@@ -695,10 +695,10 @@ under the License.
</container>
</decorator-section>
<decorator-section name="search-options">
- <include-form name="findProductionRun"
location="component://manufacturing/widget/manufacturing/ProductionRunForms.xml"/>
+ <include-form name="FindProductionRun"
location="component://manufacturing/widget/manufacturing/ProductionRunForms.xml"/>
</decorator-section>
<decorator-section name="search-results">
- <include-form
name="listFindProductionRun"
location="component://manufacturing/widget/manufacturing/ProductionRunForms.xml"/>
+ <include-form
name="ListFindProductionRun"
location="component://manufacturing/widget/manufacturing/ProductionRunForms.xml"/>
</decorator-section>
</decorator-screen>
</widgets>
@@ -729,7 +729,7 @@ under the License.
<decorator-screen name="CommonManufacturingDecorator"
location="${parameters.commonManufacturingDecoratorLocation}">
<decorator-section name="body">
<screenlet
title="${uiLabelMap.ManufacturingWorkWithShipmentPlans}">
- <include-form name="listShipmentPlans"
location="component://manufacturing/widget/manufacturing/ProductionRunForms.xml"/>
+ <include-form name="ListShipmentPlans"
location="component://manufacturing/widget/manufacturing/ProductionRunForms.xml"/>
</screenlet>
<section>
<condition>
@@ -737,7 +737,7 @@ under the License.
</condition>
<widgets>
<screenlet
title="${uiLabelMap.FormFieldTitle_shipmentId} ${shipment.shipmentId}">
- <include-form name="listShipmentPlan"
location="component://manufacturing/widget/manufacturing/ProductionRunForms.xml"/>
+ <include-form name="ListShipmentPlan"
location="component://manufacturing/widget/manufacturing/ProductionRunForms.xml"/>
</screenlet>
<section>
<condition>
Modified:
ofbiz/trunk/applications/manufacturing/widget/manufacturing/LookupScreens.xml
URL:
http://svn.apache.org/viewvc/ofbiz/trunk/applications/manufacturing/widget/manufacturing/LookupScreens.xml?rev=1761086&r1=1761085&r2=1761086&view=diff
==============================================================================
---
ofbiz/trunk/applications/manufacturing/widget/manufacturing/LookupScreens.xml
(original)
+++
ofbiz/trunk/applications/manufacturing/widget/manufacturing/LookupScreens.xml
Fri Sep 16 20:58:32 2016
@@ -40,10 +40,10 @@ under the License.
<widgets>
<decorator-screen name="LookupDecorator"
location="component://common/widget/CommonScreens.xml">
<decorator-section name="search-options">
- <include-form name="lookupRouting"
location="component://manufacturing/widget/manufacturing/FieldLookupForms.xml"/>
+ <include-form name="LookupRouting"
location="component://manufacturing/widget/manufacturing/FieldLookupForms.xml"/>
</decorator-section>
<decorator-section name="search-results">
- <include-form name="listLookupRouting"
location="component://manufacturing/widget/manufacturing/FieldLookupForms.xml"/>
+ <include-form name="ListLookupRouting"
location="component://manufacturing/widget/manufacturing/FieldLookupForms.xml"/>
</decorator-section>
</decorator-screen>
</widgets>
@@ -69,10 +69,10 @@ under the License.
<widgets>
<decorator-screen name="LookupDecorator"
location="component://common/widget/CommonScreens.xml">
<decorator-section name="search-options">
- <include-form name="lookupRoutingTask"
location="component://manufacturing/widget/manufacturing/FieldLookupForms.xml"/>
+ <include-form name="LookupRoutingTask"
location="component://manufacturing/widget/manufacturing/FieldLookupForms.xml"/>
</decorator-section>
<decorator-section name="search-results">
- <include-form name="listLookupRoutingTask"
location="component://manufacturing/widget/manufacturing/FieldLookupForms.xml"/>
+ <include-form name="ListLookupRoutingTask"
location="component://manufacturing/widget/manufacturing/FieldLookupForms.xml"/>
</decorator-section>
</decorator-screen>
</widgets>
Modified:
ofbiz/trunk/applications/manufacturing/widget/manufacturing/ProductionRunForms.xml
URL:
http://svn.apache.org/viewvc/ofbiz/trunk/applications/manufacturing/widget/manufacturing/ProductionRunForms.xml?rev=1761086&r1=1761085&r2=1761086&view=diff
==============================================================================
---
ofbiz/trunk/applications/manufacturing/widget/manufacturing/ProductionRunForms.xml
(original)
+++
ofbiz/trunk/applications/manufacturing/widget/manufacturing/ProductionRunForms.xml
Fri Sep 16 20:58:32 2016
@@ -67,7 +67,7 @@ under the License.
</field>
<field name="submitButton"
title="${uiLabelMap.CommonSubmit}"><submit/></field>
</form>
- <form name="findProductionRun" target="FindProductionRun" title=""
type="single"
+ <form name="FindProductionRun" target="FindProductionRun" title=""
type="single"
header-row-style="header-row" default-table-style="basic-table">
<field name="workEffortTypeId"><hidden
value="PROD_ORDER_HEADER"/></field>
<field name="workEffortId"
title="${uiLabelMap.ManufacturingProductionRunId}"><text-find/></field>
@@ -91,7 +91,7 @@ under the License.
<field name="submitButton"
title="${uiLabelMap.CommonFind}"><submit/></field>
</form>
- <form name="listFindProductionRun" list-name="listIt" title="" type="list"
paginate-target="FindProductionRun"
+ <form name="ListFindProductionRun" list-name="listIt" title="" type="list"
paginate-target="FindProductionRun"
odd-row-style="alternate-row" default-table-style="basic-table
hover-bar">
<actions>
<service service-name="performFind" result-map="result"
result-map-list="listIt">
@@ -730,7 +730,7 @@ under the License.
<!-- Shipment Plan Forms -->
<!-- ******************* -->
<!-- List for Shipment Plan -->
- <form name="listShipmentPlan" type="list" target="" title=""
list-name="shipmentPlan"
+ <form name="ListShipmentPlan" type="list" target="" title=""
list-name="shipmentPlan"
odd-row-style="alternate-row" default-table-style="basic-table
hover-bar">
<field name="orderId" widget-style="buttontext">
<hyperlink target="/ordermgr/control/orderview"
target-type="inter-app" description="${orderId}">
@@ -761,7 +761,7 @@ under the License.
<field name="productionRunQuantityProduced"><display/></field>
</form>
- <form name="listShipmentPlans" type="list" target="" title=""
list-name="shipmentPlans"
+ <form name="ListShipmentPlans" type="list" target="" title=""
list-name="shipmentPlans"
odd-row-style="alternate-row" default-table-style="basic-table
hover-bar" header-row-style="header-row-2">
<field name="shipmentId" widget-style="buttontext" sort-field="true">
<hyperlink target="/facility/control/ViewShipment"
target-type="inter-app" description="${shipmentId}">
@@ -783,7 +783,7 @@ under the License.
<field name="mrpName" title="${uiLabelMap.ManufacturingMrpName}"><text
size="20"/></field>
<field name="submitButton"
title="${uiLabelMap.CommonSubmit}"><submit/></field>
</form>
- <form name="linkProductionRun" type="single"
target="createProductionRunAssoc" title=""
+ <form name="LinkProductionRun" type="single"
target="createProductionRunAssoc" title=""
header-row-style="header-row" default-table-style="basic-table">
<field name="productionRunId"><hidden/></field>
<field name="workEffortAssocTypeId"><hidden
value="WORK_EFF_PRECEDENCY"/></field>
@@ -805,7 +805,7 @@ under the License.
</field>
<field name="submitButton"
title="${uiLabelMap.CommonSubmit}"><submit/></field>
</form>
- <form name="mandatoryWorkEfforts" type="list" target="" title=""
list-name="mandatoryWorkEfforts"
+ <form name="MandatoryWorkEfforts" type="list" target="" title=""
list-name="mandatoryWorkEfforts"
odd-row-style="alternate-row" default-table-style="basic-table
hover-bar">
<field name="workEffortIdFrom" title=" " widget-style="buttontext">
<hyperlink target="ShowProductionRun"
description="${workEffortIdFrom}" also-hidden="false" link-type="anchor">
@@ -843,7 +843,7 @@ under the License.
</hyperlink>
</field>
</form>
- <form name="dependentWorkEfforts" type="list" target="" title=""
list-name="dependentWorkEfforts"
+ <form name="DependentWorkEfforts" type="list" target="" title=""
list-name="dependentWorkEfforts"
odd-row-style="alternate-row" default-table-style="basic-table
hover-bar">
<field name="workEffortIdTo" title=" " widget-style="buttontext">
<hyperlink target="ShowProductionRun"
description="${workEffortIdTo}" also-hidden="false" link-type="anchor">
