diff --git a/navalplanner-webapp/src/main/java/org/navalplanner/web/planner/order/OrderPlanningModel.java b/navalplanner-webapp/src/main/java/org/navalplanner/web/planner/order/OrderPlanningModel.java index 2594c49a7..7098f42c5 100644 --- a/navalplanner-webapp/src/main/java/org/navalplanner/web/planner/order/OrderPlanningModel.java +++ b/navalplanner-webapp/src/main/java/org/navalplanner/web/planner/order/OrderPlanningModel.java @@ -1092,7 +1092,7 @@ public abstract class OrderPlanningModel implements IOrderPlanningModel { SortedMap> orderDayAssignmentsGrouped = groupDayAssignmentsByDayAndResource(orderDayAssignments); List resourcesDayAssignments = new ArrayList(); - for (Resource resource : order.getResources()) { + for (Resource resource : reloadResources(order.getResources())) { resourcesDayAssignments.addAll(resource.getAssignments()); } SortedMap> resourceDayAssignmentsGrouped = groupDayAssignmentsByDayAndResource(resourcesDayAssignments); @@ -1145,6 +1145,17 @@ public abstract class OrderPlanningModel implements IOrderPlanningModel { chart.setHeight("150px"); } + private List reloadResources( + Collection resources) { + List result = new ArrayList(); + for (Resource each : resources) { + Resource reloaded = resourceDAO + .findExistingEntity(each.getId()); + result.add(reloaded); + } + return result; + } + private void resetMaps() { mapOrderLoad.clear(); mapOrderOverload.clear();