Author: mor
Date: Sat May 10 05:48:22 2008 New Revision: 655072 URL: http://svn.apache.org/viewvc?rev=655072&view=rev Log: A bunch of clean ups in HR module - still more to go ... Patch from Harsha Chadhar Modified: ofbiz/trunk/applications/humanres/config/HumanResUiLabels.xml ofbiz/trunk/applications/humanres/widget/EmploymentScreens.xml ofbiz/trunk/applications/humanres/widget/PartyAbilityScreens.xml ofbiz/trunk/applications/humanres/widget/forms/EmploymentForms.xml ofbiz/trunk/applications/humanres/widget/forms/LookupForms.xml ofbiz/trunk/applications/humanres/widget/forms/PartyAbilityForms.xml Modified: ofbiz/trunk/applications/humanres/config/HumanResUiLabels.xml URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/humanres/config/HumanResUiLabels.xml?rev=655072&r1=655071&r2=655072&view=diff ============================================================================== --- ofbiz/trunk/applications/humanres/config/HumanResUiLabels.xml (original) +++ ofbiz/trunk/applications/humanres/config/HumanResUiLabels.xml Sat May 10 05:48:22 2008 @@ -604,6 +604,9 @@ <value xml:lang="it">Lista Passi Salario</value> <value xml:lang="th">รายà¸à¸²à¸£à¸à¸±à¹à¸à¹à¸à¸´à¸à¹à¸à¸·à¸à¸</value> </property> + <property key="PageTitleListSalarySteps"> + <value xml:lang="en">List Salary Steps</value> + </property> <property key="HumanResListSkillTypes"> <value xml:lang="en">List Skill Types</value> <value xml:lang="th">รายà¸à¸²à¸£à¸à¸£à¸°à¹à¸ à¸à¸à¸±à¸à¸©à¸°</value> Modified: ofbiz/trunk/applications/humanres/widget/EmploymentScreens.xml URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/humanres/widget/EmploymentScreens.xml?rev=655072&r1=655071&r2=655072&view=diff ============================================================================== --- ofbiz/trunk/applications/humanres/widget/EmploymentScreens.xml (original) +++ ofbiz/trunk/applications/humanres/widget/EmploymentScreens.xml Sat May 10 05:48:22 2008 @@ -207,6 +207,11 @@ <set field="titleProperty" value="HumanResListPartyBenefits"/> <set field="headerItem" value="Employment"/> <set field="tabButtonItem" value="EditPartyBenefit"/> + <set field="roleTypeIdFrom" from-field="parameters.roleTypeIdFrom"/> + <set field="roleTypeIdTo" from-field="parameters.roleTypeIdTo"/> + <set field="partyIdTo" from-field="parameters.partyIdTo"/> + <set field="partyIdFrom" from-field="parameters.partyIdFrom"/> + <set field="fromDate" from-field="parameters.fromDate"/> </actions> <widgets> <decorator-screen name="CommonEmploymentDecorator" location="${parameters.mainDecoratorLocation}"> @@ -221,7 +226,7 @@ <section> <widgets> <container> - <link text="${uiLabelMap.HumanResNewPartyBenefit}" target="EditPartyBenefit" style="buttontext"/> + <link text="${uiLabelMap.HumanResNewPartyBenefit}" target="EditPartyBenefits?roleTypeIdFrom=${roleTypeIdFrom}&roleTypeIdTo=${roleTypeIdTo}&partyIdFrom=${partyIdFrom}&partyIdTo=${partyIdTo}&fromDate=${fromDate}" style="buttontext"/> </container> <include-form name="ListPartyBenefits" location="component://humanres/widget/forms/EmploymentForms.xml"/> </widgets> @@ -271,7 +276,7 @@ <section> <widgets> <container> - <link text="${uiLabelMap.HumanResNewPayrollPreferences}" target="EditPayrollPreference" style="buttontext"/> + <link text="${uiLabelMap.HumanResNewPayrollPreferences}" target="EditPayrollPreferences?partyId=${partyId}&roleTypeId=${roleTypeId}" style="buttontext"/> </container> <include-form name="ListPayrollPreferences" location="component://humanres/widget/forms/EmploymentForms.xml"/> </widgets> @@ -374,25 +379,16 @@ </actions> <widgets> <decorator-screen name="CommonPayGradeDecorator" location="${parameters.mainDecoratorLocation}"> - <decorator-section name="body"> - <container style="screenlet"> - <container style="screenlet-title-bar"> - <container style="h3"> - <label text="${uiLabelMap.HumanResEditSalaryStep}"/> - </container> - </container> - <container style="screenlet-body"> - <section> - <widgets> - <container> - <link target="EditSalaryStep" text="${uiLabelMap.HumanResNewSalaryStep}" style="buttontext"/> - </container> - <include-form name="ListSalarySteps" location="component://humanres/widget/forms/EmploymentForms.xml"/> - <include-form name="EditSalaryStep" location="component://humanres/widget/forms/EmploymentForms.xml"/> - </widgets> - </section> - </container> - </container> + <decorator-section name="body"> + <screenlet title="${uiLabelMap.PageTitleListSalarySteps}"> + <container> + <link target="EditSalarySteps?payGradeId=${payGradeId}" text="${uiLabelMap.HumanResNewSalaryStep}" style="buttontext"/> + </container> + <include-form name="ListSalarySteps" location="component://humanres/widget/forms/EmploymentForms.xml"/> + </screenlet> + <screenlet title="${uiLabelMap.HumanResEditSalaryStep}"> + <include-form name="EditSalaryStep" location="component://humanres/widget/forms/EmploymentForms.xml"/> + </screenlet> </decorator-section> </decorator-screen> </widgets> @@ -530,6 +526,7 @@ <section> <actions> <set field="titleProperty" value="${uiLabelMap.CommonFind} ${uiLabelMap.HumanResEmployee}"/> + <set field="headerItem" value="Employee"/> </actions> <widgets> <decorator-screen name="main-decorator" location="${parameters.mainDecoratorLocation}"> Modified: ofbiz/trunk/applications/humanres/widget/PartyAbilityScreens.xml URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/humanres/widget/PartyAbilityScreens.xml?rev=655072&r1=655071&r2=655072&view=diff ============================================================================== --- ofbiz/trunk/applications/humanres/widget/PartyAbilityScreens.xml (original) +++ ofbiz/trunk/applications/humanres/widget/PartyAbilityScreens.xml Sat May 10 05:48:22 2008 @@ -168,7 +168,7 @@ <section> <widgets> <container> - <link target="EditPerfReview" text="${uiLabelMap.HumanResNewPartyReview}" style="buttontext"/> + <link target="EditPerfReviews?employeePartyId=${employeePartyId}&employeeRoleTypeId=${employeeRoleTypeId}" text="${uiLabelMap.HumanResNewPartyReview}" style="buttontext"/> </container> <include-form name="ListPerfReviews" location="component://humanres/widget/forms/PartyAbilityForms.xml"/> </widgets> Modified: ofbiz/trunk/applications/humanres/widget/forms/EmploymentForms.xml URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/humanres/widget/forms/EmploymentForms.xml?rev=655072&r1=655071&r2=655072&view=diff ============================================================================== --- ofbiz/trunk/applications/humanres/widget/forms/EmploymentForms.xml (original) +++ ofbiz/trunk/applications/humanres/widget/forms/EmploymentForms.xml Sat May 10 05:48:22 2008 @@ -33,7 +33,7 @@ <field name="partyIdFrom"><display/></field> <field name="partyIdTo"><display/></field> <field name="fromDate"><display/></field> - <field name="terminationReasonId" title="${uiLabelMap.HumanResTerminationReasonId}"><lookup target-form-name="LookupTerminationReasonId"/></field> + <field name="terminationReasonId" title="${uiLabelMap.HumanResTerminationReasonId}"><lookup target-form-name="LookupTerminationReason"/></field> <field name="terminationTypeId" title="${uiLabelMap.HumanResTerminationTypeId}"> <drop-down allow-empty="false"> <entity-options description="${description}" key-field-name="terminationTypeId" entity-name="TerminationType"> @@ -92,12 +92,20 @@ <form name="EditEmploymentApp" type="single" target="updateEmploymentApp" title="" default-map-name="employmentApp" header-row-style="header-row" default-table-style="basic-table"> <alt-target use-when="employmentApp==null" target="createEmploymentApp"/> - <auto-fields-service service-name="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="statusId"> + <drop-down allow-empty="false"> + <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> @@ -109,6 +117,7 @@ </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> </form> @@ -125,15 +134,15 @@ </condition-list> </entity-condition> </actions> - <auto-fields-service service-name="updatePayHistory"/> + <auto-fields-service service-name="updatePayHistory" default-field-type="hidden"/> <field name="roleTypeIdFrom"><display/></field> <field name="roleTypeIdTo"><display/></field> <field name="partyIdFrom"><display/></field> <field name="partyIdTo"><display/></field> <field name="fromDate"><display/></field> - <field name="salaryStepSeqId" title="${uiLableMap.HumanResSalaryStepSeqId}"><lookup target-form-name="LookupSalaryStepSeq"/></field> - <field name="payGradeId" title="${uiLableMap.HumanResPayGradeID}"><lookup target-form-name="LookupPayGrade"/></field> - <field name="periodTypeId"> + <field name="salaryStepSeqId" title="${uiLabelMap.HumanResSalaryStepSeqId}"><lookup target-form-name="LookupSalaryStep" size="20"/></field> + <field name="payGradeId" title="${uiLabelMap.HumanResPayGradeID}"><lookup target-form-name="LookupPayGrade" size="20"/></field> + <field name="periodTypeId" title="${uiLabelMap.FormFieldTitle_periodTypeId}"> <drop-down allow-empty="false"> <entity-options description="${description}" key-field-name="periodTypeId" entity-name="PeriodType"> <entity-order-by field-name="description"/> @@ -166,7 +175,7 @@ </field> <field name="submitButton" title="${uiLabelMap.CommonUpdate}"><submit button-type="button"/></field> <field name="deleteLink" title="${uiLabelMap.CommonEmptyHeader}" widget-style="buttontext"> - <hyperlink target="deletePartyBenefit?roleTypeIdFrom=${roleTypeIdFrom}&roleTypeIdTo=${roleTypeIdTo}&roleTypeIdFrom=${roleTypeIdFrom}&roleTypeIdTo=${roleTypeIdTo}&fromDate=${fromDate}&benefitTypeId=${benefitTypeId}" description="${uiLabelMap.CommonDelete}"/> + <hyperlink target="deletePartyBenefit?roleTypeIdFrom=${roleTypeIdFrom}&roleTypeIdTo=${roleTypeIdTo}&partyIdFrom=${partyIdFrom}&partyIdTo=${partyIdTo}&fromDate=${fromDate}&benefitTypeId=${benefitTypeId}" description="${uiLabelMap.CommonDelete}"/> </field> </form> <form name="EditPartyBenefit" type="single" target="createPartyBenefit" title="" @@ -199,10 +208,16 @@ <actions> <entity-condition entity-name="PayrollPreference"><order-by field-name="payrollPreferenceSeqId"/></entity-condition> </actions> - <auto-fields-service default-field-type="display" service-name="updatePayrollPreference"/> + <auto-fields-service default-field-type="hidden" service-name="updatePayrollPreference"/> + <field name="partyId"><display/></field> + <field name="roleTypeId"><display/></field> <field name="payrollPreferenceSeqId" title="${uiLabelMap.HumanResPayrollPreferenceSeqId}" widget-style="buttontext"> <hyperlink also-hidden="false" description="${payrollPreferenceSeqId}" target="EditPayrollPreferences?payrollPreferenceSeqId=${payrollPreferenceSeqId}&partyId=${partyId}&roleTypeId=${roleTypeId}"/> </field> + <field name="paymentMethodTypeId"><display/></field> + <field name="periodTypeId"><display/></field> + <field name="fromDate"><display/></field> + <field name="thruDate"><date-time/></field> <field name="deleteLink" title="${uiLabelMap.CommonEmptyHeader}" widget-style="buttontext"> <hyperlink target="deletePayrollPreference?payrollPreferenceSeqId=${payrollPreferenceSeqId}&partyId=${partyId}&roleTypeId=${roleTypeId}" description="${uiLabelMap.CommonDelete}" also-hidden="false"/> </field> Modified: ofbiz/trunk/applications/humanres/widget/forms/LookupForms.xml URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/humanres/widget/forms/LookupForms.xml?rev=655072&r1=655071&r2=655072&view=diff ============================================================================== --- ofbiz/trunk/applications/humanres/widget/forms/LookupForms.xml (original) +++ ofbiz/trunk/applications/humanres/widget/forms/LookupForms.xml Sat May 10 05:48:22 2008 @@ -144,8 +144,8 @@ <field-map field-name="entityName" value="SalaryStep"/> </service> </actions> - <field name="salaryStepId" title="${uiLabelMap.HumanResLookupSalaryStepSeqId}" widget-style="buttontext"> - <hyperlink also-hidden="false" target-type="plain" description="${salaryStepId}" target="javascript:set_value('${salaryStepId}')"/> + <field name="salaryStepSeqId" title="${uiLabelMap.HumanResLookupSalaryStepSeqId}" widget-style="buttontext"> + <hyperlink also-hidden="false" target-type="plain" description="${salaryStepSeqId}" target="javascript:set_value('${salaryStepSeqId}')"/> </field> <field name="description"><display/></field> </form> Modified: ofbiz/trunk/applications/humanres/widget/forms/PartyAbilityForms.xml URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/humanres/widget/forms/PartyAbilityForms.xml?rev=655072&r1=655071&r2=655072&view=diff ============================================================================== --- ofbiz/trunk/applications/humanres/widget/forms/PartyAbilityForms.xml (original) +++ ofbiz/trunk/applications/humanres/widget/forms/PartyAbilityForms.xml Sat May 10 05:48:22 2008 @@ -52,8 +52,8 @@ </drop-down> </field> <field name="partyQualTypeId" use-when="partyQual!=null" title="partyQualTypeId"><display/></field> - <field name="submitButton" use-when="partyQual==null" title="Create" widget-style="smallSubmit"><submit button-type="button"/></field> - <field name="submitButton" use-when="partyQual!=null" title="Update" widget-style="smallSubmit"><submit button-type="button"/></field> + <field name="submitButton" use-when="partyQual==null" title="${uiLabelMap.CommonCreate}" widget-style="smallSubmit"><submit button-type="button"/></field> + <field name="submitButton" use-when="partyQual!=null" title="${uiLabelMap.CommonUpdate}" widget-style="smallSubmit"><submit button-type="button"/></field> </form> <form name="ListPartyResumes" type="list" title="" paginate-target="findPartyResumes" odd-row-style="alternate-row" default-table-style="basic-table hover-bar"> @@ -81,17 +81,22 @@ <field name="resumeId" use-when="partyResume!=null" title="resumeId"><display/></field> <field name="partyId" use-when="partyResume!=null" title="partyId"><display/></field> <field name="partyId" use-when="partyResume==null" title="partyId" tooltip="${uiLabelMap.CommonRequired}"><lookup target-form-name="LookupPartyName"/></field> - <field name="submitButton" use-when="partyResume==null" title="Create" widget-style="smallSubmit"><submit button-type="button"/></field> - <field name="submitButton" use-when="partyResume!=null" title="Update" widget-style="smallSubmit"><submit button-type="button"/></field> + <field name="submitButton" use-when="partyResume==null" title="${uiLabelMap.CommonCreate}" widget-style="smallSubmit"><submit button-type="button"/></field> + <field name="submitButton" use-when="partyResume!=null" title="${uiLabelMap.CommonUpdate}" widget-style="smallSubmit"><submit button-type="button"/></field> </form> - <form name="ListPartySkills" type="list" title="" paginate-target="findPartySkills" + <form name="ListPartySkills" type="list" target="updatePartySkill" title="" paginate-target="findPartySkills" odd-row-style="alternate-row" default-table-style="basic-table hover-bar"> <actions> <entity-condition entity-name="PartySkill"/> </actions> <auto-fields-service default-field-type="display" service-name="updatePartySkill"/> <field name="partyId"><display/></field> - <field name="skillTypeId" title="${uiLabelMap.HumanResSkillType}"><display/></field> + <field name="skillTypeId" title="${uiLabelMap.HumanResSkillType}" widget-style="linktext"> + <hyperlink also-hidden="false" description="${skillTypeId}" target="updatePartySkill?skillTypeId=${skillTypeId}&partyId=${partyId}"/> + </field> + <field name="yearsExperience"><display/></field> + <field name="rating"><display/></field> + <field name="skillLevel"><display/></field> <field name="submitButton" title="${uiLabelMap.CommonUpdate}" widget-style="smallSubmit"><submit button-type="button"/></field> <field name="deleteLink" title="${uiLabelMap.CommonDelete}" widget-style="buttontext"> <hyperlink target="deletePartySkill?partyId=${partyId}&skillTypeId=${skillTypeId}" description="${uiLabelMap.CommonDelete}" also-hidden="false"/> @@ -101,7 +106,8 @@ header-row-style="header-row" default-table-style="basic-table"> <alt-target use-when="partySkill==null" target="createPartySkill"/> <auto-fields-service service-name="createPartySkill"/> - <field name="partyId"><text/></field> + <field name="partyId" use-when="partyId==null"><lookup target-form-name="LookupPartyName"/></field> + <field use-when="partyId!=null" name="partyId"><ignored/></field> <field name="skillTypeId" title="${uiLabelMap.HumanResSkillType}" tooltip="${uiLabelMap.CommonRequired}"> <drop-down allow-empty="false"> <entity-options description="${description}" key-field-name="skillTypeId" entity-name="SkillType"> @@ -116,10 +122,19 @@ <actions> <entity-condition entity-name="PerfReview"><order-by field-name="perfReviewId"/></entity-condition> </actions> - <auto-fields-service default-field-type="display" service-name="updatePerfReview"/> + <auto-fields-service default-field-type="hidden" service-name="updatePerfReview"/> + <field name="employeePartyId"><display/></field> + <field name="employeeRoleTypeId"><display/></field> <field name="perfReviewId" widget-style="linktext"> - <hyperlink also-hidden="false" description="${perfReviewId}" target="EditPerfReviews?perfReviewId=${perfReviewId}&employeePartyId=${employeePartyId}&employeeRoleTypeId=${employeeRoleTypeId}"/> + <hyperlink also-hidden="false" description="${perfReviewId}" target="EditPerfReviews?perfReviewId=${perfReviewId}&partyIdTo=${employeePartyId}&roleTypeIdTo=${employeeRoleTypeId}"/> </field> + <field name="paymentId"><display/></field> + <field name="emplPositionId"><display/></field> + <field name="payHistoryPartyIdFrom"><display/></field> + <field name="payHistoryPartyIdTo"><display/></field> + <field name="managerRoleTypeId"><display/></field> + <field name="fromDate"><display/></field> + <field name="thruDate"><display/></field> <field name="deleteLink" title="${uiLabelMap.CommonDelete}" widget-style="buttontext"> <hyperlink target="deletePerfReview?perfReviewId=${perfReviewId}&employeePartyId=${employeePartyId}&employeeRoleTypeId=${employeeRoleTypeId}" description="${uiLabelMap.CommonDelete}" also-hidden="false"/> </field> @@ -134,8 +149,8 @@ <field name="employeePartyId"><hidden/></field> <field name="employeeRoleTypeId"><hidden/></field> <field name="managerPartyId" use-when="perfReview==null"><lookup target-form-name="LookupPartyName"/></field> - <field name="paymentId" use-when="perfReview==null"><lookup target-form-name="LookupPayment"/></field> - <field name="emplPositionId" use-when="perfReview==null"><lookup target-form-name="LookupEmplPosition"/></field> + <field name="paymentId" use-when="perfReview==null" title="${uiLabelMap.FormFieldTitle_paymentId}"><lookup target-form-name="LookupPayment"/></field> + <field name="emplPositionId" use-when="perfReview==null" title="${uiLabelMap.FormFieldTitle_emplPositionId}"><lookup target-form-name="LookupEmplPosition"/></field> <field name="payHistoryPartyIdFrom" use-when="perfReview==null"><lookup target-form-name="LookupPartyName"/></field> <field name="payHistoryPartyIdTo" use-when="perfReview==null"><lookup target-form-name="LookupPartyName"/></field> <field name="managerRoleTypeId"> @@ -234,8 +249,8 @@ </entity-options> </drop-down> </field> - <field name="submitButton" use-when="performanceNote==null" title="Create" widget-style="smallSubmit"><submit button-type="button"/></field> - <field name="submitButton" use-when="performanceNote!=null" title="Update" widget-style="smallSubmit"><submit button-type="button"/></field> + <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="ListPersonTrainings" type="list" target="updatePersonTraining" title="" paginate-target="findPersonTrainings" odd-row-style="alternate-row" default-table-style="basic-table hover-bar"> @@ -271,7 +286,7 @@ </entity-options> </drop-down> </field> - <field name="submitButton" use-when="personTraining==null" title="Create" widget-style="smallSubmit"><submit button-type="button"/></field> + <field name="submitButton" use-when="personTraining==null" title="${uiLabelMap.CommonCreate}" widget-style="smallSubmit"><submit button-type="button"/></field> <field name="submitButton" use-when="personTraining!=null" title="${uiLabelMap.CommonUpdate}" widget-style="smallSubmit"><submit button-type="button"/></field> </form> <form name="ListSkillTypes" type="list" title="" target="updateSkillType" |
Free forum by Nabble | Edit this page |