[ofbiz-plugins] branch trunk updated: Improved: Updated service name and removed duplicate service. (#16)

[surajk]

This is an automated email from the ASF dual-hosted git repository.

surajk pushed a commit to branch trunk
in repository https://gitbox.apache.org/repos/asf/ofbiz-plugins.git


The following commit(s) were added to refs/heads/trunk by this push:
     new 9428ee9  Improved: Updated service name and removed duplicate service. (#16)
9428ee9 is described below

commit 9428ee95794e6c46c20db25df3a4f9862f5faf96
Author: Suraj Khurana <[hidden email]>
AuthorDate: Sat May 16 13:47:16 2020 +0530

    Improved: Updated service name and removed duplicate service. (#16)
   
    * Improved: Updated service name and removed duplicate service.
    (OFBIZ-11616)
   
    Please check dependent PR (https://github.com/apache/ofbiz-framework/pull/88) for more details.
---
 projectmgr/webapp/projectmgr/WEB-INF/controller.xml |  2 +-
 scrum/minilang/ScrumServices.xml                    |  6 ------
 scrum/minilang/test/MyWorkTests.xml                 |  2 +-
 scrum/minilang/test/TimesheetTests.xml              | 10 +---------
 scrum/servicedef/services.xml                       |  6 ------
 scrum/webapp/scrum/WEB-INF/controller.xml           |  4 ++--
 scrum/widget/TimeSheetForms.xml                     |  2 +-
 7 files changed, 6 insertions(+), 26 deletions(-)

diff --git a/projectmgr/webapp/projectmgr/WEB-INF/controller.xml b/projectmgr/webapp/projectmgr/WEB-INF/controller.xml
index 7efb628..6534ea8 100644
--- a/projectmgr/webapp/projectmgr/WEB-INF/controller.xml
+++ b/projectmgr/webapp/projectmgr/WEB-INF/controller.xml
@@ -504,7 +504,7 @@
     </request-map>
     <request-map uri="TimeSheetStatustoProgress">
         <security https="true" auth="true"/>
-        <event type="service" invoke="updateTimesheetToInProcess"/>
+        <event type="service" invoke="updateTimesheet"/>
         <response name="success" type="view" value="Timesheet"/>
         <response name="error" type="view" value="Timesheet"/>
     </request-map>
diff --git a/scrum/minilang/ScrumServices.xml b/scrum/minilang/ScrumServices.xml
index 279239f..ab8333c 100644
--- a/scrum/minilang/ScrumServices.xml
+++ b/scrum/minilang/ScrumServices.xml
@@ -2497,12 +2497,6 @@
             <set field="sprintId" from-field="productBacklogs[0].workEffortId"/>
         </if-not-empty>
     </simple-method>
-    <simple-method method-name="updateTimesheetToInProcess"
-        short-description="Updates the Timesheet status back to in process to be able to correct errors">
-        <entity-one entity-name="Timesheet" value-field="timesheet" />
-        <set field="timesheet.statusId" value="TIMESHEET_IN_PROCESS" />
-        <store-value value-field="timesheet" />
-    </simple-method>
     <simple-method method-name="updateScrumRevisionChange" short-description="Update Scrum Revision Change" login-required="false">
         <log level="info" message="==========>>> Auto store Revision# [${parameters.revisionNumber}],committer# ${parameters.user},taskId# ${parameters.taskId},hours# ${parameters.hours}"/>
         <!-- Check user login -->
diff --git a/scrum/minilang/test/MyWorkTests.xml b/scrum/minilang/test/MyWorkTests.xml
index 03b60a2..b1b9e27 100644
--- a/scrum/minilang/test/MyWorkTests.xml
+++ b/scrum/minilang/test/MyWorkTests.xml
@@ -90,6 +90,6 @@ under the License.
         <set-current-user-login value-field="userLogin"/>
         <set field="inMap.timesheetId" value="DEMO-TIMESHEET2"/>
         <set field="inMap.statusId" value="TIMESHEET_COMPLETED"/>
-        <call-service service-name="updateTimesheet" in-map-name="inMap"></call-service>
+        <call-service service-name="updateTimesheet" in-map-name="inMap"/>
     </simple-method>
 </simple-methods>
diff --git a/scrum/minilang/test/TimesheetTests.xml b/scrum/minilang/test/TimesheetTests.xml
index 4a3cbbe..36a9dbd 100644
--- a/scrum/minilang/test/TimesheetTests.xml
+++ b/scrum/minilang/test/TimesheetTests.xml
@@ -28,14 +28,6 @@ under the License.
         <set-current-user-login value-field="userLogin"/>
         <set field="inMap.timesheetId" value="DEMO-TIMESHEET1"/>
         <set field="inMap.statusId" value="TIMESHEET_COMPLETED"/>
-        <call-service service-name="updateTimesheet" in-map-name="inMap"></call-service>
-    </simple-method>
-    <simple-method method-name="testTimesheetToInProcess" short-description="Test set timesheet status to In Process" login-required="false">
-        <entity-one entity-name="UserLogin" value-field="userLogin">
-            <field-map field-name="userLoginId" value="scrumteam2"/>
-        </entity-one>
-        <set-current-user-login value-field="userLogin"/>
-        <set field="inMap.timesheetId" value="DEMO-TIMESHEET1"/>
-        <call-service service-name="updateTimesheetToInProcess" in-map-name="inMap"></call-service>
+        <call-service service-name="updateTimesheet" in-map-name="inMap"/>
     </simple-method>
 </simple-methods>
diff --git a/scrum/servicedef/services.xml b/scrum/servicedef/services.xml
index 315f358..b3d205f 100644
--- a/scrum/servicedef/services.xml
+++ b/scrum/servicedef/services.xml
@@ -245,12 +245,6 @@ under the License.
         <attribute name="custRequestStatusId" mode="IN" type="String" optional="true"/>
         <attribute name="webSiteId" mode="IN" type="String" optional="true"/><!-- for notification services -->
     </service>
-    <service name="updateTimesheetToInProcess" default-entity-name="Timesheet" engine="simple" auth="true"
-        location="component://scrum/minilang/ScrumServices.xml" invoke="updateTimesheetToInProcess">
-        <description>Updates the Timesheet status back to in process to be able to correct errors</description>
-        <auto-attributes include="pk" mode="IN" optional="false"/>
-    </service>
-    
     <service name="updateScrumRevision" engine="soap" export="true"
         location="http://www.example.com/webtools/control/SOAPService" invoke="updateScrumRevisionChange">
         <implements service="updateScrumRevisionChange"/>
diff --git a/scrum/webapp/scrum/WEB-INF/controller.xml b/scrum/webapp/scrum/WEB-INF/controller.xml
index 8a54847..41aab3d 100644
--- a/scrum/webapp/scrum/WEB-INF/controller.xml
+++ b/scrum/webapp/scrum/WEB-INF/controller.xml
@@ -761,9 +761,9 @@ under the License.
         <response name="success" type="view" value="ViewTimeSheet"/>
         <response name="error" type="view" value="ViewTimeSheet"/>
     </request-map>
-    <request-map uri="updateTimesheetToInProcess">
+    <request-map uri="processTimesheet">
         <security https="true" auth="true"/>
-        <event type="service" invoke="updateTimesheetToInProcess"/>
+        <event type="service" invoke="updateTimesheet"/>
         <response name="success" type="view" value="ViewTimeSheet"/>
         <response name="error" type="view" value="ViewTimeSheet"/>
     </request-map>
diff --git a/scrum/widget/TimeSheetForms.xml b/scrum/widget/TimeSheetForms.xml
index 90a0ed1..4300990 100644
--- a/scrum/widget/TimeSheetForms.xml
+++ b/scrum/widget/TimeSheetForms.xml
@@ -81,7 +81,7 @@
             </hyperlink>
         </field>
         <field name="inProcessLink" title="${uiLabelMap.StatusToInProcess}" widget-style="buttontext">
-            <hyperlink description="${groovy:statusId.equals(&quot;TIMESHEET_COMPLETED&quot;)?inProcess:&quot;&quot;}" target="updateTimesheetToInProcess" >
+            <hyperlink description="${groovy:statusId.equals(&quot;TIMESHEET_COMPLETED&quot;)?inProcess:&quot;&quot;}" target="processTimesheet" >
                 <parameter param-name="timesheetId"/>
                 <parameter param-name="statusId" value="TIMESHEET_IN_PROCESS"/>
             </hyperlink>