Author: jacopoc
Date: Thu Jun 7 06:12:40 2007 New Revision: 545165 URL: http://svn.apache.org/viewvc?view=rev&rev=545165 Log: After a quick review, I've applied the patch for the humanres component from Abhijit Meshram (OFBIZ-1051) with misc improvements to the user interface. . Modified: ofbiz/trunk/applications/humanres/config/HumanResUiLabels.properties ofbiz/trunk/applications/humanres/webapp/humanres/WEB-INF/controller.xml ofbiz/trunk/applications/humanres/widget/EmplPositionScreens.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/EmplPositionForms.xml ofbiz/trunk/applications/humanres/widget/forms/EmploymentForms.xml ofbiz/trunk/applications/humanres/widget/forms/PartyAbilityForms.xml Modified: ofbiz/trunk/applications/humanres/config/HumanResUiLabels.properties URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/humanres/config/HumanResUiLabels.properties?view=diff&rev=545165&r1=545164&r2=545165 ============================================================================== --- ofbiz/trunk/applications/humanres/config/HumanResUiLabels.properties (original) +++ ofbiz/trunk/applications/humanres/config/HumanResUiLabels.properties Thu Jun 7 06:12:40 2007 @@ -34,7 +34,7 @@ HumanResEditEmplPosition=Edit Employee Position HumanResEditEmplPositionFulfillment=Edit Position Fulfillment HumanResEditEmplPositionReportingStruct=Edit EmplPosition Reporting Structure -HumanResEditEmplPositionResponsibility=Edit position Responsibility +HumanResEditEmplPositionResponsibility=Edit Position Responsibility HumanResEditPartyBenefit=Edit Party Benefit HumanResEditPartyQual=Edit party Qualification HumanResEditPartyResume=Edit Party Resume @@ -83,6 +83,7 @@ HumanResManagerApplication=HumanRes Manager Application HumanResNewEmployment=New Employment HumanResNewEmplPosition=New Employee Position +HumanResNewEmplPositionFulfillment=New Employee Position Fulfillment HumanResNewEmplPositionResponsibility=New EmplPosition Responsibility HumanResNewEmplPositionReportingStruct=New EmplPositionReportingStruct HumanResNewPartyBenefit=New Party Benefit 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?view=diff&rev=545165&r1=545164&r2=545165 ============================================================================== --- ofbiz/trunk/applications/humanres/webapp/humanres/WEB-INF/controller.xml (original) +++ ofbiz/trunk/applications/humanres/webapp/humanres/WEB-INF/controller.xml Thu Jun 7 06:12:40 2007 @@ -379,12 +379,12 @@ </request-map> <request-map uri="createTerminationReason"> <security https="true" auth="true"/> - <event type="service" invoke="createUnemploymentClaim"/> + <event type="service" invoke="createTerminationReason"/> <response name="success" type="view" value="EditTerminationReason"/> </request-map> <request-map uri="updateTerminationReason"> <security https="true" auth="true"/> - <event type="service" invoke="updateUnemploymentClaim"/> + <event type="service" invoke="updateTerminationReason"/> <response name="success" type="view" value="EditTerminationReason"/> </request-map> <request-map uri="deleteTerminationReason"> Modified: ofbiz/trunk/applications/humanres/widget/EmplPositionScreens.xml URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/humanres/widget/EmplPositionScreens.xml?view=diff&rev=545165&r1=545164&r2=545165 ============================================================================== --- ofbiz/trunk/applications/humanres/widget/EmplPositionScreens.xml (original) +++ ofbiz/trunk/applications/humanres/widget/EmplPositionScreens.xml Thu Jun 7 06:12:40 2007 @@ -82,7 +82,7 @@ <decorator-screen name="CommonEmplPositionDecorator" location="${parameters.mainDecoratorLocation}"> <decorator-section name="body"> <container> - <link target="EditEmplPositionFulfillment" text="${uiLabelMap.HumanResNewEmplPositionFulfillment}" style="buttontext"/> + <link target="EditEmplPositionFulfillments" text="${uiLabelMap.HumanResNewEmplPositionFulfillment}" style="buttontext"/> </container> <container style="boxoutside"> <container style="screenlet-header"> Modified: ofbiz/trunk/applications/humanres/widget/EmploymentScreens.xml URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/humanres/widget/EmploymentScreens.xml?view=diff&rev=545165&r1=545164&r2=545165 ============================================================================== --- ofbiz/trunk/applications/humanres/widget/EmploymentScreens.xml (original) +++ ofbiz/trunk/applications/humanres/widget/EmploymentScreens.xml Thu Jun 7 06:12:40 2007 @@ -124,7 +124,7 @@ <section> <actions> <set field="headerItem" value="Employment"/> - <set field="tabButtonItem" value="EditPayHistories"/> + <set field="tabButtonItem" value="EditPayHistory"/> </actions> <widgets> <decorator-screen name="CommonEmploymentDecorator" location="${parameters.mainDecoratorLocation}"> @@ -259,10 +259,10 @@ <actions> <set field="headerItem" value="PayGrade"/> <set field="tabButtonItem" value="EditSalaryStep"/> - <set field="PayGradeId" from-field="parameters.PayGradeId"/> + <set field="payGradeId" from-field="parameters.payGradeId"/> </actions> <widgets> - <decorator-screen name="CommonEmploymentDecorator" location="${parameters.mainDecoratorLocation}"> + <decorator-screen name="CommonPayGradeDecorator" location="${parameters.mainDecoratorLocation}"> <decorator-section name="body"> <container> <link target="EditSalaryStep" text="${uiLabelMap.HumanResNewSalaryStep}" style="buttontext"/> Modified: ofbiz/trunk/applications/humanres/widget/Menus.xml URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/humanres/widget/Menus.xml?view=diff&rev=545165&r1=545164&r2=545165 ============================================================================== --- ofbiz/trunk/applications/humanres/widget/Menus.xml (original) +++ ofbiz/trunk/applications/humanres/widget/Menus.xml Thu Jun 7 06:12:40 2007 @@ -20,7 +20,7 @@ <menus xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="http://ofbiz.apache.org/dtds/widget-menu.xsd"> - <menu name="EmploymentBar" default-menu-item-name="EditPartyBenifit" type="simple"> + <menu name="EmploymentBar" default-menu-item-name="EditPartyBenefit" type="simple"> <menu-item name="EditPartyBenefit" title="${uiLabelMap.HumanResEditPartyBenefit}"> <link target="EditPartyBenefits?roleTypeIdFrom=${roleTypeIdFrom}&roleTypeIdTo=${roleTypeIdTo}&partyIdFrom=${partyIdFrom}&partyIdTo=${partyIdTo}&fromDate=${fromDate}"/> </menu-item> @@ -59,7 +59,7 @@ </menu> <menu name="SalaryBar" default-menu-item-name="EditSalaryStep" type="simple"> <menu-item name="EditSalaryStep" title="${uiLabelMap.HumanResEditSalaryStep}"> - <link target="EditSalarySteps?PayGradeId=${payGradeId}"/> + <link target="EditSalarySteps?payGradeId=${payGradeId}"/> </menu-item> </menu> Modified: ofbiz/trunk/applications/humanres/widget/PartyAbilityScreens.xml URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/humanres/widget/PartyAbilityScreens.xml?view=diff&rev=545165&r1=545164&r2=545165 ============================================================================== --- ofbiz/trunk/applications/humanres/widget/PartyAbilityScreens.xml (original) +++ ofbiz/trunk/applications/humanres/widget/PartyAbilityScreens.xml Thu Jun 7 06:12:40 2007 @@ -96,8 +96,7 @@ <actions> <set field="headerItem" value="Employment"/> <set field="tabButtonItem" value="EditPerfReview"/> - <set field="titleProperty" value="PageTitleEditPartyReview"/> - <set field="tabButtonItem" value="EditPartySkill"/> + <set field="titleProperty" value="PageTitleEditPartyReview"/> <set field="perfReviewId" from-field="parameters.perfReviewId"/> <set field="employeePartyId" from-field="parameters.partyIdTo"/> <set field="employeeRoleTypeId" from-field="parameters.roleTypeIdTo"/> Modified: ofbiz/trunk/applications/humanres/widget/forms/EmplPositionForms.xml URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/humanres/widget/forms/EmplPositionForms.xml?view=diff&rev=545165&r1=545164&r2=545165 ============================================================================== --- ofbiz/trunk/applications/humanres/widget/forms/EmplPositionForms.xml (original) +++ ofbiz/trunk/applications/humanres/widget/forms/EmplPositionForms.xml Thu Jun 7 06:12:40 2007 @@ -30,7 +30,7 @@ </field> <field name="partyId" title="${uiLabelMap.PartyPartyId}"> <display-entity description="${firstName} ${middleName} ${lastName} ${groupName}" entity-name="PartyNameView"> - <sub-hyperlink target="viewprofile?partyId=${partyId}" link-style="smallSubmit" target-type="inter-app" description="${partyId}"/> + <sub-hyperlink target="/partymgr/control/viewprofile?partyId=${partyId}" link-style="smallSubmit" target-type="inter-app" description="${partyId}"/> </display-entity> </field> <field name="deleteLink" title="${uiLabelMap.CommonDelete}" widget-style="buttontext"> @@ -76,20 +76,21 @@ <auto-fields-service service-name="updateEmplPositionFulfillment"/> <field name="partyId" title="${uiLabelMap.PartyPartyId}"> <display-entity description="${firstName} ${middleName} ${lastName} ${groupName}" entity-name="PartyNameView"> - <sub-hyperlink target="viewprofile?partyId=${partyId}" link-style="smallSubmit" description="${partyId}"/> + <sub-hyperlink target="/partymgr/control/viewprofile?partyId=${partyId}" link-style="smallSubmit" target-type="inter-app" description="${partyId}"/> </display-entity> </field> - <field name="emplPositionId" title="{uiLabelMap.HumanResEmployeePositionId}"><display /></field> - <field name="fromDate" title="${uiLabelMap.CommonDate}"><display /></field> + <field name="emplPositionId" title="${uiLabelMap.HumanResEmployeePositionId}"><display /></field> + <field name="fromDate" title="${uiLabelMap.CommonDate}"><display/></field> <field name="submitButton" title="${uiLabelMap.CommonUpdate}"><submit button-type="button"/> </field> <field name="deleteLink" title="${uiLabelMap.CommonDelete}" widget-style="buttontext"> <hyperlink target="deleteEmplPositionFulfillment?emplPositionId=${emplPositionId}&partyId=${partyId}&fromDate=${fromDate}" description="${uiLabelMap.CommonDelete}" also-hidden="false"/> </field> </form> <form name="EditEmplPositionFulfillment" type="single" target="createEmplPositionFulfillment" title=""> - <auto-fields-service service-name="createEmplPosition"/> - <field name="partyId" title="${PartyPartyId}" tooltip="${uiLabelMap.CommonRequired}"><lookup target-form-name="LookupPartyName"/></field> - <field name="emplPositionId" title="${uiLabelMap.HumanResEmployeePositionId}" tooltip="${uiLabelMap.CommonRequired}"><hidden/></field> + <auto-fields-service service-name="createEmplPositionFulfillment"/> + <field name="emplPositionId"><hidden /></field> + <field name="partyId" title="${uiLabelMap.PartyPartyId}" tooltip="${uiLabelMap.CommonRequired}"><lookup target-form-name="LookupPartyName"/></field> + <field name="fromDate" title="${uiLabelMap.CommonFromDate}" tooltip="${uiLabelMap.CommonRequired}"/> <field name="submitButton" title="${uiLabelMap.CommonAdd}"><submit button-type="button"/></field> </form> @@ -108,6 +109,7 @@ </form> <form name="EditEmplPositionReportingStruct" type="single" target="createEmplPositionReportingStruct" title=""> <auto-fields-service service-name="createEmplPositionReportingStruct"/> + <field name="emplPositionId"><hidden /></field> <field name="emplPositionIdReportingTo" title="${uiLabelMap.HumanResEmplPositionIdReportingTo}" tooltip="${uiLabelMap.CommonRequired}"><lookup target-form-name="LookupEmplPosition"/></field> <field name="emplPositionIdManagedBy" title="${uiLabelMap.HumanResEmplPositionIdManagedBy}" tooltip="${uiLabelMap.CommonRequired}"><lookup target-form-name="LookupEmplPosition"/></field> <field name="fromDate" title="${uiLabelMap.CommonDate}" tooltip="${uiLabelMap.CommonRequired}"/> @@ -129,8 +131,8 @@ </form> <form name="EditEmplPositionResponsibility" type="single" target="createEmplPositionResponsibility" title=""> <auto-fields-service service-name="createEmplPositionResponsibility"/> - <field name="emplPositionId" title="${uiLabelMap.HumanResEmplPositionId}" tooltip="${uiLabelMap.CommonRequired}"><lookup target-form-name="LookupEmplPosition"/></field> - <field name="responsibilityTypeId"> + <field name="emplPositionId"><hidden /></field> + <field name="responsibilityTypeId" tooltip="${uiLabelMap.CommonRequired}"> <drop-down allow-empty="false"> <entity-options entity-name="ResponsibilityType" key-field-name="responsibilityTypeId" description=" ${description}"> <entity-order-by field-name="description"/> Modified: ofbiz/trunk/applications/humanres/widget/forms/EmploymentForms.xml URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/humanres/widget/forms/EmploymentForms.xml?view=diff&rev=545165&r1=545164&r2=545165 ============================================================================== --- ofbiz/trunk/applications/humanres/widget/forms/EmploymentForms.xml (original) +++ ofbiz/trunk/applications/humanres/widget/forms/EmploymentForms.xml Thu Jun 7 06:12:40 2007 @@ -25,7 +25,7 @@ <actions> <entity-condition entity-name="Employment"/> </actions> - <auto-fields-service default-field-type="display" service-name="updateEmployment"/> + <auto-fields-service service-name="updateEmployment"/> <field name="roleTypeIdFrom" title="roleTypeIdFrom"><display/></field> <field name="roleTypeIdTo" title="roleTypeIdTo"><display/></field> @@ -35,7 +35,7 @@ <field name="terminationReasonId" title="${uiLabelMap.HumanResTerminationReasonId}"><lookup target-form-name="LookupTerminationReasonId"/></field> <field name="terminationTypeId" title="${uiLabelMap.HumanResTerminationTypeId}"> <drop-down allow-empty="false"> - <entity-options description="${description}" key-field-name="terminationReasonId" entity-name="TerminationReason"> + <entity-options description="${description}" key-field-name="terminationTypeId" entity-name="TerminationType"> <entity-order-by field-name="description"/> </entity-options> </drop-down> @@ -237,7 +237,7 @@ <entity-condition entity-name="PayGrade"><order-by field-name="payGradeId"/></entity-condition> </actions> <auto-fields-service default-field-type="display" service-name="updatePayGrade"/> - <field name="payGradeId" title="PayGread Id" widget-style="buttontext"> + <field name="payGradeId" title="PayGrade Id" widget-style="buttontext"> <hyperlink also-hidden="false" description="${payGradeId}" target="EditPayGrade?payGradeId=${payGradeId}"/> </field> <field name="deleteLink" title="" widget-style="buttontext"> @@ -256,31 +256,23 @@ <field name="submitButton" use-when="payGrade==null" title="Create" widget-style="smallSubmit"><submit button-type="button"/></field> <field name="submitButton" use-when="payGrade!=null" title="Update" widget-style="smallSubmit"><submit button-type="button"/></field> </form> - <form name="ListSalarySteps" type="list" title="" paginate-target="findSalarySteps"> + <form name="ListSalarySteps" type="list" title="" target="updateSalaryStep" paginate-target="findSalarySteps"> <actions> <entity-condition entity-name="SalaryStep"><order-by field-name="salaryStepSeqId"/></entity-condition> </actions> - <auto-fields-service default-field-type="display" service-name="updateSalaryStep"/> - <field name="salaryStepSeqId" title="${uiLabelMap.HumanResSalaryStepSeqId}" widget-style="buttontext"> - <hyperlink also-hidden="false" description="${salaryStepSeqId}" target="EditSalaryStep?salaryStepSeqId=${salaryStepSeqId}&payGradeId=${payGradeId}"/> - </field> + <auto-fields-service service-name="updateSalaryStep"/> + <field name="salaryStepSeqId" title="${uiLabelMap.HumanResSalaryStepSeqId}"><display/></field> + <field name="payGradeId" title="${uiLabelMap.HumanResPayGradeId}"><display/></field> + <field name="submitButton" title="${uiLabelMap.CommonUpdate}" widget-style="smallSubmit"><submit button-type="button"/></field> <field name="deleteLink" title="" widget-style="buttontext"> <hyperlink target="deleteSalaryStep?salaryStepSeqId=${salaryStepSeqId}&payGradeId=${payGradeId}" description="${uiLabelMap.CommonDelete}"/> </field> </form> - <form name="EditSalaryStep" type="single" target="updateSalaryStep" title=""> - <actions> - <entity-one entity-name="SalaryStep" value-name="salaryStep"/> - </actions> - <alt-target use-when="salaryStep==null" target="createSalaryStep"/> - <auto-fields-service service-name="updateSalaryStep" map-name="salaryStep"/> - <field use-when="salaryStep!=null" name="salaryStepSeqId" tooltip="${uiLabelMap.CommonNotModifRecreat}"><display/></field> - <field name="salaryStepSeqId" use-when="salaryStep==null"><ignored/></field> - <field use-when="salaryStep==null&&salaryStepSeqId!=null" name="salaryStepSeqId" tooltip="${uiLabelMap.CommonCannotBeFound}:[${salaryStepSeqId}]"><text size="20" maxlength="20"/></field> - <field name="payGradeId" use-when="salaryStep!=null" title="payGradeId"><display/></field> - <field name="payGradeId" use-when="salaryStep==null" title="payGradeId" tooltip="${uiLabelMap.CommonRequired}"><lookup target-form-name="LookupPayGrade"/></field> - <field name="submitButton" use-when="salaryStep==null" title="Create" widget-style="smallSubmit"><submit button-type="button"/></field> - <field name="submitButton" use-when="salaryStep!=null" title="Update" widget-style="smallSubmit"><submit button-type="button"/></field> + <form name="EditSalaryStep" type="single" target="createSalaryStep" title=""> + <auto-fields-service service-name="createSalaryStep"/> + <field name="salaryStepSeqId"><ignored/></field> + <field name="payGradeId"><hidden/></field> + <field name="submitButton" title="${uiLabelMap.CommonCreate}" widget-style="smallSubmit"><submit button-type="button"/></field> </form> <form name="ListTerminationReasons" type="list" title="" paginate-target="findTerminationReasons"> <actions> @@ -294,14 +286,11 @@ <hyperlink target="deleteTerminationReason?terminationReasonId=${terminationReasonId}" description="${uiLabelMap.CommonDelete}"/> </field> </form> - <form name="EditTerminationReason" type="single" target="updateTerminationReason" title="" default-map-name = "terminationReason"> - <actions> - <set field="terminationReasonId" from-field="parameters.terminationReasonId"/> - <entity-one entity-name="TerminationReason" value-name="terminationReason"/> - </actions> + <form name="EditTerminationReason" type="single" target="updateTerminationReason" title="" default-map-name = "terminationReason"> <alt-target use-when="terminationReason==null" target="createTerminationReason"/> - <auto-fields-service service-name="updateTerminationReason" map-name="terminationReason"/> + <auto-fields-service service-name="createTerminationReason"/> <field use-when="terminationReason!=null" name="terminationReasonId" tooltip="${uiLabelMap.CommonNotModifRecreat}"><display/></field> + <field use-when="terminationReason==null" name="terminationReasonId"><ignored/></field> <field use-when="terminationReason==null&&terminationReasonId!=null" name="terminationReasonId" tooltip="${uiLabelMap.CommonCannotBeFound}:[${terminationReasonId}]"><text size="20" maxlength="20"/></field> <field name="submitButton" use-when="terminationReason==null" title="Create" widget-style="smallSubmit"><submit button-type="button"/></field> <field name="submitButton" use-when="terminationReason!=null" title="Update" widget-style="smallSubmit"><submit button-type="button"/></field> Modified: ofbiz/trunk/applications/humanres/widget/forms/PartyAbilityForms.xml URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/humanres/widget/forms/PartyAbilityForms.xml?view=diff&rev=545165&r1=545164&r2=545165 ============================================================================== --- ofbiz/trunk/applications/humanres/widget/forms/PartyAbilityForms.xml (original) +++ ofbiz/trunk/applications/humanres/widget/forms/PartyAbilityForms.xml Thu Jun 7 06:12:40 2007 @@ -30,7 +30,7 @@ </field> <field name="partyId" title="${uiLabelMap.PartyPartyId}"> <display-entity description="${firstName} ${middleName} ${lastName} ${groupName}" entity-name="PartyNameView"> - <sub-hyperlink target="viewprofile?partyId=${partyId}" link-style="smallSubmit" description="${partyId}"/> + <sub-hyperlink target="/partymgr/control/viewprofile?partyId=${partyId}" link-style="smallSubmit" target-type="inter-app" description="${partyId}"/> </display-entity> </field> </form> @@ -63,7 +63,7 @@ </field> <field name="partyId" title="${uiLabelMap.PartyPartyId}"> <display-entity description="${firstName} ${middleName} ${lastName} ${groupName}" entity-name="PartyNameView"> - <sub-hyperlink target="viewprofile?partyId=${partyId}" link-style="smallSubmit" description="${partyId}"/> + <sub-hyperlink target="/partymgr/control/viewprofile?partyId=${partyId}" link-style="smallSubmit" target-type="inter-app" description="${partyId}"/> </display-entity> </field> <field name="deleteLink" title="${uiLabelMap.CommonDelete}" widget-style="buttontext"> @@ -238,7 +238,7 @@ </field> <field name="partyId" title="${uiLabelMap.PartyPartyId}"> <display-entity description="${firstName} ${middleName} ${lastName} ${groupName}" entity-name="PartyNameView"> - <sub-hyperlink target="viewprofile?partyId=${partyId}" link-style="smallSubmit" description="${partyId}"/> + <sub-hyperlink target="/partymgr/control/viewprofile?partyId=${partyId}" link-style="smallSubmit" target-type="inter-app" description="${partyId}"/> </display-entity> </field> </form> @@ -270,7 +270,7 @@ </field> <field name="partyId" title="${uiLabelMap.PartyPartyId}"> <display-entity description="${firstName} ${middleName} ${lastName} ${groupName}" entity-name="PartyNameView"> - <sub-hyperlink target="viewprofile?partyId=${partyId}" link-style="smallSubmit" description="${partyId}"/> + <sub-hyperlink target="/partymgr/control/viewprofile?partyId=${partyId}" link-style="smallSubmit" target-type="inter-app" description="${partyId}"/> </display-entity> </field> <field name="deleteLink" title="${uiLabelMap.CommonDelete}" widget-style="buttontext"> |
Free forum by Nabble | Edit this page |