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 timeTrackedTableWithLeftPane; @Override public void doAfterCompose(Component comp) throws Exception { super.doAfterCompose(comp); + TimeTracker timeTracker = new TimeTracker(createExampleInterval()); this.timeTrackedTableWithLeftPane = new TimeTrackedTableWithLeftPane( getDataSource(), getColumnsForLeft(), getLeftRenderer(), - getRightRenderer(), new TimeTracker(createExampleInterval())); + getRightRenderer(), timeTracker); - insertionPointRightPanel.appendChild(timeTrackedTableWithLeftPane - .getRightPane()); + TimeTrackedTable 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 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 @@
-
Horizontally auto-scrolled timetracker gap
+