svn commit: r660162 - in /ofbiz/trunk/applications/huma
Locked
 
|
Author: ashish
Date: Mon May 26 04:10:25 2008 New Revision: 660162 URL: http://svn.apache.org/viewvc?rev=660162&view=rev Log: Applied patch from JIRA issue OFBIZ-1659. In this patch created tab and functionality for EmplPositionType and EmplPositionTypeRate in HR component Thanks Harsha Chadhar 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/servicedef/services.xml ofbiz/trunk/applications/humanres/webapp/humanres/WEB-INF/controller.xml ofbiz/trunk/applications/humanres/widget/Menus.xml ofbiz/trunk/applications/humanres/widget/PartyAbilityScreens.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=660162&r1=660161&r2=660162&view=diff ============================================================================== --- ofbiz/trunk/applications/humanres/config/HumanResUiLabels.xml (original) +++ ofbiz/trunk/applications/humanres/config/HumanResUiLabels.xml Mon May 26 04:10:25 2008 @@ -741,6 +741,15 @@ <property key="HumanResPartySkills"> <value xml:lang="en">Party Skills</value> </property> + <property key="HumanResEditEmplPositionType"> + <value xml:lang="en">Edit Position Types</value> + </property> + <property key="HumanResEmplPositionType"> + <value xml:lang="en">Position Types</value> + </property> + <property key="HumanResEmplPositionTypeRate"> + <value xml:lang="en">Position Type Rate</value> + </property> <property key="HumanResNewPartySkill"> <value xml:lang="en">New Party Skill</value> <value xml:lang="it">Nuova Abilità Soggetto</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=660162&r1=660161&r2=660162&view=diff ============================================================================== --- ofbiz/trunk/applications/humanres/script/org/ofbiz/humanres/HumanResServices.xml (original) +++ ofbiz/trunk/applications/humanres/script/org/ofbiz/humanres/HumanResServices.xml Mon May 26 04:10:25 2008 @@ -582,4 +582,41 @@ <entity-one entity-name="TerminationType" value-name="lookedUpValue"/> <remove-value value-name="lookedUpValue"/> </simple-method> + + <simple-method method-name="createEmplPositionType" short-description="Create a PositionType"> + <make-value entity-name="EmplPositionType" value-name="newEntity"/> + <set-nonpk-fields map-name="parameters" value-name="newEntity"/> + <if-empty field-name="newEntity.emplPositionTypeId"> + <sequenced-id-to-env sequence-name="EmplPositionType" env-name="newEntity.emplPositionTypeId"/> + </if-empty> + <field-to-result field-name="newEntity.emplPositionTypeId" result-name="emplPositionTypeId"/> + <create-value value-name="newEntity"/> + </simple-method> + + <simple-method method-name="updateEmplPositionType" short-description="Update PositionType"> + <entity-one entity-name="EmplPositionType" value-name="lookedUpValue"/> + <set-nonpk-fields value-name="lookedUpValue" map-name="parameters"/> + <store-value value-name="lookedUpValue"/> + </simple-method> + + <simple-method method-name="createEmplPositionTypeRate" short-description="Create a PositionType"> + <make-value entity-name="EmplPositionTypeRate" value-name="newEntity"/> + <set-pk-fields map-name="parameters" value-name="newEntity"/> + <set-nonpk-fields map-name="parameters" value-name="newEntity"/> + <field-to-result field-name="newEntity.emplPositionTypeId" result-name="emplPositionTypeId"/> + <field-to-result field-name="newEntity.periodTypeId" result-name="periodTypeId"/> + <field-to-result field-name="newEntity.fromDate" result-name="fromDate"/> + <create-value value-name="newEntity"/> + </simple-method> + + <simple-method method-name="updateEmplPositionTypeRate" short-description="Update EmplPositionTypeRate"> + <entity-one entity-name="EmplPositionTypeRate" value-name="lookedUpValue"/> + <set-nonpk-fields value-name="lookedUpValue" map-name="parameters"/> + <store-value value-name="lookedUpValue"/> + </simple-method> + + <simple-method method-name="deleteEmplPositionTypeRate" short-description="Delete EmplPositionTypeRate"> + <entity-one entity-name="EmplPositionTypeRate" value-name="lookedUpValue"/> + <remove-value value-name="lookedUpValue"/> + </simple-method> </simple-methods> \ No newline at end of file Modified: ofbiz/trunk/applications/humanres/servicedef/services.xml URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/humanres/servicedef/services.xml?rev=660162&r1=660161&r2=660162&view=diff ============================================================================== --- ofbiz/trunk/applications/humanres/servicedef/services.xml (original) +++ ofbiz/trunk/applications/humanres/servicedef/services.xml Mon May 26 04:10:25 2008 @@ -615,4 +615,46 @@ <permission-service service-name="humanResManagerPermission" main-action="DELETE"/> <auto-attributes mode="IN" include="pk" optional="false"/> </service> + + <service name="createEmplPositionType" engine="simple" default-entity-name="EmplPositionType" + location="org/ofbiz/humanres/HumanResServices.xml" invoke="createEmplPositionType" auth="true"> + <description>Create Valid PositionType</description> + <permission-service service-name="humanResManagerPermission" main-action="CREATE"/> + <auto-attributes mode="INOUT" include="pk" optional="true"/> + <auto-attributes mode="IN" include="nonpk" optional="true"/> + <override name="description" optional="false"/> + </service> + + <service name="updateEmplPositionType" engine="simple" default-entity-name="EmplPositionType" + location="org/ofbiz/humanres/HumanResServices.xml" invoke="updateEmplPositionType" auth="true"> + <description>Update Valid PositionType</description> + <permission-service service-name="humanResManagerPermission" main-action="UPDATE"/> + <auto-attributes mode="IN" include="pk" optional="false"/> + <auto-attributes mode="IN" include="nonpk" optional="true"/> + </service> + + <service name="createEmplPositionTypeRate" engine="simple" default-entity-name="EmplPositionTypeRate" + location="org/ofbiz/humanres/HumanResServices.xml" invoke="createEmplPositionTypeRate" auth="true"> + <description>Create Valid EmplPositionTypeRate</description> + <permission-service service-name="humanResManagerPermission" main-action="CREATE"/> + <auto-attributes mode="INOUT" include="pk" optional="true"/> + <auto-attributes mode="IN" include="nonpk" optional="true"/> + <override name="description" optional="false"/> + </service> + + <service name="updateEmplPositionTypeRate" engine="simple" default-entity-name="EmplPositionTypeRate" + location="org/ofbiz/humanres/HumanResServices.xml" invoke="updateEmplPositionTypeRate" auth="true"> + <description>Update Valid EmplPositionTypeRate</description> + <permission-service service-name="humanResManagerPermission" main-action="UPDATE"/> + <auto-attributes mode="IN" include="pk" optional="false"/> + <auto-attributes mode="IN" include="nonpk" optional="true"/> + </service> + + <service name="deleteEmplPositionTypeRate" engine="simple" default-entity-name="EmplPositionTypeRate" + location="org/ofbiz/humanres/HumanResServices.xml" invoke="deleteEmplPositionTypeRate" auth="true"> + <description>Delete Valid EmplPositionTypeRate</description> + <permission-service service-name="humanResManagerPermission" main-action="DELETE"/> + <auto-attributes mode="IN" include="pk" optional="false"/> + </service> + </services> \ No newline at end of file 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=660162&r1=660161&r2=660162&view=diff ============================================================================== --- ofbiz/trunk/applications/humanres/webapp/humanres/WEB-INF/controller.xml (original) +++ ofbiz/trunk/applications/humanres/webapp/humanres/WEB-INF/controller.xml Mon May 26 04:10:25 2008 @@ -640,6 +640,43 @@ <event type="service" invoke="deleteTerminationType"/> <response name="success" type="view" value="EditTerminationTypes"/> </request-map> + <request-map uri="FindEmplPositionTypes"> + <security https="true" auth="true"/> + <response name="success" type="view" value="FindEmplPositionTypes"/> + </request-map> + <request-map uri="EditEmplPositionTypes"> + <security https="true" auth="true"/> + <response name="success" type="view" value="EditEmplPositionTypes"/> + </request-map> + <request-map uri="createEmplPositionType"> + <security https="true" auth="true"/> + <event type="service" invoke="createEmplPositionType"/> + <response name="success" type="view" value="EditEmplPositionTypes"/> + </request-map> + <request-map uri="updateEmplPositionType"> + <security https="true" auth="true"/> + <event type="service-multi" invoke="updateEmplPositionType"/> + <response name="success" type="view" value="EditEmplPositionTypes"/> + </request-map> + <request-map uri="EditEmplPositionTypeRate"> + <security https="true" auth="true"/> + <response name="success" type="view" value="EditEmplPositionTypeRate"/> + </request-map> + <request-map uri="createEmplPositionTypeRate"> + <security https="true" auth="true"/> + <event type="service" invoke="createEmplPositionTypeRate"/> + <response name="success" type="view" value="EditEmplPositionTypeRate"/> + </request-map> + <request-map uri="updateEmplPositionTypeRate"> + <security https="true" auth="true"/> + <event type="service-multi" invoke="updateEmplPositionTypeRate"/> + <response name="success" type="view" value="EditEmplPositionTypeRate"/> + </request-map> + <request-map uri="deleteEmplPositionTypeRate"> + <security https="true" auth="true"/> + <event type="service" invoke="deleteEmplPositionTypeRate"/> + <response name="success" type="view" value="EditEmplPositionTypeRate"/> + </request-map> <!-- ===================Lookup Request===================== --> <request-map uri="LookupPartyName"><security auth="true" https="true"/><response name="success" type="view" value="LookupPartyName"/></request-map> <request-map uri="LookupPayment"><security auth="true" https="true"/><response name="success" type="view" value="LookupPayment"/></request-map> @@ -709,4 +746,7 @@ <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"/> <view-map name="FindPayGrades" type="screen" page="component://humanres/widget/EmploymentScreens.xml#FindPayGrades"/> + <view-map name="FindEmplPositionTypes" type="screen" page="component://humanres/widget/PartyAbilityScreens.xml#FindEmplPositionTypes"/> + <view-map name="EditEmplPositionTypes" type="screen" page="component://humanres/widget/PartyAbilityScreens.xml#EditEmplPositionTypes"/> + <view-map name="EditEmplPositionTypeRate" type="screen" page="component://humanres/widget/PartyAbilityScreens.xml#EditEmplPositionTypeRate"/> </site-conf> Modified: ofbiz/trunk/applications/humanres/widget/Menus.xml URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/humanres/widget/Menus.xml?rev=660162&r1=660161&r2=660162&view=diff ============================================================================== --- ofbiz/trunk/applications/humanres/widget/Menus.xml (original) +++ ofbiz/trunk/applications/humanres/widget/Menus.xml Mon May 26 04:10:25 2008 @@ -107,6 +107,9 @@ <menu-item name="TerminationType" title="${uiLabelMap.HumanResTerminationType}"> <link target="findTerminationTypes"/> </menu-item> + <menu-item name="EmplPositionTypes" title="${uiLabelMap.HumanResEmplPositionType}"> + <link target="FindEmplPositionTypes"/> + </menu-item> </menu> <menu name="ProfileTabBar" default-menu-item-name="viewprofile" default-selected-style="selected" @@ -133,4 +136,14 @@ <link target="EditPerformanceNotes?partyId=${partyId}"/> </menu-item> </menu> + + <menu name="EmplPositionTypeTabBar" default-menu-item-name="EditEmplPositionType" default-selected-style="selected" + menu-container-style="button-bar tab-bar" type="simple" selected-menuitem-context-field-name="tabButtonItem2"> + <menu-item name="EditEmplPositionType" title="${uiLabelMap.HumanResEditEmplPositionType}"> + <link target="EditEmplPositionTypes?emplPositionTypeId=${emplPositionTypeId}"/> + </menu-item> + <menu-item name="EditEmplPositionTypeRate" title="${uiLabelMap.HumanResEmplPositionTypeRate}"> + <link target="EditEmplPositionTypeRate?emplPositionTypeId=${emplPositionTypeId}"/> + </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=660162&r1=660161&r2=660162&view=diff ============================================================================== --- ofbiz/trunk/applications/humanres/widget/PartyAbilityScreens.xml (original) +++ ofbiz/trunk/applications/humanres/widget/PartyAbilityScreens.xml Mon May 26 04:10:25 2008 @@ -490,4 +490,106 @@ </widgets> </section> </screen> + <screen name="FindEmplPositionTypes"> + <section> + <actions> + <set field="titleProperty" value="FindPositionTypes"/> + <set field="headerItem" value="EmplPositionTypes"/> + <set field="tabButtonItem" value="EmplPositionTypes"/> + <set field="emplPositionTypeId" from-field="parameters.emplPositionTypeId"/> + <set field="emplPositionTypeCtx" from-field="parameters"/> + </actions> + <widgets> + <decorator-screen name="GlobalHRSettingsDecorator" location="${parameters.mainDecoratorLocation}"> + <decorator-section name="body"> + <screenlet title="${uiLabelMap.CommonFind} ${uiLabelMap.HumanResEmplPositionType}"> + <section> + <widgets> + <container> + <link target="EditEmplPositionTypes" text="${uiLabelMap.CommonNew} ${uiLabelMap.HumanResEmplPositionType}" style="buttontext"/> + </container> + <include-form name="FindEmplPositionTypes" location="component://humanres/widget/forms/PartyAbilityForms.xml"/> + </widgets> + </section> + </screenlet> + <screenlet title="${uiLabelMap.CommonList} ${uiLabelMap.HumanResEmplPositionType}"> + <section> + <widgets> + <include-form name="ListEmplPositionTypes" location="component://humanres/widget/forms/PartyAbilityForms.xml"/> + </widgets> + </section> + </screenlet> + </decorator-section> + </decorator-screen> + </widgets> + </section> + </screen> + <screen name="EditEmplPositionTypes"> + <section> + <actions> + <set field="titleProperty" value="FindPositionTypes"/> + <set field="headerItem" value="EmplPositionTypes"/> + <set field="tabButtonItem" value="EmplPositionTypes"/> + <set field="tabButtonItem2" value="EditEmplPositionType"/> + <set field="emplPositionTypeId" from-field="parameters.emplPositionTypeId"/> + <entity-one entity-name="EmplPositionType" value-name="emplPositionType"/> + </actions> + <widgets> + <decorator-screen name="GlobalHRSettingsDecorator" location="${parameters.mainDecoratorLocation}"> + <decorator-section name="body"> + <section> + <condition> + <not> + <if-empty field-name="emplPositionTypeId"/> + </not> + </condition> + <widgets> + <include-menu location="component://humanres/widget/Menus.xml" name="EmplPositionTypeTabBar"/> + </widgets> + </section> + <screenlet title="${uiLabelMap.CommonEdit} ${uiLabelMap.HumanResEmplPositionType}"> + <section> + <widgets> + <include-form name="EditEmplPositionTypes" location="component://humanres/widget/forms/PartyAbilityForms.xml"/> + </widgets> + </section> + </screenlet> + </decorator-section> + </decorator-screen> + </widgets> + </section> + </screen> + <screen name="EditEmplPositionTypeRate"> + <section> + <actions> + <set field="titleProperty" value="EditEmplPositionTypeRate"/> + <set field="headerItem" value="EmplPositionTypes"/> + <set field="tabButtonItem" value="EmplPositionTypes"/> + <set field="tabButtonItem2" value="EditEmplPositionTypeRate"/> + <set field="emplPositionTypeId" from-field="parameters.emplPositionTypeId"/> + <entity-one entity-name="EmplPositionTypeRate" value-name="emplPositionTypeRate"/> + </actions> + <widgets> + <decorator-screen name="GlobalHRSettingsDecorator" location="${parameters.mainDecoratorLocation}"> + <decorator-section name="body"> + <include-menu location="component://humanres/widget/Menus.xml" name="EmplPositionTypeTabBar"/> + <screenlet title="${uiLabelMap.CommonList} ${uiLabelMap.HumanResPositionType} ${uiLabelMap.CommonRate}"> + <section> + <widgets> + <include-form name="ListEmplPositionTypeRates" location="component://humanres/widget/forms/PartyAbilityForms.xml"/> + </widgets> + </section> + </screenlet> + <screenlet title="${uiLabelMap.CommonNew} ${uiLabelMap.HumanResPositionType} ${uiLabelMap.CommonRate}"> + <section> + <widgets> + <include-form name="AddEmplPositionTypeRate" location="component://humanres/widget/forms/PartyAbilityForms.xml" /> + </widgets> + </section> + </screenlet> + </decorator-section> + </decorator-screen> + </widgets> + </section> + </screen> </screens> \ No newline at end of file Modified: ofbiz/trunk/applications/humanres/widget/forms/PartyAbilityForms.xml URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/humanres/widget/forms/PartyAbilityForms.xml?rev=660162&r1=660161&r2=660162&view=diff ============================================================================== --- ofbiz/trunk/applications/humanres/widget/forms/PartyAbilityForms.xml (original) +++ ofbiz/trunk/applications/humanres/widget/forms/PartyAbilityForms.xml Mon May 26 04:10:25 2008 @@ -438,4 +438,81 @@ <field name="emplPositionId" title="${uiLabelMap.FormFieldTitle_emplPositionId}"><lookup target-form-name="LookupEmplPosition"/></field> <field name="searchButton" widget-style="smallSubmit"><submit button-type="button"/></field> </form> + <form name="FindEmplPositionTypes" type="single" header-row-style="header-row" default-table-style="basic-table"> + <auto-fields-entity entity-name="EmplPositionType" default-field-type="find"/> + <field name="noConditionFind"><hidden value="Y"/></field> + <field name="emplPositionTypeId"><text/></field> + <field name="description" title="${uiLabelMap.CommonDescription}"><text/></field> + <field name="searchButton" widget-style="smallSubmit"><submit button-type="button"/></field> + </form> + <form name="ListEmplPositionTypes" type="list" list-name="listIt" target="updateEmplPositionType" + 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="emplPositionTypeCtx"/> + <field-map field-name="entityName" value="EmplPositionType"/> + </service> + </actions> + <auto-fields-service service-name="updateEmplPositionType" default-field-type="hidden"/> + <field name="emplPositionTypeId" title="${uiLabelMap.HumanResEmplPositionType}"> + <hyperlink also-hidden="false" description="${emplPositionTypeId}" target="EditEmplPositionTypes?emplPositionTypeId=${emplPositionTypeId}"/> + </field> + <field name="description" title="${uiLabelMap.CommonDescription}"><display/></field> + </form> + <form name="EditEmplPositionTypes" type="single" target="updateEmplPositionType" default-map-name="emplPositionType" + header-row-style="header-row" default-table-style="basic-table"> + <alt-target use-when="emplPositionType==null" target="createEmplPositionType"/> + <auto-fields-service service-name="updateEmplPositionType"/> + <field name="emplPositionTypeId" use-when="emplPositionType==null"><text/></field> + <field name="emplPositionTypeId" use-when="emplPositionType!=null"><display/></field> + <field name="description" title="${uiLabelMap.CommonDescription}"><text/></field> + <field name="submitButton" use-when="emplPositionType==null" title="${uiLabelMap.CommonCreate}" widget-style="smallSubmit"><submit button-type="button"/></field> + <field name="submitButton" use-when="emplPositionType!=null" title="${uiLabelMap.CommonUpdate}" widget-style="smallSubmit"><submit button-type="button"/></field> + </form> + <form name="ListEmplPositionTypeRates" type="multi" title="" target="updateEmplPositionTypeRate" + odd-row-style="alternate-row" default-table-style="basic-table hover-bar"> + <actions> + <entity-condition entity-name="EmplPositionTypeRate"><order-by field-name="fromDate"/></entity-condition> + </actions> + <auto-fields-service service-name="updateEmplPositionTypeRate" default-field-type="hidden"/> + <field name="emplPositionTypeId"><hidden/></field> + <field name="periodTypeId"><display/></field> + <field name="rateTypeId"> + <drop-down allow-empty="true" no-current-selected-key=""> + <entity-options description="${description}" key-field-name="rateTypeId" entity-name="RateType"> + <entity-order-by field-name="rateTypeId"/> + </entity-options> + </drop-down> + </field> + <field name="payGradeId"><lookup target-form-name="LookupPayGrade"/></field> + <field name="salaryStepSeqId"><lookup target-form-name="LookupSalaryStep"/></field> + <field name="fromDate"><display/></field> + <field name="deleteLink" title="${uiLabelMap.CommonDelete}" widget-style="buttontext"> + <hyperlink target="deleteEmplPositionTypeRate?emplPositionTypeId=${emplPositionTypeId}&fromDate=${fromDate}" description="${uiLabelMap.CommonDelete}" also-hidden="false"/> + </field> + <field name="_rowSubmit" title="${uiLabelMap.CommonSelect}"><hidden value="Y"/></field> + <field name="submitButton" title="${uiLabelMap.CommonSubmit}" widget-style="smallSubmit"><submit/></field> + </form> + <form name="AddEmplPositionTypeRate" type="single" target="createEmplPositionTypeRate" default-map-name="emplPositionTypeRate" paginate-target="EditEmplPositionTypeRate" + header-row-style="header-row" default-table-style="basic-table"> + <field name="emplPositionTypeId"><hidden/></field> + <field name="rateTypeId"> + <drop-down allow-empty="true" no-current-selected-key=""> + <entity-options description="${description}" key-field-name="rateTypeId" entity-name="RateType"> + <entity-order-by field-name="rateTypeId"/> + </entity-options> + </drop-down> + </field> + <field name="payGradeId"><lookup target-form-name="LookupPayGrade"/></field> + <field name="salaryStepSeqId"><lookup target-form-name="LookupSalaryStep"/></field> + <field name="periodTypeId"> + <drop-down allow-empty="false"> + <entity-options description="${description}" key-field-name="periodTypeId" entity-name="PeriodType"> + <entity-order-by field-name="periodTypeId"/> + </entity-options> + </drop-down> + </field> + <field name="fromDate"><date-time/></field> + <field name="submitButton" title="${uiLabelMap.CommonCreate}" widget-style="buttontext"><submit button-type="text-link"/></field> + </form> </forms> \ No newline at end of file |
«
Return to OFBiz - Commits
|
1 view|%1 views
| Free forum by Nabble | Edit this page |