svn commit: r1709192 - in /ofbiz/trunk/applications/humanres: entitydef/entitymodel.xml servicedef/services.xml widget/forms/PayGradeForms.xml

Author: jleroux
Date: Sat Oct 17 16:09:43 2015
New Revision: 1709192

URL: http://svn.apache.org/viewvc?rev=1709192&view=rev
Log:
Changes for "SalaryStep entity missing From and Thru dates" https://issues.apache.org/jira/browse/OFBIZ-5758

I applied the patch I created for the Jira and added
    <parameter param-name="fromDate"/>
in ListSalarySteps form, to be able to delete a salary step from the screen

Modified:
    ofbiz/trunk/applications/humanres/entitydef/entitymodel.xml
    ofbiz/trunk/applications/humanres/servicedef/services.xml
    ofbiz/trunk/applications/humanres/widget/forms/PayGradeForms.xml

Modified: ofbiz/trunk/applications/humanres/entitydef/entitymodel.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/humanres/entitydef/entitymodel.xml?rev=1709192&r1=1709191&r2=1709192&view=diff
==============================================================================
--- ofbiz/trunk/applications/humanres/entitydef/entitymodel.xml (original)
+++ ofbiz/trunk/applications/humanres/entitydef/entitymodel.xml Sat Oct 17 16:09:43 2015
@@ -597,10 +597,15 @@ under the License.
             title="Salary Step Entity">
       <field name="salaryStepSeqId" type="id-ne"></field>
       <field name="payGradeId" type="id-ne"></field>
+      <field name="fromDate" type="date-time"></field>
+      <field name="thruDate" type="date-time"></field>
       <field name="dateModified" type="date-time"></field>
       <field name="amount" type="currency-amount"></field>
+      <field name="createdByUserLogin" type="id-vlong"></field>
+      <field name="lastModifiedByUserLogin" type="id-vlong"></field>
       <prim-key field="salaryStepSeqId"/>
       <prim-key field="payGradeId"/>
+      <prim-key field="fromDate"/>
       <relation type="one" fk-name="SLRY_STP_PGRD" rel-entity-name="PayGrade">
         <key-map field-name="payGradeId"/>
       </relation>

Modified: ofbiz/trunk/applications/humanres/servicedef/services.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/humanres/servicedef/services.xml?rev=1709192&r1=1709191&r2=1709192&view=diff
==============================================================================
--- ofbiz/trunk/applications/humanres/servicedef/services.xml (original)
+++ ofbiz/trunk/applications/humanres/servicedef/services.xml Sat Oct 17 16:09:43 2015
@@ -288,6 +288,7 @@ under the License.
         <permission-service service-name="humanResManagerPermission" main-action="CREATE"/>
         <auto-attributes mode="IN" include="nonpk" optional="true"/>
         <attribute name="payGradeId" mode="IN" type="String"/>
+        <attribute name="fromDate" mode="IN" type="Timestamp"/>
         <attribute name="salaryStepSeqId" mode="OUT" type="String"/>
     </service>
 

Modified: ofbiz/trunk/applications/humanres/widget/forms/PayGradeForms.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/humanres/widget/forms/PayGradeForms.xml?rev=1709192&r1=1709191&r2=1709192&view=diff
==============================================================================
--- ofbiz/trunk/applications/humanres/widget/forms/PayGradeForms.xml (original)
+++ ofbiz/trunk/applications/humanres/widget/forms/PayGradeForms.xml Sat Oct 17 16:09:43 2015
@@ -74,6 +74,7 @@
             <hyperlink target="deleteSalaryStep" description="${uiLabelMap.CommonDelete}">
                 <parameter param-name="salaryStepSeqId"/>
                 <parameter param-name="payGradeId"/>
+                <parameter param-name="fromDate"/>
             </hyperlink>
         </field>
     </form>