From 0ec4a52b78b2d44d89e3189bd121f451617022b2 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C3=93scar=20Gonz=C3=A1lez=20Fern=C3=A1ndez?=
 <ogonzalez@igalia.com>
Date: Sat, 3 Oct 2009 17:52:38 +0200
Subject: [PATCH] ItEr28S06CUAsignacionGrupoRecursosAPlanificacionItEr27S06: It
 can go back from advanced allocation to basic allocation

---
 .../AdvancedAllocationController.java         |  9 +++++-
 .../ResourceAllocationController.java         | 29 +++++++++++++++++--
 .../webapp/planner/advance_allocation.zul     | 16 ----------
 3 files changed, 35 insertions(+), 19 deletions(-)

diff --git a/navalplanner-webapp/src/main/java/org/navalplanner/web/planner/allocation/AdvancedAllocationController.java b/navalplanner-webapp/src/main/java/org/navalplanner/web/planner/allocation/AdvancedAllocationController.java
index 397b7fa66..37c011055 100644
--- a/navalplanner-webapp/src/main/java/org/navalplanner/web/planner/allocation/AdvancedAllocationController.java
+++ b/navalplanner-webapp/src/main/java/org/navalplanner/web/planner/allocation/AdvancedAllocationController.java
@@ -43,7 +43,8 @@ import org.zkoss.zul.Grid;
 import org.zkoss.zul.Label;
 import org.zkoss.zul.api.Column;
 
-public class AdvancedAllocationController extends GenericForwardComposer {
+public abstract class AdvancedAllocationController extends
+        GenericForwardComposer {
 
     private Div insertionPointTimetracker;
     private Div insertionPointLeftPanel;
@@ -83,6 +84,12 @@ public class AdvancedAllocationController extends GenericForwardComposer {
         insertionPointTimetracker.appendChild(timeTrackerComponent);
     }
 
+    public void onClick$acceptButton() {
+        backToPreviousButton();
+    }
+
+    protected abstract void backToPreviousButton();
+
     public void onClick$zoomIncrease() {
         timeTracker.zoomIncrease();
     }
diff --git a/navalplanner-webapp/src/main/java/org/navalplanner/web/planner/allocation/ResourceAllocationController.java b/navalplanner-webapp/src/main/java/org/navalplanner/web/planner/allocation/ResourceAllocationController.java
index 101c6b837..af9b72a6c 100644
--- a/navalplanner-webapp/src/main/java/org/navalplanner/web/planner/allocation/ResourceAllocationController.java
+++ b/navalplanner-webapp/src/main/java/org/navalplanner/web/planner/allocation/ResourceAllocationController.java
@@ -41,6 +41,7 @@ import org.navalplanner.business.resources.entities.Criterion;
 import org.navalplanner.business.resources.entities.Resource;
 import org.navalplanner.business.resources.entities.Worker;
 import org.navalplanner.web.common.ComponentsReplacer;
+import org.navalplanner.web.common.IChildrenSnapshot;
 import org.navalplanner.web.common.IMessagesForUser;
 import org.navalplanner.web.common.Level;
 import org.navalplanner.web.common.MessagesForUser;
@@ -103,6 +104,8 @@ public class ResourceAllocationController extends GenericForwardComposer {
 
     private Button applyButton;
 
+    private IChildrenSnapshot previousSnapshot;
+
     @Override
     public void doAfterCompose(Component comp) throws Exception {
         super.doAfterCompose(comp);
@@ -290,6 +293,7 @@ public class ResourceAllocationController extends GenericForwardComposer {
         resourceAllocationModel.cancel();
     }
 
+
     private void close() {
         self.setVisible(false);
         clear();
@@ -305,16 +309,37 @@ public class ResourceAllocationController extends GenericForwardComposer {
     }
 
     public void advanceAllocation() {
-        ComponentsReplacer.replaceAllChildren(window, "advance_allocation.zul",
+        IChildrenSnapshot snapshot = ComponentsReplacer
+                .replaceAllChildren(window, "advance_allocation.zul",
                 new HashMap<String, Object>() {
                     {
                         put("advancedAllocationController",
-                                new AdvancedAllocationController());
+                                new AdvancedAllocationController() {
+
+                                    @Override
+                                    protected void backToPreviousButton() {
+                                        previousSnapshot.restore();
+                                    }
+                                });
                     }
                 });
+        previousSnapshot = withWidth(snapshot, window.getWidth());
         window.setWidth("1200px");
     }
 
+    private IChildrenSnapshot withWidth(final IChildrenSnapshot snapshot,
+            final String currentWidth) {
+        return new IChildrenSnapshot() {
+
+            @Override
+            public IChildrenSnapshot restore() {
+                IChildrenSnapshot result = snapshot.restore();
+                window.setWidth(currentWidth);
+                return result;
+            }
+        };
+    }
+
     /**
      * Renders a {@link SpecificResourceAllocation} item
      * @author Diego Pino Garcia <dpino@igalia.com>
diff --git a/navalplanner-webapp/src/main/webapp/planner/advance_allocation.zul b/navalplanner-webapp/src/main/webapp/planner/advance_allocation.zul
index 2c5405419..6fa4856ae 100644
--- a/navalplanner-webapp/src/main/webapp/planner/advance_allocation.zul
+++ b/navalplanner-webapp/src/main/webapp/planner/advance_allocation.zul
@@ -35,22 +35,6 @@
         <button label="+" id="zoomIncrease"/>
         <button label="-" id="zoomDecrease"/>
         From: <datebox /> to: <datebox />
-        <separator/>
-        Filter:
-        <combobox>
-            <comboitem label="Orders"
-                description="Show full orders and company view" />
-            <comboitem label="Tasks"
-                description="Tasks inside orders or filtered" />
-        </combobox>
-        <combobox>
-            <comboitem label="Filter by Label" />
-            <comboitem label="Filter by criterion" />
-            <comboitem label="Filter by resources" />
-            <comboitem label="Critical way" />
-        </combobox>
-        <textbox/>
-
        </hbox>
        </north>