Author: pranayp
Date: Tue Jun 28 06:23:37 2016
New Revision: 1750448
URL: http://svn.apache.org/viewvc?rev=1750448&view=rev
Log:
[OFBIZ-5852] Now party can be assigned to a routing tasks. Thanks Pierre Smits
for reporting the improvement required and Amardeep Singh Jhajj for providing
the patch.
Modified:
ofbiz/trunk/applications/manufacturing/webapp/manufacturing/WEB-INF/controller.xml
ofbiz/trunk/applications/manufacturing/widget/manufacturing/ManufacturingMenus.xml
ofbiz/trunk/applications/manufacturing/widget/manufacturing/RoutingScreens.xml
ofbiz/trunk/applications/manufacturing/widget/manufacturing/RoutingTaskForms.xml
Modified:
ofbiz/trunk/applications/manufacturing/webapp/manufacturing/WEB-INF/controller.xml
URL:
http://svn.apache.org/viewvc/ofbiz/trunk/applications/manufacturing/webapp/manufacturing/WEB-INF/controller.xml?rev=1750448&r1=1750447&r2=1750448&view=diff
==============================================================================
---
ofbiz/trunk/applications/manufacturing/webapp/manufacturing/WEB-INF/controller.xml
(original)
+++
ofbiz/trunk/applications/manufacturing/webapp/manufacturing/WEB-INF/controller.xml
Tue Jun 28 06:23:37 2016
@@ -338,6 +338,24 @@ under the License.
<response name="success" type="view"
value="EditRoutingTaskFixedAssets"/>
<response name="error" type="view" value="EditRoutingTaskFixedAssets"/>
</request-map>
+ <request-map uri="EditRoutingTaskParties">
+ <security https="true" auth="true"/>
+ <response name="success" type="view" value="EditRoutingTaskParties"/>
+ </request-map>
+ <request-map uri="createRoutinTaskPartyAssign">
+ <security https="true" auth="true"/>
+ <event type="service" invoke="assignPartyToWorkEffort"/>
+ <response name="success" type="request-redirect"
value="EditRoutingTaskParties">
+ <redirect-parameter name="workEffortId"/>
+ </response>
+ </request-map>
+ <request-map uri="updateRoutinTaskPartyAssign">
+ <security https="true" auth="true"/>
+ <event type="service" invoke="updatePartyToWorkEffortAssignment"/>
+ <response name="success" type="request-redirect"
value="EditRoutingTaskParties">
+ <redirect-parameter name="workEffortId"/>
+ </response>
+ </request-map>
<!-- CostCalc mappings -->
<request-map uri="EditCostCalcs">
<security https="true" auth="true"/>
@@ -803,6 +821,7 @@ under the License.
<view-map name="EditRoutingTaskAssoc"
page="component://manufacturing/widget/manufacturing/RoutingScreens.xml#EditRoutingTaskAssoc"
type="screen"/>
<view-map name="EditRoutingProductLink"
page="component://manufacturing/widget/manufacturing/RoutingScreens.xml#EditRoutingProductLink"
type="screen"/>
<view-map name="EditRoutingTaskFixedAssets"
page="component://manufacturing/widget/manufacturing/RoutingScreens.xml#EditRoutingTaskFixedAssets"
type="screen"/>
+ <view-map name="EditRoutingTaskParties"
page="component://manufacturing/widget/manufacturing/RoutingScreens.xml#EditRoutingTaskParties"
type="screen"/>
<!-- Lookup view mappings -->
<view-map name="LookupPartyName" type="screen"
page="component://party/widget/partymgr/LookupScreens.xml#LookupPartyName"/>
<view-map name="LookupCustomerName" type="screen"
page="component://party/widget/partymgr/LookupScreens.xml#LookupCustomerName"/>
Modified:
ofbiz/trunk/applications/manufacturing/widget/manufacturing/ManufacturingMenus.xml
URL:
http://svn.apache.org/viewvc/ofbiz/trunk/applications/manufacturing/widget/manufacturing/ManufacturingMenus.xml?rev=1750448&r1=1750447&r2=1750448&view=diff
==============================================================================
---
ofbiz/trunk/applications/manufacturing/widget/manufacturing/ManufacturingMenus.xml
(original)
+++
ofbiz/trunk/applications/manufacturing/widget/manufacturing/ManufacturingMenus.xml
Tue Jun 28 06:23:37 2016
@@ -373,6 +373,11 @@ under the License.
<parameter param-name="workEffortId"
from-field="routingTask.workEffortId"/>
</link>
</menu-item>
+ <menu-item name="editRoutingTaskParties"
title="${uiLabelMap.WorkEffortParties}">
+ <link target="EditRoutingTaskParties">
+ <parameter param-name="workEffortId"
from-field="routingTask.workEffortId"/>
+ </link>
+ </menu-item>
</menu>
</menus>
Modified:
ofbiz/trunk/applications/manufacturing/widget/manufacturing/RoutingScreens.xml
URL:
http://svn.apache.org/viewvc/ofbiz/trunk/applications/manufacturing/widget/manufacturing/RoutingScreens.xml?rev=1750448&r1=1750447&r2=1750448&view=diff
==============================================================================
---
ofbiz/trunk/applications/manufacturing/widget/manufacturing/RoutingScreens.xml
(original)
+++
ofbiz/trunk/applications/manufacturing/widget/manufacturing/RoutingScreens.xml
Tue Jun 28 06:23:37 2016
@@ -394,4 +394,25 @@ under the License.
</widgets>
</section>
</screen>
+ <screen name="EditRoutingTaskParties">
+ <section>
+ <actions>
+ <set field="titleProperty" value="WorkEffortParties"/>
+ <entity-and entity-name="WorkEffortPartyAssignment"
list="routingTaskParties">
+ <field-map field-name="workEffortId"
from-field="parameters.workEffortId"/>
+ <order-by field-name="-fromDate"/>
+ </entity-and>
+ </actions>
+ <widgets>
+ <decorator-screen name="CommonRoutingTaskDecorator">
+ <decorator-section name="body">
+ <screenlet title="${uiLabelMap.AddParty}">
+ <include-form name="AddRoutingTaskParty"
location="component://manufacturing/widget/manufacturing/RoutingTaskForms.xml"/>
+ </screenlet>
+ <include-form name="ListRoutingTaskParties"
location="component://manufacturing/widget/manufacturing/RoutingTaskForms.xml"/>
+ </decorator-section>
+ </decorator-screen>
+ </widgets>
+ </section>
+ </screen>
</screens>
Modified:
ofbiz/trunk/applications/manufacturing/widget/manufacturing/RoutingTaskForms.xml
URL:
http://svn.apache.org/viewvc/ofbiz/trunk/applications/manufacturing/widget/manufacturing/RoutingTaskForms.xml?rev=1750448&r1=1750447&r2=1750448&view=diff
==============================================================================
---
ofbiz/trunk/applications/manufacturing/widget/manufacturing/RoutingTaskForms.xml
(original)
+++
ofbiz/trunk/applications/manufacturing/widget/manufacturing/RoutingTaskForms.xml
Tue Jun 28 06:23:37 2016
@@ -402,4 +402,35 @@ under the License.
<submit button-type="button"/>
</field>
</form>
+ <form name="AddRoutingTaskParty" target="createRoutinTaskPartyAssign"
type="single"
+ header-row-style="header-row" default-table-style="basic-table">
+ <field name="workEffortId"><hidden/></field>
+ <field name="statusId"><hidden value="PRTYASGN_ASSIGNED"/></field>
+ <field name="partyId" required-field="true"><lookup
target-form-name="LookupPartyName"/></field>
+ <field name="roleTypeId" required-field="true">
+ <drop-down allow-empty="false">
+ <entity-options entity-name="RoleType">
+ <entity-order-by field-name="description"/>
+ </entity-options>
+ </drop-down>
+ </field>
+ <field name="fromDate"
title="${uiLabelMap.CommonFromDate}"><date-time/></field>
+ <field name="thruDate"
title="${uiLabelMap.CommonThruDate}"><date-time/></field>
+ <field name="submitButton" widget-style="smallSubmit"><submit
button-type="button"/></field>
+ </form>
+ <form name="ListRoutingTaskParties" type="list"
target="updateRoutinTaskPartyAssign" list-name="routingTaskParties"
+ odd-row-style="alternate-row" header-row-style="header-row-2"
default-table-style="basic-table hover-bar"
paginate-target="EditRoutingTaskParties">
+ <field name="workEffortId"><hidden/></field>
+ <field name="partyId">
+ <display-entity entity-name="PartyNameView"
description="${personalTitle} ${firstName} ${middleName} ${lastName} ${suffix}
${groupName}" also-hidden="true" cache="false"/>
+ </field>
+ <field name="roleTypeId" title="${uiLabelMap.CommonRole}">
+ <display-entity entity-name="RoleType"
key-field-name="roleTypeId"/>
+ </field>
+ <field name="fromDate"
title="${uiLabelMap.CommonFromDate}"><display/></field>
+ <field name="thruDate"
title="${uiLabelMap.CommonThruDate}"><date-time/></field>
+ <field name="submitButton" title="${uiLabelMap.CommonUpdate}"
widget-style="smallSubmit">
+ <submit button-type="button"/>
+ </field>
+ </form>
</forms>
