You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@ofbiz.apache.org by nm...@apache.org on 2025/05/11 11:53:20 UTC

(ofbiz-plugins) branch trunk updated: Improved: Slimdown use of ${groovy: } on scrum plugin (OFBIZ-13233)

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

nmalin 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 7b261dd92 Improved: Slimdown use of ${groovy: } on scrum plugin (OFBIZ-13233)
7b261dd92 is described below

commit 7b261dd92a47e6f50d1d4d8fc8500317fe2518d4
Author: Nicolas Malin <ni...@nereide.fr>
AuthorDate: Sun May 11 13:52:42 2025 +0200

    Improved: Slimdown use of ${groovy: } on scrum plugin (OFBIZ-13233)
    
    * Simplify groovy complexity on scriptlet call
    * Remove import that block by security script rules
---
 scrum/minilang/ScrumServices.xml | 20 ++++++++---------
 scrum/widget/scrumForms.xml      | 46 +++++++++++-----------------------------
 2 files changed, 22 insertions(+), 44 deletions(-)

diff --git a/scrum/minilang/ScrumServices.xml b/scrum/minilang/ScrumServices.xml
index 6057e499b..6b7866ccd 100644
--- a/scrum/minilang/ScrumServices.xml
+++ b/scrum/minilang/ScrumServices.xml
@@ -482,11 +482,11 @@
                             <set field="days" value="${dayNr}" type="Integer"/>
                             <set field="hours" from-field="parameters.hoursDay${dayNr}" type="Integer" default-value="0"/>
                             <!-- for fromDate and thuDate with time-->
-                            <set field="leaveFromDate" value="${groovy:import java.sql.Timestamp;
-                                return new Timestamp(fromDate.getTime() + ((int) (24L*60L*60L*1000L*days)));}"/>
+                            <set field="leaveFromDate" value="${groovy: org.apache.ofbiz.base.util.UtilDateTime.addDaysToTimestamp(
+                                fromDate, days)}"/>
                             <set field="emplLeaveFromDate" from-field="leaveFromDate" type="Timestamp"/>
-                            <set field="leaveThruDate" value="${groovy:import java.sql.Timestamp;
-                                return new Timestamp(emplLeaveFromDate.getTime() + ((int) (60L*60L*1000L*hours)));}"/>
+                            <set field="leaveThruDate" value="${groovy: org.apache.ofbiz.base.util.UtilDateTime.adjustTimestamp(
+                                emplLeaveFromDate, Calendar.HOUR, hours)}"/>
                             <set field="emplLeaveThruDate" from-field="leaveThruDate" type="Timestamp"/>
                             <entity-one entity-name="EmplLeave" value-field="emplLeaveMap">
                                 <field-map field-name="partyId" from-field="timesheet.partyId"/>
@@ -527,11 +527,11 @@
                                 <set field="fromDate" from-field="timesheet.fromDate"/>
                                 <set field="days" value="${dayNr}" type="Integer"/>
                                 <set field="hours" from-field="parameters.hoursDay${dayNr}" type="Integer" default-value="0"/>
-                                <set field="leaveFromDate" value="${groovy:import java.sql.Timestamp;
-                                    return new Timestamp(fromDate.getTime() + ((int) (24L*60L*60L*1000L*days)));}"/>
+                                <set field="leaveFromDate" value="${groovy: org.apache.ofbiz.base.util.UtilDateTime.addDaysToTimestamp(
+                                    fromDate, days)}"/>
                                 <set field="emplLeaveFromDate" from-field="leaveFromDate" type="Timestamp"/>
-                                <set field="leaveThruDate" value="${groovy:import java.sql.Timestamp;
-                                return new Timestamp(emplLeaveFromDate.getTime() + ((int) (60L*60L*1000L*hours)));}"/>
+                                <set field="leaveThruDate" value="${groovy: org.apache.ofbiz.base.util.UtilDateTime.adjustTimestamp(
+                                emplLeaveFromDate, Calendar.HOUR, hours)}"/>
                                 <set field="emplLeaveThruDate" from-field="leaveThruDate" type="Timestamp"/>
                                 <entity-one entity-name="EmplLeave" value-field="emplLeave">
                                     <field-map field-name="partyId" from-field="timesheet.partyId"/>
@@ -2739,8 +2739,8 @@
             <field-map field-name="fromDate" from-field="parameters.fromDate"/>
         </entity-one>
         <if-not-empty field="emplLeaveMap">
-            <set field="hours" value="${groovy:import java.sql.Timestamp;
-               return new Double((emplLeaveMap.thruDate.getTime() - emplLeaveMap.fromDate.getTime()) / ((int) (60L*60L*1000L)));}" type="Double"/>
+            <set field="hours" value="${groovy: org.apache.ofbiz.base.util.UtilDateTime.getInterval(emplLeaveMap.fromDate,
+             emplLeaveMap.thruDate) / ((int) (60L*60L*1000L))}" type="Double"/>
            <set field="result.hours" from-field="hours"/>
            <field-to-result field="result.hours" result-name="hours" />
            <else>
diff --git a/scrum/widget/scrumForms.xml b/scrum/widget/scrumForms.xml
index 508b84f49..c6a54cd62 100644
--- a/scrum/widget/scrumForms.xml
+++ b/scrum/widget/scrumForms.xml
@@ -1151,24 +1151,14 @@ under the License.
         </actions>
         <row-actions>
             <set field="isCurrentProject" value="${groovy: 
-                if (request.getAttribute('currentProject') != context.projectId)
-                    request.setAttribute('isCurrentProject', false)
-                else
-                    request.setAttribute('isCurrentProject', true)
-                if (request.getAttribute('currentProject') != context.projectId)
+                    request.setAttribute('isCurrentProject', request.getAttribute('currentProject') == context.projectIdfalse)
                     request.setAttribute('currentProject', context.projectId)
-                return (boolean)request.getAttribute('isCurrentProject')
-                }"
+                    request.getAttribute('isCurrentProject')}"
                 type="Boolean"/>
             <set field="isCurrentCompany" value="${groovy: 
-                if (request.getAttribute('currentCompany') != context.companyId)
-                    request.setAttribute('isCurrentCompany', false)
-                else
-                    request.setAttribute('isCurrentCompany', true)
-                if (request.getAttribute('currentCompany') != context.companyId)
+                    request.setAttribute('isCurrentCompany', request.getAttribute('currentCompany') == context.companyId)
                     request.setAttribute('currentCompany', context.companyId)
-                return (boolean)request.getAttribute('isCurrentCompany')
-                }"
+                    request.getAttribute('isCurrentCompany')}"
                 type="Boolean"/>
             <set field="estimatedHrs" value="${sprintEstimatedMilliSeconds/1000/60/60/40}" type="Integer"/>
             <entity-and entity-name="WorkEffortCustRequestView" list="custRequests">
@@ -1251,15 +1241,9 @@ under the License.
             <set field="currentProject" value="${groovy: request.setAttribute('currentProject', ' ')}" type="String"/>
         </actions>
         <row-actions>
-            <set field="isCurrentProject" value="${groovy: 
-                if (request.getAttribute('currentProject') != context.projectId)
-                    request.setAttribute('isCurrentProject', false)
-                else
-                    request.setAttribute('isCurrentProject', true)
-                if (request.getAttribute('currentProject') != context.projectId)
-                    request.setAttribute('currentProject', context.projectId)
-                return (boolean)request.getAttribute('isCurrentProject')
-                }"
+            <set field="isCurrentProject" value="${groovy:
+                request.setAttribute('isCurrentProject', request.getAttribute('currentProject') != context.projectId)
+                request.getAttribute('isCurrentProject')}"
                 type="Boolean"/>
             <service service-name="getScrumProject" result-map="result">
                 <field-map field-name="projectId" from-field="projectId"/>
@@ -2092,7 +2076,7 @@ under the License.
             <entity-and entity-name="PartyDetailAndWorkEffortAssign" list="sprintMembers" filter-by-date="true">
                 <field-map field-name="workEffortId" from-field="sprintId"/>
             </entity-and>
-            <set field="partyId" value="${groovy: if (assignTo.size() != 0) return assignTo.first().partyId}"/>
+            <set field="partyId" value="${groovy: assignTo?.first()?.partyId}"/>
             <service service-name="getScrumActualHour" result-map="results">
                 <field-map field-name="taskId" from-field="taskId"/>
             </service>
@@ -2385,16 +2369,10 @@ under the License.
             <entity-one entity-name="Person" value-field="person">
                 <field-map field-name="partyId" from-field="ownerRoles[0].partyId"/>
             </entity-one>
-            <set field="isCurrentCompany" value="${groovy: 
-                if (request.getAttribute('currentCompany') != context.groupName)
-                    request.setAttribute('isCurrentCompany', false)
-                else
-                    request.setAttribute('isCurrentCompany', true)
-                if (request.getAttribute('currentCompany') != context.groupName)
+            <set field="isCurrentCompany" value="${groovy:
+                    request.setAttribute('isCurrentCompany', request.getAttribute('currentCompany') == context.groupName)
                     request.setAttribute('currentCompany', context.groupName)
-                return (boolean)request.getAttribute('isCurrentCompany');
-                }"
-                type="Boolean"/>
+                    request.getAttribute('isCurrentCompany')}"/>
             <set field="groupId" from-field="partyAndSecurityGroupList[0].groupId"/> 
             <set field="productTartget" value="${groovy:
                 if (groupId == 'SCRUM_PRODUCT_OWNER')
@@ -2741,7 +2719,7 @@ under the License.
             <entity-and entity-name="WorkEffortPartyAssignment" list="assignTo" filter-by-date="true">
                 <field-map field-name="workEffortId" from-field="taskId"/>
             </entity-and>
-            <set field="partyId" value="${groovy: if (assignTo.size() != 0) return assignTo.first().partyId}"/>
+            <set field="partyId" value="${groovy: assignTo?.first()?.partyId}"/>
             <set field="taskActualMilliSeconds" value="${groovy: if (resultTask.actualMilliSeconds) return actualMilliSeconds/3600000}"/>
             <service service-name="getScrumActualHour" result-map="result">
                 <field-map field-name="taskId" from-field="taskId"/>