From 418e01fffe099a780097fbef378917129f83bbf7 Mon Sep 17 00:00:00 2001
From: Manuel Rego Casasnovas <mrego@igalia.com>
Date: Thu, 11 Mar 2010 12:05:34 +0100
Subject: [PATCH]  ItEr50S11CUFiltradoNaPlanificacionItEr49S15: Fixing problem
 showing labels and resources information while filtering.

---
 .../main/java/org/zkoss/ganttz/Planner.java   | 34 +++++++++++++------
 1 file changed, 23 insertions(+), 11 deletions(-)

diff --git a/ganttzk/src/main/java/org/zkoss/ganttz/Planner.java b/ganttzk/src/main/java/org/zkoss/ganttz/Planner.java
index 6d8adb855..c50646350 100644
--- a/ganttzk/src/main/java/org/zkoss/ganttz/Planner.java
+++ b/ganttzk/src/main/java/org/zkoss/ganttz/Planner.java
@@ -127,6 +127,10 @@ public class Planner extends HtmlMacroComponent  {
 
     private boolean isShowingCriticalPath = false;
 
+    private boolean isShowingLabels = false;
+
+    private boolean isShowingResources = false;
+
     private ZoomLevel initialZoomLevel = null;
 
     private Listbox listZoomLevels = null;
@@ -448,28 +452,28 @@ public class Planner extends HtmlMacroComponent  {
 
     public void showAllLabels() {
         Button showAllLabelsButton = (Button) getFellow("showAllLabels");
-        if (showAllLabelsButton.getSclass().equals(
-                "planner-command show-labels")) {
+        if (isShowingLabels) {
+            Clients.evalJavaScript("zkTasklist.hideAllTooltips();");
+            showAllLabelsButton.setSclass("planner-command show-labels");
+        } else {
             Clients.evalJavaScript("zkTasklist.showAllTooltips();");
             showAllLabelsButton
                     .setSclass("planner-command show-labels clicked");
-        } else {
-            Clients.evalJavaScript("zkTasklist.hideAllTooltips();");
-            showAllLabelsButton.setSclass("planner-command show-labels");
         }
+        isShowingLabels = !isShowingLabels;
     }
 
     public void showAllResources() {
         Button showAllLabelsButton = (Button) getFellow("showAllResources");
-        if (showAllLabelsButton.getSclass().equals(
-                "planner-command show-resources")) {
-            Clients.evalJavaScript("zkTasklist.showResourceTooltips();");
-            showAllLabelsButton
-                    .setSclass("planner-command show-resources clicked");
-        } else {
+        if (isShowingResources) {
             Clients.evalJavaScript("zkTasklist.hideResourceTooltips();");
             showAllLabelsButton.setSclass("planner-command show-resources");
+        } else {
+            Clients.evalJavaScript("zkTasklist.showResourceTooltips();");
+            showAllLabelsButton
+            .setSclass("planner-command show-resources clicked");
         }
+        isShowingResources = !isShowingResources;
     }
 
     public void print() {
@@ -533,5 +537,13 @@ public class Planner extends HtmlMacroComponent  {
         leftPane.setPredicate(predicate);
         getTaskList().setPredicate(predicate);
         getDependencyList().redrawDependencies();
+
+        if (isShowingLabels) {
+            Clients.evalJavaScript("zkTasklist.showAllTooltips();");
+        }
+
+        if (isShowingResources) {
+            Clients.evalJavaScript("zkTasklist.showResourceTooltips();");
+        }
     }
 }