diff --git a/ganttzk/src/main/java/org/zkoss/ganttz/resourceload/ResourceLoadLeftPane.java b/ganttzk/src/main/java/org/zkoss/ganttz/resourceload/ResourceLoadLeftPane.java index 5b9beb1f9..625c45cbb 100644 --- a/ganttzk/src/main/java/org/zkoss/ganttz/resourceload/ResourceLoadLeftPane.java +++ b/ganttzk/src/main/java/org/zkoss/ganttz/resourceload/ResourceLoadLeftPane.java @@ -5,22 +5,39 @@ import java.util.List; import org.zkoss.ganttz.data.resourceload.LoadTimeLine; import org.zkoss.ganttz.data.resourceload.LoadTimelinesGroup; import org.zkoss.zk.ui.Component; +import org.zkoss.zk.ui.HtmlMacroComponent; import org.zkoss.zul.Div; import org.zkoss.zul.Label; -import org.zkoss.zul.impl.XulElement; +import org.zkoss.zul.api.Box; -public class ResourceLoadLeftPane extends XulElement { +public class ResourceLoadLeftPane extends HtmlMacroComponent { + + private final List groups; public ResourceLoadLeftPane(List groups) { - for (LoadTimelinesGroup loadTimelinesGroup : groups) { + this.groups = groups; + } + + private void addGroups(Box container) { + for (LoadTimelinesGroup loadTimelinesGroup : this.groups) { LoadTimeLine principal = loadTimelinesGroup.getPrincipal(); - appendChild(createFirstLevel(principal)); + container.appendChild(createFirstLevel(principal)); for (LoadTimeLine loadTimeLine : loadTimelinesGroup.getChildren()) { - appendChild(createSecondLevel(loadTimeLine)); + container.appendChild(createSecondLevel(loadTimeLine)); } } } + @Override + public void afterCompose() { + super.afterCompose(); + addGroups(getContainer()); + } + + private Box getContainer() { + return (Box) getFellow("leftVBox"); + } + private Component createFirstLevel(LoadTimeLine principal) { Div result = createLabelWithName(principal); result.setSclass("firstlevel"); 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 92ea997ea..fece99f1d 100644 --- a/ganttzk/src/main/java/org/zkoss/ganttz/resourceload/ResourcesLoadPanel.java +++ b/ganttzk/src/main/java/org/zkoss/ganttz/resourceload/ResourcesLoadPanel.java @@ -47,6 +47,7 @@ public class ResourcesLoadPanel extends XulElement implements AfterCompose { @Override public void afterCompose() { timeTrackerComponent.afterCompose(); + leftPane.afterCompose(); } public TimeTrackerComponent getTimeTrackerComponent() { diff --git a/ganttzk/src/main/resources/metainfo/zk/lang-addon.xml b/ganttzk/src/main/resources/metainfo/zk/lang-addon.xml index cf31e85d7..ea353b855 100755 --- a/ganttzk/src/main/resources/metainfo/zk/lang-addon.xml +++ b/ganttzk/src/main/resources/metainfo/zk/lang-addon.xml @@ -41,10 +41,7 @@ resourceLoadLeftPane org.zkoss.ganttz.resourceload.ResourceLoadLeftPane - - default - ~./ganttz/resourceload/resourceloadleftpane.dsp - + ~./ganttz/resourceload/leftPane.zul diff --git a/ganttzk/src/main/resources/web/ganttz/resourceload/leftPane.zul b/ganttzk/src/main/resources/web/ganttz/resourceload/leftPane.zul new file mode 100644 index 000000000..53a170b74 --- /dev/null +++ b/ganttzk/src/main/resources/web/ganttz/resourceload/leftPane.zul @@ -0,0 +1,8 @@ + + + + + + \ No newline at end of file diff --git a/ganttzk/src/main/resources/web/ganttz/resourceload/resourceloadleftpane.dsp b/ganttzk/src/main/resources/web/ganttz/resourceload/resourceloadleftpane.dsp deleted file mode 100644 index 115fa038f..000000000 --- a/ganttzk/src/main/resources/web/ganttz/resourceload/resourceloadleftpane.dsp +++ /dev/null @@ -1,11 +0,0 @@ -<%@ taglib uri="http://www.zkoss.org/dsp/web/core" prefix="c" %> -<%@ taglib uri="http://www.zkoss.org/dsp/zk/core" prefix="z" %> - - - -
- - ${z:redraw(child, null)} - -
\ No newline at end of file