From d810f41161d0d182e686e3ffc3238810de0f6f97 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C3=93scar=20Gonz=C3=A1lez=20Fern=C3=A1ndez?=
 <ogonzalez@igalia.com>
Date: Fri, 2 Oct 2009 19:19:53 +0200
Subject: [PATCH] ItEr28S06CUAsignacionGrupoRecursosAPlanificacionItEr27S06:
 Now using insertion point for timetracker

---
 .../web/FakeTimeTrackableTableController.java  | 18 +++++++++++++-----
 .../webapp/planner/testtimetrackabletable.zul  |  2 +-
 2 files changed, 14 insertions(+), 6 deletions(-)

diff --git a/navalplanner-webapp/src/main/java/org/navalplanner/web/FakeTimeTrackableTableController.java b/navalplanner-webapp/src/main/java/org/navalplanner/web/FakeTimeTrackableTableController.java
index 228fb814b..9175683d0 100644
--- a/navalplanner-webapp/src/main/java/org/navalplanner/web/FakeTimeTrackableTableController.java
+++ b/navalplanner-webapp/src/main/java/org/navalplanner/web/FakeTimeTrackableTableController.java
@@ -30,8 +30,10 @@ import org.joda.time.LocalDate;
 import org.zkoss.ganttz.timetracker.ICellForDetailItemRenderer;
 import org.zkoss.ganttz.timetracker.IConvertibleToColumn;
 import org.zkoss.ganttz.timetracker.PairOfLists;
+import org.zkoss.ganttz.timetracker.TimeTrackedTable;
 import org.zkoss.ganttz.timetracker.TimeTrackedTableWithLeftPane;
 import org.zkoss.ganttz.timetracker.TimeTracker;
+import org.zkoss.ganttz.timetracker.TimeTrackerComponentWithoutColumns;
 import org.zkoss.ganttz.timetracker.zoom.DetailItem;
 import org.zkoss.ganttz.util.Interval;
 import org.zkoss.zk.ui.Component;
@@ -46,21 +48,27 @@ public class FakeTimeTrackableTableController extends GenericForwardComposer
 
     private Div insertionPointLeftPanel;
     private Div insertionPointRightPanel;
+    private Div insertionPointTimetracker;
     private TimeTrackedTableWithLeftPane<FakeDataLeft, FakeData> timeTrackedTableWithLeftPane;
 
     @Override
     public void doAfterCompose(Component comp) throws Exception {
         super.doAfterCompose(comp);
+        TimeTracker timeTracker = new TimeTracker(createExampleInterval());
         this.timeTrackedTableWithLeftPane = new TimeTrackedTableWithLeftPane<FakeDataLeft, FakeData>(
                 getDataSource(), getColumnsForLeft(), getLeftRenderer(),
-                getRightRenderer(), new TimeTracker(createExampleInterval()));
+                getRightRenderer(), timeTracker);
 
-        insertionPointRightPanel.appendChild(timeTrackedTableWithLeftPane
-                .getRightPane());
+        TimeTrackedTable<FakeData> rightPane = timeTrackedTableWithLeftPane
+                .getRightPane();
+        insertionPointRightPanel.appendChild(rightPane);
+        rightPane.afterCompose();
         insertionPointLeftPanel.appendChild(timeTrackedTableWithLeftPane
                 .getLeftPane());
-        // Forces innter Timetracked component aftercompose()
-        timeTrackedTableWithLeftPane.getTimeTrackedTable();
+        TimeTrackerComponentWithoutColumns timetracker = new TimeTrackerComponentWithoutColumns(
+                timeTracker, "timeTracker");
+        insertionPointTimetracker.appendChild(timetracker);
+        timetracker.afterCompose();
     }
 
     private ICellForDetailItemRenderer<FakeColumn, FakeDataLeft> getLeftRenderer() {
diff --git a/navalplanner-webapp/src/main/webapp/planner/testtimetrackabletable.zul b/navalplanner-webapp/src/main/webapp/planner/testtimetrackabletable.zul
index 0bba615b4..a7b332e2f 100644
--- a/navalplanner-webapp/src/main/webapp/planner/testtimetrackabletable.zul
+++ b/navalplanner-webapp/src/main/webapp/planner/testtimetrackabletable.zul
@@ -86,7 +86,7 @@
 
                 <center sclass="taskspanel">
                     <borderlayout>
-                        <north border="0"><div sclass="timetrackergap" height="33px" id="insertionPointTimetracker">Horizontally auto-scrolled timetracker gap</div></north>
+                        <north border="0"><div sclass="timetrackergap" height="33px" id="insertionPointTimetracker"></div></north>
                         <center autoscroll="true" border="0" sclass="rightpanellayout">
                             <div id="insertionPointRightPanel" sclass="taskspanelgap"></div>
                         </center>