From 0f247ae0390f5c6b88fbdadbe8ccf56359f6bd63 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=C3=93scar=20Gonz=C3=A1lez=20Fern=C3=A1ndez?= Date: Fri, 10 Dec 2010 17:10:25 +0100 Subject: [PATCH] [Bug #749] Fix bug When the task is limiting but has not been assigned yet, the end date must be modified when the task is moved. FEA: ItEr64S03BugFixing --- .../org/navalplanner/business/planner/entities/Task.java | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/navalplanner-business/src/main/java/org/navalplanner/business/planner/entities/Task.java b/navalplanner-business/src/main/java/org/navalplanner/business/planner/entities/Task.java index 0ccd7ed6b..e18dd0800 100644 --- a/navalplanner-business/src/main/java/org/navalplanner/business/planner/entities/Task.java +++ b/navalplanner-business/src/main/java/org/navalplanner/business/planner/entities/Task.java @@ -223,6 +223,10 @@ public class Task extends TaskElement implements ITaskLeafConstraint { && resourceAllocation.isLimitingAndHasDayAssignments(); } + private boolean isLimitingAndNotAssignedYet() { + return isLimiting() && !isLimitingAndHasDayAssignments(); + } + public void addResourceAllocation(ResourceAllocation resourceAllocation) { addResourceAllocation(resourceAllocation, true); } @@ -460,7 +464,8 @@ public class Task extends TaskElement implements ITaskLeafConstraint { return; } if (calculatedValue != CalculatedValue.END_DATE - || getSatisfiedResourceAllocations().isEmpty()) { + || getSatisfiedResourceAllocations().isEmpty() + || isLimitingAndNotAssignedYet()) { setIntraDayEndDate(calculateEndKeepingLength(newStartDate)); } setIntraDayStartDate(newStartDate);