You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@ofbiz.apache.org by de...@apache.org on 2017/07/09 06:02:33 UTC
svn commit: r1801348 - in /ofbiz/ofbiz-framework/trunk/applications/humanres:
minilang/HumanResServices.xml servicedef/services.xml
webapp/humanres/WEB-INF/controller.xml widget/forms/EmploymentForms.xml
Author: deepak
Date: Sun Jul 9 06:02:33 2017
New Revision: 1801348
URL: http://svn.apache.org/viewvc?rev=1801348&view=rev
Log:
Improved: Service "deletePayHistory" does not have correct implementation (OFBIZ-9111)
Use entity auto for deletePayHistory service, also added new service to expirePayHistory and call expirePayHistory from UI.
Thanks Pawan Verma for your contribution.
Modified:
ofbiz/ofbiz-framework/trunk/applications/humanres/minilang/HumanResServices.xml
ofbiz/ofbiz-framework/trunk/applications/humanres/servicedef/services.xml
ofbiz/ofbiz-framework/trunk/applications/humanres/webapp/humanres/WEB-INF/controller.xml
ofbiz/ofbiz-framework/trunk/applications/humanres/widget/forms/EmploymentForms.xml
Modified: ofbiz/ofbiz-framework/trunk/applications/humanres/minilang/HumanResServices.xml
URL: http://svn.apache.org/viewvc/ofbiz/ofbiz-framework/trunk/applications/humanres/minilang/HumanResServices.xml?rev=1801348&r1=1801347&r2=1801348&view=diff
==============================================================================
--- ofbiz/ofbiz-framework/trunk/applications/humanres/minilang/HumanResServices.xml (original)
+++ ofbiz/ofbiz-framework/trunk/applications/humanres/minilang/HumanResServices.xml Sun Jul 9 06:02:33 2017
@@ -36,14 +36,6 @@
<call-service service-name="createPayHistory" in-map-name="createPayHistoryMap"/>
</simple-method>
- <simple-method method-name="deletePayHistory" short-description="Delete Pay History">
- <now-timestamp field="nowTimeStamp"/>
- <entity-one entity-name="PayHistory" value-field="lookedUpValue"/>
- <set field="lookedUpValue.thruDate" from-field="nowTimeStamp"/>
- <store-value value-field="lookedUpValue"/>
- <remove-value value-field="lookedUpValue"/>
- </simple-method>
-
<simple-method method-name="createEmplPositionReportingStruct" short-description="Create a Employee Position Reporting Structure">
<make-value entity-name="EmplPositionReportingStruct" value-field="newEntity"/>
<set-pk-fields map="parameters" value-field="newEntity"/>
Modified: ofbiz/ofbiz-framework/trunk/applications/humanres/servicedef/services.xml
URL: http://svn.apache.org/viewvc/ofbiz/ofbiz-framework/trunk/applications/humanres/servicedef/services.xml?rev=1801348&r1=1801347&r2=1801348&view=diff
==============================================================================
--- ofbiz/ofbiz-framework/trunk/applications/humanres/servicedef/services.xml (original)
+++ ofbiz/ofbiz-framework/trunk/applications/humanres/servicedef/services.xml Sun Jul 9 06:02:33 2017
@@ -253,12 +253,16 @@ under the License.
<auto-attributes mode="IN" include="nonpk" optional="true"/>
</service>
- <service name="deletePayHistory" engine="simple" default-entity-name="PayHistory"
- location="component://humanres/minilang/HumanResServices.xml" invoke="deletePayHistory" auth="true">
+ <service name="deletePayHistory" engine="simple" default-entity-name="PayHistory" invoke="delete" auth="true">
<description>Delete Pay History</description>
<permission-service service-name="humanResManagerPermission" main-action="DELETE"/>
<auto-attributes mode="IN" include="pk" optional="false"/>
</service>
+ <service name="expirePayHistory" engine="simple" default-entity-name="PayHistory" invoke="expire" auth="true">
+ <description>Expire Pay History</description>
+ <permission-service service-name="humanResManagerPermission" main-action="UPDATE"/>
+ <auto-attributes mode="IN" include="pk" optional="false"/>
+ </service>
<service name="createPayrollPreference" engine="entity-auto" default-entity-name="PayrollPreference" invoke="create" auth="true">
<description>Create Payroll Preference</description>
Modified: ofbiz/ofbiz-framework/trunk/applications/humanres/webapp/humanres/WEB-INF/controller.xml
URL: http://svn.apache.org/viewvc/ofbiz/ofbiz-framework/trunk/applications/humanres/webapp/humanres/WEB-INF/controller.xml?rev=1801348&r1=1801347&r2=1801348&view=diff
==============================================================================
--- ofbiz/ofbiz-framework/trunk/applications/humanres/webapp/humanres/WEB-INF/controller.xml (original)
+++ ofbiz/ofbiz-framework/trunk/applications/humanres/webapp/humanres/WEB-INF/controller.xml Sun Jul 9 06:02:33 2017
@@ -243,6 +243,11 @@ under the License.
<event type="service" invoke="deletePayHistory"/>
<response name="success" type="view" value="ListPayHistories"/>
</request-map>
+ <request-map uri="expirePayHistory">
+ <security https="true" auth="true"/>
+ <event type="service" invoke="expirePayHistory"/>
+ <response name="success" type="view" value="ListPayHistories"/>
+ </request-map>
<request-map uri="findPartyBenefits">
<security https="true" auth="true"/>
<response name="success" type="view" value="EditPartyBenefits"/>
Modified: ofbiz/ofbiz-framework/trunk/applications/humanres/widget/forms/EmploymentForms.xml
URL: http://svn.apache.org/viewvc/ofbiz/ofbiz-framework/trunk/applications/humanres/widget/forms/EmploymentForms.xml?rev=1801348&r1=1801347&r2=1801348&view=diff
==============================================================================
--- ofbiz/ofbiz-framework/trunk/applications/humanres/widget/forms/EmploymentForms.xml (original)
+++ ofbiz/ofbiz-framework/trunk/applications/humanres/widget/forms/EmploymentForms.xml Sun Jul 9 06:02:33 2017
@@ -177,7 +177,7 @@
</field>
<field name="submitButton" title="${uiLabelMap.CommonUpdate}"><submit button-type="button"/></field>
<field name="deleteLink" title=" " widget-style="buttontext">
- <hyperlink description="${uiLabelMap.CommonDelete}" target="deletePayHistory">
+ <hyperlink description="${uiLabelMap.CommonDelete}" target="expirePayHistory">
<parameter param-name="roleTypeIdFrom"/>
<parameter param-name="roleTypeIdTo"/>
<parameter param-name="partyIdFrom"/>