Commit 7bd98b4a authored by holivier's avatar holivier

Correction on Grade form to continue on Grade screen not returning on Rate screen

parent ebb60346
<?xml version="1.0" encoding="UTF-8" standalone="yes"?>
<patch>
<x:add-element path="/resource[1]" previous="/property[@key='HumanResEmplPositionType'][1]">
<!--#START CUSTOM CODE# tmpModifDoc-->
<!--#START CUSTOM CODE# tmpWaitingJira-->
<property key="HumanResEmplPositionTypeGrade">
<value xml:lang="en">Position Type Grade</value>
<value xml:lang="fr">Grade par type de position</value>
</property>
<!--#END CUSTOM CODE# tmpModifDoc--></x:add-element>
<!--#END CUSTOM CODE# tmpWaitingJira--></x:add-element>
</patch>
\ No newline at end of file
......@@ -46,7 +46,17 @@
<description>Delete Pay History</description>
<permission-service service-name="humanResManagerPermission" main-action="DELETE"/>
<auto-attributes mode="IN" include="pk" optional="false"/>
@@ -577,12 +586,13 @@
@@ -568,21 +577,22 @@
<description>Update Valid EmplPositionTypeRate</description>
<permission-service service-name="humanResManagerPermission" main-action="UPDATE"/>
<auto-attributes include="pk" mode="IN" optional="false"/>
<auto-attributes include="nonpk" mode="IN" optional="true"/>
<attribute name="rateAmount" type="BigDecimal" mode="IN" optional="true"/>
<attribute name="rateCurrencyUomId" type="String" mode="IN" optional="true"/>
- <attribute name="periodTypeId" type="String" mode="IN"/>
+ <attribute name="periodTypeId" type="String" mode="IN" optional="true"/>
<override name="fromDate" optional="true"/>
</service>
<service name="deleteEmplPositionTypeRate" engine="simple" default-entity-name="EmplPositionTypeRate"
location="component://humanres/minilang/HumanResServices.xml" invoke="deleteEmplPositionTypeRate" auth="true">
......
@@ -172,32 +172,69 @@
@@ -154,14 +154,14 @@
<field name="rateCurrencyUomId"><hidden/></field>
<field name="emplPositionTypeId"><hidden/></field>
<field name="fromDate"><hidden/></field>
<field name="rateAmountFromDate"><hidden/></field>
<field name="rateTypeId"><display-entity entity-name="RateType"/></field>
<field name="periodTypeId"><display-entity entity-name="PeriodType"/></field>
- <field name="payGradeId"><display-entity entity-name="PayGrade"/></field>
- <field name="salaryStepSeqId" title="${uiLabelMap.HumanResSalaryStepSeqId}"><display/></field>
+<!-- <field name="payGradeId"><display-entity entity-name="PayGrade"/></field> -->
+<!-- <field name="salaryStepSeqId" title="${uiLabelMap.HumanResSalaryStepSeqId}"><display/></field> -->
<field name="rateAmount"><display type="currency" currency="${rateCurrencyUomId}"/></field>
<field name="deleteButton" widget-style="buttontext"><submit/></field>
</form>
<form name="AddEmplPositionTypeRate" type="single" target="updateEmplPositionTypeRate" default-map-name="emplPositionTypeRate" paginate-target="EditEmplPositionTypeRates"
header-row-style="header-row" default-table-style="basic-table">
<actions>
@@ -172,32 +172,62 @@
<drop-down>
<entity-options key-field-name="rateTypeId" entity-name="RateType">
<entity-order-by field-name="description"/>
......@@ -39,9 +56,9 @@
+ <field name="thruDate"><display/></field>
+ <field name="payGradeId"><display-entity entity-name="PayGrade"/></field>
+ <field name="salaryStepSeqId" title="${uiLabelMap.HumanResSalaryStepSeqId}"><display/></field>
+ <field name="deleteButton" widget-style="buttontext"><submit/></field>
+ <field name="deleteButton" widget-style="buttontext" use-when="${groovy:payGradeId!=null}"><submit/></field>
+ </form>
+ <form name="AddEmplPositionTypeGrade" type="single" target="updateEmplPositionTypeRate" default-map-name="emplPositionTypeRate">
+ <form name="AddEmplPositionTypeGrade" type="single" target="updateEmplPositionTypeGrade" default-map-name="emplPositionTypeRate">
+ <actions>
+ <property-to-field field="defaultCurrencyUomId" resource="general" property="currency.uom.id.default" default="USD"/>
+ </actions>
......@@ -53,14 +70,7 @@
+ </entity-options>
+ </drop-down>
+ </field>
+ <field name="periodTypeId" required-field="true">
+ <drop-down allow-empty="false" no-current-selected-key="RATE_MONTH">
+ <entity-options key-field-name="periodTypeId" entity-name="PeriodType">
+ <entity-order-by field-name="periodTypeId"/>
+ </entity-options>
+ </drop-down>
+ </field>
+ <field name="payGradeId"><lookup target-form-name="LookupPayGrade"/></field>
+ <field name="payGradeId" required-field="true"><lookup target-form-name="LookupPayGrade"/></field>
+ <field name="salaryStepSeqId" title="${uiLabelMap.HumanResSalaryStepSeqId}"><lookup target-form-name="LookupSalaryStep" target-parameter="payGradeId"/></field>
+ <field name="submitButton" title="${uiLabelMap.CommonCreate}" widget-style="buttontext"><submit button-type="text-link"/></field>
+ </form>
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment