From 60e4f47fa1ed71b9a5e3e05ba701ec0ecfdb264e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=C3=93scar=20Gonz=C3=A1lez=20Fern=C3=A1ndez?= Date: Tue, 22 Jun 2010 10:08:22 +0200 Subject: [PATCH] ItEr60S04ValidacionEProbasFuncionaisItEr59S04: [Bug #529] Fix bug by reverting commit that introduced it. Revert " ItEr59S04ValidacionEProbasFuncionaisItEr58S04: [Bug #497] It also needed to reload the resources that are gotten from the day assignments." This reverts commit 401ac50fd9c8dc2a234013348bbd820d0f62de30. --- .../web/planner/order/OrderPlanningModel.java | 13 ------------- 1 file changed, 13 deletions(-) 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 80f6ce9bd..3d385d9bb 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 @@ -1176,19 +1176,6 @@ public abstract class OrderPlanningModel implements IOrderPlanningModel { List orderDayAssignments = order.getDayAssignments(); SortedMap> orderDayAssignmentsGrouped = groupDayAssignmentsByDayAndResource(orderDayAssignments); - SortedMap> orderDayAssignmentsGroupedReloaded = new TreeMap>(); - for (LocalDate day : orderDayAssignmentsGrouped.keySet()) { - Map map = new HashMap(); - for (Resource resource : orderDayAssignmentsGrouped.get(day) - .keySet()) { - Resource resourceReloaded = reloadResources( - Arrays.asList(resource)).get(0); - map.put(resourceReloaded, orderDayAssignmentsGrouped.get( - day).get(resource)); - } - orderDayAssignmentsGroupedReloaded.put(day, map); - } - orderDayAssignmentsGrouped = orderDayAssignmentsGroupedReloaded; List resourcesDayAssignments = new ArrayList(); for (Resource resource : reloadResources(order.getResources())) {