You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@ofbiz.apache.org by as...@apache.org on 2008/05/23 07:38:12 UTC
svn commit: r659434 - in /ofbiz/trunk/applications: humanres/config/
humanres/data/ humanres/script/org/ofbiz/humanres/ humanres/servicedef/
humanres/webapp/humanres/WEB-INF/ humanres/widget/ humanres/widget/forms/
party/webapp/partymgr/party/ party/wi...
Author: ashish
Date: Thu May 22 22:38:05 2008
New Revision: 659434
URL: http://svn.apache.org/viewvc?rev=659434&view=rev
Log:
Applied patch from JIRA issue # OFBIZ-1659.
Following things are covered in this patch :-
1) Introduce GlobalHRSettings header item to manage all the "type" data and common data
in HR module.
2) Added the CRUD operations for TerminationType entity.
Thanks Harsha Chadhar for your patch.
Modified:
ofbiz/trunk/applications/humanres/config/HumanResUiLabels.xml
ofbiz/trunk/applications/humanres/data/HumanResTypeData.xml
ofbiz/trunk/applications/humanres/script/org/ofbiz/humanres/HumanResServices.xml
ofbiz/trunk/applications/humanres/servicedef/services.xml
ofbiz/trunk/applications/humanres/webapp/humanres/WEB-INF/controller.xml
ofbiz/trunk/applications/humanres/widget/CommonScreens.xml
ofbiz/trunk/applications/humanres/widget/EmploymentScreens.xml
ofbiz/trunk/applications/humanres/widget/Menus.xml
ofbiz/trunk/applications/humanres/widget/PartyAbilityScreens.xml
ofbiz/trunk/applications/humanres/widget/forms/EmploymentForms.xml
ofbiz/trunk/applications/humanres/widget/forms/PartyAbilityForms.xml
ofbiz/trunk/applications/party/webapp/partymgr/party/PartyForms.xml
ofbiz/trunk/applications/party/widget/partymgr/PartyScreens.xml
Modified: ofbiz/trunk/applications/humanres/config/HumanResUiLabels.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/humanres/config/HumanResUiLabels.xml?rev=659434&r1=659433&r2=659434&view=diff
==============================================================================
--- ofbiz/trunk/applications/humanres/config/HumanResUiLabels.xml (original)
+++ ofbiz/trunk/applications/humanres/config/HumanResUiLabels.xml Thu May 22 22:38:05 2008
@@ -544,6 +544,9 @@
<property key="HumanResFindPersonTraining">
<value xml:lang="en">Find Person Training</value>
</property>
+ <property key="HumanResGlobalHRSettings">
+ <value xml:lang="en">Global HR Settings</value>
+ </property>
<property key="HumanResListEmplPositionsReportedTo">
<value xml:lang="en">List Employee Positions, Reported To [${parameters.emplPositionId}]</value>
</property>
@@ -923,6 +926,9 @@
<value xml:lang="it">Codice Motivazione Licenziamento</value>
<value xml:lang="th">รหัสà¸à¸à¸à¹à¸à¸à¹à¸«à¸à¸¸à¸à¸¥</value>
</property>
+ <property key="HumanResTerminationType">
+ <value xml:lang="en">Termination Type</value>
+ </property>
<property key="HumanResTerminationTypeId">
<value xml:lang="en">Termination Type Id</value>
<value xml:lang="it">Tipo Licenziamento</value>
Modified: ofbiz/trunk/applications/humanres/data/HumanResTypeData.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/humanres/data/HumanResTypeData.xml?rev=659434&r1=659433&r2=659434&view=diff
==============================================================================
--- ofbiz/trunk/applications/humanres/data/HumanResTypeData.xml (original)
+++ ofbiz/trunk/applications/humanres/data/HumanResTypeData.xml Thu May 22 22:38:05 2008
@@ -73,4 +73,8 @@
<DeductionType description="State Tax" hasTable="N" parentTypeId="" deductionTypeId="STATE_TAX"/>
<DeductionType description="Insurance" hasTable="N" parentTypeId="" deductionTypeId="INSURANCE"/>
<DeductionType description="Cafeteria Plan" hasTable="N" parentTypeId="" deductionTypeId="CAFE_PLAN"/>
+
+ <TerminationType description="Resignation" hasTable="N" parentTypeId="" terminationTypeId="RESIGN"/>
+ <TerminationType description="Fired" hasTable="N" parentTypeId="" terminationTypeId="FIRE"/>
+ <TerminationType description="Retirement" hasTable="N" parentTypeId="" terminationTypeId="RETIRE"/>
</entity-engine-xml>
Modified: ofbiz/trunk/applications/humanres/script/org/ofbiz/humanres/HumanResServices.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/humanres/script/org/ofbiz/humanres/HumanResServices.xml?rev=659434&r1=659433&r2=659434&view=diff
==============================================================================
--- ofbiz/trunk/applications/humanres/script/org/ofbiz/humanres/HumanResServices.xml (original)
+++ ofbiz/trunk/applications/humanres/script/org/ofbiz/humanres/HumanResServices.xml Thu May 22 22:38:05 2008
@@ -605,4 +605,25 @@
<entity-one entity-name="ResponsibilityType" value-name="lookedUpValue"/>
<remove-value value-name="lookedUpValue"/>
</simple-method>
+
+ <simple-method method-name="createTerminationType" short-description="Create a TerminationType">
+ <make-value entity-name="TerminationType" value-name="newEntity"/>
+ <set-nonpk-fields map-name="parameters" value-name="newEntity"/>
+ <if-empty field-name="newEntity.terminationTypeId">
+ <sequenced-id-to-env sequence-name="TerminationType" env-name="newEntity.terminationTypeId"/>
+ </if-empty>
+ <field-to-result field-name="newEntity.terminationTypeId" result-name="terminationTypeId"/>
+ <create-value value-name="newEntity"/>
+ </simple-method>
+
+ <simple-method method-name="updateTerminationType" short-description="Update TerminationType">
+ <entity-one entity-name="TerminationType" value-name="lookedUpValue"/>
+ <set-nonpk-fields value-name="lookedUpValue" map-name="parameters"/>
+ <store-value value-name="lookedUpValue"/>
+ </simple-method>
+
+ <simple-method method-name="deleteTerminationType" short-description="Delete TerminationType">
+ <entity-one entity-name="TerminationType" value-name="lookedUpValue"/>
+ <remove-value value-name="lookedUpValue"/>
+ </simple-method>
</simple-methods>
\ No newline at end of file
Modified: ofbiz/trunk/applications/humanres/servicedef/services.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/humanres/servicedef/services.xml?rev=659434&r1=659433&r2=659434&view=diff
==============================================================================
--- ofbiz/trunk/applications/humanres/servicedef/services.xml (original)
+++ ofbiz/trunk/applications/humanres/servicedef/services.xml Thu May 22 22:38:05 2008
@@ -535,6 +535,7 @@
<permission-service service-name="humanResManagerPermission" main-action="CREATE"/>
<auto-attributes mode="INOUT" include="pk" optional="true"/>
<auto-attributes mode="IN" include="nonpk" optional="true"/>
+ <override name="description" optional="false"/>
</service>
<service name="updateSkillType" engine="simple" default-entity-name="SkillType"
@@ -605,4 +606,27 @@
<permission-service service-name="humanResManagerPermission" main-action="DELETE"/>
<auto-attributes include="pk" mode="IN" optional="false"/>
</service>
+
+ <service name="createTerminationType" engine="simple" default-entity-name="TerminationType"
+ location="org/ofbiz/humanres/HumanResServices.xml" invoke="createTerminationType" auth="true">
+ <description>Create Valid TerminationType</description>
+ <permission-service service-name="humanResManagerPermission" main-action="CREATE"/>
+ <auto-attributes mode="INOUT" include="pk" optional="true"/>
+ <auto-attributes mode="IN" include="nonpk" optional="true"/>
+ <override name="description" optional="false"/>
+ </service>
+
+ <service name="updateTerminationType" engine="simple" default-entity-name="TerminationType"
+ location="org/ofbiz/humanres/HumanResServices.xml" invoke="updateTerminationType" auth="true">
+ <description>Update Valid TerminationType</description>
+ <permission-service service-name="humanResManagerPermission" main-action="UPDATE"/>
+ <auto-attributes mode="IN" include="pk" optional="false"/>
+ <auto-attributes mode="IN" include="nonpk" optional="true"/>
+ </service>
+ <service name="deleteTerminationType" engine="simple" default-entity-name="TerminationType"
+ location="org/ofbiz/humanres/HumanResServices.xml" invoke="deleteTerminationType" auth="true">
+ <description>Delete Valid TerminationType</description>
+ <permission-service service-name="humanResManagerPermission" main-action="DELETE"/>
+ <auto-attributes mode="IN" include="pk" optional="false"/>
+ </service>
</services>
\ No newline at end of file
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=659434&r1=659433&r2=659434&view=diff
==============================================================================
--- ofbiz/trunk/applications/humanres/webapp/humanres/WEB-INF/controller.xml (original)
+++ ofbiz/trunk/applications/humanres/webapp/humanres/WEB-INF/controller.xml Thu May 22 22:38:05 2008
@@ -347,7 +347,7 @@
</request-map>
<request-map uri="updateTerminationReason">
<security https="true" auth="true"/>
- <event type="service" invoke="updateTerminationReason"/>
+ <event type="service-multi" invoke="updateTerminationReason"/>
<response name="success" type="view" value="EditTerminationReason"/>
</request-map>
<request-map uri="deleteTerminationReason">
@@ -509,7 +509,7 @@
</request-map>
<request-map uri="deleteSkillType">
<security https="true" auth="true"/>
- <event type="service-multi" invoke="deleteSkillType"/>
+ <event type="service" invoke="deleteSkillType"/>
<response name="success" type="view" value="EditSkillTypes"/>
</request-map>
<!--====================Employee Requests==================-->
@@ -578,6 +578,33 @@
<response name="success" type="view" value="FindPersonTrainings"/>
<response name="error" type="view" value="FindPersonTrainings"/>
</request-map>
+ <request-map uri="globalHRSetting">
+ <security https="true" auth="true"/>
+ <response name="success" type="view" value="FindGlobalHRSettings"/>
+ </request-map>
+ <request-map uri="findTerminationTypes">
+ <security https="true" auth="true"/>
+ <response name="success" type="view" value="EditTerminationTypes"/>
+ </request-map>
+ <request-map uri="EditTerminationTypes">
+ <security https="true" auth="true"/>
+ <response name="success" type="view" value="EditTerminationTypes"/>
+ </request-map>
+ <request-map uri="createTerminationType">
+ <security https="true" auth="true"/>
+ <event type="service" invoke="createTerminationType"/>
+ <response name="success" type="view" value="EditTerminationTypes"/>
+ </request-map>
+ <request-map uri="updateTerminationType">
+ <security https="true" auth="true"/>
+ <event type="service-multi" invoke="updateTerminationType"/>
+ <response name="success" type="view" value="EditTerminationTypes"/>
+ </request-map>
+ <request-map uri="deleteTerminationType">
+ <security https="true" auth="true"/>
+ <event type="service" invoke="deleteTerminationType"/>
+ <response name="success" type="view" value="EditTerminationTypes"/>
+ </request-map>
<!-- ===================Lookup Request===================== -->
<request-map uri="LookupPartyName"><security auth="true" https="true"/><response name="success" type="view" value="LookupPartyName"/></request-map>
<request-map uri="LookupPayment"><security auth="true" https="true"/><response name="success" type="view" value="LookupPayment"/></request-map>
@@ -636,4 +663,6 @@
<view-map name="EmplPositionView" type="screen" page="component://humanres/widget/EmplPositionScreens.xml#EmplPositionView"/>
<view-map name="FindPersonTrainings" type="screen" page="component://humanres/widget/PartyAbilityScreens.xml#FindPersonTrainings"/>
<view-map name="NewPersonTraining" type="screen" page="component://humanres/widget/PartyAbilityScreens.xml#NewPersonTraining"/>
+ <view-map name="FindGlobalHRSettings" type="screen" page="component://humanres/widget/EmploymentScreens.xml#ListGlobalHRSettings"/>
+ <view-map name="EditTerminationTypes" type="screen" page="component://humanres/widget/PartyAbilityScreens.xml#EditTerminationTypes"/>
</site-conf>
Modified: ofbiz/trunk/applications/humanres/widget/CommonScreens.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/humanres/widget/CommonScreens.xml?rev=659434&r1=659433&r2=659434&view=diff
==============================================================================
--- ofbiz/trunk/applications/humanres/widget/CommonScreens.xml (original)
+++ ofbiz/trunk/applications/humanres/widget/CommonScreens.xml Thu May 22 22:38:05 2008
@@ -278,4 +278,25 @@
</widgets>
</section>
</screen>
+ <screen name="GlobalHRSettingsDecorator">
+ <section>
+ <actions>
+ <set field="headerItem" value="GlobalHRSettings"/>
+ </actions>
+ <widgets>
+ <decorator-screen name="main-decorator" location="${parameters.mainDecoratorLocation}">
+ <decorator-section name="body">
+ <section>
+ <widgets>
+ <container>
+ <include-menu name="GlobalHRSettingMenus" location="component://humanres/widget/Menus.xml"/>
+ </container>
+ </widgets>
+ </section>
+ <decorator-section-include name="body"/>
+ </decorator-section>
+ </decorator-screen>
+ </widgets>
+ </section>
+ </screen>
</screens>
Modified: ofbiz/trunk/applications/humanres/widget/EmploymentScreens.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/humanres/widget/EmploymentScreens.xml?rev=659434&r1=659433&r2=659434&view=diff
==============================================================================
--- ofbiz/trunk/applications/humanres/widget/EmploymentScreens.xml (original)
+++ ofbiz/trunk/applications/humanres/widget/EmploymentScreens.xml Thu May 22 22:38:05 2008
@@ -45,7 +45,7 @@
<section>
<widgets>
<container>
- <link target="EditEmployment" text="${uiLabelMap.HumanResNewEmployment}" style="buttontext"/>
+ <link target="EditEmployment?partyIdFrom=${partyIdFrom}&partyIdTo=${partyIdTo}&roleTypeIdFrom=${roleTypeIdFrom}&roleTypeIdTo=${roleTypeIdTo}&fromDate=${fromDate}" text="${uiLabelMap.HumanResNewEmployment}" style="buttontext"/>
</container>
<include-form name="FindEmployments" location="component://humanres/widget/forms/EmploymentForms.xml"/>
</widgets>
@@ -111,10 +111,7 @@
<actions>
<set field="titleProperty" value="HumanResFindEmploymentApp"/>
<set field="headerItem" value="EmploymentApp"/>
- <!--entity-one entity-name="EmploymentApp" value-name="employmentApp"/-->
- <entity-and entity-name="EmploymentApp" list-name="mploymentApps">
- <field-map field-name="applicationId"/>
- </entity-and>
+ <set field="employmentAppCtx" from-field="parameters"/>
</actions>
<widgets>
<decorator-screen name="CommonEmploymentDecorator" location="${parameters.mainDecoratorLocation}">
@@ -362,12 +359,12 @@
<section>
<actions>
<set field="titleProperty" value="HumanResAddTerminationReason"/>
- <set field="headerItem" value="TerminationReason"/>
+ <set field="tabButtonItem" value="TerminationReason"/>
<set field="terminationReasonId" from-field="parameters.terminationReasonId" />
<entity-one entity-name="TerminationReason" value-name="terminationReason" />
</actions>
<widgets>
- <decorator-screen name="CommonEmploymentDecorator" location="${parameters.mainDecoratorLocation}">
+ <decorator-screen name="GlobalHRSettingsDecorator" location="${parameters.mainDecoratorLocation}">
<decorator-section name="body">
<screenlet title="${uiLabelMap.HumanResListTerminationReasons}">
<section>
@@ -501,4 +498,36 @@
</widgets>
</section>
</screen>
+ <screen name="ListGlobalHRSettings">
+ <section>
+ <actions>
+ <set field="titleProperty" value="PageTitleListSkillTypes"/>
+ <set field="headerItem" value="SkillType"/>
+ <set field="labelTitleProperty" value="PageTitleListSkillTypes"/>
+ </actions>
+ <widgets>
+ <decorator-screen name="GlobalHRSettingsDecorator" location="${parameters.mainDecoratorLocation}">
+ <decorator-section name="body">
+ <screenlet title="${uiLabelMap.${labelTitleProperty}}">
+ <section>
+ <widgets>
+ <container>
+ <link target="EditSkillTypes" text="${uiLabelMap.HumanResNewSkillType}" style="buttontext" />
+ </container>
+ <include-form name="ListSkillTypes" location="component://humanres/widget/forms/PartyAbilityForms.xml"/>
+ </widgets>
+ </section>
+ </screenlet>
+ <screenlet title="${uiLabelMap.HumanResNewSkillType}">
+ <section>
+ <widgets>
+ <include-form name="AddSkillType" location="component://humanres/widget/forms/PartyAbilityForms.xml"/>
+ </widgets>
+ </section>
+ </screenlet>
+ </decorator-section>
+ </decorator-screen>
+ </widgets>
+ </section>
+ </screen>
</screens>
Modified: ofbiz/trunk/applications/humanres/widget/Menus.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/humanres/widget/Menus.xml?rev=659434&r1=659433&r2=659434&view=diff
==============================================================================
--- ofbiz/trunk/applications/humanres/widget/Menus.xml (original)
+++ ofbiz/trunk/applications/humanres/widget/Menus.xml Thu May 22 22:38:05 2008
@@ -32,9 +32,6 @@
<menu-item name="EmploymentApp" title="${uiLabelMap.HumanResEmploymentApp}"><link target="FindEmploymentApp"/></menu-item>
<menu-item name="PartyResume" title="${uiLabelMap.HumanResPartyResume}"><link target="FindPartyResume"/></menu-item>
<menu-item name="PayGrade" title="${uiLabelMap.HumanResPayGrade}"><link target="FindPayGrade"/></menu-item>
- <menu-item name="TerminationReason" title="${uiLabelMap.HumanResTerminationReason}"><link target="FindTerminationReason"/></menu-item>
- <menu-item name="SkillType" title="${uiLabelMap.HumanResSkillType}"><link target="findSkillTypes"/></menu-item>
- <menu-item name="ResponsibilityType" title="${uiLabelMap.HumanResResponsibilityType}"><link target="EditResponsibilityType"/></menu-item>
<menu-item name="Logout" title="${uiLabelMap.CommonLogout}" align-style="col-right" selected-style="selected">
<condition><not><if-empty field-name="userLogin"/></not></condition>
<link target="logout"/>
@@ -43,6 +40,7 @@
<condition><if-empty field-name="userLogin"/></condition>
<link target="${checkLoginUrl}"/>
</menu-item>
+ <menu-item name="GlobalHRSettings" title="${uiLabelMap.HumanResGlobalHRSettings}" selected-style="selected"><link target="globalHRSetting"/></menu-item>
</menu>
<menu name="EmploymentBar" default-menu-item-name="EditPartyBenefit" default-selected-style="selected"
type="simple" menu-container-style="button-bar tab-bar" selected-menuitem-context-field-name="tabButtonItem">
@@ -100,4 +98,20 @@
</menu-item>
</menu>
<menu name="SkillType" type="simple" id="app-navigation" default-selected-style="selected" selected-menuitem-context-field-name="tabButtonItem"/>
+
+ <menu name="GlobalHRSettingMenus" type="simple" default-menu-item-name="SkillType"
+ menu-container-style="button-bar tab-bar" selected-menuitem-context-field-name="tabButtonItem" default-selected-style="selected">
+ <menu-item name="SkillType" title="${uiLabelMap.HumanResSkillType}">
+ <link target="EditSkillTypes"/>
+ </menu-item>
+ <menu-item name="ResponsibilityType" title="${uiLabelMap.HumanResResponsibilityType}">
+ <link target="EditResponsibilityType"/>
+ </menu-item>
+ <menu-item name="TerminationReason" title="${uiLabelMap.HumanResTerminationReason}">
+ <link target="FindTerminationReason"/>
+ </menu-item>
+ <menu-item name="TerminationType" title="${uiLabelMap.HumanResTerminationType}">
+ <link target="findTerminationTypes"/>
+ </menu-item>
+ </menu>
</menus>
\ No newline at end of file
Modified: ofbiz/trunk/applications/humanres/widget/PartyAbilityScreens.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/humanres/widget/PartyAbilityScreens.xml?rev=659434&r1=659433&r2=659434&view=diff
==============================================================================
--- ofbiz/trunk/applications/humanres/widget/PartyAbilityScreens.xml (original)
+++ ofbiz/trunk/applications/humanres/widget/PartyAbilityScreens.xml Thu May 22 22:38:05 2008
@@ -24,7 +24,7 @@
<section>
<actions>
<set field="headerItem" value="PartyQual"/>
- <set field="partyId" from-field="parameters.partyId"/>
+ <entity-one entity-name="PartyQual" value-name="partyQual"/>
</actions>
<widgets>
<decorator-screen name="CommonPartyAbilityDecorator" location="${parameters.mainDecoratorLocation}">
@@ -54,8 +54,9 @@
<screen name="FindPartyResume">
<section>
<actions>
- <set field="titleProperty" value="PageTitleFindPartyResume"></set>
+ <set field="titleProperty" value="PageTitleFindPartyResume"/>
<set field="headerItem" value="PartyResume"/>
+ <set field="partyResumeCtx" from-field="parameters"/>
</actions>
<widgets>
<decorator-screen name="CommonPartyAbilityDecorator" location="${parameters.mainDecoratorLocation}">
@@ -266,7 +267,7 @@
<entity-one entity-name="SkillType" value-name="skillType" />
</actions>
<widgets>
- <decorator-screen name="main-decorator" location="${parameters.mainDecoratorLocation}">
+ <decorator-screen name="GlobalHRSettingsDecorator" location="${parameters.mainDecoratorLocation}">
<decorator-section name="body">
<container style="screenlet">
<container style="screenlet-title-bar">
@@ -277,9 +278,6 @@
<container style="screenlet-body">
<section>
<widgets>
- <container>
- <link target="EditSkillTypes" text="${uiLabelMap.HumanResNewSkillType}" style="buttontext" />
- </container>
<include-form name="ListSkillTypes" location="component://humanres/widget/forms/PartyAbilityForms.xml"/>
</widgets>
</section>
@@ -308,12 +306,12 @@
<section>
<actions>
<set field="titleProperty" value="PageTitleEditResponsibilityType"/>
- <set field="headerItem" value="ResponsibilityType"/>
+ <set field="tabButtonItem" value="ResponsibilityType"/>
<set field="responsibilityTypeId" from-field="parameters.responsibilityTypeId"/>
<entity-one entity-name="ResponsibilityType" value-name="responsibilityType"/>
</actions>
<widgets>
- <decorator-screen name="main-decorator" location="${parameters.mainDecoratorLocation}">
+ <decorator-screen name="GlobalHRSettingsDecorator" location="${parameters.mainDecoratorLocation}">
<decorator-section name="body">
<section>
<widgets>
@@ -361,6 +359,7 @@
<set field="titleProperty" value="HumanResFindPersonTraining"/>
<set field="headerItem" value="Training"/>
<set field="partyId" from-field="parameters.partyId"/>
+ <set field="personTrainingsCtx" from-field="parameters"/>
</actions>
<widgets>
<decorator-screen name="main-decorator" location="${parameters.mainDecoratorLocation}">
@@ -419,6 +418,7 @@
<set field="partyId" from-field="parameters.partyId"/>
<set field="partyQualTypeId" from-field="parameters.partyQualTypeId"/>
<set field="fromDate" from-field="parameters.fromDate"/>
+ <set field="partyQualCtx" from-field="parameters"/>
</actions>
<widgets>
<decorator-screen name="main-decorator" location="${parameters.mainDecoratorLocation}">
@@ -445,4 +445,34 @@
</widgets>
</section>
</screen>
+ <screen name="EditTerminationTypes">
+ <section>
+ <actions>
+ <set field="tabButtonItem" value="TerminationType"/>
+ <set field="titleProperty" value="HumanResTerminationType"/>
+ <set field="terminationTypeId" from-field="parameters.terminationTypeId"/>
+ <entity-one entity-name="TerminationType" value-name="terminationType" />
+ </actions>
+ <widgets>
+ <decorator-screen name="GlobalHRSettingsDecorator" location="${parameters.mainDecoratorLocation}">
+ <decorator-section name="body">
+ <screenlet title="${uiLabelMap.CommonList} ${uiLabelMap.HumanResTerminationType}">
+ <section>
+ <widgets>
+ <include-form name="ListTerminationTypes" location="component://humanres/widget/forms/PartyAbilityForms.xml"/>
+ </widgets>
+ </section>
+ </screenlet>
+ <screenlet title="${uiLabelMap.CommonNew} ${uiLabelMap.HumanResTerminationType}">
+ <section>
+ <widgets>
+ <include-form name="AddTerminationType" location="component://humanres/widget/forms/PartyAbilityForms.xml" />
+ </widgets>
+ </section>
+ </screenlet>
+ </decorator-section>
+ </decorator-screen>
+ </widgets>
+ </section>
+ </screen>
</screens>
\ No newline at end of file
Modified: ofbiz/trunk/applications/humanres/widget/forms/EmploymentForms.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/humanres/widget/forms/EmploymentForms.xml?rev=659434&r1=659433&r2=659434&view=diff
==============================================================================
--- ofbiz/trunk/applications/humanres/widget/forms/EmploymentForms.xml (original)
+++ ofbiz/trunk/applications/humanres/widget/forms/EmploymentForms.xml Thu May 22 22:38:05 2008
@@ -42,7 +42,7 @@
<field name="fromDate"><date-time/></field>
<field name="terminationReasonId" title="${uiLabelMap.HumanResTerminationReasonId}"><lookup target-form-name="LookupTerminationReason"/></field>
<field name="terminationTypeId" title="${uiLabelMap.HumanResTerminationTypeId}">
- <drop-down allow-empty="false">
+ <drop-down allow-empty="true" current-description="">
<entity-options description="${description}" key-field-name="terminationTypeId" entity-name="TerminationType">
<entity-order-by field-name="description"/>
</entity-options>
@@ -63,10 +63,10 @@
<field name="roleTypeIdFrom" widget-style="buttontext">
<hyperlink also-hidden="false" description="${roleTypeIdFrom}" target="EditEmployment?partyIdFrom=${partyIdFrom}&partyIdTo=${partyIdTo}&roleTypeIdFrom=${roleTypeIdFrom}&roleTypeIdTo=${roleTypeIdTo}&fromDate=${fromDate}"/>
</field>
- <field name="roleTypeIdTo"><display/></field>
- <field name="partyIdFrom"><display/></field>
- <field name="partyIdTo"><display/></field>
- <field name="fromDate"><display/></field>
+ <field name="roleTypeIdTo"><display also-hidden="true"/></field>
+ <field name="partyIdFrom"><display also-hidden="true"/></field>
+ <field name="partyIdTo"><display also-hidden="true"/></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>
@@ -76,7 +76,7 @@
<alt-target use-when="employment==null" target="createEmployment"/>
<auto-fields-service service-name="createEmployment" default-field-type="hidden"/>
<field name="roleTypeIdFrom" tooltip="${uiLabelMap.CommonRequired}">
- <drop-down allow-empty="false" no-current-selected-key="------">
+ <drop-down allow-empty="true" no-current-selected-key="------">
<entity-options description="${description}" key-field-name="roleTypeId" entity-name="RoleType">
<entity-order-by field-name="description"/>
</entity-options>
@@ -91,10 +91,10 @@
</field>
<field name="partyIdFrom" title="${uiLabelMap.HumanResPartyIdFrom}" tooltip="${uiLabelMap.CommonRequired}"><lookup target-form-name="LookupPartyName"/></field>
<field name="partyIdTo" title="${uiLabelMap.HumanResPartyIdTo}" tooltip="${uiLabelMap.CommonRequired}"><lookup target-form-name="LookupPartyName"/></field>
- <field name="fromDate" title="${uiLabelMap.CommonDate}" tooltip="${uiLabelMap.CommonRequired}"/>
+ <field name="fromDate" title="${uiLabelMap.CommonDate}" tooltip="${uiLabelMap.CommonRequired}"><date-time/></field>
<field name="terminationReasonId" title="${uiLabelMap.HumanResTerminationReasonId}"><lookup target-form-name="LookupTerminationReason"/></field>
- <field name="terminationTypeId" title="${uiLabelMap.HumanResTerminationTypeId}">
- <drop-down allow-empty="false" no-current-selected-key="------">
+ <field name="terminationTypeId" use-when="employment!=null" title="${uiLabelMap.HumanResTerminationTypeId}">
+ <drop-down allow-empty="true" no-current-selected-key="------">
<entity-options description="${description}" key-field-name="terminationTypeId" entity-name="TerminationType">
<entity-order-by field-name="description"/>
</entity-options>
@@ -110,7 +110,7 @@
<set field="referredByPartyId" from-field="parameters.partyId"/>
<entity-one entity-name="EmploymentApp" auto-field-map="true"/>
<service service-name="performFind" result-map-name="result" result-map-list-name="listIt">
- <field-map field-name="inputFields" env-name="parameters"/>
+ <field-map field-name="inputFields" env-name="employmentAppCtx"/>
<field-map field-name="entityName" value="EmploymentApp"/>
<field-map field-name="orderBy" value="applicationId"/>
</service>
@@ -160,8 +160,8 @@
</drop-down>
</field>
<field name="applyingPartyId"><lookup target-form-name="LookupPartyName"/></field>
- <field name="referredByPartyId" use-when="applicationId==null"><lookup target-form-name="LookupPartyName"/></field>
- <field name="referredByPartyId" use-when="referredByPartyId!=null&&applicationId!=null"><hidden/></field>
+ <field name="referredByPartyId" use-when="employmentApp==null"><lookup target-form-name="LookupPartyName"/></field>
+ <field name="referredByPartyId" use-when="employmentApp!=null"><hidden/></field>
<field name="employmentAppSourceTypeId">
<drop-down allow-empty="true" current-description="">
<entity-options description="${employmentAppSourceTypeId}" key-field-name="employmentAppSourceTypeId" entity-name="EmploymentAppSourceType">
@@ -356,23 +356,24 @@
<field name="payGradeId"><hidden/></field>
<field name="submitButton" title="${uiLabelMap.CommonCreate}" widget-style="smallSubmit"><submit button-type="button"/></field>
</form>
- <form name="ListTerminationReasons" type="list" title="" target="updateTerminationReason" paginate-target="FindTerminationReason"
+ <form name="ListTerminationReasons" type="multi" title="" target="updateTerminationReason" paginate-target="FindTerminationReason"
odd-row-style="alternate-row" default-table-style="basic-table hover-bar">
<actions>
<entity-condition entity-name="TerminationReason"><order-by field-name="terminationReasonId"/></entity-condition>
</actions>
<auto-fields-service default-field-type="display" service-name="updateTerminationReason"/>
<field name="terminationReasonId" title="${uiLabelMap.HumanResTerminationReasonId}"><display/></field>
- <field name="description"><text/></field>
- <field name="submitButton" title="${uiLabelMap.CommonUpdate}" widget-style="smallSubmit"><submit button-type="button"/></field>
- <field name="deleteLink" title="${uiLabelMap.CommonEmptyHeader}" widget-style="buttontext">
- <hyperlink target="deleteTerminationReason?terminationReasonId=${terminationReasonId}" description="${uiLabelMap.CommonDelete}"/>
+ <field name="submitButton" title="${uiLabelMap.CommonSubmit}" widget-style="smallSubmit"><submit/></field>
+ <field name="deleteLink" title="${uiLabelMap.CommonDelete}" widget-style="buttontext">
+ <hyperlink target="deleteTerminationReason?terminationReasonId=${terminationReasonId}" description="${uiLabelMap.CommonDelete}" also-hidden="false"/>
</field>
+ <field name="_rowSubmit" title="${uiLabelMap.CommonSelect}"><hidden value="Y"/></field>
</form>
<form name="AddTerminationReason" type="single" target="createTerminationReason" title="" default-map-name = "terminationReason"
header-row-style="header-row" default-table-style="basic-table">
<auto-fields-service service-name="createTerminationReason"/>
- <field name="terminationReasonId"><ignored/></field>
+ <field name="terminationReasonId"><text/></field>
+ <field name="description" title="${uiLabelMap.CommonDescription}" tooltip="${uiLabelMap.CommonRequired}" widget-style="required"><text/></field>
<field name="submitButton" title="${uiLabelMap.CommonCreate}" widget-style="smallSubmit"><submit button-type="button"/></field>
</form>
<form name="ListUnemploymentClaims" type="list" title="" target="updateUnemploymentClaim" paginate-target="FindUnemploymentClaim"
Modified: ofbiz/trunk/applications/humanres/widget/forms/PartyAbilityForms.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/humanres/widget/forms/PartyAbilityForms.xml?rev=659434&r1=659433&r2=659434&view=diff
==============================================================================
--- ofbiz/trunk/applications/humanres/widget/forms/PartyAbilityForms.xml (original)
+++ ofbiz/trunk/applications/humanres/widget/forms/PartyAbilityForms.xml Thu May 22 22:38:05 2008
@@ -24,7 +24,7 @@
odd-row-style="alternate-row" 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="parameters"/>
+ <field-map field-name="inputFields" env-name="partyQualCtx"/>
<field-map field-name="entityName" value="PartyQual"/>
<field-map field-name="orderBy" value="fromDate"/>
</service>
@@ -58,10 +58,11 @@
<field name="_rowSubmit" title="${uiLabelMap.CommonSelect}"><hidden value="Y"/></field>
<field name="submitButton" title="${uiLabelMap.CommonSubmit}" widget-style="smallSubmit"><submit/></field>
</form>
- <form name="AddPartyQual" type="single" target="createPartyQual" title=""
+ <form name="AddPartyQual" type="single" target="createPartyQual"
header-row-style="header-row" default-table-style="basic-table">
<auto-fields-service service-name="createPartyQual"/>
- <field name="partyId" title="${uiLabelMap.PartyPartyId}"><lookup target-form-name="LookupPartyName"/></field>
+ <field name="partyId" title="${uiLabelMap.PartyPartyId}" use-when="partyQual!=null"><hidden/></field>
+ <field name="partyId" title="${uiLabelMap.PartyPartyId}" use-when="partyQual==null"><lookup target-form-name="LookupPartyName"/></field>
<field name="partyQualTypeId">
<drop-down allow-empty="true">
<entity-options description="${description}" key-field-name="partyQualTypeId" entity-name="PartyQualType">
@@ -91,7 +92,7 @@
odd-row-style="alternate-row" 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="parameters"/>
+ <field-map field-name="inputFields" env-name="partyResumeCtx"/>
<field-map field-name="entityName" value="PartyResume"/>
<field-map field-name="orderBy" value="resumeId"/>
</service>
@@ -109,18 +110,14 @@
<hyperlink target="deletePartyResume?resumeId=${resumeId}" description="${uiLabelMap.CommonDelete}" also-hidden="false"/>
</field>
</form>
- <form name="EditPartyResume" type="single" target="updatePartyResume" title="" default-map-name="partyResume"
+ <form name="EditPartyResume" type="single" target="createPartyResume" title="" default-map-name="partyResume"
header-row-style="header-row" default-table-style="basic-table">
- <alt-target use-when="partyResume==null" target="createPartyResume"/>
<auto-fields-service service-name="createPartyResume"/>
<field name="contentId"><lookup target-form-name="LookupContent"/></field>
- <field use-when="partyResume!=null" name="resumeId" tooltip="${uiLabelMap.CommonNotModifRecreat}"><display/></field>
<field name="resumeId" use-when="partyResume!=null" title="${uiLabelMap.HumanResResumeId}"><display/></field>
- <field name="resumeId" use-when="partyResume==null" title="${uiLabelMap.HumanResResumeId}"><hidden/></field>
- <field name="partyId" use-when="partyResume!=null&&partyId!=null" title="${uiLabelMap.FormFieldTitle_partyId}"><display/></field>
+ <field name="partyId" use-when="partyResume!=null&&partyId!=null" title="${uiLabelMap.FormFieldTitle_partyId}"><hidden/></field>
<field name="partyId" use-when="partyResume==null&&partyId==null" title="${uiLabelMap.FormFieldTitle_partyId}" tooltip="${uiLabelMap.CommonRequired}"><lookup target-form-name="LookupPartyName"/></field>
- <field use-when="partyResume==null" name="submitButton" title="${uiLabelMap.CommonCreate}" widget-style="smallSubmit"><submit button-type="button"/></field>
- <field use-when="partyResume!=null" name="submitButton" title="${uiLabelMap.CommonUpdate}" widget-style="smallSubmit"><submit button-type="button"/></field>
+ <field name="submitButton" title="${uiLabelMap.CommonCreate}" widget-style="smallSubmit"><submit button-type="button"/></field>
</form>
<form name="FindPartySkills" type="single" target="FindPartySkills"
header-row-style="header-row" default-table-style="basic-table">
@@ -329,12 +326,12 @@
<field name="submitButton" use-when="performanceNote==null" title="${uiLabelMap.CommonCreate}" widget-style="smallSubmit"><submit button-type="button"/></field>
<field name="submitButton" use-when="performanceNote!=null" title="${uiLabelMap.CommonUpdate}" widget-style="smallSubmit"><submit button-type="button"/></field>
</form>
- <form name="ListSkillTypes" type="multi" title="" target="updateSkillType"
+ <form name="ListSkillTypes" type="multi" title="" target="updateSkillType"
odd-row-style="alternate-row" default-table-style="basic-table hover-bar">
<actions>
<entity-condition entity-name="SkillType"><order-by field-name="skillTypeId"/></entity-condition>
</actions>
- <auto-fields-service service-name="updateSkillType"/>
+ <auto-fields-service service-name="updateSkillType" default-field-type="hidden"/>
<field name="skillTypeId" title="${uiLabelMap.HumanResSkillTypeId}"><display/></field>
<field name="description" title="${uiLabelMap.CommonDescription}"><text/></field>
<field name="deleteLink" title="${uiLabelMap.CommonDelete}" widget-style="buttontext">
@@ -346,7 +343,8 @@
<form name="AddSkillType" type="single" target="createSkillType" default-map-name="skillType"
header-row-style="header-row" default-table-style="basic-table">
<auto-fields-service service-name="createSkillType" default-field-type="hidden"/>
- <field name="description" title="${uiLabelMap.CommonDescription}"><text/></field>
+ <field name="skillTypeId" title="${uiLabelMap.HumanResSkillTypeId}"><text/></field>
+ <field name="description" title="${uiLabelMap.CommonDescription}" tooltip="${uiLabelMap.CommonRequired}" widget-style="required"><text/></field>
<field name="submitButton" title="${uiLabelMap.CommonCreate}" widget-style="buttontext"><submit button-type="text-link"/></field>
</form>
<form name="ListResponsibilityTypes" type="list" list-name="responsibilityTypes" target="updateResponsibilityType"
@@ -354,13 +352,17 @@
<actions>
<entity-condition entity-name="ResponsibilityType"><order-by field-name="responsibilityTypeId"/></entity-condition>
</actions>
- <auto-fields-service service-name="updateResponsibilityType"/>
+ <auto-fields-service service-name="updateResponsibilityType" default-field-type="hidden"/>
<field name="responsibilityTypeId" title="${uiLabelMap.HumanResResponsibilityTypeId}"><display/></field>
- <field name="description" title="${uiLabelMap.CommonDescription}"/>
+ <field name="deleteLink" title="${uiLabelMap.CommonDelete}" widget-style="buttontext">
+ <hyperlink target="deleteResponsibilityType?responsibilityTypeId=${responsibilityTypeId}" description="${uiLabelMap.CommonDelete}" also-hidden="false"/>
+ </field>
+ <field name="description" title="${uiLabelMap.CommonDescription}"><text/></field>
<field name="submitButton" title="${uiLabelMap.CommonUpdate}" widget-style="smallSubmit"><submit button-type="button"/></field>
</form>
<form name="AddResponsibilityType" type="single" target="createResponsibilityType" title="" default-map-name="responsibilityType">
- <auto-fields-service service-name="createResponsibilityType"/>
+ <auto-fields-service service-name="createResponsibilityType" default-field-type="hidden"/>
+ <field name="responsibilityTypeId" title="${uiLabelMap.HumanResResponsibilityTypeId}"><text/></field>
<field name="description" title="${uiLabelMap.CommonDescription}" tooltip="${uiLabelMap.CommonRequired}"><text/></field>
<field name="submitButton" title="${uiLabelMap.CommonCreate}" widget-style="buttontext"><submit button-type="text-link"/></field>
</form>
@@ -382,7 +384,7 @@
odd-row-style="alternate-row" 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="parameters"/>
+ <field-map field-name="inputFields" env-name="personTrainingsCtx"/>
<field-map field-name="entityName" value="PersonTraining"/>
</service>
</actions>
@@ -445,4 +447,25 @@
</field>
<field name="searchButton" widget-style="smallSubmit"><submit button-type="button"/></field>
</form>
+ <form name="ListTerminationTypes" type="multi" title="" target="updateTerminationType"
+ odd-row-style="alternate-row" default-table-style="basic-table hover-bar">
+ <actions>
+ <entity-condition entity-name="TerminationType"><order-by field-name="terminationTypeId"/></entity-condition>
+ </actions>
+ <auto-fields-service service-name="updateTerminationType" default-field-type="hidden"/>
+ <field name="terminationTypeId" title="${uiLabelMap.HumanResTerminationTypeId}"><display/></field>
+ <field name="description" title="${uiLabelMap.CommonDescription}"><text/></field>
+ <field name="deleteLink" title="${uiLabelMap.CommonDelete}" widget-style="buttontext">
+ <hyperlink target="deleteTerminationType?terminationTypeId=${terminationTypeId}" description="${uiLabelMap.CommonDelete}" also-hidden="false"/>
+ </field>
+ <field name="_rowSubmit" title="${uiLabelMap.CommonSelect}"><hidden value="Y"/></field>
+ <field name="submitButton" title="${uiLabelMap.CommonSubmit}" widget-style="smallSubmit"><submit/></field>
+ </form>
+ <form name="AddTerminationType" type="single" target="createTerminationType" default-map-name="TerminationType"
+ header-row-style="header-row" default-table-style="basic-table">
+ <auto-fields-service service-name="createTerminationType" default-field-type="hidden"/>
+ <field name="terminationTypeId"><text/></field>
+ <field name="description" title="${uiLabelMap.CommonDescription}" tooltip="${uiLabelMap.CommonRequired}" widget-style="required"><text/></field>
+ <field name="submitButton" title="${uiLabelMap.CommonCreate}" widget-style="buttontext"><submit button-type="text-link"/></field>
+ </form>
</forms>
\ No newline at end of file
Modified: ofbiz/trunk/applications/party/webapp/partymgr/party/PartyForms.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/party/webapp/partymgr/party/PartyForms.xml?rev=659434&r1=659433&r2=659434&view=diff
==============================================================================
--- ofbiz/trunk/applications/party/webapp/partymgr/party/PartyForms.xml (original)
+++ ofbiz/trunk/applications/party/webapp/partymgr/party/PartyForms.xml Thu May 22 22:38:05 2008
@@ -598,14 +598,4 @@
</field>
<field name="fromDate"><display/></field>
</form>
- <form name="ListPersonTrainings" type="multi" list-name="personTrainings" separate-columns="true" target="updatePersonTrainings?partyId=${partyId}" paginate-target="FindPersonTrainings"
- odd-row-style="alternate-row" default-table-style="basic-table hover-bar">
- <auto-fields-service default-field-type="display" service-name="updatePersonTraining"/>
- <field name="partyId" title="PartyId" widget-style="linktext">
- <hyperlink also-hidden="false" target="/partymgr/control/viewprofile?partyId=${partyId}" target-type="plain" description="${partyId}"/>
- </field>
- <field name="thruDate"><date-time type="timestamp"/></field>
- <field name="trainingClassTypeId"><display-entity description="${description}" entity-name="TrainingClassType"/></field>
- <field name="submitButton" title="${uiLabelMap.CommonSubmit}" widget-style="smallSubmit"><submit/></field>
- </form>
</forms>
\ No newline at end of file
Modified: ofbiz/trunk/applications/party/widget/partymgr/PartyScreens.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/party/widget/partymgr/PartyScreens.xml?rev=659434&r1=659433&r2=659434&view=diff
==============================================================================
--- ofbiz/trunk/applications/party/widget/partymgr/PartyScreens.xml (original)
+++ ofbiz/trunk/applications/party/widget/partymgr/PartyScreens.xml Thu May 22 22:38:05 2008
@@ -1081,9 +1081,7 @@
<set field="tabButtonItem" value="PersonTraining"/>
<set field="partyId" from-field="parameters.partyId"/>
<set field="trainingClassTypeId" from-field="parameters.trainingClassTypeId"/>
- <entity-and entity-name="PersonTraining" list-name="personTrainings">
- <field-map field-name="partyId"/>
- </entity-and>
+ <set field="personTrainingsCtx.partyId" from-field="parameters.partyId"/>
</actions>
<widgets>
<decorator-screen name="CommonPartyDecorator" location="${parameters.mainDecoratorLocation}">
@@ -1091,7 +1089,7 @@
<screenlet title="${uiLabelMap.HumanResListPersonTraining}">
<section>
<widgets>
- <include-form name="ListPersonTrainings" location="component://party/webapp/partymgr/party/PartyForms.xml"/>
+ <include-form name="ListPersonTrainings" location="component://humanres/widget/forms/PartyAbilityForms.xml"/>
</widgets>
</section>
</screenlet>
@@ -1115,7 +1113,7 @@
<set field="tabButtonItem" value="PartyResume"/>
<set field="partyId" from-field="parameters.partyId"/>
<set field="resumeId" from-field="parameters.resumeId"/>
- <entity-one entity-name="PartyResume" value-name="partyResume"/>
+ <set field="partyResumeCtx.resumeId" from-field="parameters.resumeId"/>
</actions>
<widgets>
<decorator-screen name="CommonPartyDecorator" location="${parameters.mainDecoratorLocation}">
@@ -1146,9 +1144,7 @@
<set field="headerItem" value="find"/>
<set field="tabButtonItem" value="EmploymentApplication"/>
<set field="referredByPartyId" from-field="parameters.partyId"/>
- <entity-and entity-name="EmploymentApp" list-name="employmentApps">
- <field-map field-name="applicationId"></field-map>
- </entity-and>
+ <set field="employmentAppCtx.applicationId" from-field="parameters.applicationId"/>
</actions>
<widgets>
<decorator-screen name="CommonPartyDecorator" location="${parameters.mainDecoratorLocation}">