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 1df238d70..2510d8f46 100644 --- a/ganttzk/src/main/java/org/zkoss/ganttz/timetracker/TimeTrackedTable.java +++ b/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 extends TimeTrackerComponent { +public class TimeTrackedTable extends HtmlMacroComponent { private final Callable> data; private final ICellForDetailItemRenderer cellRenderer; + private final TimeTracker timeTracker; public TimeTrackedTable(Callable> dataSource, ICellForDetailItemRenderer 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 extends TimeTrackerComponent { } public RowRenderer getRowRenderer() { - return OnColumnsRowRenderer.create(cellRenderer, - getDetailsSecondLevel()); + return OnColumnsRowRenderer.create(cellRenderer, timeTracker + .getDetailsSecondLevel()); + } + + public Collection getDetailsSecondLevel() { + return timeTracker.getDetailsSecondLevel(); + } + + public int getHorizontalSize() { + return timeTracker.getHorizontalSize(); } } diff --git a/ganttzk/src/main/java/org/zkoss/ganttz/timetracker/TimeTrackedTableWithLeftPane.java b/ganttzk/src/main/java/org/zkoss/ganttz/timetracker/TimeTrackedTableWithLeftPane.java index 1d973ba4b..34a7a2f6e 100644 --- a/ganttzk/src/main/java/org/zkoss/ganttz/timetracker/TimeTrackedTableWithLeftPane.java +++ b/ganttzk/src/main/java/org/zkoss/ganttz/timetracker/TimeTrackedTableWithLeftPane.java @@ -51,7 +51,7 @@ public class TimeTrackedTableWithLeftPane extends Div { this.dataSource = dataSource; timeTrackedTable = new TimeTrackedTable( dataForTimeTracker(dataSource), cellRendererForTimeTracker, - timeTracker, "timetrackedtable"); + timeTracker); leftPane = new Grid(); zoomLevelListener = new IZoomLevelChangedListener() { @Override diff --git a/ganttzk/src/main/resources/metainfo/zk/lang-addon.xml b/ganttzk/src/main/resources/metainfo/zk/lang-addon.xml index 3586e9fdf..8fdd09532 100755 --- a/ganttzk/src/main/resources/metainfo/zk/lang-addon.xml +++ b/ganttzk/src/main/resources/metainfo/zk/lang-addon.xml @@ -132,6 +132,12 @@ ~./ganttz/zul/timetracker/timetracker.zul + + timeTrackedTable + org.zkoss.ganttz.timetracker.TimeTrackedTable + ~./ganttz/zul/timetracker/timetrackedtable.zul + + timetrackedTableWithLeftPane org.zkoss.ganttz.timetracker.TimeTrackedTableWithLeftPane diff --git a/ganttzk/src/main/resources/web/ganttz/zul/timetracker/secondlevelgrid.zul b/ganttzk/src/main/resources/web/ganttz/zul/timetracker/timetrackedtable.zul similarity index 88% rename from ganttzk/src/main/resources/web/ganttz/zul/timetracker/secondlevelgrid.zul rename to ganttzk/src/main/resources/web/ganttz/zul/timetracker/timetrackedtable.zul index 8f9b5d9c3..98c40b2ea 100644 --- a/ganttzk/src/main/resources/web/ganttz/zul/timetracker/secondlevelgrid.zul +++ b/ganttzk/src/main/resources/web/ganttz/zul/timetracker/timetrackedtable.zul @@ -19,10 +19,14 @@ --> + + - - +