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

Add method endFor() for calculating last day of day assigments

Browse source 
FEA: ItEr65OTS04CorreccionsRecursosLimitantes
This commit is contained in:
Diego Pino Garcia 2010-12-14 11:10:00 +01:00
parent f86922f056
commit 0ae147676e
1 changed files with 6 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
navalplanner-webapp/src/main/java/org/navalplanner/web/limitingresources/LimitingResourceQueueModel.java
View file

@ -646,8 +646,7 @@ public class LimitingResourceQueueModel implements ILimitingResourceQueueModel {
element.getResourceAllocation().allocateLimitingDayAssignments(
dayAssignments);
DateAndHour endTime = LimitingResourceAllocator
.getLastElementTime(dayAssignments);
DateAndHour endTime = endFor(dayAssignments);
// the assignments can be generated after the required start
startTime = DateAndHour.Max(startTime, startFor(dayAssignments));
if (sameDay(startTime, endTime)) {
@ -661,6 +660,11 @@ public class LimitingResourceQueueModel implements ILimitingResourceQueueModel {
return true;
}
private DateAndHour endFor(List<DayAssignment> dayAssignments) {
DayAssignment last = dayAssignments.get(dayAssignments.size() - 1);
return new DateAndHour(last.getDay(), 0);
}
private DateAndHour startFor(List<DayAssignment> dayAssignments) {
return new DateAndHour(dayAssignments
.get(0).getDay(), 0);