RenJuan/TASKPM
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Change getSmallestStartDateFromChildren result type to IntraDayDate

Browse source 
FEA: ItEr61S08TimeUnitConfigurablePlanning
This commit is contained in:
Óscar González Fernández 2010-10-06 20:44:09 +02:00
parent 7d48bb69f2
commit 79ccf427e7
2 changed files with 10 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

13
navalplanner-business/src/main/java/org/navalplanner/business/planner/entities/TaskGroup.java
View file

@ -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 <ogonzalez@igalia.com>
@ -186,15 +187,15 @@ public class TaskGroup extends TaskElement {
return false;
}
public Date getSmallestStartDateFromChildren() {
public IntraDayDate getSmallestStartDateFromChildren() {
return Collections.min(getChildrenStartDates());
}
private List<Date> getChildrenStartDates() {
List<Date> dates = new ArrayList<Date>();
for (TaskElement taskElement : getChildren()) {
dates.add(taskElement.getStartDate());
private List<IntraDayDate> getChildrenStartDates() {
List<IntraDayDate> result = new ArrayList<IntraDayDate>();
for (TaskElement each : getChildren()) {
result.add(each.getIntraDayStartDate());
}
return dates;
return result;
}
}

4
navalplanner-webapp/src/main/java/org/navalplanner/web/common/TemplateModel.java
View file

@ -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