From 79ccf427e795a8404b2bbf38df2603a297bef228 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=C3=93scar=20Gonz=C3=A1lez=20Fern=C3=A1ndez?= Date: Wed, 6 Oct 2010 20:44:09 +0200 Subject: [PATCH] Change getSmallestStartDateFromChildren result type to IntraDayDate FEA: ItEr61S08TimeUnitConfigurablePlanning --- .../business/planner/entities/TaskGroup.java | 13 +++++++------ .../org/navalplanner/web/common/TemplateModel.java | 4 +++- 2 files changed, 10 insertions(+), 7 deletions(-) diff --git a/navalplanner-business/src/main/java/org/navalplanner/business/planner/entities/TaskGroup.java b/navalplanner-business/src/main/java/org/navalplanner/business/planner/entities/TaskGroup.java index 7e69dd1c6..231bce2e3 100644 --- a/navalplanner-business/src/main/java/org/navalplanner/business/planner/entities/TaskGroup.java +++ b/navalplanner-business/src/main/java/org/navalplanner/business/planner/entities/TaskGroup.java @@ -33,6 +33,7 @@ import org.apache.commons.lang.Validate; import org.hibernate.validator.AssertTrue; import org.navalplanner.business.orders.entities.TaskSource; import org.navalplanner.business.scenarios.entities.Scenario; +import org.navalplanner.business.workingday.IntraDayDate; /** * @author Óscar González Fernández @@ -186,15 +187,15 @@ public class TaskGroup extends TaskElement { return false; } - public Date getSmallestStartDateFromChildren() { + public IntraDayDate getSmallestStartDateFromChildren() { return Collections.min(getChildrenStartDates()); } - private List getChildrenStartDates() { - List dates = new ArrayList(); - for (TaskElement taskElement : getChildren()) { - dates.add(taskElement.getStartDate()); + private List getChildrenStartDates() { + List result = new ArrayList(); + for (TaskElement each : getChildren()) { + result.add(each.getIntraDayStartDate()); } - return dates; + return result; } } diff --git a/navalplanner-webapp/src/main/java/org/navalplanner/web/common/TemplateModel.java b/navalplanner-webapp/src/main/java/org/navalplanner/web/common/TemplateModel.java index fad5176e6..2ba63d5e5 100644 --- a/navalplanner-webapp/src/main/java/org/navalplanner/web/common/TemplateModel.java +++ b/navalplanner-webapp/src/main/java/org/navalplanner/web/common/TemplateModel.java @@ -280,7 +280,9 @@ public class TemplateModel implements ITemplateModel { @Override public Date getSmallestBeginDateFromChildrenFor(TaskElement container) { TaskGroup taskGroup = (TaskGroup) container; - return taskGroup.getSmallestStartDateFromChildren(); + IntraDayDate smallestStart = taskGroup + .getSmallestStartDateFromChildren(); + return smallestStart.toDateTimeAtStartOfDay().toDate(); } @Override