From 9a0d2438aed47dff5855f69a69ac89c5bd05388f Mon Sep 17 00:00:00 2001
From: Lorenzo Tilve <ltilve@igalia.com>
Date: Tue, 16 Mar 2010 09:43:57 +0100
Subject: [PATCH]  ItEr50S12CUAsignacionGrupoRecursosAPlanificacionItEr49S17:
 Fixed inconsistence between zoomLevel selected index and advanced assignment
 table contents

---
 .../web/planner/allocation/AdvancedAllocationController.java | 5 +++++
 .../src/main/webapp/planner/advance_allocation.zul           | 2 +-
 2 files changed, 6 insertions(+), 1 deletion(-)

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 f3bbee84d..ba56621cd 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
@@ -83,6 +83,7 @@ import org.zkoss.zul.Hbox;
 import org.zkoss.zul.Intbox;
 import org.zkoss.zul.Label;
 import org.zkoss.zul.ListModel;
+import org.zkoss.zul.Listbox;
 import org.zkoss.zul.Messagebox;
 import org.zkoss.zul.SimpleListModel;
 import org.zkoss.zul.api.Column;
@@ -381,6 +382,8 @@ public class AdvancedAllocationController extends GenericForwardComposer {
 
     private PaginatorFilter paginatorFilter;
 
+    private Listbox advancedAllocationZoomLevel;
+
     private TimeTrackerComponentWithoutColumns timeTrackerComponent;
     private Grid leftPane;
     private TimeTrackedTable<Row> table;
@@ -537,6 +540,8 @@ public class AdvancedAllocationController extends GenericForwardComposer {
         paginatorFilter.setZoomLevel(timeTracker.getDetailLevel());
         paginatorFilter.setInterval(timeTracker.getRealInterval());
         paginationUpButton.setDisabled(isLastPage());
+        advancedAllocationZoomLevel.setSelectedIndex(timeTracker
+                .getDetailLevel().ordinal());
         timeTracker.setFilter(paginatorFilter);
         timeTracker.addZoomListener(new IZoomLevelChangedListener() {
             @Override
diff --git a/navalplanner-webapp/src/main/webapp/planner/advance_allocation.zul b/navalplanner-webapp/src/main/webapp/planner/advance_allocation.zul
index 90c0153d3..66f648ad5 100644
--- a/navalplanner-webapp/src/main/webapp/planner/advance_allocation.zul
+++ b/navalplanner-webapp/src/main/webapp/planner/advance_allocation.zul
@@ -45,7 +45,7 @@
             <button tooltiptext="Page down" image="/common/img/ico_left.png" id="paginationDownButton"
             onClick="advancedAllocationController.paginationDown();" disabled="true" />
             <label>${i18n:_('Zoom level')}:</label>
-            <listbox mold="select" rows="1"
+            <listbox mold="select" rows="1" id="advancedAllocationZoomLevel"
                 model="${advancedAllocationController.zoomLevels}"
                 onSelect="advancedAllocationController.setZoomLevel(self.selectedItem.value);" >
             </listbox>