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

ItEr30S17ValidacionEProbasFuncionais: Fixing maximum capacity line in order chart.

Browse source
This commit is contained in:
Manuel Rego Casasnovas 2009-10-14 18:35:53 +02:00 • committed by Javier Moran Rua
parent 564d384cf5
commit e04bc398f3
1 changed files with 19 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

26
navalplanner-webapp/src/main/java/org/navalplanner/web/planner/OrderPlanningModel.java
View file

@ -29,6 +29,7 @@ import java.util.Collection;
import java.util.Collections;
import java.util.Comparator;
import java.util.Date;
import java.util.HashSet;
import java.util.List;
import java.util.Set;
import java.util.SortedMap;
@ -522,6 +523,8 @@ public abstract class OrderPlanningModel implements IOrderPlanningModel {
});
Set<Resource> resroucesAlreadyUsed = new HashSet<Resource>();
for (DayAssignment dayAssignment : dayAssignments) {
LocalDate day = dayAssignment.getDay();
Integer hours = 0;
@ -539,13 +542,22 @@ public abstract class OrderPlanningModel implements IOrderPlanningModel {
}
if (calendarHours) {
ResourceCalendar calendar = dayAssignment.getResource()
.getCalendar();
if (calendar != null) {
hours = calendar.getWorkableHours(dayAssignment.getDay());
} else {
hours = SameWorkHoursEveryDay.getDefaultWorkingDay()
.getWorkableHours(dayAssignment.getDay());
Resource resource = dayAssignment.getResource();
if (map.get(day) == null) {
resroucesAlreadyUsed.clear();
}
if (!resroucesAlreadyUsed.contains(resource)) {
resroucesAlreadyUsed.add(resource);
ResourceCalendar calendar = resource.getCalendar();
if (calendar != null) {
hours = calendar.getWorkableHours(dayAssignment
.getDay());
} else {
hours = SameWorkHoursEveryDay.getDefaultWorkingDay()
.getWorkableHours(dayAssignment.getDay());
}
}
} else {
hours = dayAssignment.getHours();