This is an automated email from the ASF dual-hosted git repository.
mridulpathak 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 b34f87ebc Fixed: ProjectServices regressions in date combining and
project scheduling (OFBIZ-13529)
b34f87ebc is described below
commit b34f87ebc21de9bc893f63dc2db7dfa02a59cbf9
Author: Mridul Pathak <[email protected]>
AuthorDate: Thu Sep 10 13:31:35 2026 +0530
Fixed: ProjectServices regressions in date combining and project scheduling
(OFBIZ-13529)
- Restore empty check fallback in combineDatesAndPlannedHoursInfo when
highInfo.actualStartDate is null
- Correct iteration element property access when clearing estimated dates
in scheduleProject
- Fix predecessor lookup condition (workEffortIdTo) and hours extraction
from nested taskInfo
- Fix predecessor ID resolution and advance taskId to prevent infinite loop
- Correct parent workEffort field lookup to workEffortParentId
---
.../ofbiz/projectmgr/ProjectServicesScript.groovy | 27 +++++++++++++---------
1 file changed, 16 insertions(+), 11 deletions(-)
diff --git
a/projectmgr/src/main/groovy/org/apache/ofbiz/projectmgr/ProjectServicesScript.groovy
b/projectmgr/src/main/groovy/org/apache/ofbiz/projectmgr/ProjectServicesScript.groovy
index 31cf18ea4..bd597721e 100644
---
a/projectmgr/src/main/groovy/org/apache/ofbiz/projectmgr/ProjectServicesScript.groovy
+++
b/projectmgr/src/main/groovy/org/apache/ofbiz/projectmgr/ProjectServicesScript.groovy
@@ -278,38 +278,43 @@ Map scheduleProject() {
startDate = tasks[0].actualStartDate
taskId = tasks[0].workEffortId
tasks.each {
- tasks.estimatedStartDate = null
- tasks.estimatedCompletionDate = null
+ it.estimatedStartDate = null
+ it.estimatedCompletionDate = null
}
} else {
generalStartDate = UtilDateTime.nowTimestamp()
}
+ String predecessorId = null
while (!generalStartDate) {
BigDecimal highestHours
List assocs = from('WorkEffortAssoc')
- .where(workEffortId: taskId)
+ .where(workEffortIdTo: taskId)
.queryList()
if (assocs) {
assocs.each {
BigDecimal hours = 0
Map task = run service: 'getProjectTask', with: [taskId:
it.workEffortIdFrom]
- if (task.estimatedHours && task.actualHours) {
- hours = (task.estimatedHours < task.actualHours) ?
task.actualHours : task.estimatedHours
+ Map taskInfo = task?.taskInfo ?: [:]
+ BigDecimal estimatedHours = (taskInfo.plannedHours ?:
taskInfo.estimatedHours) as BigDecimal
+ BigDecimal actualHours = taskInfo.actualHours as BigDecimal
+ if (estimatedHours && actualHours) {
+ hours = (estimatedHours < actualHours) ? actualHours :
estimatedHours
} else {
- hours = task.actualHours ?: 16
+ hours = actualHours ?: (estimatedHours ?: 16)
}
if (!highestHours || highestHours < hours) {
highestHours = hours
- preDesessorId = task.taskId
+ predecessorId = it.workEffortIdFrom
}
}
+ taskId = predecessorId
BigDecimal taskDays = -(highestHours / 8)
- startDate = UtilDateTime.addDaysToTimestamp(startDate, taskDays)
+ startDate = UtilDateTime.addDaysToTimestamp(startDate, taskDays as
Double)
} else {
GenericValue workEffort = from('WorkEffort').where(workEffortId:
taskId).queryOne()
- if (workEffort.parentWorkEffortId) {
- taskId = workEffort.parentWorkEffortId
+ if (workEffort?.workEffortParentId) {
+ taskId = workEffort.workEffortParentId
} else {
generalStartDate = startDate
}
@@ -1090,7 +1095,7 @@ private Map combineDatesAndPlannedHoursInfo(Map highInfo)
{
.where(condition)
.select('actualEntryStartDate')
.queryFirst()
- if (timeEntriesInfo && highInfo.actualStartDate >
timeEntriesInfo.actualEntryStartDate) {
+ if (timeEntriesInfo?.actualEntryStartDate && (!highInfo.actualStartDate ||
highInfo.actualStartDate > timeEntriesInfo.actualEntryStartDate)) {
highInfo.actualStartDate = timeEntriesInfo.actualEntryStartDate
}
return highInfo
