You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@ofbiz.apache.org by ha...@apache.org on 2009/01/28 11:40:36 UTC
svn commit: r738430 - in /ofbiz/trunk/applications/humanres:
entitydef/entitymodel.xml webapp/humanres/WEB-INF/controller.xml
widget/EmplPositionScreens.xml widget/Menus.xml
widget/forms/EmplPositionForms.xml
Author: hansbak
Date: Wed Jan 28 10:40:35 2009
New Revision: 738430
URL: http://svn.apache.org/viewvc?rev=738430&view=rev
Log:
list employee positions on the employee profile
Modified:
ofbiz/trunk/applications/humanres/entitydef/entitymodel.xml
ofbiz/trunk/applications/humanres/webapp/humanres/WEB-INF/controller.xml
ofbiz/trunk/applications/humanres/widget/EmplPositionScreens.xml
ofbiz/trunk/applications/humanres/widget/Menus.xml
ofbiz/trunk/applications/humanres/widget/forms/EmplPositionForms.xml
Modified: ofbiz/trunk/applications/humanres/entitydef/entitymodel.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/humanres/entitydef/entitymodel.xml?rev=738430&r1=738429&r2=738430&view=diff
==============================================================================
--- ofbiz/trunk/applications/humanres/entitydef/entitymodel.xml (original)
+++ ofbiz/trunk/applications/humanres/entitydef/entitymodel.xml Wed Jan 28 10:40:35 2009
@@ -668,7 +668,18 @@
<key-map field-name="partyId"/>
</relation>
</entity>
- <entity entity-name="EmplPositionReportingStruct"
+ <view-entity entity-name="EmplPositionAndFulfillment"
+ package-name="org.ofbiz.humanres.position"
+ title="EmplPosition Fulfillment Entity">
+ <member-entity entity-alias="EMPPOS" entity-name="EmplPosition"></member-entity>
+ <member-entity entity-alias="EPF" entity-name="EmplPositionFulfillment"></member-entity>
+ <alias-all entity-alias="EMPPOS"/>
+ <alias name="employeePartyId" entity-alias="EPF" field="partyId"/>
+ <view-link entity-alias="EMPPOS" rel-entity-alias="EPF">
+ <key-map field-name="emplPositionId"/>
+ </view-link>
+ </view-entity>
+ <entity entity-name="EmplPositionReportingStruct"
package-name="org.ofbiz.humanres.position"
title="EmplPosition Reporting Structure Entity">
<field name="emplPositionIdReportingTo" type="id-ne"></field>
Modified: ofbiz/trunk/applications/humanres/webapp/humanres/WEB-INF/controller.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/humanres/webapp/humanres/WEB-INF/controller.xml?rev=738430&r1=738429&r2=738430&view=diff
==============================================================================
--- ofbiz/trunk/applications/humanres/webapp/humanres/WEB-INF/controller.xml (original)
+++ ofbiz/trunk/applications/humanres/webapp/humanres/WEB-INF/controller.xml Wed Jan 28 10:40:35 2009
@@ -431,6 +431,10 @@
<security https="true" auth="true"/>
<response name="success" type="view" value="EditEmplPosition"/>
</request-map>
+ <request-map uri="ListEmplPositions">
+ <security https="true" auth="true"/>
+ <response name="success" type="view" value="ListEmplPositions"/>
+ </request-map>
<request-map uri="createEmplPosition">
<security https="true" auth="true"/>
<event type="service" invoke="createEmplPosition"/>
@@ -940,6 +944,7 @@
<view-map name="FindEmplPositions" type="screen" page="component://humanres/widget/EmplPositionScreens.xml#FindEmplPositions"/>
<view-map name="EditEmplPosition" type="screen" page="component://humanres/widget/EmplPositionScreens.xml#EditEmplPosition"/>
+ <view-map name="ListEmplPositions" type="screen" page="component://humanres/widget/EmplPositionScreens.xml#ListEmplPositionsParty"/>
<view-map name="EditEmplPositionFulfillments" type="screen" page="component://humanres/widget/EmplPositionScreens.xml#EditEmplPositionFulfillments"/>
<view-map name="EditEmplPositionResponsibilities" type="screen" page="component://humanres/widget/EmplPositionScreens.xml#EditEmplPositionResponsibilities"/>
<view-map name="EditEmplPositionReportingStructs" type="screen" page="component://humanres/widget/EmplPositionScreens.xml#EditEmplPositionReportingStructs"/>
Modified: ofbiz/trunk/applications/humanres/widget/EmplPositionScreens.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/humanres/widget/EmplPositionScreens.xml?rev=738430&r1=738429&r2=738430&view=diff
==============================================================================
--- ofbiz/trunk/applications/humanres/widget/EmplPositionScreens.xml (original)
+++ ofbiz/trunk/applications/humanres/widget/EmplPositionScreens.xml Wed Jan 28 10:40:35 2009
@@ -51,6 +51,22 @@
</widgets>
</section>
</screen>
+ <screen name="ListEmplPositionsParty">
+ <section>
+ <actions>
+ <set field="titleProperty" value="HumanResFindEmplPosition"/>
+ <set field="headerItem" value="EmplPosition"/>
+ <set field="tabButtonItem" value="ListEmplPositions"/>
+ </actions>
+ <widgets>
+ <decorator-screen name="EmployeeDecorator" location="${parameters.mainDecoratorLocation}">
+ <decorator-section name="body">
+ <include-form name="ListEmplPositionsParty" location="component://humanres/widget/forms/EmplPositionForms.xml"/>
+ </decorator-section>
+ </decorator-screen>
+ </widgets>
+ </section>
+ </screen>
<screen name="EditEmplPosition">
<section>
<actions>
Modified: ofbiz/trunk/applications/humanres/widget/Menus.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/humanres/widget/Menus.xml?rev=738430&r1=738429&r2=738430&view=diff
==============================================================================
--- ofbiz/trunk/applications/humanres/widget/Menus.xml (original)
+++ ofbiz/trunk/applications/humanres/widget/Menus.xml Wed Jan 28 10:40:35 2009
@@ -116,9 +116,9 @@
<menu-item name="ListEmployment" title="${uiLabelMap.HumanResEmployment}">
<link target="ListEmployments?partyId=${parameters.partyId}"/>
</menu-item>
- <!--menu-item name="EmplPositionView" title="${uiLabelMap.HumanResEmployeePosition}">
- <link target="emplPositionView?emplPositionId=${emplPositionId}"/>
- </menu-item-->
+ <menu-item name="ListEmplPositions" title="${uiLabelMap.HumanResEmployeePosition}">
+ <link target="ListEmplPositions?partyId=${parameters.partyId}"/>
+ </menu-item>
<menu-item name="EditEmployeeSkills" title="${uiLabelMap.HumanResSkills}">
<link target="EditEmployeeSkills?partyId=${partyId}"/>
</menu-item>
Modified: ofbiz/trunk/applications/humanres/widget/forms/EmplPositionForms.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/humanres/widget/forms/EmplPositionForms.xml?rev=738430&r1=738429&r2=738430&view=diff
==============================================================================
--- ofbiz/trunk/applications/humanres/widget/forms/EmplPositionForms.xml (original)
+++ ofbiz/trunk/applications/humanres/widget/forms/EmplPositionForms.xml Wed Jan 28 10:40:35 2009
@@ -41,6 +41,15 @@
<field name="statusId"><display-entity entity-name="StatusItem" description="${description}"/></field>
<field name="emplPositionTypeId"><display-entity entity-name="EmplPositionType" description="${description}"/></field>
</form>
+ <form name="ListEmplPositionsParty" extends="ListEmplPositions" list-name="ListEmplPositions">
+ <actions>
+ <entity-and entity-name="EmplPositionAndFulfillment">
+ <field-map field-name="employeePartyId" from-field="parameters.partyId"/>
+ </entity-and>
+ </actions>
+ <field name="fromDate"><display type="date"/></field>
+ <field name="thruDate"><display type="date"/></field>
+ </form>
<form name="EditEmplPosition" type="single" target="updateEmplPosition" title="" default-map-name="emplPosition"
header-row-style="header-row" default-table-style="basic-table">
<alt-target use-when="emplPosition==null" target="createEmplPosition"/>