You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@ofbiz.apache.org by ap...@apache.org on 2008/11/16 07:18:59 UTC
svn commit: r717984 - in /ofbiz/trunk/applications/humanres:
config/HumanResUiLabels.xml entitydef/entitymodel.xml
widget/EmploymentScreens.xml widget/forms/EmploymentForms.xml
Author: apatel
Date: Sat Nov 15 22:18:59 2008
New Revision: 717984
URL: http://svn.apache.org/viewvc?rev=717984&view=rev
Log:
Now employment search takes employee first and last name. Updated labels to match with context. Added little tool tip.
Added view entity to show employee (Person) data with employment record.
Modified:
ofbiz/trunk/applications/humanres/config/HumanResUiLabels.xml
ofbiz/trunk/applications/humanres/entitydef/entitymodel.xml
ofbiz/trunk/applications/humanres/widget/EmploymentScreens.xml
ofbiz/trunk/applications/humanres/widget/forms/EmploymentForms.xml
Modified: ofbiz/trunk/applications/humanres/config/HumanResUiLabels.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/humanres/config/HumanResUiLabels.xml?rev=717984&r1=717983&r2=717984&view=diff
==============================================================================
--- ofbiz/trunk/applications/humanres/config/HumanResUiLabels.xml (original)
+++ ofbiz/trunk/applications/humanres/config/HumanResUiLabels.xml Sat Nov 15 22:18:59 2008
@@ -567,6 +567,9 @@
<property key="HumanResFindEmplPosition">
<value xml:lang="en">Find Employee Position</value>
</property>
+ <property key="HumanResFindEmployment">
+ <value xml:lang="en">Find Employment</value>
+ </property>
<property key="HumanResFindEmploymentApp">
<value xml:lang="en">Find Employment Application</value>
</property>
@@ -776,6 +779,19 @@
<property key="HumanResEmplPositionTypeRate">
<value xml:lang="en">Position Type Rate</value>
</property>
+ <property key="HumanResEmploymentPartyIdFrom">
+ <value xml:lang="en">Internal Organization</value>
+ <value xml:lang="it">Codice Soggetto Da</value>
+ <value xml:lang="th">à¸à¸²à¸à¸£à¸«à¸±à¸ªà¸à¸¥à¸¸à¹à¸¡à¸à¸¹à¹à¹à¸à¹</value>
+ </property>
+ <property key="HumanResEmploymentPartyIdFromToolTip">
+ <value xml:lang="en">Internal Organization Employee works in</value>
+ </property>
+ <property key="HumanResEmployeePartyIdTo">
+ <value xml:lang="en">Employee Party Id</value>
+ <value xml:lang="it">Codice Soggetto A</value>
+ <value xml:lang="th">à¸à¸¶à¸à¸£à¸«à¸±à¸ªà¸à¸¥à¸¸à¹à¸¡à¸à¸¹à¹à¹à¸à¹</value>
+ </property>
<property key="HumanResNewPartySkill">
<value xml:lang="en">New Party Skill</value>
<value xml:lang="it">Nuova Abilità Soggetto</value>
@@ -825,16 +841,6 @@
<value xml:lang="it">Benifit Soggetto</value>
<value xml:lang="th">à¸à¸¥à¸¸à¹à¸¡à¸à¸¥à¸à¸£à¸°à¹à¸¢à¸à¸à¹</value>
</property>
- <property key="HumanResPartyIdFrom">
- <value xml:lang="en">Party Id From</value>
- <value xml:lang="it">Codice Soggetto Da</value>
- <value xml:lang="th">à¸à¸²à¸à¸£à¸«à¸±à¸ªà¸à¸¥à¸¸à¹à¸¡à¸à¸¹à¹à¹à¸à¹</value>
- </property>
- <property key="HumanResPartyIdTo">
- <value xml:lang="en">Party Id To</value>
- <value xml:lang="it">Codice Soggetto A</value>
- <value xml:lang="th">à¸à¸¶à¸à¸£à¸«à¸±à¸ªà¸à¸¥à¸¸à¹à¸¡à¸à¸¹à¹à¹à¸à¹</value>
- </property>
<property key="HumanResPartyQualification">
<value xml:lang="en">Qualifications</value>
</property>
Modified: ofbiz/trunk/applications/humanres/entitydef/entitymodel.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/humanres/entitydef/entitymodel.xml?rev=717984&r1=717983&r2=717984&view=diff
==============================================================================
--- ofbiz/trunk/applications/humanres/entitydef/entitymodel.xml (original)
+++ ofbiz/trunk/applications/humanres/entitydef/entitymodel.xml Sat Nov 15 22:18:59 2008
@@ -341,6 +341,18 @@
<key-map field-name="partyIdFrom" rel-field-name="agreementId"/>
</relation>
</entity>
+ <view-entity entity-name="EmploymentAndPerson"
+ package-name="org.ofbiz.humanres.employment"
+ title="Employment and Person Entity">
+ <member-entity entity-alias="EMPLMNT" entity-name="Employment"/>
+ <member-entity entity-alias="PERS" entity-name="Person"/>
+ <alias-all entity-alias="EMPLMNT"/>
+ <alias-all entity-alias="PERS"/>
+ <view-link entity-alias="EMPLMNT" rel-entity-alias="PERS">
+ <key-map field-name="partyIdTo" rel-field-name="partyId"/>
+ </view-link>
+ </view-entity>
+
<entity entity-name="EmploymentApp"
package-name="org.ofbiz.humanres.employment"
title="Employment Application Entity">
Modified: ofbiz/trunk/applications/humanres/widget/EmploymentScreens.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/humanres/widget/EmploymentScreens.xml?rev=717984&r1=717983&r2=717984&view=diff
==============================================================================
--- ofbiz/trunk/applications/humanres/widget/EmploymentScreens.xml (original)
+++ ofbiz/trunk/applications/humanres/widget/EmploymentScreens.xml Sat Nov 15 22:18:59 2008
@@ -23,7 +23,7 @@
<screen name="FindEmployments">
<section>
<actions>
- <set field="titleProperty" value="FindEmployment"/>
+ <set field="titleProperty" value="HumanResFindEmployment"/>
<set field="headerItem" value="Employment"/>
<set field="roleTypeIdFrom" from-field="parameters.roleTypeIdFrom"/>
<set field="roleTypeIdTo" from-field="parameters.roleTypeIdTo"/>
Modified: ofbiz/trunk/applications/humanres/widget/forms/EmploymentForms.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/humanres/widget/forms/EmploymentForms.xml?rev=717984&r1=717983&r2=717984&view=diff
==============================================================================
--- ofbiz/trunk/applications/humanres/widget/forms/EmploymentForms.xml (original)
+++ ofbiz/trunk/applications/humanres/widget/forms/EmploymentForms.xml Sat Nov 15 22:18:59 2008
@@ -22,18 +22,20 @@
xsi:noNamespaceSchemaLocation="http://ofbiz.apache.org/dtds/widget-form.xsd">
<form name="FindEmployments" type="single" target="FindEmployments"
odd-row-style="header-row" default-table-style="basic-table">
- <auto-fields-entity entity-name="Employment" default-field-type="find"/>
<field name="roleTypeIdFrom"><hidden value="INTERNAL_ORGANIZATIO"/></field>
<field name="roleTypeIdTo"><hidden value="EMPLOYEE"/></field>
- <field name="partyIdFrom" title="${uiLabelMap.HumanResPartyIdFrom}" tooltip="${uiLabelMap.CommonRequired}">
- <drop-down allow-empty="false">
+ <field name="partyIdFrom" title="${uiLabelMap.HumanResEmploymentPartyIdFrom}" tooltip="${uiLabelMap.HumanResEmploymentPartyIdFromToolTip}">
+ <drop-down allow-empty="true">
<entity-options entity-name="PartyRole" description="${partyId}" key-field-name="partyId">
<entity-constraint name="roleTypeId" operator="equals" value="INTERNAL_ORGANIZATIO"/>
</entity-options>
</drop-down>
</field>
- <field name="partyIdTo" title="${uiLabelMap.HumanResPartyIdTo}"><lookup target-form-name="LookupPartyName"/></field>
- <field name="fromDate"><date-time/></field>
+ <field name="partyIdTo" title="${uiLabelMap.HumanResEmployeePartyIdTo}"><lookup target-form-name="LookupPartyName"/></field>
+ <field name="firstName"><text-find/></field>
+ <field name="lastName"><text-find/></field>
+ <field name="fromDate"><date-find/></field>
+ <field name="thruDate"><date-find/></field>
<field name="terminationReasonId" title="${uiLabelMap.HumanResTerminationReasonId}"><lookup target-form-name="LookupTerminationReason"/></field>
<field name="terminationTypeId" title="${uiLabelMap.HumanResTerminationTypeId}">
<drop-down allow-empty="true" current-description="">
@@ -45,22 +47,27 @@
<field name="noConditionFind"><hidden value="Y"/></field>
<field name="searchButton" widget-style="smallSubmit"><submit button-type="button"/></field>
</form>
- <form name="ListEmployments" type="list" paginate-target="FindEmployments" default-entity-name="Employment" list-name="listIt" separate-columns="true"
+ <form name="ListEmployments" type="list" paginate-target="FindEmployments" default-entity-name="EmploymentAndPerson" list-name="listIt" separate-columns="true"
odd-row-style="alternate-row" header-row-style="header-row-2" default-table-style="basic-table hover-bar">
<actions>
<service service-name="performFind" result-map-name="result" result-map-list-name="listIt">
<field-map field-name="inputFields" env-name="employmentCtx"/>
- <field-map field-name="entityName" value="Employment"/>
+ <field-map field-name="entityName" value="EmploymentAndPerson"/>
</service>
</actions>
- <field name="partyIdFrom" title="${uiLabelMap.CommonEdit}" widget-style="buttontext">
- <hyperlink also-hidden="false" description="${partyIdFrom}" target="EditEmployment?partyIdFrom=${partyIdFrom}&partyIdTo=${partyIdTo}&roleTypeIdFrom=${roleTypeIdFrom}&fromDate=${fromDate}&roleTypeIdTo=${roleTypeIdTo}"/>
+ <field name="partyIdFrom" title="${uiLabelMap.HumanResEmploymentPartyIdFrom}"><display></display></field>
+ <field name="partyIdTo" title="${uiLabelMap.HumanResEmployeePartyIdTo}" widget-style="buttontext">
+ <hyperlink also-hidden="false" description="${partyIdTo}" target="viewprofile?partyId=${partyIdTo}"/>
</field>
- <field name="partyIdTo"><display also-hidden="true"/></field>
+ <field name="firstName"><display></display></field>
+ <field name="lastName"><display></display></field>
<field name="fromDate"><display also-hidden="true"/></field>
<field name="thruDate"><display/></field>
<field name="terminationReasonId" title="${uiLabelMap.HumanResTerminationReasonId}"><display/></field>
- <field name="terminationTypeId" title="${uiLabelMap.HumanResTerminationTypeId}"><display/></field>
+ <field name="terminationTypeId" title="${uiLabelMap.HumanResTerminationTypeId}"><display/></field>
+ <field name="editLink" title="${uiLabelMap.CommonEmptyHeader}" widget-style="buttontext">
+ <hyperlink target="EditEmployment?partyIdFrom=${partyIdFrom}&partyIdTo=${partyIdTo}&roleTypeIdFrom=${roleTypeIdFrom}&fromDate=${fromDate}&roleTypeIdTo=${roleTypeIdTo}" description="${uiLabelMap.CommonEdit}"/>
+ </field>
</form>
<form name="EditEmployment" type="single" target="updateEmployment" default-map-name="employment"
header-row-style="header-row" default-table-style="basic-table">