From 75017c9fe89fb41da91c77339f033a300db41ee5 Mon Sep 17 00:00:00 2001
From: Manuel Rego Casasnovas <mrego@igalia.com>
Date: Fri, 11 Jun 2010 08:12:05 +0200
Subject: [PATCH]  ItEr59S04ValidacionEProbasFuncionaisItEr58S04: [Bug #497]
 Resources are reloaded in order to show the load chart.

While allocating DayAssignments are resources are changed, but Order.getResources() still returns the old resources with the original DayAssignments. This list of resources is reloaded in order to get just the new DayAssignments.
---
 .../web/planner/order/OrderPlanningModel.java       | 13 ++++++++++++-
 1 file changed, 12 insertions(+), 1 deletion(-)

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<LocalDate, Map<Resource, Integer>> orderDayAssignmentsGrouped = groupDayAssignmentsByDayAndResource(orderDayAssignments);
 
             List<DayAssignment> resourcesDayAssignments = new ArrayList<DayAssignment>();
-            for (Resource resource : order.getResources()) {
+            for (Resource resource : reloadResources(order.getResources())) {
                 resourcesDayAssignments.addAll(resource.getAssignments());
             }
             SortedMap<LocalDate, Map<Resource, Integer>> resourceDayAssignmentsGrouped = groupDayAssignmentsByDayAndResource(resourcesDayAssignments);
@@ -1145,6 +1145,17 @@ public abstract class OrderPlanningModel implements IOrderPlanningModel {
             chart.setHeight("150px");
         }
 
+        private List<Resource> reloadResources(
+                Collection<? extends Resource> resources) {
+            List<Resource> result = new ArrayList<Resource>();
+            for (Resource each : resources) {
+                Resource reloaded = resourceDAO
+                        .findExistingEntity(each.getId());
+                result.add(reloaded);
+            }
+            return result;
+        }
+
         private void resetMaps() {
             mapOrderLoad.clear();
             mapOrderOverload.clear();