diff --git a/ganttzk/src/main/java/org/zkoss/ganttz/Planner.java b/ganttzk/src/main/java/org/zkoss/ganttz/Planner.java index c96b0d8f6..10c13eaf8 100644 --- a/ganttzk/src/main/java/org/zkoss/ganttz/Planner.java +++ b/ganttzk/src/main/java/org/zkoss/ganttz/Planner.java @@ -59,6 +59,7 @@ import org.zkoss.zul.Button; import org.zkoss.zul.ListModel; import org.zkoss.zul.Separator; import org.zkoss.zul.SimpleListModel; +import org.zkoss.zul.api.Listbox; public class Planner extends HtmlMacroComponent { @@ -125,6 +126,8 @@ public class Planner extends HtmlMacroComponent { private ZoomLevel initialZoomLevel = null; + private Listbox listZoomLevels = null; + public Planner() { registerNeededScripts(); } @@ -276,6 +279,7 @@ public class Planner extends HtmlMacroComponent { Button showCriticalPathButton = (Button) getFellow("showCriticalPath"); showCriticalPathButton.setVisible(false); } + listZoomLevels.setSelectedIndex(getZoomLevel().ordinal()); } private void resettingPreviousComponentsToNull() { @@ -384,6 +388,7 @@ public class Planner extends HtmlMacroComponent { @Override public void afterCompose() { super.afterCompose(); + listZoomLevels = (Listbox) getFellow("listZoomLevels"); } public TimeTracker getTimeTracker() { diff --git a/ganttzk/src/main/java/org/zkoss/ganttz/resourceload/ResourcesLoadPanel.java b/ganttzk/src/main/java/org/zkoss/ganttz/resourceload/ResourcesLoadPanel.java index a16af9156..575c0ddad 100644 --- a/ganttzk/src/main/java/org/zkoss/ganttz/resourceload/ResourcesLoadPanel.java +++ b/ganttzk/src/main/java/org/zkoss/ganttz/resourceload/ResourcesLoadPanel.java @@ -41,6 +41,7 @@ import org.zkoss.zul.Button; import org.zkoss.zul.ListModel; import org.zkoss.zul.Separator; import org.zkoss.zul.SimpleListModel; +import org.zkoss.zul.api.Listbox; public class ResourcesLoadPanel extends HtmlMacroComponent { @@ -62,6 +63,8 @@ public class ResourcesLoadPanel extends HtmlMacroComponent { private final TimeTracker timeTracker; + private Listbox listZoomLevels; + public ResourcesLoadPanel(List groups, TimeTracker timeTracker) { this.groups = groups; @@ -168,6 +171,8 @@ public class ResourcesLoadPanel extends HtmlMacroComponent { timeTrackerHeader.afterCompose(); timeTrackerComponent.afterCompose(); + listZoomLevels = (Listbox) getFellow("listZoomLevels"); + listZoomLevels.setSelectedIndex(timeTracker.getDetailLevel().ordinal()); } private TimeTrackerComponent createTimeTrackerHeader() { diff --git a/ganttzk/src/main/resources/web/ganttz/zul/plannerLayout.zul b/ganttzk/src/main/resources/web/ganttz/zul/plannerLayout.zul index 6466d66a9..02e206c94 100644 --- a/ganttzk/src/main/resources/web/ganttz/zul/plannerLayout.zul +++ b/ganttzk/src/main/resources/web/ganttz/zul/plannerLayout.zul @@ -19,7 +19,7 @@ planner = self; - diff --git a/ganttzk/src/main/resources/web/ganttz/zul/resourcesLoadLayout.zul b/ganttzk/src/main/resources/web/ganttz/zul/resourcesLoadLayout.zul index fab89abc7..c4a1b0733 100644 --- a/ganttzk/src/main/resources/web/ganttz/zul/resourcesLoadLayout.zul +++ b/ganttzk/src/main/resources/web/ganttz/zul/resourcesLoadLayout.zul @@ -33,7 +33,7 @@ resourcesLoadPanel = self; -