From bc96b3b2d4da19dc867fbfaf578e11df7cfbfe4f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=C3=93scar=20Gonz=C3=A1lez=20Fern=C3=A1ndez?= Date: Thu, 11 Nov 2010 16:57:29 +0100 Subject: [PATCH] When resizing a task the workable days are updated FEA: ItEr61OTS04PlanificacionHaciaAtras --- .../org/navalplanner/business/planner/entities/Task.java | 7 +++++++ .../business/planner/entities/TaskElement.java | 5 +++++ 2 files changed, 12 insertions(+) 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 c0a4a53da..333a047e2 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 @@ -628,6 +628,13 @@ public class Task extends TaskElement implements ITaskLeafConstraint { || resourceAllocations.isEmpty(); } + @Override + protected void updateWorkableDays() { + if (workableDays != null) { + workableDays = getWorkableDaysBetweenDates(); + } + } + @Override public boolean canBeExplicitlyResized() { return canBeResized() && !isSubcontracted(); diff --git a/navalplanner-business/src/main/java/org/navalplanner/business/planner/entities/TaskElement.java b/navalplanner-business/src/main/java/org/navalplanner/business/planner/entities/TaskElement.java index 1607f82e9..d012dc11f 100644 --- a/navalplanner-business/src/main/java/org/navalplanner/business/planner/entities/TaskElement.java +++ b/navalplanner-business/src/main/java/org/navalplanner/business/planner/entities/TaskElement.java @@ -314,11 +314,16 @@ public abstract class TaskElement extends BaseEntity { } boolean sameDay = this.endDate.areSameDay(endDate.getDate()); setIntraDayEndDate(endDate); + updateWorkableDays(); if (!sameDay) { moveAllocations(scenario); } } + // default implementation meant to be override + protected void updateWorkableDays() { + } + protected abstract boolean canBeResized(); /**