ItEr28S06CUAsignacionGrupoRecursosAPlanificacionItEr27S06: TimeTrackedTable doesn't inherit from TimeTrackerComponenet now

ganttzk/src/main/java/org/zkoss/ganttz/timetracker/TimeTrackedTable.java

@@ -20,31 +20,28 @@
 
 package org.zkoss.ganttz.timetracker;
 
+import java.util.Collection;
 import java.util.List;
 import java.util.concurrent.Callable;
 
 import org.zkoss.ganttz.timetracker.zoom.DetailItem;
+import org.zkoss.zk.ui.HtmlMacroComponent;
 import org.zkoss.zul.ListModel;
 import org.zkoss.zul.ListModelList;
 import org.zkoss.zul.RowRenderer;
 
-public class TimeTrackedTable<T> extends TimeTrackerComponent {
+public class TimeTrackedTable<T> extends HtmlMacroComponent {
 
     private final Callable<List<T>> data;
     private final ICellForDetailItemRenderer<DetailItem, T> cellRenderer;
+    private final TimeTracker timeTracker;
 
     public TimeTrackedTable(Callable<List<T>> dataSource,
             ICellForDetailItemRenderer<DetailItem, T> cellRenderer,
-            TimeTracker timeTracker,
-            String idTimeTrackerElement) {
-        super(timeTracker, "~./ganttz/zul/timetracker/secondlevelgrid.zul",
-                idTimeTrackerElement);
+            TimeTracker timeTracker) {
         this.data = dataSource;
         this.cellRenderer = cellRenderer;
-    }
-
-    @Override
-    protected void scrollHorizontalPercentage(int pixelsDisplacement) {
+        this.timeTracker = timeTracker;
     }
 
     public ListModel getTableModel() {
@@ -60,8 +57,16 @@ public class TimeTrackedTable<T> extends TimeTrackerComponent {
     }
 
     public RowRenderer getRowRenderer() {
-        return OnColumnsRowRenderer.create(cellRenderer,
-                getDetailsSecondLevel());
+        return OnColumnsRowRenderer.create(cellRenderer, timeTracker
+                .getDetailsSecondLevel());
+    }
+
+    public Collection<DetailItem> getDetailsSecondLevel() {
+        return timeTracker.getDetailsSecondLevel();
+    }
+
+    public int getHorizontalSize() {
+        return timeTracker.getHorizontalSize();
     }
 
 }

ganttzk/src/main/java/org/zkoss/ganttz/timetracker/TimeTrackedTableWithLeftPane.java

@@ -51,7 +51,7 @@ public class TimeTrackedTableWithLeftPane<A, B> extends Div {
         this.dataSource = dataSource;
         timeTrackedTable = new TimeTrackedTable<B>(
                 dataForTimeTracker(dataSource), cellRendererForTimeTracker,
-                timeTracker, "timetrackedtable");
+                timeTracker);
         leftPane = new Grid();
         zoomLevelListener = new IZoomLevelChangedListener() {
             @Override

ganttzk/src/main/resources/metainfo/zk/lang-addon.xml

@@ -132,6 +132,12 @@
 		<macro-uri>~./ganttz/zul/timetracker/timetracker.zul</macro-uri>
 	</component>
 
+	<component>
+	   <component-name>timeTrackedTable</component-name>
+	   <component-class>org.zkoss.ganttz.timetracker.TimeTrackedTable</component-class>
+	   <macro-uri>~./ganttz/zul/timetracker/timetrackedtable.zul</macro-uri>
+	</component>
+
 	<component>
 	   <component-name>timetrackedTableWithLeftPane</component-name>
 	   <component-class>org.zkoss.ganttz.timetracker.TimeTrackedTableWithLeftPane</component-class>

ganttzk/src/main/resources/web/ganttz/zul/timetracker/timetrackedtable.zul

@@ -19,10 +19,14 @@
 -->
 
 <zk>
+<zscript><![CDATA[
+top = self;
+]]>
+</zscript>
 <grid width="${top.horizontalSize+2}" model="${top.tableModel}"
     rowRenderer="${top.rowRenderer}" fixedLayout="${true}">
-    <columns>
-        <column label="${each.name}" width="${each.size}"
+    <columns visible="${false}">
+        <column label="${each.name}" width="${each.size}px"
                     forEach="${top.detailsSecondLevel}"></column>
     </columns>
 </grid>