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 0c3bf5451..d0c0bc0ee 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 @@ -612,4 +612,15 @@ public class Task extends TaskElement { public boolean hasConsolidations() { return ((consolidation != null) && (!consolidation.isEmpty())); } + + public LocalDate getFirstDayNotConsolidated() { + if (consolidation != null) { + LocalDate until = consolidation.getConsolidatedUntil(); + if (until != null) { + return until.plusDays(1); + } + } + return LocalDate.fromDateFields(getStartDate()); + } + } diff --git a/navalplanner-business/src/main/java/org/navalplanner/business/planner/entities/consolidations/Consolidation.java b/navalplanner-business/src/main/java/org/navalplanner/business/planner/entities/consolidations/Consolidation.java index 4959fed19..63fc245bd 100644 --- a/navalplanner-business/src/main/java/org/navalplanner/business/planner/entities/consolidations/Consolidation.java +++ b/navalplanner-business/src/main/java/org/navalplanner/business/planner/entities/consolidations/Consolidation.java @@ -22,6 +22,7 @@ package org.navalplanner.business.planner.entities.consolidations; import java.util.SortedSet; +import org.joda.time.LocalDate; import org.navalplanner.business.common.BaseEntity; import org.navalplanner.business.planner.entities.Task; @@ -54,4 +55,9 @@ public abstract class Consolidation extends BaseEntity { return task; } + public LocalDate getConsolidatedUntil() { + ConsolidatedValue last = getConsolidatedValues().last(); + return (last == null) ? null : last.getDate(); + } + }