From c81475bc4cc87ca43eb50a0d1efc3221e14eeb16 Mon Sep 17 00:00:00 2001
From: Manuel Rego Casasnovas <mrego@igalia.com>
Date: Fri, 21 May 2010 13:42:57 +0200
Subject: [PATCH]  ItEr58S17AsignacionConsolidacion: Add method to get first
 day not consolidated from a Task.

---
 .../navalplanner/business/planner/entities/Task.java  | 11 +++++++++++
 .../entities/consolidations/Consolidation.java        |  6 ++++++
 2 files changed, 17 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 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();
+    }
+
 }