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

ItEr58S12GraficaInferiorPantallaCargaRecursosItEr57S13: Now chart at resource load view just show information for the selected dates.

Browse source
This commit is contained in:
Manuel Rego Casasnovas 2010-05-18 11:51:36 +02:00 • committed by Javier Moran Rua
parent 4182c67fee
commit a97fb6342f
1 changed files with 32 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

38
navalplanner-webapp/src/main/java/org/navalplanner/web/resourceload/ResourceLoadController.java
View file

@ -497,8 +497,19 @@ public class ResourceLoadController implements Composer {
resetMinimumAndMaximumValueForChart();
Plotinfo plotInfoLoad = createPlotinfo(getLoad(interval.getStart(),
interval.getFinish()), interval);
Date start = interval.getStart();
Date finish = interval.getFinish();
if ((resourceLoadModel.getInitDateFilter() != null)
&& (resourceLoadModel.getInitDateFilter().compareTo(start) > 0)) {
start = resourceLoadModel.getInitDateFilter();
}
if ((resourceLoadModel.getEndDateFilter() != null)
&& (resourceLoadModel.getEndDateFilter().compareTo(finish) < 0)) {
finish = resourceLoadModel.getEndDateFilter();
}
Plotinfo plotInfoLoad = createPlotinfo(getLoad(start, finish),
interval);
plotInfoLoad
.setFillColor(CompanyPlanningModel.COLOR_ASSIGNED_LOAD_GLOBAL);
plotInfoLoad.setLineWidth(0);
@ -511,8 +522,7 @@ public class ResourceLoadController implements Composer {
plotInfoMax.setFillColor("#FFFFFF");
plotInfoMax.setLineWidth(2);
Plotinfo plotInfoOverload = createPlotinfo(getOverload(interval
.getStart(), interval.getFinish()), interval);
Plotinfo plotInfoOverload = createPlotinfo(getOverload(start, finish), interval);
plotInfoOverload
.setFillColor(CompanyPlanningModel.COLOR_OVERLOAD_GLOBAL);
plotInfoOverload.setLineWidth(0);
@ -535,7 +545,15 @@ public class ResourceLoadController implements Composer {
SortedMap<LocalDate, Map<Resource, Integer>> dayAssignmentGrouped = groupDayAssignmentsByDayAndResource(dayAssignments);
SortedMap<LocalDate, BigDecimal> mapDayAssignments = calculateHoursAdditionByDayWithoutOverload(dayAssignmentGrouped);
return mapDayAssignments;
SortedMap<LocalDate, BigDecimal> result = new TreeMap<LocalDate, BigDecimal>();
for (LocalDate day : mapDayAssignments.keySet()) {
if ((day.compareTo(new LocalDate(start)) >= 0)
&& (day.compareTo(new LocalDate(finish)) <= 0)) {
result.put(day, mapDayAssignments.get(day));
}
}
return result;
}
private SortedMap<LocalDate, BigDecimal> getOverload(Date start,
@ -557,7 +575,15 @@ public class ResourceLoadController implements Composer {
}
}
return mapDayAssignments;
SortedMap<LocalDate, BigDecimal> result = new TreeMap<LocalDate, BigDecimal>();
for (LocalDate day : mapDayAssignments.keySet()) {
if ((day.compareTo(new LocalDate(start)) >= 0)
&& (day.compareTo(new LocalDate(finish)) <= 0)) {
result.put(day, mapDayAssignments.get(day));
}
}
return result;
}
private SortedMap<LocalDate, BigDecimal> calculateHoursAdditionByDayWithoutOverload(