From 2a645b4bca614b654f9d542957519201799f568a Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C3=93scar=20Gonz=C3=A1lez=20Fern=C3=A1ndez?=
 <ogonzalez@igalia.com>
Date: Wed, 22 Sep 2010 12:51:12 +0200
Subject: [PATCH] Expose start and endData of ResourceAllocation as
 IntraDayDate properties

FEA: ItEr60S19TimeUnitDataType
---
 .../planner/entities/ResourceAllocation.java  | 20 +++++++++++++++++--
 1 file changed, 18 insertions(+), 2 deletions(-)

diff --git a/navalplanner-business/src/main/java/org/navalplanner/business/planner/entities/ResourceAllocation.java b/navalplanner-business/src/main/java/org/navalplanner/business/planner/entities/ResourceAllocation.java
index d51b34a6f..bead7796e 100644
--- a/navalplanner-business/src/main/java/org/navalplanner/business/planner/entities/ResourceAllocation.java
+++ b/navalplanner-business/src/main/java/org/navalplanner/business/planner/entities/ResourceAllocation.java
@@ -1088,15 +1088,31 @@ public abstract class ResourceAllocation<T extends DayAssignment> extends
     }
 
     public LocalDate getStartDate() {
-        return LocalDate.fromDateFields(task.getStartDate());
+        IntraDayDate start = getIntraDayStartDate();
+        return start != null ? start.getDate() : null;
+    }
+
+    public IntraDayDate getIntraDayStartDate() {
+        return task.getIntraDayStartDate();
     }
 
     public LocalDate getEndDate() {
+        IntraDayDate intraDayEndDate = getIntraDayEndDate();
+        return intraDayEndDate != null ? intraDayEndDate.getDate() : null;
+    }
+
+    public IntraDayDate getIntraDayEndDate() {
+        IntraDayDate intraDayEnd = getDayAssignmentsState().getIntraDayEnd();
+        if (intraDayEnd != null) {
+            return intraDayEnd;
+        }
+
         List<? extends DayAssignment> assignments = getAssignments();
         if (assignments.isEmpty()) {
             return null;
         }
-        return assignments.get(assignments.size() - 1).getDay().plusDays(1);
+        DayAssignment lastAssignment = assignments.get(assignments.size() - 1);
+        return IntraDayDate.startOfDay(lastAssignment.getDay().plusDays(1));
     }
 
     public boolean isAlreadyFinishedBy(LocalDate date) {