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/29 17:30:54 UTC
svn commit: r661359 [2/2] - in /ofbiz/trunk/applications: humanres/config/
humanres/data/ humanres/entitydef/ humanres/script/org/ofbiz/humanres/
humanres/servicedef/ humanres/webapp/humanres/WEB-INF/ humanres/widget/
humanres/widget/forms/ party/webap...
Modified: ofbiz/trunk/applications/humanres/widget/forms/LookupForms.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/humanres/widget/forms/LookupForms.xml?rev=661359&r1=661358&r2=661359&view=diff
==============================================================================
--- ofbiz/trunk/applications/humanres/widget/forms/LookupForms.xml (original)
+++ ofbiz/trunk/applications/humanres/widget/forms/LookupForms.xml Thu May 29 08:30:53 2008
@@ -169,4 +169,124 @@
</field>
<field name="description"><display/></field>
</form>
+ <form name="LookupPayRollPreference" type="single" target="LookupPayRollPreference"
+ header-row-style="header-row" default-table-style="basic-table">
+ <auto-fields-entity entity-name="PayrollPreference" default-field-type="hidden"/>
+ <field name="payrollPreferenceSeqId" title="${uiLabelMap.HumanResLookupPayrollPreferenceSeqId}"><text-find/></field>
+ <field name="noConditionFind"><hidden value="Y"/></field>
+ <field name="submitButton" title="${uiLabelMap.CommonLookup}" widget-style="smallSubmit"><submit button-type="button"/></field>
+ </form>
+ <form name="ListPayRollPreferences" type="list" list-name="listIt" paginate-target="LookupPayRollPreference"
+ 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="entityName" value="PayrollPreference"/>
+ </service>
+ </actions>
+ <field name="payrollPreferenceSeqId" widget-style="buttontext">
+ <hyperlink also-hidden="false" target-type="plain" description="${payrollPreferenceSeqId}" target="javascript:set_value('${payrollPreferenceSeqId}')"/>
+ </field>
+ <field name="description"><display/></field>
+ </form>
+ <form name="LookupUnemploymentClaim" type="single" target="LookupUnemploymentClaim"
+ header-row-style="header-row" default-table-style="basic-table">
+ <auto-fields-entity entity-name="UnemploymentClaim" default-field-type="hidden"/>
+ <field name="unemploymentClaimId" title="${uiLabelMap.HumanResLookupUnemploymentClaimId}"><text-find/></field>
+ <field name="noConditionFind"><hidden value="Y"/></field>
+ <field name="submitButton" title="${uiLabelMap.CommonLookup}" widget-style="smallSubmit"><submit button-type="button"/></field>
+ </form>
+ <form name="ListUnemploymentClaims" type="list" list-name="listIt" paginate-target="LookupUnemploymentClaim"
+ 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="entityName" value="UnemploymentClaim"/>
+ </service>
+ </actions>
+ <field name="unemploymentClaimId" widget-style="buttontext">
+ <hyperlink also-hidden="false" target-type="plain" description="${unemploymentClaimId}" target="javascript:set_value('${unemploymentClaimId}')"/>
+ </field>
+ <field name="description"><display/></field>
+ </form>
+ <form name="LookupAgreementEmploymentAppl" type="single" target="LookupAgreementEmploymentAppl"
+ header-row-style="header-row" default-table-style="basic-table">
+ <auto-fields-entity entity-name="AgreementEmploymentAppl" default-field-type="hidden"/>
+ <field name="agreementItemSeqId" title="${uiLabelMap.HumanResLookupAgreementItemSeqId}"><text-find/></field>
+ <field name="noConditionFind"><hidden value="Y"/></field>
+ <field name="submitButton" title="${uiLabelMap.CommonLookup}" widget-style="smallSubmit"><submit button-type="button"/></field>
+ </form>
+ <form name="ListAgreementEmploymentAppls" type="list" list-name="listIt" paginate-target="LookupAgreementEmploymentAppl"
+ 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="entityName" value="AgreementEmploymentAppl"/>
+ </service>
+ </actions>
+ <field name="agreementItemSeqId" widget-style="buttontext">
+ <hyperlink also-hidden="false" target-type="plain" description="${agreementItemSeqId}" target="javascript:set_value('${agreementItemSeqId}')"/>
+ </field>
+ <field name="description"><display/></field>
+ </form>
+ <form name="LookupPerfReview" type="single" target="LookupPerfReview"
+ header-row-style="header-row" default-table-style="basic-table">
+ <auto-fields-entity entity-name="PerfReview" default-field-type="hidden"/>
+ <field name="perfReviewId" title="${uiLabelMap.HumanResLookupPerfReviewId}"><text-find/></field>
+ <field name="noConditionFind"><hidden value="Y"/></field>
+ <field name="submitButton" title="${uiLabelMap.CommonLookup}" widget-style="smallSubmit"><submit button-type="button"/></field>
+ </form>
+ <form name="ListPerfReviews" type="list" list-name="listIt" paginate-target="LookupPerfReview"
+ 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="entityName" value="PerfReview"/>
+ </service>
+ </actions>
+ <field name="perfReviewId" widget-style="buttontext">
+ <hyperlink also-hidden="false" target-type="plain" description="${perfReviewId}" target="javascript:set_value('${perfReviewId}')"/>
+ </field>
+ <field name="description"><display/></field>
+ </form>
+ <form name="LookupPartyResume" type="single" target="LookupPartyResume"
+ header-row-style="header-row" default-table-style="basic-table">
+ <auto-fields-entity entity-name="PartyResume" default-field-type="hidden"/>
+ <field name="resumeId" title="${uiLabelMap.HumanResLookupPartyResumeId}"><text-find/></field>
+ <field name="noConditionFind"><hidden value="Y"/></field>
+ <field name="submitButton" title="${uiLabelMap.CommonLookup}" widget-style="smallSubmit"><submit button-type="button"/></field>
+ </form>
+ <form name="ListPartyResumes" type="list" list-name="listIt" paginate-target="LookupPartyResume"
+ 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="entityName" value="PartyResume"/>
+ </service>
+ </actions>
+ <field name="resumeId" widget-style="buttontext">
+ <hyperlink also-hidden="false" target-type="plain" description="${resumeId}" target="javascript:set_value('${resumeId}')"/>
+ </field>
+ <field name="description"><display/></field>
+ </form>
+ <form name="LookupEmploymentApp" type="single" target="LookupEmploymentApp"
+ header-row-style="header-row" default-table-style="basic-table">
+ <auto-fields-entity entity-name="EmploymentApp" default-field-type="hidden"/>
+ <field name="applicationId" title="${uiLabelMap.HumanResLookupApplicationId}"><text-find/></field>
+ <field name="noConditionFind"><hidden value="Y"/></field>
+ <field name="submitButton" title="${uiLabelMap.CommonLookup}" widget-style="smallSubmit"><submit button-type="button"/></field>
+ </form>
+ <form name="ListEmploymentApps" type="list" list-name="listIt" paginate-target="LookupEmploymentApp"
+ 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="entityName" value="EmploymentApp"/>
+ </service>
+ </actions>
+ <field name="applicationId" widget-style="buttontext">
+ <hyperlink also-hidden="false" target-type="plain" description="${applicationId}" target="javascript:set_value('${applicationId}')"/>
+ </field>
+ <field name="description"><display/></field>
+ </form>
</forms>
\ No newline at end of file
Modified: ofbiz/trunk/applications/humanres/widget/forms/PartyQualForms.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/humanres/widget/forms/PartyQualForms.xml?rev=661359&r1=661358&r2=661359&view=diff
==============================================================================
--- ofbiz/trunk/applications/humanres/widget/forms/PartyQualForms.xml (original)
+++ ofbiz/trunk/applications/humanres/widget/forms/PartyQualForms.xml Thu May 29 08:30:53 2008
@@ -20,7 +20,7 @@
<forms xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xsi:noNamespaceSchemaLocation="http://ofbiz.apache.org/dtds/widget-form.xsd">
- <form name="FindPartyQuals" type="single" target="FindPartyQuals" header-row-style="header-row" default-table-style="basic-table">
+ <form name="FindPartyQuals" type="single" target="FindPartyQuals" header-row-style="header-row" default-table-style="basic-table">
<auto-fields-entity entity-name="PartyQual" default-field-type="find"/>
<field name="noConditionFind"><hidden value="Y"/></field>
<field name="partyId"><lookup target-form-name="LookupPartyName"/></field>
Modified: ofbiz/trunk/applications/humanres/widget/forms/PartyResumeForms.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/humanres/widget/forms/PartyResumeForms.xml?rev=661359&r1=661358&r2=661359&view=diff
==============================================================================
--- ofbiz/trunk/applications/humanres/widget/forms/PartyResumeForms.xml (original)
+++ ofbiz/trunk/applications/humanres/widget/forms/PartyResumeForms.xml Thu May 29 08:30:53 2008
@@ -25,20 +25,21 @@
<field name="noConditionFind"><hidden value="Y"/></field>
<field name="partyId"><lookup target-form-name="LookupPartyName"/></field>
<field name="contentId"><lookup target-form-name="LookupContent"/></field>
+ <field name="resumeId"><lookup target-form-name="LookupPartyResume"/></field>
<field name="searchButton" widget-style="smallSubmit"><submit button-type="button"/></field>
</form>
<form name="ListPartyResumes" type="list" separate-columns="true" default-entity-name="PartyResume" list-name="listIt" paginate-target="FindPartyResumes" paginate="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="partyResumeCtx"/>
+ <field-map field-name="inputFields" env-name="partyResumeCtx"/>
<field-map field-name="entityName" value="PartyResume"/>
<field-map field-name="orderBy" value="resumeId"/>
</service>
</actions>
<auto-fields-entity entity-name="PartyResume" default-field-type="display"/>
<field name="resumeId" title="ResumeId" widget-style="linktext">
- <hyperlink also-hidden="false" description="${resumeId}" target="EditPartyResume?resumeId=${resumeId}"/>
+ <hyperlink also-hidden="false" description="${resumeId}" target="EditPartyResume?resumeId=${resumeId}"/>
</field>
<field name="partyId" title="${uiLabelMap.PartyPartyId}">
<display-entity description="${firstName} ${middleName} ${lastName} ${groupName}" entity-name="PartyNameView">
@@ -46,7 +47,7 @@
</display-entity>
</field>
<field name="deleteLink" title="${uiLabelMap.CommonDelete}" widget-style="buttontext">
- <hyperlink target="deletePartyResume?resumeId=${resumeId}" description="${uiLabelMap.CommonDelete}" also-hidden="false"/>
+ <hyperlink target="deletePartyResume?resumeId=${resumeId}" description="${uiLabelMap.CommonDelete}" also-hidden="false"/>
</field>
</form>
<form name="EditPartyResume" type="single" target="createPartyResume" title="" default-map-name="partyResume"
Modified: ofbiz/trunk/applications/humanres/widget/forms/PayGradeForms.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/humanres/widget/forms/PayGradeForms.xml?rev=661359&r1=661358&r2=661359&view=diff
==============================================================================
--- ofbiz/trunk/applications/humanres/widget/forms/PayGradeForms.xml (original)
+++ ofbiz/trunk/applications/humanres/widget/forms/PayGradeForms.xml Thu May 29 08:30:53 2008
@@ -24,6 +24,7 @@
header-row-style="header-row" default-table-style="basic-table">
<auto-fields-service service-name="createPayGrade" default-field-type="find"/>
<field name="noConditionFind"><hidden value="Y"/></field>
+ <field name="payGradeId"><lookup target-form-name="LookupPayGrade"/></field>
<field name="searchButton" widget-style="smallSubmit"><submit button-type="button"/></field>
</form>
<form name="ListPayGrades" type="list" list-name="listIt" title="" target="updatePayGrade" paginate-target="FindPayGrade"
@@ -36,7 +37,7 @@
</actions>
<auto-fields-service default-field-type="display" service-name="updatePayGrade"/>
<field name="payGradeId" title="${uiLabelMap.HumanResPayGradeID}" widget-style="linktext">
- <hyperlink also-hidden="true" target="EditPayGrade?payGradeId=${payGradeId}" target-type="plain" description="${payGradeId}"/>
+ <hyperlink also-hidden="true" target="EditPayGrade?payGradeId=${payGradeId}" target-type="plain" description="${payGradeId}"/>
</field>
</form>
<form name="EditPayGrade" type="single" target="updatePayGrade" title=""
@@ -48,13 +49,14 @@
<field name="payGradeName"><text/></field>
<field name="submitButton" title="${uiLabelMap.CommonSave}" widget-style="smallSubmit"><submit button-type="button"/></field>
</form>
- <form name="ListSalarySteps" type="multi" target="updateSalaryStep" paginate-target="findSalarySteps"
+ <form name="ListSalarySteps" type="multi" target="updateSalaryStep?salaryStepSeqId=${salaryStepSeqId}&payGradeId=${payGradeId}" paginate-target="findSalarySteps"
odd-row-style="alternate-row" default-table-style="basic-table hover-bar">
<actions>
+ <entity-one entity-name="SalaryStep" auto-field-map="true"/>
<entity-condition entity-name="SalaryStep"><order-by field-name="salaryStepSeqId"/></entity-condition>
</actions>
<auto-fields-service service-name="updateSalaryStep"/>
- <field name="salaryStepSeqId" title="${uiLabelMap.HumanResSalaryStepSeqId}"><display/></field>
+ <field name="salaryStepSeqId" title="${uiLabelMap.HumanResSalaryStepSeqId}"><display also-hidden="true"/></field>
<field name="payGradeId"><hidden/></field>
<field name="_rowSubmit" title="${uiLabelMap.CommonSelect}"><hidden value="Y"/></field>
<field name="submitButton" title="${uiLabelMap.CommonSubmit}" widget-style="smallSubmit"><submit/></field>
Modified: ofbiz/trunk/applications/humanres/widget/forms/PerfReviewForms.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/humanres/widget/forms/PerfReviewForms.xml?rev=661359&r1=661358&r2=661359&view=diff
==============================================================================
--- ofbiz/trunk/applications/humanres/widget/forms/PerfReviewForms.xml (original)
+++ ofbiz/trunk/applications/humanres/widget/forms/PerfReviewForms.xml Thu May 29 08:30:53 2008
@@ -23,6 +23,7 @@
<form name="FindPerfReviews" type="single" target="FindPerfReviews" header-row-style="header-row" default-table-style="basic-table">
<auto-fields-entity entity-name="PerfReview" default-field-type="find"/>
<field name="noConditionFind"><hidden value="Y"/></field>
+ <field name="perfReviewId"><lookup target-form-name="LookupPerfReview"/></field>
<field name="employeeRoleTypeId"><hidden/></field>
<field name="managerRoleTypeId"><hidden/></field>
<field name="employeePartyId"><lookup target-form-name="LookupPartyName"/></field>
@@ -49,12 +50,17 @@
header-row-style="header-row" default-table-style="basic-table">
<alt-target use-when="perfReview==null" target="createPerfReview"/>
<auto-fields-service service-name="updatePerfReview" map-name="perfReview"/>
- <field name="perfReviewId" use-when="perfReview==null" tooltip="${uiLabelMap.CommonRequired}" widget-style="required"><text/></field>
+ <field name="perfReviewId" use-when="perfReview==null" tooltip="${uiLabelMap.CommonRequired}" widget-style="required"><lookup target-form-name="LookupPerfReview"/></field>
<field name="perfReviewId" use-when="perfReview!=null" widget-style="tabletext" tooltip="${uiLabelMap.CommonNotModifRecreat}"><display/></field>
<field name="employeePartyId" use-when="perfReview==null" tooltip="${uiLabelMap.CommonRequired}" widget-style="required"><lookup target-form-name="LookupPartyName"/></field>
<field name="employeePartyId" use-when="perfReview!=null" widget-style="tabletext" tooltip="${uiLabelMap.CommonNotModifRecreat}"><display/></field>
<field name="employeeRoleTypeId"><hidden value="EMPLOYEE"/></field>
<field name="managerPartyId"><lookup target-form-name="LookupPartyName"/></field>
+ <field name="managerRoleTypeId">
+ <drop-down allow-empty="true">
+ <entity-options entity-name="RoleType" description="${description}" key-field-name="roleTypeId"/>
+ </drop-down>
+ </field>
<field name="paymentId" title="${uiLabelMap.FormFieldTitle_paymentId}"><lookup target-form-name="LookupPayment"/></field>
<field name="emplPositionId" title="${uiLabelMap.FormFieldTitle_emplPositionId}"><lookup target-form-name="LookupEmplPosition"/></field>
<field name="submitButton" use-when="perfReview==null" title="${uiLabelMap.CommonCreate}" widget-style="smallSubmit"><submit button-type="button"/></field>
Modified: ofbiz/trunk/applications/humanres/widget/forms/PersonTrainingForms.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/humanres/widget/forms/PersonTrainingForms.xml?rev=661359&r1=661358&r2=661359&view=diff
==============================================================================
--- ofbiz/trunk/applications/humanres/widget/forms/PersonTrainingForms.xml (original)
+++ ofbiz/trunk/applications/humanres/widget/forms/PersonTrainingForms.xml Thu May 29 08:30:53 2008
@@ -44,7 +44,7 @@
</actions>
<auto-fields-service default-field-type="display" service-name="updatePersonTraining"/>
<field name="partyId" title="PartyId" widget-style="linktext">
- <hyperlink also-hidden="true" target="viewprofile?partyId=${partyId}" target-type="plain" description="${partyId}"/>
+ <hyperlink also-hidden="true" target="viewprofile?partyId=${partyId}" target-type="plain" description="${partyId}"/>
</field>
<field name="trainingClassTypeId"><display-entity description="${description}" entity-name="TrainingClassType"/></field>
<field name="thruDate"><date-time type="timestamp"/></field>
@@ -54,7 +54,7 @@
header-row-style="header-row" default-table-style="basic-table">
<field use-when="party!=null" name="partyId" widget-style="tabletext"><hidden/></field>
<field use-when="party==null" name="partyId" tooltip="${uiLabelMap.CommonRequired}" widget-style="required"><lookup target-form-name="LookupPartyName"/></field>
- <field name="trainingClassTypeId" tooltip="${uiLabelMap.CommonRequired}" widget-style="required">
+ <field name="trainingClassTypeId" tooltip="${uiLabelMap.CommonRequired}" widget-style="required">
<drop-down allow-empty="false">
<entity-options description="${description}" entity-name="TrainingClassType">
<entity-order-by field-name="description"/>
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=661359&r1=661358&r2=661359&view=diff
==============================================================================
--- ofbiz/trunk/applications/party/webapp/partymgr/WEB-INF/controller.xml (original)
+++ ofbiz/trunk/applications/party/webapp/partymgr/WEB-INF/controller.xml Thu May 29 08:30:53 2008
@@ -978,43 +978,43 @@
<response name="success" type="view" value="EditPersonTrainings"/>
<response name="error" type="view" value="EditPersonTrainings"/>
</request-map>
- <request-map uri="EditPartyResume">
+ <request-map uri="EditPartyResumes">
<security https="true" auth="true"/>
- <response name="success" type="view" value="EditPartyResume"/>
+ <response name="success" type="view" value="EditPartyResumes"/>
</request-map>
<request-map uri="createPartyResume">
<security https="true" auth="true"/>
<event type="service" invoke="createPartyResume"/>
- <response name="success" type="view" value="EditPartyResume"/>
+ <response name="success" type="view" value="EditPartyResumes"/>
</request-map>
<request-map uri="updatePartyResume">
<security https="true" auth="true"/>
<event type="service" invoke="updatePartyResume"/>
- <response name="success" type="view" value="EditPartyResume"/>
+ <response name="success" type="view" value="EditPartyResumes"/>
</request-map>
<request-map uri="deletePartyResume">
<security https="true" auth="true"/>
<event type="service" invoke="deletePartyResume"/>
- <response name="success" type="view" value="EditPartyResume"/>
+ <response name="success" type="view" value="EditPartyResumes"/>
</request-map>
- <request-map uri="FindEmploymentApp">
+ <request-map uri="EditEmploymentApps">
<security https="true" auth="true"/>
- <response name="success" type="view" value="EditEmploymentApp"/>
+ <response name="success" type="view" value="EditEmploymentApps"/>
</request-map>
<request-map uri="createEmploymentApp">
<security https="true" auth="true"/>
<event type="service" invoke="createEmploymentApp"/>
- <response name="success" type="request" value="FindEmploymentApp"/>
+ <response name="success" type="request" value="EditEmploymentApps"/>
</request-map>
<request-map uri="updateEmploymentApp">
<security https="true" auth="true"/>
<event type="service-multi" invoke="updateEmploymentApp"/>
- <response name="success" type="view" value="EditEmploymentApp"/>
+ <response name="success" type="view" value="EditEmploymentApps"/>
</request-map>
<request-map uri="deleteEmploymentApp">
<security https="true" auth="true"/>
<event type="service" invoke="deleteEmploymentApp"/>
- <response name="success" type="request" value="FindEmploymentApp"/>
+ <response name="success" type="request" value="EditEmploymentApps"/>
</request-map>
<!-- Lookup request mappings -->
@@ -1131,7 +1131,7 @@
<view-map name="PartyInvitationRoleAssocs" type="screen" page="component://party/widget/partymgr/PartyInvitationScreens.xml#EditPartyInvitationsRoleAssocs"/>
<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"/>
+ <view-map name="EditPartyResumes" type="screen" page="component://party/widget/partymgr/PartyScreens.xml#EditPartyResumes"/>
+ <view-map name="EditEmploymentApps" type="screen" page="component://party/widget/partymgr/PartyScreens.xml#EditEmploymentApps"/>
<!-- 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=661359&r1=661358&r2=661359&view=diff
==============================================================================
--- ofbiz/trunk/applications/party/widget/partymgr/PartyMenus.xml (original)
+++ ofbiz/trunk/applications/party/widget/partymgr/PartyMenus.xml Thu May 29 08:30:53 2008
@@ -65,10 +65,10 @@
<link target="EditPersonTrainings?partyId=${partyId}"/>
</menu-item>
<menu-item name="PartyResume" title="${uiLabelMap.HumanResPartyResume}">
- <link target="EditPartyResume?partyId=${partyId}"/>
+ <link target="EditPartyResumes?partyId=${partyId}"/>
</menu-item>
<menu-item name="EmploymentApplication" title="${uiLabelMap.HumanResEmploymentApp}">
- <link target="FindEmploymentApp?partyId=${partyId}&&referredByPartyId=${partyId}"/>
+ <link target="EditEmploymentApps?partyId=${partyId}&&referredByPartyId=${partyId}"/>
</menu-item>
</menu>
<menu name="ProfileSubTabBar" menu-container-style="button-bar button-style-2" default-selected-style="selected">
Modified: ofbiz/trunk/applications/party/widget/partymgr/PartyScreens.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/party/widget/partymgr/PartyScreens.xml?rev=661359&r1=661358&r2=661359&view=diff
==============================================================================
--- ofbiz/trunk/applications/party/widget/partymgr/PartyScreens.xml (original)
+++ ofbiz/trunk/applications/party/widget/partymgr/PartyScreens.xml Thu May 29 08:30:53 2008
@@ -1012,7 +1012,6 @@
</widgets>
</section>
</screen>
-
<screen name="editCarrierAccount">
<section>
<actions>
@@ -1040,7 +1039,6 @@
</widgets>
</section>
</screen>
-
<screen name="EditPartySkills">
<section>
<actions>
@@ -1057,14 +1055,14 @@
<screenlet title="${uiLabelMap.HumanResListPartySkill}">
<section>
<widgets>
- <include-form name="ListPartySkills" location="component://humanres/widget/forms/PartyAbilityForms.xml"/>
+ <include-form name="ListPartySkills" location="component://humanres/widget/forms/PartySkillForms.xml"/>
</widgets>
</section>
</screenlet>
<screenlet title="${uiLabelMap.HumanResNewPartySkill}">
<section>
<widgets>
- <include-form name="AddPartySkills" location="component://humanres/widget/forms/PartyAbilityForms.xml"/>
+ <include-form name="AddPartySkills" location="component://humanres/widget/forms/PartySkillForms.xml"/>
</widgets>
</section>
</screenlet>
@@ -1089,14 +1087,14 @@
<screenlet title="${uiLabelMap.HumanResListPersonTraining}">
<section>
<widgets>
- <include-form name="ListPersonTrainings" location="component://humanres/widget/forms/PartyAbilityForms.xml"/>
+ <include-form name="ListPersonTrainings" location="component://humanres/widget/forms/PersonTrainingForms.xml"/>
</widgets>
</section>
</screenlet>
<screenlet title="${uiLabelMap.HumanResNewPersonTraining}">
<section>
<widgets>
- <include-form name="AddPersonTraining" location="component://humanres/widget/forms/PartyAbilityForms.xml"/>
+ <include-form name="AddPersonTraining" location="component://humanres/widget/forms/PersonTrainingForms.xml"/>
</widgets>
</section>
</screenlet>
@@ -1105,7 +1103,7 @@
</widgets>
</section>
</screen>
- <screen name="EditPartyResume">
+ <screen name="EditPartyResumes">
<section>
<actions>
<set field="titleProperty" value="HumanResEditPartyResume"/>
@@ -1121,14 +1119,14 @@
<screenlet title="${uiLabelMap.HumanResListPartyResumes}">
<section>
<widgets>
- <include-form name="ListPartyResumes" location="component://humanres/widget/forms/PartyAbilityForms.xml"/>
+ <include-form name="ListPartyResumes" location="component://humanres/widget/forms/PartyResumeForms.xml"/>
</widgets>
</section>
</screenlet>
<screenlet title="${uiLabelMap.HumanResNewPartyResume}">
<section>
<widgets>
- <include-form name="EditPartyResume" location="component://humanres/widget/forms/PartyAbilityForms.xml"/>
+ <include-form name="EditPartyResume" location="component://humanres/widget/forms/PartyResumeForms.xml"/>
</widgets>
</section>
</screenlet>
@@ -1137,7 +1135,7 @@
</widgets>
</section>
</screen>
- <screen name="EditEmploymentApp">
+ <screen name="EditEmploymentApps">
<section>
<actions>
<set field="titleProperty" value="HumanResFindEmploymentApp"/>
@@ -1152,14 +1150,14 @@
<screenlet title="${uiLabelMap.CommonList} ${uiLabelMap.HumanResEmploymentApp}">
<section>
<widgets>
- <include-form name="ListEmploymentApps" location="component://humanres/widget/forms/EmploymentForms.xml"/>
+ <include-form name="ListEmploymentApps" location="component://humanres/widget/forms/EmploymentAppForms.xml"/>
</widgets>
</section>
</screenlet>
<screenlet title="${uiLabelMap.HumanResNewEmploymentApp}">
<section>
<widgets>
- <include-form name="AddEmploymentApp" location="component://humanres/widget/forms/EmploymentForms.xml"/>
+ <include-form name="AddEmploymentApp" location="component://humanres/widget/forms/EmploymentAppForms.xml"/>
</widgets>
</section>
</screenlet>
@@ -1168,4 +1166,4 @@
</widgets>
</section>
</screen>
-</screens>
+</screens>
\ No newline at end of file