diff --git a/ganttzk/src/main/java/org/zkoss/ganttz/resourceload/ResourceLoadList.java b/ganttzk/src/main/java/org/zkoss/ganttz/resourceload/ResourceLoadList.java index 5c61c1dce..5dc42faab 100644 --- a/ganttzk/src/main/java/org/zkoss/ganttz/resourceload/ResourceLoadList.java +++ b/ganttzk/src/main/java/org/zkoss/ganttz/resourceload/ResourceLoadList.java @@ -2,38 +2,41 @@ package org.zkoss.ganttz.resourceload; import java.util.List; -import org.zkoss.ganttz.GanttPanel; -import org.zkoss.ganttz.Planner; import org.zkoss.ganttz.data.ResourceLoad; -import org.zkoss.zk.ui.ext.AfterCompose; import org.zkoss.zul.impl.XulElement; /** * Component to include a list of ResourceLoads inside the ResourcesLoadPanel. * @author Lorenzo Tilve Álvaro */ -public class ResourceLoadList extends XulElement implements AfterCompose { +public class ResourceLoadList extends XulElement { private List resourceLoads; public ResourceLoadList(List resourceLoads) { this.resourceLoads = resourceLoads; + insertFakeData(); } - @Override - public void afterCompose() { - } + private void insertFakeData() { + ResourceLoadComponent rlc1 = new ResourceLoadComponent( + new ResourceLoad("ResourceLoad 1")); + ResourceLoadComponent rlc2 = new ResourceLoadComponent( + new ResourceLoad("ResourceLoad 1")); - public Planner getPlanner() { - return getGanttPanel().getPlanner(); - } + rlc1.addInterval(40, 100); + rlc1.addInterval(20, 80); + rlc1.addInterval(30, 150); + rlc1.addInterval(10, 0); - private GanttPanel getGanttPanel() { - return (GanttPanel) getParent(); - } - - public synchronized void addResourceLoadComponent(ResourceLoad r) { - resourceLoads.add(r); + rlc2.addInterval(10, 100); + rlc2.addInterval(20, 60); + rlc2.addInterval(30, 100); + rlc2.addInterval(20, 0); + rlc2.addInterval(20, 60); + appendChild(rlc1); + appendChild(rlc2); } } + 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 9bf55596f..d6fa3ef07 100644 --- a/ganttzk/src/main/java/org/zkoss/ganttz/resourceload/ResourcesLoadPanel.java +++ b/ganttzk/src/main/java/org/zkoss/ganttz/resourceload/ResourcesLoadPanel.java @@ -1,5 +1,7 @@ package org.zkoss.ganttz.resourceload; +import java.util.Collections; + import org.zkoss.ganttz.Planner; import org.zkoss.ganttz.TimeTracker; import org.zkoss.ganttz.TimeTrackerComponent; @@ -11,26 +13,14 @@ public class ResourcesLoadPanel extends XulElement implements AfterCompose { private TimeTrackerComponent timeTrackerComponent; + private ResourceLoadList resourceLoadList; + public ResourcesLoadPanel(TimeTracker timeTracker) { - ResourceLoadComponent rlc1 = new ResourceLoadComponent( - new ResourceLoad("ResourceLoad 1")); - ResourceLoadComponent rlc2 = new ResourceLoadComponent( - new ResourceLoad("ResourceLoad 1")); - - rlc1.addInterval(40, 100); - rlc1.addInterval(20, 80); - rlc1.addInterval(30, 150); - rlc1.addInterval(10, 0); - - rlc2.addInterval(10, 100); - rlc2.addInterval(20, 60); - rlc2.addInterval(30, 100); - rlc2.addInterval(20, 0); - rlc2.addInterval(20, 60); timeTrackerComponent = timeTrackerForResourcesLoadPanel(timeTracker); + resourceLoadList = new ResourceLoadList(Collections + . emptyList()); appendChild(timeTrackerComponent); - appendChild(rlc1); - appendChild(rlc2); + appendChild(resourceLoadList); } private TimeTrackerComponent timeTrackerForResourcesLoadPanel( diff --git a/ganttzk/src/main/resources/metainfo/zk/lang-addon.xml b/ganttzk/src/main/resources/metainfo/zk/lang-addon.xml index b1b9b3402..6692b1b08 100755 --- a/ganttzk/src/main/resources/metainfo/zk/lang-addon.xml +++ b/ganttzk/src/main/resources/metainfo/zk/lang-addon.xml @@ -29,6 +29,15 @@ + + resourcesLoadList + org.zkoss.ganttz.resourceload.ResourceLoadList + + default + ~./ganttz/resourceload/resourceloadlist.dsp + + + leftPane org.zkoss.ganttz.LeftPane diff --git a/ganttzk/src/main/resources/web/ganttz/resourceload/resourceloadlist.dsp b/ganttzk/src/main/resources/web/ganttz/resourceload/resourceloadlist.dsp new file mode 100644 index 000000000..757eb1458 --- /dev/null +++ b/ganttzk/src/main/resources/web/ganttz/resourceload/resourceloadlist.dsp @@ -0,0 +1,10 @@ +<%@ 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