svn commit: r659799 - in /ofbiz/trunk/applications/huma
Locked
 
|
Author: ashish
Date: Sat May 24 04:57:56 2008 New Revision: 659799 URL: http://svn.apache.org/viewvc?rev=659799&view=rev Log: Applied patch from JIRA issue OFBIZ-1659. This patch includes following things. Added feature of PerformanceItems,Performance Notes. Now performance Review will be associated with the party in the role of Employee. Few cleanups also done in this patch. Thanks Parimal Gain for your patch. Modified: ofbiz/trunk/applications/humanres/config/HumanResUiLabels.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/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 Modified: ofbiz/trunk/applications/humanres/config/HumanResUiLabels.xml URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/humanres/config/HumanResUiLabels.xml?rev=659799&r1=659798&r2=659799&view=diff ============================================================================== --- ofbiz/trunk/applications/humanres/config/HumanResUiLabels.xml (original) +++ ofbiz/trunk/applications/humanres/config/HumanResUiLabels.xml Sat May 24 04:57:56 2008 @@ -360,6 +360,12 @@ <property key="HumanResAddPayGrade"> <value xml:lang="en">Add Pay Grade</value> </property> + <property key="HumanResAddPerfNote"> + <value xml:lang="en">Add Performance Note</value> + </property> + <property key="HumanResAddPerfReviewItems"> + <value xml:lang="en">Add PerfReview Items</value> + </property> <property key="HumanResAddPersonTraining"> <value xml:lang="en">Add Person Training</value> </property> @@ -458,9 +464,7 @@ <value xml:lang="en">Payroll Preferences</value> </property> <property key="HumanResEditPerfReviewItems"> - <value xml:lang="en">Edit PerfReview Items</value> - <value xml:lang="it">Aggiorna Preferenze Righe Rassegne </value> - <value xml:lang="th">à¹à¸à¹à¹à¸à¸£à¸²à¸¢à¸à¸²à¸£à¸à¸²à¸£à¸à¸£à¸§à¸à¸ªà¸à¸à¸ªà¸´à¸à¸à¸´à¸à¸´à¹à¸¨à¸©</value> + <value xml:lang="en">PerfReview Items</value> </property> <property key="HumanResEditSalaryStep"> <value xml:lang="en">Edit Salary Step</value> 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=659799&r1=659798&r2=659799&view=diff ============================================================================== --- ofbiz/trunk/applications/humanres/script/org/ofbiz/humanres/HumanResServices.xml (original) +++ ofbiz/trunk/applications/humanres/script/org/ofbiz/humanres/HumanResServices.xml Sat May 24 04:57:56 2008 @@ -122,7 +122,7 @@ <make-value entity-name="PerfReviewItem" value-name="newEntity"/> <set-pk-fields map-name="parameters" value-name="newEntity"/> <set-nonpk-fields map-name="parameters" value-name="newEntity"/> - <sequenced-id-to-env sequence-name="PerfReviewItem" env-name="newEntity.perfReviewItemSeqId"/> + <sequenced-id-to-env sequence-name="PerfReviewItem" env-name="newEntity.perfReviewItemSeqId"/> <field-to-result field-name="perfReviewItemSeqId" result-name="perfReviewItemSeqId"/> <create-value value-name="newEntity"/> </simple-method> 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=659799&r1=659798&r2=659799&view=diff ============================================================================== --- ofbiz/trunk/applications/humanres/webapp/humanres/WEB-INF/controller.xml (original) +++ ofbiz/trunk/applications/humanres/webapp/humanres/WEB-INF/controller.xml Sat May 24 04:57:56 2008 @@ -182,9 +182,15 @@ <event type="service" invoke="deletePerfReviewItem"/> <response name="success" type="view" value="EditPerfReviewItems"/> </request-map> - <request-map uri="findPerformanceNotes"> + <request-map uri="EditPerformanceNotes"> <security https="true" auth="true"/> - <response name="success" type="view" value="ListPerformanceNotes"/> + <response name="success" type="view" value="EditPerformanceNotes"/> + </request-map> + <request-map uri="createPerformanceNote"> + <security https="true" auth="true"/> + <event type="service" invoke="createPerformanceNote"/> + <response name="success" type="view" value="EditPerformanceNotes"/> + <response name="error" type="view" value="EditPerformanceNotes"/> </request-map> <request-map uri="findPersonTrainings"> <security https="true" auth="true"/> @@ -692,4 +698,5 @@ <view-map name="EditPersonTrainings" type="screen" page="component://humanres/widget/EmploymentScreens.xml#EditPersonTrainings"/> <view-map name="EditEmploymentApps" type="screen" page="component://humanres/widget/EmploymentScreens.xml#EditEmploymentApps"/> <view-map name="EditPartyResumes" type="screen" page="component://humanres/widget/EmploymentScreens.xml#EditPartyResumes"/> + <view-map name="EditPerformanceNotes" type="screen" page="component://humanres/widget/EmploymentScreens.xml#EditPerformanceNotes"/> </site-conf> Modified: ofbiz/trunk/applications/humanres/widget/EmploymentScreens.xml URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/humanres/widget/EmploymentScreens.xml?rev=659799&r1=659798&r2=659799&view=diff ============================================================================== --- ofbiz/trunk/applications/humanres/widget/EmploymentScreens.xml (original) +++ ofbiz/trunk/applications/humanres/widget/EmploymentScreens.xml Sat May 24 04:57:56 2008 @@ -688,4 +688,34 @@ </widgets> </section> </screen> + <screen name="EditPerformanceNotes"> + <section> + <actions> + <set field="titleProperty" value="HumanResEditPerfNote"/> + <set field="headerItem" value="Employee"/> + <set field="tabButtonItem" value="EditPerformanceNotes"/> + <set field="partyId" from-field="parameters.partyId"/> + </actions> + <widgets> + <decorator-screen name="CommonPartyDecorator" location="${parameters.mainDecoratorLocation}"> + <decorator-section name="body"> + <screenlet title="${uiLabelMap.CommonList} ${uiLabelMap.HumanResPerfNote}"> + <section> + <widgets> + <include-form name="ListPerformanceNotes" location="component://humanres/widget/forms/PartyAbilityForms.xml"/> + </widgets> + </section> + </screenlet> + <screenlet title="${uiLabelMap.HumanResAddPerfNote}"> + <section> + <widgets> + <include-form name="AddPerformanceNote" 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=659799&r1=659798&r2=659799&view=diff ============================================================================== --- ofbiz/trunk/applications/humanres/widget/Menus.xml (original) +++ ofbiz/trunk/applications/humanres/widget/Menus.xml Sat May 24 04:57:56 2008 @@ -81,12 +81,6 @@ <menu-item name="EditPerfReviewItems" title="${uiLabelMap.HumanResEditPerfReviewItems}"> <link target="EditPerfReviewItems?perfReviewId=${perfReviewId}"/> </menu-item> - <menu-item name="EditPartySkill" title="${uiLabelMap.HumanResListPartySkill}"> - <link target="EditPartySkills?employeePartyId=${employeePartyId}"/> - </menu-item> - <menu-item name="EditPartyQual" title="${uiLabelMap.HumanResListPartyQual}"> - <link target="EditPartyQuals?employeePartyId=${employeePartyId}"/> - </menu-item> </menu> <menu name="SalaryBar" default-menu-item-name="EditSalaryStep" default-selected-style="selected" type="simple" menu-container-style="button-bar tab-bar" selected-menuitem-context-field-name="tabButtonItem"> @@ -132,5 +126,8 @@ <menu-item name="EditPartyResumes" title="${uiLabelMap.HumanResPartyResume}"> <link target="EditPartyResumes?partyId=${partyId}"/> </menu-item> + <menu-item name="EditPerformanceNotes" title="${uiLabelMap.HumanResPerfNote}"> + <link target="EditPerformanceNotes?partyId=${partyId}"/> + </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=659799&r1=659798&r2=659799&view=diff ============================================================================== --- ofbiz/trunk/applications/humanres/widget/PartyAbilityScreens.xml (original) +++ ofbiz/trunk/applications/humanres/widget/PartyAbilityScreens.xml Sat May 24 04:57:56 2008 @@ -129,7 +129,7 @@ <entity-one entity-name="PerfReview" value-name="perfReview"/> </actions> <widgets> - <decorator-screen name="main-decorator" location="${parameters.mainDecoratorLocation}"> + <decorator-screen name="CommonPartyAbilityDecorator" location="${parameters.mainDecoratorLocation}"> <decorator-section name="body"> <container style="screenlet"> <container style="screenlet-title-bar"> @@ -216,32 +216,28 @@ <screen name="EditPerfReviewItems"> <section> <actions> - <set field="headerItem" value="PartyReview"/> + <set field="headerItem" value="PerfReview"/> <set field="titleProperty" value="PageTitleEditPartyReviewItem"/> - <set field="tabButtonItem" value="EditPerfReview"/> + <set field="tabButtonItem" value="EditPerfReviewItems"/> <set field="perfReviewId" from-field="parameters.perfReviewId"/> </actions> <widgets> <decorator-screen name="CommonPartyAbilityDecorator" location="${parameters.mainDecoratorLocation}"> <decorator-section name="body"> - <container style="screenlet"> - <container style="screenlet-title-bar"> - <container style="h3"> - <label text="${uiLabelMap.HumanResNewPartyReview}"/> - </container> - </container> - <container style="screenlet-body"> - <section> - <widgets> - <container> - <link target="EditPerfReviewItem" text="${uiLabelMap.HumanResNewPartyReviewItem}" style="buttontext"/> - </container> - <include-form name="ListPerfReviewItems" location="component://humanres/widget/forms/PartyAbilityForms.xml"/> - <include-form name="EditPerfReviewItem" location="component://humanres/widget/forms/PartyAbilityForms.xml"/> - </widgets> - </section> - </container> - </container> + <screenlet title="${uiLabelMap.CommonList} ${uiLabelMap.HumanResEditPerfReviewItems}"> + <section> + <widgets> + <include-form name="ListPerfReviewItems" location="component://humanres/widget/forms/PartyAbilityForms.xml"/> + </widgets> + </section> + </screenlet> + <screenlet title="${uiLabelMap.HumanResAddPerfReviewItems}"> + <section> + <widgets> + <include-form name="AddPerfReviewItem" location="component://humanres/widget/forms/PartyAbilityForms.xml"/> + </widgets> + </section> + </screenlet> </decorator-section> </decorator-screen> </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=659799&r1=659798&r2=659799&view=diff ============================================================================== --- ofbiz/trunk/applications/humanres/widget/forms/EmploymentForms.xml (original) +++ ofbiz/trunk/applications/humanres/widget/forms/EmploymentForms.xml Sat May 24 04:57:56 2008 @@ -92,7 +92,7 @@ <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}"><date-time/></field> - <field name="terminationReasonId" title="${uiLabelMap.HumanResTerminationReasonId}"><lookup target-form-name="LookupTerminationReason"/></field> + <field name="terminationReasonId" use-when="employment!=null" title="${uiLabelMap.HumanResTerminationReasonId}"><lookup target-form-name="LookupTerminationReason"/></field> <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"> @@ -139,7 +139,7 @@ <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="referredByPartyId" use-when="referredByPartyId!=null"><lookup target-form-name="LookupPartyName"/></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"/> Modified: ofbiz/trunk/applications/humanres/widget/forms/PartyAbilityForms.xml URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/humanres/widget/forms/PartyAbilityForms.xml?rev=659799&r1=659798&r2=659799&view=diff ============================================================================== --- ofbiz/trunk/applications/humanres/widget/forms/PartyAbilityForms.xml (original) +++ ofbiz/trunk/applications/humanres/widget/forms/PartyAbilityForms.xml Sat May 24 04:57:56 2008 @@ -217,23 +217,6 @@ <field name="managerPartyId"><lookup target-form-name="LookupPartyName"/></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="payHistoryPartyIdFrom"><lookup target-form-name="LookupPartyName"/></field> - <field name="payHistoryPartyIdTo"><lookup target-form-name="LookupPartyName"/></field> - <field name="managerRoleTypeId"><hidden value="MANAGER"/></field> - <field name="payHistoryRoleTypeIdFrom"> - <drop-down allow-empty="false"> - <entity-options description="${description}" key-field-name="roleTypeId" entity-name="RoleType"> - <entity-order-by field-name="roleTypeId"/> - </entity-options> - </drop-down> - </field> - <field name="payHistoryRoleTypeIdTo"> - <drop-down allow-empty="false"> - <entity-options description="${description}" key-field-name="roleTypeId" entity-name="RoleType"> - <entity-order-by field-name="roleTypeId"/> - </entity-options> - </drop-down> - </field> <field name="submitButton" use-when="perfReview==null" title="${uiLabelMap.CommonCreate}" widget-style="smallSubmit"><submit button-type="button"/></field> <field name="submitButton" use-when="perfReview!=null" title="${uiLabelMap.CommonUpdate}" widget-style="smallSubmit"><submit button-type="button"/></field> </form> @@ -254,29 +237,28 @@ <hyperlink target="deletePerfReviewItem?perfReviewId=${perfReviewId}&employeePartyId=${employeePartyId}&employeeRoleTypeId=${employeeRoleTypeId}&perfReviewItemSeqId=${perfReviewItemSeqId}" description="${uiLabelMap.CommonDelete}" also-hidden="false"/> </field> </form> - <form name="EditPerfReviewItem" type="single" target="createPerfReviewItem" title="" + <form name="AddPerfReviewItem" type="single" target="createPerfReviewItem" title="" header-row-style="header-row" default-table-style="basic-table"> <auto-fields-service service-name="createPerfReviewItem"/> - <field name="perfReviewId"><hidden/></field> <field name="perfReviewItemSeqId"><ignored/></field> - <field name="employeePartyId" tooltip="${uiLabelMap.CommonRequired}"><lookup target-form-name="LookupPartyName"/></field> - <field name="employeeRoleTypeId" tooltip="${uiLabelMap.CommonRequired}"> + <field name="employeePartyId"><hidden/></field> + <field name="employeeRoleTypeId"><hidden/></field> + <field name="perfReviewItemTypeId"> <drop-down allow-empty="false"> - <entity-options description="${description}" key-field-name="roleTypeId" entity-name="PartyRole"> - <entity-constraint name="roleTypeId" operator="equals" value="PARTYQUAL_VERIFY"/> + <entity-options description="${description}" key-field-name="perfReviewItemTypeId" entity-name="PerfReviewItemType"> <entity-order-by field-name="description"/> </entity-options> </drop-down> </field> - <field name="perfReviewItemTypeId"> + <field name="perfRatingTypeId"> <drop-down allow-empty="false"> - <entity-options description="${description}" key-field-name="perfReviewItemTypeId" entity-name="PerfReviewItemType"> - <entity-order-by field-name="${description}"/> + <entity-options description="${description}" key-field-name="perfRatingTypeId" entity-name="PerfRatingType"> + <entity-order-by field-name="description"/> </entity-options> </drop-down> </field> - <field name="submitButton" title="${uiLabelMap.CommonAdd}"><submit button-type="button"/></field> + <field name="submitButton" title="${uiLabelMap.CommonCreate}"><submit button-type="button"/></field> </form> <form name="ListPerformanceNotes" type="list" target="updatePerformanceNote" title="" paginate-target="findPerformanceNotes" odd-row-style="alternate-row" default-table-style="basic-table hover-bar"> @@ -284,33 +266,24 @@ <entity-condition entity-name="PerformanceNote"/> </actions> <auto-fields-service default-field-type="display" service-name="updatePerformanceNote"/> - <field name="partyId" title="PartyId" widget-style="linktext"> - <hyperlink also-hidden="false" description="${partyId}" target="EditPerformanceNote?partyId=${partyId}&roleTypeId=${roleTypeId}&fromDate=${fromDate}"/> - </field> <field name="partyId" title="${uiLabelMap.PartyPartyId}"> <display-entity description="${firstName} ${middleName} ${lastName} ${groupName}" entity-name="PartyNameView"> <sub-hyperlink target="/partymgr/control/viewprofile?partyId=${partyId}" link-style="smallSubmit" target-type="inter-app" description="${partyId}"/> </display-entity> - </field> + </field> </form> - <form name="EditPerformanceNote" type="single" target="updatePerformanceNote" title="" default-map-name="performanceNote" + <form name="AddPerformanceNote" type="single" target="createPerformanceNote" title="" default-map-name="performanceNote" header-row-style="header-row" default-table-style="basic-table"> - <alt-target use-when="performanceNote==null" target="createPerformanceNote"/> - <auto-fields-service service-name="updatePerformanceNote" map-name="performanceNote"/> - <field use-when="performanceNote!=null" name="partyId" tooltip="${uiLabelMap.CommonNotModifRecreat}"><display/></field> - <field use-when="performanceNote==null&&partyId!=null" name="partyId" tooltip="${uiLabelMap.CommonCannotBeFound}:[${partyId}]"><text size="20" maxlength="20"/></field> - <field name="partyId" use-when="performanceNote!=null" title="partyId"><display/></field> - <field name="partyId" use-when="performanceNote==null" title="partyId" tooltip="${uiLabelMap.CommonRequired}"><lookup target-form-name="LookupPartyName"/></field> + <auto-fields-service service-name="createPerformanceNote" map-name="performanceNote"/> + <field name="partyId"><hidden/></field> <field name="roleTypeId" title="roleType Id"> - <drop-down allow-empty="false"> - <entity-options description="${description}" key-field-name="roleTypeId" entity-name="PartyRole"> - <entity-constraint name="roleTypeId" operator="equals" value="PARTYQUAL_VERIFY"/> + <drop-down allow-empty="true"> + <entity-options description="${description}" key-field-name="roleTypeId" entity-name="RoleType"> <entity-order-by field-name="description"/> </entity-options> </drop-down> </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> + <field name="submitButton" title="${uiLabelMap.CommonCreate}" widget-style="smallSubmit"><submit button-type="button"/></field> </form> <form name="ListSkillTypes" type="multi" title="" target="updateSkillType" odd-row-style="alternate-row" default-table-style="basic-table hover-bar"> @@ -463,23 +436,6 @@ <field name="managerPartyId"><lookup target-form-name="LookupPartyName"/></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="payHistoryPartyIdFrom"><lookup target-form-name="LookupPartyName"/></field> - <field name="payHistoryPartyIdTo"><lookup target-form-name="LookupPartyName"/></field> - <field name="managerRoleTypeId"><hidden value="MANAGER"/></field> - <field name="payHistoryRoleTypeIdFrom"> - <drop-down allow-empty="false"> - <entity-options description="${description}" key-field-name="roleTypeId" entity-name="RoleType"> - <entity-order-by field-name="roleTypeId"/> - </entity-options> - </drop-down> - </field> - <field name="payHistoryRoleTypeIdTo"> - <drop-down allow-empty="false"> - <entity-options description="${description}" key-field-name="roleTypeId" entity-name="RoleType"> - <entity-order-by field-name="roleTypeId"/> - </entity-options> - </drop-down> - </field> <field name="searchButton" widget-style="smallSubmit"><submit button-type="button"/></field> </form> </forms> \ No newline at end of file |
«
Return to OFBiz - Commits
|
1 view|%1 views
| Free forum by Nabble | Edit this page |