From c6b490df652417af3edc7bb5c8c9264d52a66b26 Mon Sep 17 00:00:00 2001
From: Susana Montes Pedreira <smontes@wirelessgalicia.com>
Date: Wed, 14 Apr 2010 18:08:50 +0200
Subject: [PATCH]  ItEr53S14CUVistaRecursosTempoPorProxectoItEr49S16 : fix the
 filter of the resource load screen.

Now the selected filter is consistent with the showed information and the zoom level is maintained.
---
 .../resourceload/ResourcesLoadPanel.java      | 20 +++++++++---
 .../web/ganttz/zul/resourcesLoadLayout.zul    |  8 ++---
 .../resourceload/ResourceLoadController.java  | 31 +++++++++++++------
 3 files changed, 39 insertions(+), 20 deletions(-)

diff --git a/ganttzk/src/main/java/org/zkoss/ganttz/resourceload/ResourcesLoadPanel.java b/ganttzk/src/main/java/org/zkoss/ganttz/resourceload/ResourcesLoadPanel.java
index a6239f493..5980f369a 100644
--- a/ganttzk/src/main/java/org/zkoss/ganttz/resourceload/ResourcesLoadPanel.java
+++ b/ganttzk/src/main/java/org/zkoss/ganttz/resourceload/ResourcesLoadPanel.java
@@ -73,9 +73,9 @@ public class ResourcesLoadPanel extends HtmlMacroComponent {
 
     private Listbox listZoomLevels;
 
-    private static final String filterResources = _("Filter by resources");
-    private static final String filterCriterions = _("Filter by criterions");
-    private boolean filterbyResources = true;
+    private static final String filterResources = _("by resources");
+    private static final String filterCriterions = _("by criterions");
+    private Boolean filterbyResources;
 
     public ResourcesLoadPanel(List<LoadTimeLine> groups,
             TimeTracker timeTracker) {
@@ -104,10 +104,11 @@ public class ResourcesLoadPanel extends HtmlMacroComponent {
         } else {
             this.filterbyResources = false;
         }
+        onApplyFilter();
     }
 
     public boolean getFilter() {
-        return filterbyResources;
+        return (filterbyResources == null) ? true : filterbyResources;
     }
 
     public void onApplyFilter() {
@@ -142,12 +143,22 @@ public class ResourcesLoadPanel extends HtmlMacroComponent {
 
     public void add(final IToolbarCommand... commands) {
         Component toolbar = getToolbar();
+        resetToolbar(toolbar);
         Separator separator = getSeparator();
         for (IToolbarCommand c : commands) {
             toolbar.insertBefore(asButton(c), separator);
         }
     }
 
+    private void resetToolbar(Component toolbar) {
+        List<Component> children = toolbar.getChildren();
+        List<Button> buttons = ComponentsFinder.findComponentsOfType(
+                Button.class, children);
+        for (Button b : buttons) {
+            toolbar.removeChild(b);
+        }
+    }
+
     private Button asButton(final IToolbarCommand c) {
         Button result = new Button();
         result.addEventListener(Events.ON_CLICK, new EventListener() {
@@ -224,6 +235,7 @@ public class ResourcesLoadPanel extends HtmlMacroComponent {
     @Override
     public void afterCompose() {
         super.afterCompose();
+        clearComponents();
         getFellow("insertionPointLeftPanel").appendChild(leftPane);
         leftPane.afterCompose();
 
diff --git a/ganttzk/src/main/resources/web/ganttz/zul/resourcesLoadLayout.zul b/ganttzk/src/main/resources/web/ganttz/zul/resourcesLoadLayout.zul
index 5b0a7f20e..01eb23f35 100644
--- a/ganttzk/src/main/resources/web/ganttz/zul/resourcesLoadLayout.zul
+++ b/ganttzk/src/main/resources/web/ganttz/zul/resourcesLoadLayout.zul
@@ -39,14 +39,10 @@ resourcesLoadPanel = self;
         </listbox>
         <separator/>
         Filter:
-        <listbox id="listFilters" mold="select" rows="1" width="200px"
+        <listbox id="listFilters" mold="select" rows="1" width="150px"
             model="${resourcesLoadPanel.filters}"
-            onSelect="resourcesLoadPanel.setFilter(self.selectedItem.value);" >
+            onSelect="resourcesLoadPanel.setFilter(self.selectedItem.value);">
         </listbox>
-	<button image="/common/img/ico_filter.png" style="margin-top: -4px"
-        tooltiptext="${i18n:_('Apply filtering to resource load satisfying required criteria')}"
-        onClick="resourcesLoadPanel.onApplyFilter()"/>
-
        </hbox>
        </north>
 
diff --git a/navalplanner-webapp/src/main/java/org/navalplanner/web/resourceload/ResourceLoadController.java b/navalplanner-webapp/src/main/java/org/navalplanner/web/resourceload/ResourceLoadController.java
index 8193fc762..d0d66dd93 100644
--- a/navalplanner-webapp/src/main/java/org/navalplanner/web/resourceload/ResourceLoadController.java
+++ b/navalplanner-webapp/src/main/java/org/navalplanner/web/resourceload/ResourceLoadController.java
@@ -38,6 +38,7 @@ import org.zkoss.ganttz.resourceload.ResourcesLoadPanel;
 import org.zkoss.ganttz.resourceload.ResourcesLoadPanel.IToolbarCommand;
 import org.zkoss.ganttz.timetracker.TimeTracker;
 import org.zkoss.ganttz.timetracker.zoom.SeveralModificators;
+import org.zkoss.ganttz.timetracker.zoom.ZoomLevel;
 import org.zkoss.zk.ui.util.Composer;
 import org.zkoss.zul.Messagebox;
 
@@ -81,6 +82,8 @@ public class ResourceLoadController implements Composer {
     public void reload() {
         // by default show the task by resources
         boolean filterByResources = true;
+        timeTracker = null;
+        resourcesLoadPanel = null;
         reload(filterByResources);
     }
 
@@ -92,13 +95,14 @@ public class ResourceLoadController implements Composer {
                 resourceLoadModel.initGlobalView(filterBy, filterByResources);
             }
             timeTracker = buildTimeTracker();
-            resourcesLoadPanel = buildResourcesLoadPanel();
-            addListeners();
+            buildResourcesLoadPanel();
 
             this.parent.getChildren().clear();
             this.parent.appendChild(resourcesLoadPanel);
+
             resourcesLoadPanel.afterCompose();
             addCommands(resourcesLoadPanel);
+
         } catch (IllegalArgumentException e) {
             try {
                 Messagebox
@@ -123,24 +127,31 @@ public class ResourceLoadController implements Composer {
     }
 
     public void onApplyFilter(boolean filterByResources) {
-        resourcesLoadPanel.clearComponents();
         reload(filterByResources);
     }
 
     private void addCommands(ResourcesLoadPanel resourcesLoadPanel) {
+
         resourcesLoadPanel.add(commands.toArray(new IToolbarCommand[0]));
     }
 
     private TimeTracker buildTimeTracker() {
-        return timeTracker = new TimeTracker(resourceLoadModel
-                .getViewInterval(), resourceLoadModel
-                .calculateInitialZoomLevel(), SeveralModificators.create(),
-                SeveralModificators.create(new BankHolidaysMarker()), parent);
+        ZoomLevel zoomLevel = (timeTracker == null) ? resourceLoadModel
+                .calculateInitialZoomLevel() : timeTracker.getDetailLevel();
+        return new TimeTracker(resourceLoadModel.getViewInterval(), zoomLevel,
+                SeveralModificators.create(), SeveralModificators
+                        .create(new BankHolidaysMarker()), parent);
     }
 
-    private ResourcesLoadPanel buildResourcesLoadPanel() {
-        return new ResourcesLoadPanel(resourceLoadModel.getLoadTimeLines(),
-                timeTracker);
+    private void buildResourcesLoadPanel() {
+        if (resourcesLoadPanel != null) {
+            resourcesLoadPanel.init(resourceLoadModel.getLoadTimeLines(),
+                    timeTracker);
+        } else {
+            resourcesLoadPanel = new ResourcesLoadPanel(resourceLoadModel
+                    .getLoadTimeLines(), timeTracker);
+            addListeners();
+        }
     }
 
     public void filterBy(Order order) {