From 59f6fb165e230f5bfe2b6f818a4960e254d1f34d Mon Sep 17 00:00:00 2001 From: Manuel Rego Casasnovas Date: Wed, 11 Jan 2012 12:24:59 +0100 Subject: [PATCH] Bug #1329: Now tasks are not enlarged and nothing breaks just after selecting a stretches function This fix the issue described in previous commit. However, the bug itself is not fixed yet and needs more work in the stretches function allocation. FEA: ItEr76S04BugFixing --- .../business/planner/entities/StretchesFunction.java | 8 +------- .../planner/entities/StretchesFunctionTypeEnum.java | 3 ++- 2 files changed, 3 insertions(+), 8 deletions(-) diff --git a/libreplan-business/src/main/java/org/libreplan/business/planner/entities/StretchesFunction.java b/libreplan-business/src/main/java/org/libreplan/business/planner/entities/StretchesFunction.java index 8e823bb4c..52dc2a615 100644 --- a/libreplan-business/src/main/java/org/libreplan/business/planner/entities/StretchesFunction.java +++ b/libreplan-business/src/main/java/org/libreplan/business/planner/entities/StretchesFunction.java @@ -131,14 +131,8 @@ public class StretchesFunction extends AssignmentFunction { LocalDate startInclusive, LocalDate taskEnd, int intervalHours) { Validate.isTrue(!isConsolidated()); - - // End has to be exclusive on last Stretch - LocalDate endDate = getEnd(); - if (endDate.equals(taskEnd)) { - endDate = endDate.plusDays(1); - } resourceAllocation.withPreviousAssociatedResources() - .onInterval(getStartFor(startInclusive), endDate) + .onInterval(getStartFor(startInclusive), getEnd()) .allocateHours(intervalHours); } diff --git a/libreplan-business/src/main/java/org/libreplan/business/planner/entities/StretchesFunctionTypeEnum.java b/libreplan-business/src/main/java/org/libreplan/business/planner/entities/StretchesFunctionTypeEnum.java index 037fc6c17..b2dbd31fd 100644 --- a/libreplan-business/src/main/java/org/libreplan/business/planner/entities/StretchesFunctionTypeEnum.java +++ b/libreplan-business/src/main/java/org/libreplan/business/planner/entities/StretchesFunctionTypeEnum.java @@ -216,7 +216,8 @@ public enum StretchesFunctionTypeEnum { intervals.addAll(stretchesFunction.getIntervalsDefinedByStreches()); LocalDate startInclusive = resourceAllocation.getFirstNonConsolidatedDate(); - LocalDate endExclusive = resourceAllocation.getEndDate(); + LocalDate endExclusive = resourceAllocation.getIntraDayEndDate() + .asExclusiveEnd(); int totalHours = resourceAllocation.getNonConsolidatedHours(); apply(resourceAllocation, intervals, startInclusive, endExclusive, totalHours); }