You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@ofbiz.apache.org by ad...@apache.org on 2019/10/25 08:51:04 UTC
svn commit: r1868911 - in
/ofbiz/ofbiz-framework/trunk/applications/humanres/widget:
EmplPositionScreens.xml HumanresMenus.xml forms/EmplPositionForms.xml
Author: adityasharma
Date: Fri Oct 25 08:51:03 2019
New Revision: 1868911
URL: http://svn.apache.org/viewvc?rev=1868911&view=rev
Log:
Improved: Activate / Finish EmplPositionType ValidResponsibilities
(OFBIZ-11045)
Most of code / form / screen already exist to manage EmpPositionType, except
1. menu item
2. screen menu fields
Fixed wrong entity name in the entityCondition prepared in ListValidResponsibilities form
Thanks Olivier Heintz for reporting and providing the patch
Modified:
ofbiz/ofbiz-framework/trunk/applications/humanres/widget/EmplPositionScreens.xml
ofbiz/ofbiz-framework/trunk/applications/humanres/widget/HumanresMenus.xml
ofbiz/ofbiz-framework/trunk/applications/humanres/widget/forms/EmplPositionForms.xml
Modified: ofbiz/ofbiz-framework/trunk/applications/humanres/widget/EmplPositionScreens.xml
URL: http://svn.apache.org/viewvc/ofbiz/ofbiz-framework/trunk/applications/humanres/widget/EmplPositionScreens.xml?rev=1868911&r1=1868910&r2=1868911&view=diff
==============================================================================
--- ofbiz/ofbiz-framework/trunk/applications/humanres/widget/EmplPositionScreens.xml (original)
+++ ofbiz/ofbiz-framework/trunk/applications/humanres/widget/EmplPositionScreens.xml Fri Oct 25 08:51:03 2019
@@ -147,13 +147,20 @@
<section>
<actions>
<set field="titleProperty" value="PageTitleListValidResponsibilities"/>
+ <set field="headerItem" value="EmplPositionTypes"/>
+ <set field="tabButtonItem" value="EmplPositionTypes"/>
+ <set field="tabButtonItem2" value="EditValidResponsibilities"/>
+ <set field="emplPositionTypeId" from-field="parameters.emplPositionTypeId"/>
</actions>
<widgets>
- <decorator-screen name="main-decorator" location="${parameters.mainDecoratorLocation}">
+ <decorator-screen name="GlobalHRSettingsDecorator" location="${parameters.mainDecoratorLocation}">
<decorator-section name="body">
+ <include-menu name="EmplPositionTypeTabBar" location="component://humanres/widget/HumanresMenus.xml"/>
<screenlet title="${uiLabelMap.HumanResListValidResponsibility}">
<container>
- <link target="EditValidResponsibility" text="${uiLabelMap.HumanResAddValidResponsibility}" style="buttontext"/>
+ <link target="EditValidResponsibility" text="${uiLabelMap.HumanResAddValidResponsibility}" style="buttontext">
+ <parameter param-name="emplPositionTypeId"/>
+ </link>
</container>
<include-form name="ListValidResponsibilities" location="component://humanres/widget/forms/EmplPositionForms.xml"/>
</screenlet>
@@ -166,15 +173,23 @@
<section>
<actions>
<set field="titleProperty" value="PageTitleEditValidResponsibility"/>
+ <set field="headerItem" value="EmplPositionTypes"/>
+ <set field="tabButtonItem" value="EmplPositionTypes"/>
+ <set field="tabButtonItem2" value="EditValidResponsibilities"/>
+ <set field="emplPositionTypeId" from-field="parameters.emplPositionTypeId"/>
</actions>
<widgets>
- <decorator-screen name="main-decorator" location="${parameters.mainDecoratorLocation}">
+ <decorator-screen name="GlobalHRSettingsDecorator" location="${parameters.mainDecoratorLocation}">
<decorator-section name="body">
+ <include-menu name="EmplPositionTypeTabBar" location="component://humanres/widget/HumanresMenus.xml"/>
<screenlet title="${uiLabelMap.HumanResAddValidResponsibility}">
<container>
- <link target="EditValidResponsibility" text="${uiLabelMap.HumanResAddValidResponsibility}" style="buttontext"/>
+ <link target="EditValidResponsibility" text="${uiLabelMap.HumanResAddValidResponsibility}" style="buttontext">
+ <parameter param-name="emplPositionTypeId"/>
+ </link>
</container>
<include-form name="AddValidResponsibility" location="component://humanres/widget/forms/EmplPositionForms.xml"/>
+ <include-form name="ListValidResponsibilities" location="component://humanres/widget/forms/EmplPositionForms.xml"/>
</screenlet>
</decorator-section>
</decorator-screen>
Modified: ofbiz/ofbiz-framework/trunk/applications/humanres/widget/HumanresMenus.xml
URL: http://svn.apache.org/viewvc/ofbiz/ofbiz-framework/trunk/applications/humanres/widget/HumanresMenus.xml?rev=1868911&r1=1868910&r2=1868911&view=diff
==============================================================================
--- ofbiz/ofbiz-framework/trunk/applications/humanres/widget/HumanresMenus.xml (original)
+++ ofbiz/ofbiz-framework/trunk/applications/humanres/widget/HumanresMenus.xml Fri Oct 25 08:51:03 2019
@@ -258,6 +258,11 @@
<parameter param-name="emplPositionTypeId"/>
</link>
</menu-item>
+ <menu-item name="EditValidResponsibilities" title="${uiLabelMap.HumanResEmplPositionResponsibilities}">
+ <link target="findValidResponsibilities">
+ <parameter param-name="emplPositionTypeId"/>
+ </link>
+ </menu-item>
<menu-item name="EditEmplPositionTypeRate" title="${uiLabelMap.HumanResEmplPositionTypeRate}">
<link target="EditEmplPositionTypeRates">
<parameter param-name="emplPositionTypeId"/>
Modified: ofbiz/ofbiz-framework/trunk/applications/humanres/widget/forms/EmplPositionForms.xml
URL: http://svn.apache.org/viewvc/ofbiz/ofbiz-framework/trunk/applications/humanres/widget/forms/EmplPositionForms.xml?rev=1868911&r1=1868910&r2=1868911&view=diff
==============================================================================
--- ofbiz/ofbiz-framework/trunk/applications/humanres/widget/forms/EmplPositionForms.xml (original)
+++ ofbiz/ofbiz-framework/trunk/applications/humanres/widget/forms/EmplPositionForms.xml Fri Oct 25 08:51:03 2019
@@ -238,7 +238,7 @@ under the License.
<form name="ListValidResponsibilities" type="list" target="updateValidResponsibility" title="" paginate-target="findValidResponsibilities"
odd-row-style="alternate-row" default-table-style="basic-table hover-bar">
<actions>
- <entity-condition entity-name="EmplPositionResponsibility"/>
+ <entity-condition entity-name="ValidResponsibility"/>
</actions>
<auto-fields-service service-name="updateValidResponsibility"/>
<field name="emplPositionTypeId" title="${uiLabelMap.HumanResEmployeePositionTypeId}"><display /></field>