From cbd9fcfcddbc82456b87150bbcbce8a07972058c Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C3=93scar=20Gonz=C3=A1lez=20Fern=C3=A1ndez?=
 <ogonzalez@igalia.com>
Date: Thu, 10 Jun 2010 18:37:59 +0200
Subject: [PATCH] ItEr57S04ValidacionEProbasFuncionaisItEr56S04: [Bug #488] Fix
 bug.

Calling useSchedulingDataFor
---
 .../planner/tabs/AdvancedAllocationTabCreator.java   | 12 +++++++++---
 .../planner/tabs/MultipleTabsPlannerController.java  |  6 +++++-
 2 files changed, 14 insertions(+), 4 deletions(-)

diff --git a/navalplanner-webapp/src/main/java/org/navalplanner/web/planner/tabs/AdvancedAllocationTabCreator.java b/navalplanner-webapp/src/main/java/org/navalplanner/web/planner/tabs/AdvancedAllocationTabCreator.java
index 3c93eb559..de1e3cf54 100644
--- a/navalplanner-webapp/src/main/java/org/navalplanner/web/planner/tabs/AdvancedAllocationTabCreator.java
+++ b/navalplanner-webapp/src/main/java/org/navalplanner/web/planner/tabs/AdvancedAllocationTabCreator.java
@@ -186,30 +186,35 @@ public class AdvancedAllocationTabCreator {
     private final ITaskElementDAO taskElementDAO;
 
     private final IResourceDAO resourceDAO;
+    private final Scenario currentScenario;
 
     public static ITab create(final Mode mode,
             IAdHocTransactionService adHocTransactionService,
             IOrderDAO orderDAO, ITaskElementDAO taskElementDAO,
-            IResourceDAO resourceDAO, IBack onBack) {
+            IResourceDAO resourceDAO, Scenario currentScenario,
+            IBack onBack) {
         return new AdvancedAllocationTabCreator(mode, adHocTransactionService,
-                orderDAO, taskElementDAO, resourceDAO, onBack).build();
+                orderDAO, taskElementDAO, resourceDAO, currentScenario, onBack)
+                .build();
     }
 
     private AdvancedAllocationTabCreator(Mode mode,
             IAdHocTransactionService adHocTransactionService,
             IOrderDAO orderDAO, ITaskElementDAO taskElementDAO,
-            IResourceDAO resourceDAO, IBack onBack) {
+            IResourceDAO resourceDAO, Scenario currentScenario, IBack onBack) {
         Validate.notNull(mode);
         Validate.notNull(adHocTransactionService);
         Validate.notNull(orderDAO);
         Validate.notNull(resourceDAO);
         Validate.notNull(onBack);
+        Validate.notNull(currentScenario);
         this.adHocTransactionService = adHocTransactionService;
         this.orderDAO = orderDAO;
         this.mode = mode;
         this.onBack = onBack;
         this.taskElementDAO = taskElementDAO;
         this.resourceDAO = resourceDAO;
+        this.currentScenario = currentScenario;
     }
 
     private ITab build() {
@@ -277,6 +282,7 @@ public class AdvancedAllocationTabCreator {
 
     private List<AllocationInput> createAllocationInputsFor(Order order) {
         Order orderReloaded = reload(order);
+        orderReloaded.useSchedulingDataFor(currentScenario);
         return createAllocationsWithOrderReloaded(orderReloaded);
     }
 
diff --git a/navalplanner-webapp/src/main/java/org/navalplanner/web/planner/tabs/MultipleTabsPlannerController.java b/navalplanner-webapp/src/main/java/org/navalplanner/web/planner/tabs/MultipleTabsPlannerController.java
index f479e2293..fe8455bbb 100644
--- a/navalplanner-webapp/src/main/java/org/navalplanner/web/planner/tabs/MultipleTabsPlannerController.java
+++ b/navalplanner-webapp/src/main/java/org/navalplanner/web/planner/tabs/MultipleTabsPlannerController.java
@@ -31,6 +31,7 @@ import org.navalplanner.business.orders.entities.OrderElement;
 import org.navalplanner.business.planner.daos.ITaskElementDAO;
 import org.navalplanner.business.planner.entities.TaskElement;
 import org.navalplanner.business.resources.daos.IResourceDAO;
+import org.navalplanner.business.scenarios.IScenarioManager;
 import org.navalplanner.web.common.entrypoints.URLHandler;
 import org.navalplanner.web.common.entrypoints.URLHandlerRegistry;
 import org.navalplanner.web.limitingresources.LimitingResourcesController;
@@ -170,6 +171,9 @@ public class MultipleTabsPlannerController implements Composer,
     @Autowired
     private URLHandlerRegistry registry;
 
+    @Autowired
+    private IScenarioManager scenarioManager;
+
     private TabsConfiguration buildTabsConfiguration() {
 
         Map<String, String[]> parameters = getURLQueryParametersMap();
@@ -233,7 +237,7 @@ public class MultipleTabsPlannerController implements Composer,
         final State<Void> typeChanged = typeChangedState();
         ITab advancedAllocation = doFeedbackOn(AdvancedAllocationTabCreator.create(mode,
                 transactionService, orderDAO, taskElementDAO, resourceDAO,
-                returnToPlanningTab()));
+                scenarioManager.getCurrent(), returnToPlanningTab()));
         return TabsConfiguration.create()
             .add(tabWithNameReloading(planningTab, typeChanged))
             .add(tabWithNameReloading(resourceLoadTab, typeChanged))