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 79b84941d..202535b98 100644 --- a/ganttzk/src/main/java/org/zkoss/ganttz/timetracker/TimeTrackerComponent.java +++ b/ganttzk/src/main/java/org/zkoss/ganttz/timetracker/TimeTrackerComponent.java @@ -8,6 +8,8 @@ import org.zkoss.ganttz.util.zoom.ZoomLevel; import org.zkoss.zk.au.AuRequest; import org.zkoss.zk.au.Command; import org.zkoss.zk.au.ComponentCommand; +import org.zkoss.zk.ui.Component; +import org.zkoss.zk.ui.Executions; import org.zkoss.zk.ui.HtmlMacroComponent; /** @@ -17,8 +19,15 @@ public abstract class TimeTrackerComponent extends HtmlMacroComponent { private final TimeTracker timeTracker; private IZoomLevelChangedListener zoomListener; + private final String secondLevelZul; public TimeTrackerComponent(TimeTracker timeTracker) { + this(timeTracker, "~./ganttz/zul/timetrackersecondlevel.zul"); + } + + protected TimeTrackerComponent(TimeTracker timeTracker, + String secondLevelZul) { + this.secondLevelZul = secondLevelZul; this.timeTracker = timeTracker; zoomListener = new IZoomLevelChangedListener() { @@ -30,6 +39,18 @@ public abstract class TimeTrackerComponent extends HtmlMacroComponent { this.timeTracker.addZoomListener(zoomListener); } + @Override + public void afterCompose() { + super.afterCompose(); + Component fellow = getFellow("firstleveldetails"); + addSecondLevels(fellow.getParent()); + } + + private void addSecondLevels(Component parent) { + Executions.getCurrent().createComponents(secondLevelZul, parent, + getAttributes()); + } + public ZoomLevel getZoomLevel() { return this.getTimeTracker().getDetailLevel(); } 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 30d347d24..cb7cf6940 100644 --- a/ganttzk/src/main/resources/web/ganttz/zul/timetracker/timetracker.zul +++ b/ganttzk/src/main/resources/web/ganttz/zul/timetracker/timetracker.zul @@ -39,42 +39,13 @@ function onDecrease(timetracker) { - + - - - - - - ${each.name} - - - - - - - - - - - - - - - - - - diff --git a/ganttzk/src/main/resources/web/ganttz/zul/timetrackersecondlevel.zul b/ganttzk/src/main/resources/web/ganttz/zul/timetrackersecondlevel.zul new file mode 100644 index 000000000..641049252 --- /dev/null +++ b/ganttzk/src/main/resources/web/ganttz/zul/timetrackersecondlevel.zul @@ -0,0 +1,30 @@ + + + + + + + ${each.name} + + + + + + + + + + + + + + + + + + \ No newline at end of file