Author: ashish
Date: Tue May 20 07:48:42 2008
New Revision: 658265
URL: http://svn.apache.org/viewvc?rev=658265&view=rev
Log:
Applied patch from Harsha Chadhar for JIRA issue OFBIZ-1659 for HR improvements.
Thanks Harsha for your patch.
Modified:
ofbiz/trunk/applications/humanres/data/HumanResTypeData.xml
ofbiz/trunk/applications/humanres/script/org/ofbiz/humanres/HumanResServices.xml
ofbiz/trunk/applications/humanres/webapp/humanres/WEB-INF/controller.xml
ofbiz/trunk/applications/humanres/widget/EmploymentScreens.xml
ofbiz/trunk/applications/humanres/widget/forms/EmploymentForms.xml
ofbiz/trunk/applications/humanres/widget/forms/PartyAbilityForms.xml
ofbiz/trunk/applications/party/webapp/partymgr/WEB-INF/controller.xml
ofbiz/trunk/applications/party/widget/partymgr/PartyMenus.xml
ofbiz/trunk/applications/party/widget/partymgr/PartyScreens.xml
Modified: ofbiz/trunk/applications/humanres/data/HumanResTypeData.xml
URL:
http://svn.apache.org/viewvc/ofbiz/trunk/applications/humanres/data/HumanResTypeData.xml?rev=658265&r1=658264&r2=658265&view=diff
==============================================================================
--- ofbiz/trunk/applications/humanres/data/HumanResTypeData.xml (original)
+++ ofbiz/trunk/applications/humanres/data/HumanResTypeData.xml Tue May 20
07:48:42 2008
@@ -62,4 +62,14 @@
<PartyQualType description="Degree" hasTable="N" parentTypeId=""
partyQualTypeId="DEGREE"/>
<PartyQualType description="Certification" hasTable="N" parentTypeId=""
partyQualTypeId="CERTIFICATION"/>
+
+ <EmploymentAppSourceType description="NewsPaper" hasTable="N"
parentTypeId="" employmentAppSourceTypeId="NEWS_PAPER"/>
+ <EmploymentAppSourceType description="PersonalReferal" hasTable="N"
parentTypeId="" employmentAppSourceTypeId="PER_REF"/>
+ <EmploymentAppSourceType description="Internet" hasTable="N"
parentTypeId="" employmentAppSourceTypeId="INTERNET"/>
+ <EmploymentAppSourceType description="Advertisement" hasTable="N"
parentTypeId="" employmentAppSourceTypeId="ADV"/>
+
+ <DeductionType description="Federal Tax" hasTable="N" parentTypeId=""
deductionTypeId="FED_TAX"/>
+ <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"/>
</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=658265&r1=658264&r2=658265&view=diff
==============================================================================
---
ofbiz/trunk/applications/humanres/script/org/ofbiz/humanres/HumanResServices.xml
(original)
+++
ofbiz/trunk/applications/humanres/script/org/ofbiz/humanres/HumanResServices.xml
Tue May 20 07:48:42 2008
@@ -54,8 +54,25 @@
<simple-method method-name="createPartySkill" short-description="Create
Party Skills">
<make-value entity-name="PartySkill" value-name="newEntity"/>
<set-pk-fields map-name="parameters" value-name="newEntity"/>
- <set-nonpk-fields map-name="parameters" value-name="newEntity"/>
- <create-value value-name="newEntity"/>
+ <set-nonpk-fields map-name="parameters" value-name="newEntity"/>
+ <entity-one entity-name="PartySkill" value-name="partySkill"
auto-field-map="true"/>
+ <if>
+ <condition>
+ <and>
+ <if-compare-field field-name="partySkill.partyId"
operator="equals" to-field-name="parameters.partyId"/>
+ <if-compare-field field-name="partySkill.skillTypeId"
operator="equals" to-field-name="parameters.skillTypeId"/>
+ </and>
+ </condition>
+ <then>
+ <add-error>
+ <fail-message message="Record with the selected
combination already exists.Please try with Other combination."/>
+ </add-error>
+ <check-errors/>
+ </then>
+ <else>
+ <create-value value-name="newEntity"/>
+ </else>
+ </if>
</simple-method>
<simple-method method-name="updatePartySkill" short-description="Update
Party Skills">
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=658265&r1=658264&r2=658265&view=diff
==============================================================================
--- ofbiz/trunk/applications/humanres/webapp/humanres/WEB-INF/controller.xml
(original)
+++ ofbiz/trunk/applications/humanres/webapp/humanres/WEB-INF/controller.xml
Tue May 20 07:48:42 2008
@@ -138,7 +138,7 @@
<request-map uri="deletePartySkill">
<security https="true" auth="true"/>
<event type="service" invoke="deletePartySkill"/>
- <response name="success" type="view" value="EditPartySkills"/>
+ <response name="success" type="view" value="FindPartySkills"/>
</request-map>
<request-map uri="findPerfReviews">
<security https="true" auth="true"/>
@@ -225,17 +225,18 @@
<request-map uri="createEmploymentApp">
<security https="true" auth="true"/>
<event type="service" invoke="createEmploymentApp"/>
- <response name="success" type="view" value="EditEmploymentApp"/>
+ <response name="success" type="view" value="FindEmploymentApp"/>
</request-map>
<request-map uri="updateEmploymentApp">
<security https="true" auth="true"/>
- <event type="service" invoke="updateEmploymentApp"/>
- <response name="success" type="view" value="EditEmploymentApp"/>
+ <event type="service-multi" invoke="updateEmploymentApp"/>
+ <response name="success" type="request" value="FindEmploymentApp"/>
+ <response name="error" type="view" value="FindEmploymentApp"/>
</request-map>
<request-map uri="deleteEmploymentApp">
<security https="true" auth="true"/>
<event type="service" invoke="deleteEmploymentApp"/>
- <response name="success" type="view" value="ListEmploymentApps"/>
+ <response name="success" type="view" value="FindEmploymentApp"/>
</request-map>
<request-map uri="ListPayHistories">
<security https="true" auth="true"/>
@@ -503,12 +504,12 @@
</request-map>
<request-map uri="updateSkillType">
<security https="true" auth="true"/>
- <event type="service" invoke="updateSkillType"/>
+ <event type="service-multi" invoke="updateSkillType"/>
<response name="success" type="view" value="EditSkillTypes"/>
</request-map>
<request-map uri="deleteSkillType">
<security https="true" auth="true"/>
- <event type="service" invoke="deleteSkillType"/>
+ <event type="service-multi" invoke="deleteSkillType"/>
<response name="success" type="view" value="EditSkillTypes"/>
</request-map>
<!--====================Employee Requests==================-->
Modified: ofbiz/trunk/applications/humanres/widget/EmploymentScreens.xml
URL:
http://svn.apache.org/viewvc/ofbiz/trunk/applications/humanres/widget/EmploymentScreens.xml?rev=658265&r1=658264&r2=658265&view=diff
==============================================================================
--- ofbiz/trunk/applications/humanres/widget/EmploymentScreens.xml (original)
+++ ofbiz/trunk/applications/humanres/widget/EmploymentScreens.xml Tue May 20
07:48:42 2008
@@ -111,6 +111,10 @@
<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>
</actions>
<widgets>
<decorator-screen name="CommonEmploymentDecorator"
location="${parameters.mainDecoratorLocation}">
@@ -125,7 +129,7 @@
</widgets>
</section>
</screenlet>
- <screenlet
title="${uiLabelMap.HumanResFindEmploymentApp}">
+ <screenlet title="${uiLabelMap.CommonList}
${uiLabelMap.HumanResEmploymentApp}">
<section>
<widgets>
<include-form name="ListEmploymentApps"
location="component://humanres/widget/forms/EmploymentForms.xml"/>
@@ -151,7 +155,7 @@
<container style="screenlet">
<container style="screenlet-title-bar">
<container style="h3">
- <label
text="${uiLabelMap.HumanResEditEmploymentApp}"/>
+ <label
text="${uiLabelMap.HumanResNewEmploymentApp}"/>
</container>
</container>
<container style="screenlet-body">
@@ -160,7 +164,7 @@
<container>
<link
text="${uiLabelMap.HumanResNewEmploymentApp}" target="EditEmploymentApp"
style="buttontext"/>
</container>
- <include-form name="EditEmploymentApp"
location="component://humanres/widget/forms/EmploymentForms.xml"/>
+ <include-form name="AddEmploymentApp"
location="component://humanres/widget/forms/EmploymentForms.xml"/>
</widgets>
</section>
</container>
Modified: ofbiz/trunk/applications/humanres/widget/forms/EmploymentForms.xml
URL:
http://svn.apache.org/viewvc/ofbiz/trunk/applications/humanres/widget/forms/EmploymentForms.xml?rev=658265&r1=658264&r2=658265&view=diff
==============================================================================
--- ofbiz/trunk/applications/humanres/widget/forms/EmploymentForms.xml
(original)
+++ ofbiz/trunk/applications/humanres/widget/forms/EmploymentForms.xml Tue May
20 07:48:42 2008
@@ -1,5 +1,4 @@
<?xml version="1.0" encoding="UTF-8"?>
-
<!--
Licensed to the Apache Software Foundation (ASF) under one
or more contributor license agreements. See the NOTICE file
@@ -77,14 +76,14 @@
<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">
+ <drop-down allow-empty="false" no-current-selected-key="------">
<entity-options description="${description}"
key-field-name="roleTypeId" entity-name="RoleType">
<entity-order-by field-name="description"/>
</entity-options>
</drop-down>
</field>
<field name="roleTypeIdTo" tooltip="${uiLabelMap.CommonRequired}">
- <drop-down allow-empty="false">
+ <drop-down allow-empty="false" no-current-selected-key="------">
<entity-options description="${description}"
key-field-name="roleTypeId" entity-name="RoleType">
<entity-order-by field-name="description"/>
</entity-options>
@@ -95,7 +94,7 @@
<field name="fromDate" title="${uiLabelMap.CommonDate}"
tooltip="${uiLabelMap.CommonRequired}"/>
<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="false" no-current-selected-key="------">
<entity-options description="${description}"
key-field-name="terminationTypeId" entity-name="TerminationType">
<entity-order-by field-name="description"/>
</entity-options>
@@ -104,51 +103,74 @@
<field name="submitButton" use-when="employment==null"
title="${uiLabelMap.CommonCreate}" widget-style="smallSubmit"><submit
button-type="button"/></field>
<field name="submitButton" use-when="employment!=null"
title="${uiLabelMap.CommonUpdate}" widget-style="smallSubmit"><submit
button-type="button"/></field>
</form>
- <form name="ListEmploymentApps" type="list" separate-columns="true"
default-entity-name="EmploymentApp" list-name="listIt"
paginate-target="FindEmploymentApp" paginate="true"
- odd-row-style="alternate-row" default-table-style="basic-table
hover-bar">
+ <form name="ListEmploymentApps" type="multi" list-name="listIt"
use-row-submit="true" separate-columns="true"
target="updateEmploymentApp?partyId=${partyId}&&referredByPartyId=${partyId}"
paginate-target="FindEmploymentApp"
+ odd-row-style="alternate-row" default-table-style="basic-table
hover-bar" >
<actions>
+ <set field="partyId" from-field="parameters.partyId"/>
+ <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="entityName" value="EmploymentApp"/>
<field-map field-name="orderBy" value="applicationId"/>
</service>
</actions>
- <auto-fields-entity entity-name="EmploymentApp"
default-field-type="display"/>
- <field name="applicationId"
title="${uiLabelMap.HumanResApplicationId}" widget-style="buttontext">
- <hyperlink also-hidden="false" description="${applicationId}"
target="EditEmploymentApp?applicationId=${applicationId}"/>
+ <row-actions>
+ <set field="applicationId" from-field="applicationId"/>
+ </row-actions>
+ <auto-fields-service default-field-type="hidden"
service-name="updateEmploymentApp"/>
+ <field name="applicationId"
title="${uiLabelMap.HumanResApplicationId}"><display
also-hidden="true"/></field>
+ <field name="statusId">
+ <drop-down allow-empty="true" current-description="">
+ <entity-options description="${description}"
key-field-name="statusId" entity-name="StatusItem">
+ <entity-constraint name="statusTypeId" operator="equals"
value="EMPL_POSITION_STATUS"/>
+ <entity-order-by field-name="description"/>
+ </entity-options>
+ </drop-down>
+ </field>
+ <field name="emplPositionId"
title="${uiLabelMap.FormFieldTitle_emplPositionId}"><lookup
target-form-name="LookupEmplPosition"/></field>
+ <field name="employmentAppSourceTypeId">
+ <drop-down allow-empty="true" current-description="">
+ <entity-options description="${employmentAppSourceTypeId}"
key-field-name="employmentAppSourceTypeId"
entity-name="EmploymentAppSourceType">
+ <entity-order-by field-name="employmentAppSourceTypeId"/>
+ </entity-options>
+ </drop-down>
+ </field>
+ <field name="partyId"><hidden/></field>
+ <field name="applyingPartyId"
title="${uiLabelMap.FormFieldTitle_applyingPartyId}"><lookup
target-form-name="LookupPartyName"/></field>
+ <field name="referredByPartyId"
title="${uiLabelMap.FormFieldTitle_referredByPartyId}"
use-when=""${referredByPartyId}".equals(null)"><lookup
target-form-name="LookupPartyName"/></field>
+ <field name="referredByPartyId"
use-when="referredByPartyId!=null"><hidden/></field>
+ <field name="applicationDate"
title="${uiLabelMap.FormFieldTitle_applicationDate}"><date-time/></field>
+ <field name="deleteLink" title="${uiLabelMap.CommonDelete}"
widget-style="buttontext">
+ <hyperlink
target="deleteEmploymentApp?applicationId=${applicationId}&&partyId=${partyId}&&referredByPartyId=${referredByPartyId}"
description="${uiLabelMap.CommonDelete}" also-hidden="true"/>
</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="EditEmploymentApp" type="single" target="updateEmploymentApp"
title="" default-map-name="employmentApp"
+ <form name="AddEmploymentApp" type="single"
target="createEmploymentApp?applicationId=${applicationId}&&partyId=${referredByPartyId}"
default-entity-name="EmploymentApp" paginate-target="FindEmploymentApp"
header-row-style="header-row" default-table-style="basic-table">
- <alt-target use-when="employmentApp==null"
target="createEmploymentApp"/>
<auto-fields-service service-name="createEmploymentApp"
default-field-type="hidden"/>
- <field use-when="employmentApp!=null" name="applicationId"
tooltip="${uiLabelMap.CommonNotModifRecreat}"><display/></field>
- <field name="applicationId"
use-when="employmentApp==null"><ignored/></field>
- <field use-when="employmentApp==null&&applicationId!=null"
name="applicationId"
tooltip="${uiLabelMap.CommonCannotBeFound}:[${applicationId}]"><text size="20"
maxlength="20"/></field>
- <field name="emplPositionId"
use-when="employmentApp!=null"><display/></field>
- <field name="emplPositionId" use-when="employmentApp==null"><lookup
target-form-name="LookupEmplPosition"/></field>
+ <field name="emplPositionId"><lookup
target-form-name="LookupEmplPosition"/></field>
<field name="statusId">
- <drop-down allow-empty="false">
+ <drop-down allow-empty="true" current-description="">
<entity-options description="${description}"
key-field-name="statusId" entity-name="StatusItem">
<entity-constraint name="statusTypeId" operator="equals"
value="EMPL_POSITION_STATUS"/>
<entity-order-by field-name="description"/>
</entity-options>
</drop-down>
</field>
- <field name="applyingPartyId"
use-when="employmentApp!=null"><display/></field>
- <field name="applyingPartyId" use-when="employmentApp==null"><lookup
target-form-name="LookupPartyName"/></field>
- <field name="referredByPartyId"
use-when="employmentApp!=null"><display/></field>
- <field name="referredByPartyId" use-when="employmentApp==null"><lookup
target-form-name="LookupPartyName"/></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="employmentAppSourceTypeId">
- <drop-down allow-empty="false">
+ <drop-down allow-empty="true" current-description="">
<entity-options description="${employmentAppSourceTypeId}"
key-field-name="employmentAppSourceTypeId"
entity-name="EmploymentAppSourceType">
<entity-order-by field-name="employmentAppSourceTypeId"/>
</entity-options>
</drop-down>
</field>
<field name="applicationDate"><date-time/></field>
- <field name="submitButton" use-when="employmentApp==null"
title="${uiLabelMap.CommonCreate}" widget-style="smallSubmit"><submit
button-type="button"/></field>
- <field name="submitButton" use-when="employmentApp!=null"
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="ListPayHistories" type="list" target="updatePayHistory"
title="" paginate-target="findPayHistories"
odd-row-style="alternate-row" default-table-style="basic-table
hover-bar">
@@ -485,9 +507,33 @@
<field name="otherEmail"
title="${uiLabelMap.PartyOtherEmailAddress}"><text size="60"
maxlength="250"/></field>
<field name="submitButton" title="${uiLabelMap.CommonCreate}"
widget-style="buttontext"><submit button-type="text-link"/></field>
</form>
- <form name="FindEmploymentApps" type="single" target="FindEmploymentApp"
header-row-style="header-row" default-table-style="basic-table">
+ <form name="FindEmploymentApps" type="single" target="FindEmploymentApp"
header-row-style="header-row" default-table-style="basic-table"
default-map-name="employmentApp">
+ <actions>
+ <set field="referredByPartyId" from-field="parameters.partyId"/>
+ </actions>
<auto-fields-entity entity-name="EmploymentApp"
default-field-type="find"/>
<field name="noConditionFind"><hidden value="Y"/></field>
+ <field name="statusId">
+ <drop-down allow-empty="true" current-description="">
+ <entity-options description="${description}"
key-field-name="statusId" entity-name="StatusItem">
+ <entity-constraint name="statusTypeId" operator="equals"
value="EMPL_POSITION_STATUS"/>
+ <entity-order-by field-name="description"/>
+ </entity-options>
+ </drop-down>
+ </field>
+ <field name="employmentAppSourceTypeId">
+ <drop-down allow-empty="true" current-description="">
+ <entity-options description="${description}"
key-field-name="employmentAppSourceTypeId"
entity-name="EmploymentAppSourceType">
+ <entity-order-by field-name="description"/>
+ </entity-options>
+ </drop-down>
+ </field>
+ <field name="applyingPartyId"><lookup
target-form-name="LookupPartyName"/></field>
+ <field name="referredByPartyId" use-when="referredByPartyId==null">
+ <lookup target-form-name="LookupPartyName"/>
+ </field>
+ <field name="referredByPartyId"
use-when="referredByPartyId!=null"><hidden/></field>
+ <field name="searchButton" widget-style="smallSubmit"><submit
button-type="button"/></field>
<field name="searchButton" widget-style="smallSubmit"><submit
button-type="button"/></field>
</form>
</forms>
Modified: ofbiz/trunk/applications/humanres/widget/forms/PartyAbilityForms.xml
URL:
http://svn.apache.org/viewvc/ofbiz/trunk/applications/humanres/widget/forms/PartyAbilityForms.xml?rev=658265&r1=658264&r2=658265&view=diff
==============================================================================
--- ofbiz/trunk/applications/humanres/widget/forms/PartyAbilityForms.xml
(original)
+++ ofbiz/trunk/applications/humanres/widget/forms/PartyAbilityForms.xml Tue
May 20 07:48:42 2008
@@ -125,7 +125,7 @@
<form name="FindPartySkills" type="single" target="FindPartySkills"
header-row-style="header-row" default-table-style="basic-table">
<auto-fields-entity entity-name="PartySkill"
default-field-type="find"/>
- <field name="partyId"><text-find/></field>
+ <field name="partyId"><lookup
target-form-name="LookupPartyName"/></field>
<field name="skillTypeId">
<drop-down allow-empty="true">
<entity-options description="${description}"
entity-name="SkillType">
@@ -139,28 +139,46 @@
<field name="noConditionFind"><hidden value="Y"/></field>
<field name="searchButton" widget-style="smallSubmit"><submit
button-type="button"/></field>
</form>
- <form name="ListPartySkills" type="multi" list-name="partySkills"
use-row-submit="true" separate-columns="true"
target="updatePartySkill?partyId=${partyId}"
+ <form name="ListPartySkills" type="multi" list-name="listIt"
use-row-submit="true" separate-columns="true"
target="updatePartySkill?partyId=${partyId}" paginate-target="findPartySkills"
odd-row-style="alternate-row" default-table-style="basic-table
hover-bar">
<actions>
<set field="partyId" from-field="parameters.partyId"/>
- <service service-name="performFind" result-map-name="result"
result-map-list-name="partySkills">
+ <entity-one entity-name="Party" 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="entityName" value="PartySkill"/>
+ <field-map field-name="orderBy" value="partyId"/>
+ <field-map field-name="orderBy" value="skillTypeId"/>
</service>
</actions>
<row-actions>
<set field="skillTypeId" from-field="skillTypeId"/>
</row-actions>
<auto-fields-service default-field-type="hidden"
service-name="updatePartySkill"/>
- <field name="partyId"><hidden/></field>
- <field name="skillTypeId"><display/></field>
+ <field name="partyId" title="${uiLabelMap.PartyPartyId}">
+ <display-entity description="${partyId}"
entity-name="PartyNameView">
+ <sub-hyperlink
target="/partymgr/control/viewprofile?partyId=${partyId}"
link-style="smallSubmit" target-type="inter-app" description="${partyId}"/>
+ </display-entity>
+ </field>
+ <field name="skillTypeId">
+ <display-entity entity-name="SkillType"
description="${description}"/>
+ </field>
+ <field name="firstName" title="${uiLabelMap.PartyFirstName}"
entry-name="partyId">
+ <display-entity entity-name="PartyNameView"
key-field-name="partyId" description="${firstName}"/>
+ </field>
+ <field name="lastName" title="${uiLabelMap.PartyLastName}"
entry-name="partyId">
+ <display-entity entity-name="PartyNameView"
key-field-name="partyId" description="${lastName}"/>
+ </field>
<field name="yearsExperience"><text/></field>
<field name="rating"><text/></field>
<field name="skillLevel"><text/></field>
+ <field name="deleteLink" title="${uiLabelMap.CommonDelete}"
widget-style="buttontext">
+ <hyperlink
target="deletePartySkill?skillTypeId=${skillTypeId}&&partyId=${partyId}"
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="AddPartySkills" type="single" target="createPartySkill"
+ <form name="AddPartySkills" type="single" target="createPartySkill"
paginate-target="FindEmploymentApp"
header-row-style="header-row" default-table-style="basic-table">
<field name="partyId" use-when="partyId != null"><hidden/></field>
<field name="partyId" use-when="skillTypeId == null&&partyId
== null"><lookup target-form-name="LookupPartyName"/></field>
@@ -313,18 +331,19 @@
<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="list" 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"/>
<field name="skillTypeId"
title="${uiLabelMap.HumanResSkillTypeId}"><display/></field>
- <field name="description" title="${uiLabelMap.CommonDescription}"/>
- <field name="submitButton" title="${uiLabelMap.CommonUpdate}"
widget-style="smallSubmit"><submit button-type="button"/></field>
+ <field name="description"
title="${uiLabelMap.CommonDescription}"><text/></field>
<field name="deleteLink" title="${uiLabelMap.CommonDelete}"
widget-style="buttontext">
<hyperlink target="deleteSkillType?skillTypeId=${skillTypeId}"
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="AddSkillType" type="single" target="createSkillType"
default-map-name="skillType"
header-row-style="header-row" default-table-style="basic-table">
Modified: ofbiz/trunk/applications/party/webapp/partymgr/WEB-INF/controller.xml
URL:
http://svn.apache.org/viewvc/ofbiz/trunk/applications/party/webapp/partymgr/WEB-INF/controller.xml?rev=658265&r1=658264&r2=658265&view=diff
==============================================================================
--- ofbiz/trunk/applications/party/webapp/partymgr/WEB-INF/controller.xml
(original)
+++ ofbiz/trunk/applications/party/webapp/partymgr/WEB-INF/controller.xml Tue
May 20 07:48:42 2008
@@ -997,6 +997,25 @@
<event type="service" invoke="deletePartyResume"/>
<response name="success" type="view" value="EditPartyResume"/>
</request-map>
+ <request-map uri="FindEmploymentApp">
+ <security https="true" auth="true"/>
+ <response name="success" type="view" value="EditEmploymentApp"/>
+ </request-map>
+ <request-map uri="createEmploymentApp">
+ <security https="true" auth="true"/>
+ <event type="service" invoke="createEmploymentApp"/>
+ <response name="success" type="request" value="FindEmploymentApp"/>
+ </request-map>
+ <request-map uri="updateEmploymentApp">
+ <security https="true" auth="true"/>
+ <event type="service-multi" invoke="updateEmploymentApp"/>
+ <response name="success" type="view" value="EditEmploymentApp"/>
+ </request-map>
+ <request-map uri="deleteEmploymentApp">
+ <security https="true" auth="true"/>
+ <event type="service" invoke="deleteEmploymentApp"/>
+ <response name="success" type="request" value="FindEmploymentApp"/>
+ </request-map>
<!-- Lookup request mappings -->
<request-map uri="LookupPartyName"><security https="true"
auth="true"/><response name="success" type="view"
value="LookupPartyName"/></request-map>
@@ -1113,5 +1132,6 @@
<view-map name="EditPartySkills" type="screen"
page="component://party/widget/partymgr/PartyScreens.xml#EditPartySkills"/>
<view-map name="EditPersonTrainings" type="screen"
page="component://party/widget/partymgr/PartyScreens.xml#EditPersonTrainings"/>
<view-map name="EditPartyResume" type="screen"
page="component://party/widget/partymgr/PartyScreens.xml#EditPartyResume"/>
+ <view-map name="EditEmploymentApp" type="screen"
page="component://party/widget/partymgr/PartyScreens.xml#EditEmploymentApp"/>
<!-- end of view mappings -->
</site-conf>
Modified: ofbiz/trunk/applications/party/widget/partymgr/PartyMenus.xml
URL:
http://svn.apache.org/viewvc/ofbiz/trunk/applications/party/widget/partymgr/PartyMenus.xml?rev=658265&r1=658264&r2=658265&view=diff
==============================================================================
--- ofbiz/trunk/applications/party/widget/partymgr/PartyMenus.xml (original)
+++ ofbiz/trunk/applications/party/widget/partymgr/PartyMenus.xml Tue May 20
07:48:42 2008
@@ -70,6 +70,9 @@
<menu-item name="PartyResume"
title="${uiLabelMap.HumanResPartyResume}">
<link target="EditPartyResume?partyId=${partyId}"/>
</menu-item>
+ <menu-item name="EmploymentApplication"
title="${uiLabelMap.HumanResEmploymentApp}">
+ <link
target="FindEmploymentApp?partyId=${partyId}&&referredByPartyId=${partyId}"/>
+ </menu-item>
</menu>
<menu name="create-new-party" type="simple"
menu-container-style="basic-nav">
Modified: ofbiz/trunk/applications/party/widget/partymgr/PartyScreens.xml
URL:
http://svn.apache.org/viewvc/ofbiz/trunk/applications/party/widget/partymgr/PartyScreens.xml?rev=658265&r1=658264&r2=658265&view=diff
==============================================================================
--- ofbiz/trunk/applications/party/widget/partymgr/PartyScreens.xml (original)
+++ ofbiz/trunk/applications/party/widget/partymgr/PartyScreens.xml Tue May 20
07:48:42 2008
@@ -1141,4 +1141,37 @@
</widgets>
</section>
</screen>
+ <screen name="EditEmploymentApp">
+ <section>
+ <actions>
+ <set field="titleProperty" value="HumanResFindEmploymentApp"/>
+ <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>
+ </actions>
+ <widgets>
+ <decorator-screen name="CommonPartyDecorator"
location="${parameters.mainDecoratorLocation}">
+ <decorator-section name="body">
+ <screenlet title="${uiLabelMap.CommonList}
${uiLabelMap.HumanResEmploymentApp}">
+ <section>
+ <widgets>
+ <include-form name="ListEmploymentApps"
location="component://humanres/widget/forms/EmploymentForms.xml"/>
+ </widgets>
+ </section>
+ </screenlet>
+ <screenlet
title="${uiLabelMap.HumanResNewEmploymentApp}">
+ <section>
+ <widgets>
+ <include-form name="AddEmploymentApp"
location="component://humanres/widget/forms/EmploymentForms.xml"/>
+ </widgets>
+ </section>
+ </screenlet>
+ </decorator-section>
+ </decorator-screen>
+ </widgets>
+ </section>
+ </screen>
</screens>
