Thank you, Deepak, for leaving my name out... Pierre Smits
ORRTIZ.COM <http://www.orrtiz.com> OFBiz based solutions & services OFBiz Extensions Marketplace http://oem.ofbizci.net/oci-2/ On Sat, Dec 17, 2016 at 10:04 AM, <[email protected]> wrote: > Author: deepak > Date: Sat Dec 17 09:04:23 2016 > New Revision: 1774725 > > URL: http://svn.apache.org/viewvc?rev=1774725&view=rev > Log: > Improved: Add Party criteria to Routing Tasks > (OFBIZ-9134) > Thanks Paul Foxworthy and Suraj Khurana for your contribution > > 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 > ofbiz/trunk/applications/workeffort/config/WorkEffortUiLabels.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=1774725&r1= > 1774724&r2=1774725&view=diff > ============================================================ > ================== > --- > ofbiz/trunk/applications/manufacturing/webapp/manufacturing/WEB-INF/controller.xml > (original) > +++ > ofbiz/trunk/applications/manufacturing/webapp/manufacturing/WEB-INF/controller.xml > Sat Dec 17 09:04:23 2016 > @@ -356,6 +356,31 @@ under the License. > <redirect-parameter name="workEffortId"/> > </response> > </request-map> > + <request-map uri="EditRoutingTaskSkills"> > + <security https="true" auth="true"/> > + <response name="success" type="view" > value="EditRoutingTaskSkills"/> > + </request-map> > + <request-map uri="createRoutingTaskSkill"> > + <security https="true" auth="true"/> > + <event type="service" invoke="createWorkEffortSkillStandard"/> > + <response name="success" type="request-redirect" > value="EditRoutingTaskSkills"> > + <redirect-parameter name="workEffortId"/> > + </response> > + </request-map> > + <request-map uri="updateRoutingTaskSkill"> > + <security https="true" auth="true"/> > + <event type="service" invoke="updateWorkEffortSkillStandard"/> > + <response name="success" type="request-redirect" > value="EditRoutingTaskSkills"> > + <redirect-parameter name="workEffortId"/> > + </response> > + </request-map> > + <request-map uri="deleteRoutingTaskSkill"> > + <security https="true" auth="true"/> > + <event type="service" invoke="deleteWorkEffortSkillStandard"/> > + <response name="success" type="request-redirect" > value="EditRoutingTaskSkills"> > + <redirect-parameter name="workEffortId"/> > + </response> > + </request-map> > <!-- CostCalc mappings --> > <request-map uri="EditCostCalcs"> > <security https="true" auth="true"/> > @@ -822,6 +847,7 @@ under the License. > <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"/> > + <view-map name="EditRoutingTaskSkills" page="component:// > manufacturing/widget/manufacturing/RoutingScreens.xml#EditRoutingTaskSkills" > 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= > 1774725&r1=1774724&r2=1774725&view=diff > ============================================================ > ================== > --- > ofbiz/trunk/applications/manufacturing/widget/manufacturing/ManufacturingMenus.xml > (original) > +++ > ofbiz/trunk/applications/manufacturing/widget/manufacturing/ManufacturingMenus.xml > Sat Dec 17 09:04:23 2016 > @@ -378,6 +378,11 @@ under the License. > <parameter param-name="workEffortId" > from-field="routingTask.workEffortId"/> > </link> > </menu-item> > + <menu-item name="editRoutingTaskSkills" title="${uiLabelMap. > WorkEffortSkills}"> > + <link target="EditRoutingTaskSkills"> > + <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=1774725&r1=1774724&r2=1774725&view=diff > ============================================================ > ================== > --- ofbiz/trunk/applications/manufacturing/widget/ > manufacturing/RoutingScreens.xml (original) > +++ ofbiz/trunk/applications/manufacturing/widget/ > manufacturing/RoutingScreens.xml Sat Dec 17 09:04:23 2016 > @@ -415,4 +415,24 @@ under the License. > </widgets> > </section> > </screen> > + <screen name="EditRoutingTaskSkills"> > + <section> > + <actions> > + <set field="titleProperty" value="WorkEffortSkills"/> > + <entity-and entity-name="WorkEffortSkillStandard" > list="routingTaskSkills"> > + <field-map field-name="workEffortId" > from-field="parameters.workEffortId"/> > + </entity-and> > + </actions> > + <widgets> > + <decorator-screen name="CommonRoutingTaskDecorator"> > + <decorator-section name="body"> > + <screenlet title="Add Skill"> > + <include-form name="AddRoutingTaskSkill" > location="component://manufacturing/widget/manufacturing/ > RoutingTaskForms.xml"/> > + </screenlet> > + <include-form name="ListRoutingTaskSkills" > 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= > 1774725&r1=1774724&r2=1774725&view=diff > ============================================================ > ================== > --- > ofbiz/trunk/applications/manufacturing/widget/manufacturing/RoutingTaskForms.xml > (original) > +++ > ofbiz/trunk/applications/manufacturing/widget/manufacturing/RoutingTaskForms.xml > Sat Dec 17 09:04:23 2016 > @@ -435,4 +435,34 @@ under the License. > <submit button-type="button"/> > </field> > </form> > + <form name="AddRoutingTaskSkill" target="createRoutingTaskSkill" > type="single" > + header-row-style="header-row" default-table-style="basic- > table"> > + <auto-fields-entity entity-name="WorkEffortSkillStandard" > default-field-type="edit"/> > + <field name="workEffortId"><hidden/></field> > + <field name="skillTypeId" required-field="true"> > + <drop-down allow-empty="false"> > + <entity-options entity-name="SkillType"> > + <entity-order-by field-name="description"/> > + </entity-options> > + </drop-down> > + </field> > + <field name="submitButton" widget-style="smallSubmit"><submit > button-type="button"/></field> > + </form> > + <form name="ListRoutingTaskSkills" type="list" > target="updateRoutingTaskSkill" > list-name="routingTaskSkills" > + odd-row-style="alternate-row" header-row-style="header-row-2" > default-table-style="basic-table hover-bar" > paginate-target="EditRoutingTaskSkills" > separate-columns="true"> > + <auto-fields-entity entity-name="WorkEffortSkillStandard"/> > + <field name="workEffortId"><hidden/></field> > + <field name="skillTypeId"> > + <display-entity entity-name="SkillType" > key-field-name="skillTypeId"/> > + </field> > + <field name="submitButton" title="${uiLabelMap.CommonUpdate}" > widget-style="smallSubmit"> > + <submit button-type="button"/> > + </field> > + <field name="deleteLink" title=" " widget-style="buttontext"> > + <hyperlink description="${uiLabelMap.CommonDelete}" > target="deleteRoutingTaskSkill" > also-hidden="false"> > + <parameter param-name="workEffortId"/> > + <parameter param-name="skillTypeId"/> > + </hyperlink> > + </field> > + </form> > </forms> > > Modified: ofbiz/trunk/applications/workeffort/config/ > WorkEffortUiLabels.xml > URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/ > workeffort/config/WorkEffortUiLabels.xml?rev= > 1774725&r1=1774724&r2=1774725&view=diff > ============================================================ > ================== > --- ofbiz/trunk/applications/workeffort/config/WorkEffortUiLabels.xml > (original) > +++ ofbiz/trunk/applications/workeffort/config/WorkEffortUiLabels.xml Sat > Dec 17 09:04:23 2016 > @@ -4737,6 +4737,9 @@ > <value xml:lang="zh">显示这个明细的便笺</value> > <value xml:lang="zh-TW">é¡¯ç¤ºé€™å€‹ç´°é …çš„ä¾¿ç®‹</value> > </property> > + <property key="WorkEffortSkills"> > + <value xml:lang="en">Skills</value> > + </property> > <property key="WorkEffortStartDate"> > <value xml:lang="de">Anfangsdatum</value> > <value xml:lang="en">Start Date</value> > > >
