From 2cf0b155de24ae8e2a1cea2271237e9283e5d7b7 Mon Sep 17 00:00:00 2001
From: Manuel Rego Casasnovas <mrego@igalia.com>
Date: Tue, 10 Aug 2010 14:31:19 +0200
Subject: [PATCH] ItEr60S04ValidacionEProbasFuncionaisItEr59S04: [Bug #582]
 Fixed for labels and resource icons in both windows company and order view.

---
 .../main/java/org/zkoss/ganttz/GanttPanel.java | 11 ++++++++++-
 .../main/java/org/zkoss/ganttz/Planner.java    | 18 +++++++++++++-----
 .../java/org/zkoss/ganttz/TaskComponent.java   | 10 ++++++++++
 ganttzk/src/main/resources/web/ganttz/task.dsp |  4 ++--
 4 files changed, 35 insertions(+), 8 deletions(-)

diff --git a/ganttzk/src/main/java/org/zkoss/ganttz/GanttPanel.java b/ganttzk/src/main/java/org/zkoss/ganttz/GanttPanel.java
index dac8c43e6..a8cc93d16 100644
--- a/ganttzk/src/main/java/org/zkoss/ganttz/GanttPanel.java
+++ b/ganttzk/src/main/java/org/zkoss/ganttz/GanttPanel.java
@@ -41,12 +41,17 @@ public class GanttPanel extends XulElement implements AfterCompose {
 
     private final GanttDiagramGraph diagramGraph;
 
+    private final Planner planner;
+
     public GanttPanel(
-            FunctionalityExposedForExtensions<?> context,
+            Planner planner,
             List<? extends CommandOnTaskContextualized<?>> commandsOnTasksContextualized,
             CommandOnTaskContextualized<?> doubleClickCommand,
             IDisabilityConfiguration disabilityConfiguration,
             FilterAndParentExpandedPredicates predicate) {
+        this.planner = planner;
+        FunctionalityExposedForExtensions<?> context = (FunctionalityExposedForExtensions<?>) planner
+                .getContext();
         this.diagramGraph = context.getDiagramGraph();
         timeTrackerComponent = timeTrackerForGanttPanel(context
                 .getTimeTracker());
@@ -111,4 +116,8 @@ public class GanttPanel extends XulElement implements AfterCompose {
         getTimeTracker().setZoomLevel(zoomLevel);
     }
 
+    public Planner getPlanner() {
+        return planner;
+    }
+
 }
\ No newline at end of file
diff --git a/ganttzk/src/main/java/org/zkoss/ganttz/Planner.java b/ganttzk/src/main/java/org/zkoss/ganttz/Planner.java
index ffed73efe..628277ad6 100644
--- a/ganttzk/src/main/java/org/zkoss/ganttz/Planner.java
+++ b/ganttzk/src/main/java/org/zkoss/ganttz/Planner.java
@@ -29,18 +29,18 @@ import java.util.HashMap;
 import java.util.HashSet;
 import java.util.List;
 import java.util.Map;
-import java.util.Map.Entry;
 import java.util.Set;
+import java.util.Map.Entry;
 
 import org.zkoss.ganttz.adapters.IDisabilityConfiguration;
 import org.zkoss.ganttz.adapters.IDomainAndBeansMapper;
 import org.zkoss.ganttz.adapters.PlannerConfiguration;
 import org.zkoss.ganttz.data.Dependency;
 import org.zkoss.ganttz.data.GanttDiagramGraph;
-import org.zkoss.ganttz.data.GanttDiagramGraph.GanttZKDiagramGraph;
-import org.zkoss.ganttz.data.GanttDiagramGraph.IGraphChangeListener;
 import org.zkoss.ganttz.data.Position;
 import org.zkoss.ganttz.data.Task;
+import org.zkoss.ganttz.data.GanttDiagramGraph.GanttZKDiagramGraph;
+import org.zkoss.ganttz.data.GanttDiagramGraph.IGraphChangeListener;
 import org.zkoss.ganttz.extensions.ICommand;
 import org.zkoss.ganttz.extensions.ICommandOnTask;
 import org.zkoss.ganttz.extensions.IContext;
@@ -50,9 +50,9 @@ import org.zkoss.ganttz.timetracker.TimeTrackerComponentWithoutColumns;
 import org.zkoss.ganttz.timetracker.zoom.ZoomLevel;
 import org.zkoss.ganttz.util.ComponentsFinder;
 import org.zkoss.ganttz.util.LongOperationFeedback;
-import org.zkoss.ganttz.util.LongOperationFeedback.ILongOperation;
 import org.zkoss.ganttz.util.OnZKDesktopRegistry;
 import org.zkoss.ganttz.util.WeakReferencedListeners;
+import org.zkoss.ganttz.util.LongOperationFeedback.ILongOperation;
 import org.zkoss.ganttz.util.WeakReferencedListeners.IListenerNotification;
 import org.zkoss.ganttz.util.script.IScriptsRegister;
 import org.zkoss.zk.ui.Component;
@@ -398,7 +398,7 @@ public class Planner extends HtmlMacroComponent  {
         };
         this.leftPane = new LeftPane(disabilityConfiguration, this.diagramGraph
                 .getTopLevelTasks(), predicate);
-        this.ganttPanel = new GanttPanel(this.context,
+        this.ganttPanel = new GanttPanel(this,
                 commandsOnTasksContextualized, doubleClickCommand,
                 disabilityConfiguration, predicate);
 
@@ -665,4 +665,12 @@ public class Planner extends HtmlMacroComponent  {
                 .getPostChangeListeners());
     }
 
+    public boolean isShowingLabels() {
+        return isShowingLabels;
+    }
+
+    public boolean isShowingResources() {
+        return isShowingResources;
+    }
+
 }
diff --git a/ganttzk/src/main/java/org/zkoss/ganttz/TaskComponent.java b/ganttzk/src/main/java/org/zkoss/ganttz/TaskComponent.java
index 4dde8ee57..f974a080b 100644
--- a/ganttzk/src/main/java/org/zkoss/ganttz/TaskComponent.java
+++ b/ganttzk/src/main/java/org/zkoss/ganttz/TaskComponent.java
@@ -536,10 +536,20 @@ public class TaskComponent extends Div implements AfterCompose {
         return task.getLabelsText();
     }
 
+    public String getLabelsDisplay() {
+        Planner planner = getTaskList().getGanttPanel().getPlanner();
+        return planner.isShowingLabels() ? "inline" : "none";
+    }
+
     public String getResourcesText() {
         return task.getResourcesText();
     }
 
+    public String getResourcesDisplay() {
+        Planner planner = getTaskList().getGanttPanel().getPlanner();
+        return planner.isShowingResources() ? "inline" : "none";
+    }
+
     public boolean isSubcontracted() {
         return task.isSubcontracted();
     }
diff --git a/ganttzk/src/main/resources/web/ganttz/task.dsp b/ganttzk/src/main/resources/web/ganttz/task.dsp
index c97f9571c..bd03b66da 100644
--- a/ganttzk/src/main/resources/web/ganttz/task.dsp
+++ b/ganttzk/src/main/resources/web/ganttz/task.dsp
@@ -9,8 +9,8 @@
     resizingTasksEnabled="${self.resizingTasksEnabled}"
     onMouseover="zkTasklist.showTooltip('tasktooltip${self.uuid}');"
     onMouseOut="zkTasklist.hideTooltip('tasktooltip${self.uuid}');">
-	<div class="task-labels">${self.labelsText}</div>
-	<div class="task-resources">
+	<div class="task-labels" style="display:${self.labelsDisplay}">${self.labelsText}</div>
+	<div class="task-resources" style="display:${self.resourcesDisplay}">
 		<div class="task-resources-inner">${self.resourcesText}</div>
 	</div>
     <div class="completion"></div>