diff --git a/navalplanner-webapp/src/main/java/org/navalplanner/web/planner/OrderPlanningModel.java b/navalplanner-webapp/src/main/java/org/navalplanner/web/planner/OrderPlanningModel.java index e56ecd6eb..56d89cd77 100644 --- a/navalplanner-webapp/src/main/java/org/navalplanner/web/planner/OrderPlanningModel.java +++ b/navalplanner-webapp/src/main/java/org/navalplanner/web/planner/OrderPlanningModel.java @@ -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 dayAssignments = order.getDayAssignments(); + String title = "order"; SortedMap 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 days) { List dayAssignments = new ArrayList(); + String title = "all"; Set resources = order.getResources(); for (Resource resource : resources) { @@ -261,9 +264,11 @@ public abstract class OrderPlanningModel implements IOrderPlanningModel { SortedMap 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); + } } }