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

ItEr29S13CUVistaRecursosTempoEmpresa: Showing resources load just for the dates involved in this order.

Browse source
This commit is contained in:
Manuel Rego Casasnovas 2009-10-06 16:03:01 +02:00 • committed by Javier Moran Rua
parent a3951f98a0
commit d4b3b8b8d7
1 changed files with 13 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -227,8 +227,7 @@ public abstract class OrderPlanningModel implements IOrderPlanningModel {
private Chart getChartComponent(Order order) {
XYModel xymodel = new SimpleXYModel();
addDayAssignmentsLoad(order, xymodel, "order");
addResourcesLoad(order, xymodel, "all");
addLoad(order, xymodel);
Chart chart = new Chart();
chart.setType("time_series");
@ -239,9 +238,9 @@ public abstract class OrderPlanningModel implements IOrderPlanningModel {
return chart;
}
private void addDayAssignmentsLoad(Order order, XYModel xymodel,
String title) {
private void addLoad(Order order, XYModel xymodel) {
List<DayAssignment> dayAssignments = order.getDayAssignments();
String title = "order";
SortedMap<LocalDate, Integer> mapDayAssignments = calculateHoursAdditionByDay(dayAssignments);
for (LocalDate day : mapDayAssignments.keySet()) {
@ -249,10 +248,14 @@ public abstract class OrderPlanningModel implements IOrderPlanningModel {
xymodel.addValue(title, new Long(day.toDateTimeAtStartOfDay()
.getMillis()), hours);
}
addResourcesLoad(order, xymodel, mapDayAssignments.keySet());
}
private void addResourcesLoad(Order order, XYModel xymodel, String title) {
private void addResourcesLoad(Order order, XYModel xymodel,
Set<LocalDate> days) {
List<DayAssignment> dayAssignments = new ArrayList<DayAssignment>();
String title = "all";
Set<Resource> resources = order.getResources();
for (Resource resource : resources) {
@ -261,9 +264,11 @@ public abstract class OrderPlanningModel implements IOrderPlanningModel {
SortedMap<LocalDate, Integer> mapDayAssignments = calculateHoursAdditionByDay(dayAssignments);
for (LocalDate day : mapDayAssignments.keySet()) {
Integer hours = mapDayAssignments.get(day);
xymodel.addValue(title, new Long(day.toDateTimeAtStartOfDay()
.getMillis()), hours);
if (days.contains(day)) {
Integer hours = mapDayAssignments.get(day);
xymodel.addValue(title, new Long(day.toDateTimeAtStartOfDay()
.getMillis()), hours);
}
}
}