Author: erwan
Date: Tue Mar 9 20:54:11 2010
New Revision: 921122
URL: http://svn.apache.org/viewvc?rev=921122&view=rev
Log:
Transforming list of links in screenlet menus for a better consistency
Modified:
ofbiz/trunk/applications/manufacturing/widget/manufacturing/JobshopScreens.xml
ofbiz/trunk/applications/manufacturing/widget/manufacturing/ManufacturingMenus.xml
Modified:
ofbiz/trunk/applications/manufacturing/widget/manufacturing/JobshopScreens.xml
URL:
http://svn.apache.org/viewvc/ofbiz/trunk/applications/manufacturing/widget/manufacturing/JobshopScreens.xml?rev=921122&r1=921121&r2=921122&view=diff
==============================================================================
---
ofbiz/trunk/applications/manufacturing/widget/manufacturing/JobshopScreens.xml
(original)
+++
ofbiz/trunk/applications/manufacturing/widget/manufacturing/JobshopScreens.xml
Tue Mar 9 20:54:11 2010
@@ -87,34 +87,8 @@ under the License.
<widgets>
<decorator-screen name="CommonJobshopDecorator"
location="${parameters.commonJobshopDecorator}">
<decorator-section name="body">
- <section>
- <widgets>
- <container>
- <link target="PrintProductionRun"
style="buttontext" text="${uiLabelMap.CommonPrint}">
- <parameter param-name =
"productionRunId" from-field = "productionRunId"/>
- </link>
- <link target="scheduleProductionRun"
style="buttontext" text="${uiLabelMap.ManufacturingSchedule}">
- <parameter
param-name="productionRunId" from-field="parameters.productionRunId"/>
- <parameter param-name="statusId"
value="PRUN_SCHEDULED"/>
- </link>
- <link
target="changeProductionRunStatusToPrinted" style="buttontext"
text="${uiLabelMap.ManufacturingConfirmProductionRun}">
- <parameter
param-name="productionRunId" from-field="parameters.productionRunId"/>
- </link>
- <link
target="quickChangeProductionRunStatus" style="buttontext"
text="${uiLabelMap.ManufacturingQuickComplete}">
- <parameter
param-name="productionRunId" from-field="parameters.productionRunId"/>
- <parameter param-name="statusId"
value="PRUN_COMPLETED"/>
- </link>
- <link
target="quickChangeProductionRunStatus" style="buttontext"
text="${uiLabelMap.ManufacturingQuickClose}">
- <parameter
param-name="productionRunId" from-field="parameters.productionRunId"/>
- <parameter param-name="statusId"
value="PRUN_CLOSED"/>
- </link>
- <link target="cancelProductionRun"
style="buttontext" text="${uiLabelMap.ManufacturingCancel}">
- <parameter
param-name="productionRunId" from-field="parameters.productionRunId"/>
- </link>
- </container>
- </widgets>
- </section>
- <screenlet
title="${uiLabelMap.ManufacturingProductionRunId} ${productionRunId}">
+ <screenlet
title="${uiLabelMap.ManufacturingProductionRunId} ${productionRunId}"
navigation-menu-name="ProductionRunStatusAction">
+ <include-menu name="ProductionRunStatusTabBar"
location="component://manufacturing/widget/manufacturing/ManufacturingMenus.xml"/>
<include-form name="UpdateProductionRun"
location="component://manufacturing/webapp/manufacturing/jobshopmgt/ProductionRunForms.xml"/>
<platform-specific>
<html><html-template
location="component://manufacturing/webapp/manufacturing/jobshopmgt/associatedProductionRuns.ftl"/></html>
@@ -156,50 +130,8 @@ under the License.
<widgets>
<decorator-screen name="CommonJobshopDecorator"
location="${parameters.commonJobshopDecorator}">
<decorator-section name="body">
- <container>
- <link target="PrintProductionRun"
text="${uiLabelMap.CommonPrint}" style="buttontext">
- <parameter param-name="productionRunId"/>
- </link>
- <section>
- <condition>
- <if-compare
field="productionRun.currentStatusId" operator="equals" value="PRUN_COMPLETED"/>
- </condition>
- <widgets>
- <link
target="changeProductionRunStatusToClosed"
text="${uiLabelMap.ManufacturingProductionRunClose}" style="buttontext">
- <parameter
param-name="productionRunId"/>
- </link>
- </widgets>
- </section>
- <section>
- <condition>
- <and>
- <if-compare
field="productionRun.currentStatusId" operator="not-equals"
value="PRUN_CANCELLED"/>
- <if-compare
field="productionRun.currentStatusId" operator="not-equals"
value="PRUN_COMPLETED"/>
- <if-compare
field="productionRun.currentStatusId" operator="not-equals"
value="PRUN_CLOSED"/>
- </and>
- </condition>
- <widgets>
- <link
target="quickStartAllProductionRunTasks"
text="${uiLabelMap.ManufacturingQuickStartAllTasks}" style="buttontext">
- <parameter
param-name="productionRunId"/>
- </link>
- <link
target="quickRunAllProductionRunTasks"
text="${uiLabelMap.ManufacturingQuickRunAllTasks}" style="buttontext">
- <parameter
param-name="productionRunId"/>
- </link>
- <link
target="quickChangeProductionRunStatus"
text="${uiLabelMap.ManufacturingQuickComplete}" style="buttontext">
- <parameter
param-name="productionRunId"/>
- <parameter param-name="statusId"
value="PRUN_COMPLETED"/>
- </link>
- <link
target="quickChangeProductionRunStatus"
text="${uiLabelMap.ManufacturingQuickClose}" style="buttontext">
- <parameter
param-name="productionRunId"/>
- <parameter param-name="statusId"
value="PRUN_CLOSED"/>
- </link>
- <link target="cancelProductionRun"
text="${uiLabelMap.ManufacturingCancel}" style="buttontext">
- <parameter param-name="productionRunId"/>
- </link>
- </widgets>
- </section>
- </container>
- <screenlet
title="${uiLabelMap.ManufacturingProductionRunId} ${productionRunId}">
+ <screenlet
title="${uiLabelMap.ManufacturingProductionRunId} ${productionRunId}"
navigation-menu-name="ProductionRunStatusAction">
+ <include-menu name="ProductionRunStatusTabBar"
location="component://manufacturing/widget/manufacturing/ManufacturingMenus.xml"/>
<include-form name="ShowProductionRun"
location="component://manufacturing/webapp/manufacturing/jobshopmgt/ProductionRunForms.xml"/>
</screenlet>
<section>
Modified:
ofbiz/trunk/applications/manufacturing/widget/manufacturing/ManufacturingMenus.xml
URL:
http://svn.apache.org/viewvc/ofbiz/trunk/applications/manufacturing/widget/manufacturing/ManufacturingMenus.xml?rev=921122&r1=921121&r2=921122&view=diff
==============================================================================
---
ofbiz/trunk/applications/manufacturing/widget/manufacturing/ManufacturingMenus.xml
(original)
+++
ofbiz/trunk/applications/manufacturing/widget/manufacturing/ManufacturingMenus.xml
Tue Mar 9 20:54:11 2010
@@ -181,6 +181,105 @@ under the License.
</link>
</menu-item>
</menu>
+
+ <menu name="ProductionRunStatusTabBar" extends="CommonTabBarMenu"
extends-resource="component://common/widget/CommonMenus.xml">
+ <menu-item name="cancel" title="${uiLabelMap.ManufacturingCancel}">
+ <link target="cancelProductionRun">
+ <parameter param-name="productionRunId"/>
+ </link>
+ </menu-item>
+ <menu-item name="quickChangeClose"
title="${uiLabelMap.ManufacturingQuickClose}">
+ <condition>
+ <and>
+ <if-compare field="productionRun.currentStatusId"
operator="not-equals" value="PRUN_CANCELLED"/>
+ <if-compare field="productionRun.currentStatusId"
operator="not-equals" value="PRUN_COMPLETED"/>
+ <if-compare field="productionRun.currentStatusId"
operator="not-equals" value="PRUN_CLOSED"/>
+ </and>
+ </condition>
+ <link target="quickChangeProductionRunStatus">
+ <parameter param-name="productionRunId"/>
+ <parameter param-name="statusId" value="PRUN_CLOSED"/>
+ </link>
+ </menu-item>
+ <menu-item name="quickChangeComplete"
title="${uiLabelMap.ManufacturingQuickComplete}">
+ <condition>
+ <and>
+ <if-compare field="productionRun.currentStatusId"
operator="not-equals" value="PRUN_CANCELLED"/>
+ <if-compare field="productionRun.currentStatusId"
operator="not-equals" value="PRUN_COMPLETED"/>
+ <if-compare field="productionRun.currentStatusId"
operator="not-equals" value="PRUN_CLOSED"/>
+ </and>
+ </condition>
+ <link target="quickChangeProductionRunStatus">
+ <parameter param-name="productionRunId" />
+ <parameter param-name="statusId" value="PRUN_COMPLETED"/>
+ </link>
+ </menu-item>
+ <menu-item name="changeStatusToPrinted"
title="${uiLabelMap.ManufacturingConfirmProductionRun}">
+ <condition>
+ <or>
+ <if-compare field="productionRun.currentStatusId"
operator="equals" value="PRUN_CREATED"/>
+ <if-compare field="productionRun.currentStatusId"
operator="equals" value="PRUN_SCHEDULED"/>
+ </or>
+ </condition>
+ <link target="changeProductionRunStatusToPrinted">
+ <parameter param-name="productionRunId"/>
+ </link>
+ </menu-item>
+ <menu-item name="quickRunAllProductionRunTasks"
title="${uiLabelMap.ManufacturingQuickRunAllTasks}">
+ <condition>
+ <and>
+ <if-compare field="productionRun.currentStatusId"
operator="not-equals" value="PRUN_CREATED"/>
+ <if-compare field="productionRun.currentStatusId"
operator="not-equals" value="PRUN_SCHEDULED"/>
+ <if-compare field="productionRun.currentStatusId"
operator="not-equals" value="PRUN_CANCELLED"/>
+ <if-compare field="productionRun.currentStatusId"
operator="not-equals" value="PRUN_COMPLETED"/>
+ <if-compare field="productionRun.currentStatusId"
operator="not-equals" value="PRUN_CLOSED"/>
+ </and>
+ </condition>
+ <link target="quickStartAllProductionRunTasks">
+ <parameter param-name="productionRunId"/>
+ </link>
+ </menu-item>
+ <menu-item name="quickStartAllProductionRunTasks"
title="${uiLabelMap.ManufacturingQuickStartAllTasks}">
+ <condition>
+ <and>
+ <if-compare field="productionRun.currentStatusId"
operator="not-equals" value="PRUN_CREATED"/>
+ <if-compare field="productionRun.currentStatusId"
operator="not-equals" value="PRUN_SCHEDULED"/>
+ <if-compare field="productionRun.currentStatusId"
operator="not-equals" value="PRUN_CANCELLED"/>
+ <if-compare field="productionRun.currentStatusId"
operator="not-equals" value="PRUN_COMPLETED"/>
+ <if-compare field="productionRun.currentStatusId"
operator="not-equals" value="PRUN_CLOSED"/>
+ </and>
+ </condition>
+ <link target="quickStartAllProductionRunTasks">
+ <parameter param-name="productionRunId"/>
+ </link>
+ </menu-item>
+ <menu-item name="quickChangeComplete2Close"
title="${uiLabelMap.ManufacturingQuickClose}">
+ <condition>
+ <if-compare field="productionRun.currentStatusId"
operator="equals" value="PRUN_COMPLETED"/>
+ </condition>
+ <link target="quickChangeProductionRunStatus">
+ <parameter param-name="productionRunId"/>
+ <parameter param-name="statusId" value="PRUN_CLOSED"/>
+ </link>
+ </menu-item>
+ <menu-item name="schedule" title="${uiLabelMap.ManufacturingSchedule}">
+ <condition>
+ <or>
+ <if-compare field="productionRun.currentStatusId"
operator="equals" value="PRUN_CREATED"/>
+ <if-compare field="productionRun.currentStatusId"
operator="equals" value="PRUN_SCHEDULED"/>
+ </or>
+ </condition>
+ <link target="scheduleProductionRun">
+ <parameter param-name="productionRunId"/>
+ <parameter param-name="statusId" value="PRUN_SCHEDULED"/>
+ </link>
+ </menu-item>
+ <menu-item name="print" title="${uiLabelMap.CommonPrint}">
+ <link target="PrintProductionRun">
+ <parameter param-name="productionRunId"/>
+ </link>
+ </menu-item>
+ </menu>
<menu name="MrpTabBar" extends="CommonTabBarMenu"
extends-resource="component://common/widget/CommonMenus.xml">
<menu-item name="RunMrp" title="${uiLabelMap.ManufacturingRunMrp}">
