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 35a84ce5e..9bad8586d 100644 --- a/ganttzk/src/main/java/org/zkoss/ganttz/resourceload/ResourcesLoadPanel.java +++ b/ganttzk/src/main/java/org/zkoss/ganttz/resourceload/ResourcesLoadPanel.java @@ -91,9 +91,13 @@ public class ResourcesLoadPanel extends HtmlMacroComponent { private WeakReferencedListeners nameFilterListener = WeakReferencedListeners.create(); + private Component loadChart; + public ResourcesLoadPanel(List groups, - TimeTracker timeTracker, Component componentOnWhichGiveFeedback) { + TimeTracker timeTracker, Component componentOnWhichGiveFeedback, + Component loadChart) { this.componentOnWhichGiveFeedback = componentOnWhichGiveFeedback; + this.loadChart = loadChart; init(groups, timeTracker); } @@ -302,12 +306,15 @@ public class ResourcesLoadPanel extends HtmlMacroComponent { if(refreshNameFilter) { setupNameFilter(); } + + getFellow("insertionPointChart").appendChild(loadChart); } public void clearComponents() { getFellow("insertionPointLeftPanel").getChildren().clear(); getFellow("insertionPointRightPanel").getChildren().clear(); getFellow("insertionPointTimetracker").getChildren().clear(); + getFellow("insertionPointChart").getChildren().clear(); } private TimeTrackerComponent createTimeTrackerHeader() { diff --git a/ganttzk/src/main/resources/web/ganttz/zul/resourcesLoadLayout.zul b/ganttzk/src/main/resources/web/ganttz/zul/resourcesLoadLayout.zul index fd64688c2..cde328466 100644 --- a/ganttzk/src/main/resources/web/ganttz/zul/resourcesLoadLayout.zul +++ b/ganttzk/src/main/resources/web/ganttz/zul/resourcesLoadLayout.zul @@ -87,35 +87,8 @@ resourcesLoadPanel = self; - - -
- - - - - ${i18n:_('Assignation percentage')} - - - - - ${i18n:_('0% - 100%')} - - - - - ${i18n:_('100%')} - - - - - ${i18n:_('+ 100%')} - - - - -
-
+ +
diff --git a/navalplanner-webapp/src/main/java/org/navalplanner/web/resourceload/ResourceLoadController.java b/navalplanner-webapp/src/main/java/org/navalplanner/web/resourceload/ResourceLoadController.java index 17d2b9e40..92f34d183 100644 --- a/navalplanner-webapp/src/main/java/org/navalplanner/web/resourceload/ResourceLoadController.java +++ b/navalplanner-webapp/src/main/java/org/navalplanner/web/resourceload/ResourceLoadController.java @@ -41,6 +41,8 @@ import org.springframework.beans.factory.annotation.Autowired; import org.springframework.beans.factory.config.BeanDefinition; import org.springframework.context.annotation.Scope; import org.springframework.stereotype.Component; +import org.zkforge.timeplot.Plotinfo; +import org.zkforge.timeplot.Timeplot; import org.zkoss.ganttz.data.resourceload.LoadTimeLine; import org.zkoss.ganttz.resourceload.IFilterChangedListener; import org.zkoss.ganttz.resourceload.ISeeScheduledOfListener; @@ -218,7 +220,7 @@ public class ResourceLoadController implements Composer { } } else { resourcesLoadPanel = new ResourcesLoadPanel(resourceLoadModel - .getLoadTimeLines(), timeTracker, parent); + .getLoadTimeLines(), timeTracker, parent, buildLoadChart()); if(filterBy == null) { addWorkersBandbox(); addTimeFilter(); @@ -375,4 +377,16 @@ public class ResourceLoadController implements Composer { } } + + private org.zkoss.zk.ui.Component buildLoadChart() { + Timeplot chartLoadTimeplot = createEmptyTimeplot(); + return chartLoadTimeplot; + } + + private Timeplot createEmptyTimeplot() { + Timeplot timeplot = new Timeplot(); + timeplot.appendChild(new Plotinfo()); + return timeplot; + } + }