From fafa5f7a4ef134c85052b90f5a3c1779c2b4ab27 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C3=93scar=20Gonz=C3=A1lez=20Fern=C3=A1ndez?=
 <ogonzalez@igalia.com>
Date: Wed, 26 Aug 2009 11:28:22 +0200
Subject: [PATCH] ItEr23S10CUAsignacionGrupoRecursosAPlanificacionItEr22S10:
 Parametrizing the id of the timetracker element

---
 .../zkoss/ganttz/timetracker/TimeTrackedTable.java    |  5 +++--
 .../ganttz/timetracker/TimeTrackerComponent.java      | 11 +++++++++--
 .../web/ganttz/zul/timetracker/timetracker.zul        |  4 ++--
 3 files changed, 14 insertions(+), 6 deletions(-)

diff --git a/ganttzk/src/main/java/org/zkoss/ganttz/timetracker/TimeTrackedTable.java b/ganttzk/src/main/java/org/zkoss/ganttz/timetracker/TimeTrackedTable.java
index 02a666c44..483ae7ae7 100644
--- a/ganttzk/src/main/java/org/zkoss/ganttz/timetracker/TimeTrackedTable.java
+++ b/ganttzk/src/main/java/org/zkoss/ganttz/timetracker/TimeTrackedTable.java
@@ -2,8 +2,9 @@ package org.zkoss.ganttz.timetracker;
 
 public class TimeTrackedTable extends TimeTrackerComponent {
 
-    public TimeTrackedTable(TimeTracker timeTracker) {
-        super(timeTracker, "~./ganttz/zul/timetrackersecondlevel.zul");
+    public TimeTrackedTable(TimeTracker timeTracker, String idTimeTrackerElement) {
+        super(timeTracker, "~./ganttz/zul/timetrackersecondlevel.zul",
+                idTimeTrackerElement);
     }
 
     @Override
diff --git a/ganttzk/src/main/java/org/zkoss/ganttz/timetracker/TimeTrackerComponent.java b/ganttzk/src/main/java/org/zkoss/ganttz/timetracker/TimeTrackerComponent.java
index 202535b98..6ec5510bf 100644
--- a/ganttzk/src/main/java/org/zkoss/ganttz/timetracker/TimeTrackerComponent.java
+++ b/ganttzk/src/main/java/org/zkoss/ganttz/timetracker/TimeTrackerComponent.java
@@ -20,13 +20,15 @@ public abstract class TimeTrackerComponent extends HtmlMacroComponent {
     private final TimeTracker timeTracker;
     private IZoomLevelChangedListener zoomListener;
     private final String secondLevelZul;
+    private String timeTrackerElementId;
 
     public TimeTrackerComponent(TimeTracker timeTracker) {
-        this(timeTracker, "~./ganttz/zul/timetrackersecondlevel.zul");
+        this(timeTracker, "~./ganttz/zul/timetrackersecondlevel.zul",
+                "timetracker");
     }
 
     protected TimeTrackerComponent(TimeTracker timeTracker,
-            String secondLevelZul) {
+            String secondLevelZul, String timetrackerId) {
         this.secondLevelZul = secondLevelZul;
         this.timeTracker = timeTracker;
         zoomListener = new IZoomLevelChangedListener() {
@@ -37,6 +39,11 @@ public abstract class TimeTrackerComponent extends HtmlMacroComponent {
             }
         };
         this.timeTracker.addZoomListener(zoomListener);
+        timeTrackerElementId = timetrackerId;
+    }
+
+    public String getTimeTrackerId() {
+        return timeTrackerElementId;
     }
 
     @Override
diff --git a/ganttzk/src/main/resources/web/ganttz/zul/timetracker/timetracker.zul b/ganttzk/src/main/resources/web/ganttz/zul/timetracker/timetracker.zul
index cb7cf6940..14ff94364 100644
--- a/ganttzk/src/main/resources/web/ganttz/zul/timetracker/timetracker.zul
+++ b/ganttzk/src/main/resources/web/ganttz/zul/timetracker/timetracker.zul
@@ -9,7 +9,7 @@ top = self;
 <n:script language="javascript">
 
 function getHorizontalScroll(timetracker) {
-    return document.getElementById('timetracker').scrollLeft;
+    return document.getElementById('${top.timeTrackerId}').scrollLeft;
 }
 
 function onIncrease(timetracker) {
@@ -29,7 +29,7 @@ function onDecrease(timetracker) {
 }
 
 </n:script>
-<n:div id="timetracker">
+<n:div id="${top.timeTrackerId}">
     <vbox>
 
         <n:div id="zoom_buttons">