From 4b3dc7bc7c62a3f628baf97df2c31081f033c9cd Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jacobo=20Aragunde=20P=C3=A9rez?= Date: Tue, 31 Jan 2012 10:35:11 +0100 Subject: [PATCH] Bug #1359: Initialize the resources when the page is loaded, independently from the hidden/shown property of the load chart. FEA: ItEr76S04BugFixing --- .../web/resourceload/ResourceLoadController.java | 13 +++++++++++-- 1 file changed, 11 insertions(+), 2 deletions(-) diff --git a/libreplan-webapp/src/main/java/org/libreplan/web/resourceload/ResourceLoadController.java b/libreplan-webapp/src/main/java/org/libreplan/web/resourceload/ResourceLoadController.java index 382893f24..3af09f504 100644 --- a/libreplan-webapp/src/main/java/org/libreplan/web/resourceload/ResourceLoadController.java +++ b/libreplan-webapp/src/main/java/org/libreplan/web/resourceload/ResourceLoadController.java @@ -842,9 +842,12 @@ public class ResourceLoadController implements Composer { ResourceLoadDisplayData generatedData, TimeTracker timeTracker) { Timeplot chartLoadTimeplot = createEmptyTimeplot(); + ResourceLoadChartFiller chartFiller = + new ResourceLoadChartFiller(generatedData); loadChart = new Chart(chartLoadTimeplot, - new ResourceLoadChartFiller(generatedData), timeTracker); + chartFiller, timeTracker); loadChart.setZoomLevel(timeTracker.getDetailLevel()); + chartFiller.initializeResources(); if (resourcesLoadPanel.isVisibleChart()) { loadChart.fillChart(); } @@ -888,6 +891,8 @@ public class ResourceLoadController implements Composer { private final ResourceLoadDisplayData generatedData; + private List resources; + public ResourceLoadChartFiller(ResourceLoadDisplayData generatedData) { this.generatedData = generatedData; } @@ -901,11 +906,15 @@ public class ResourceLoadController implements Composer { protected ILoadChartData getDataOn(Interval interval) { List assignments = generatedData .getDayAssignmentsConsidered(); - List resources = generatedData.getResourcesConsidered(); return new ResourceLoadChartData(assignments, resources, interval.getStart(), interval.getFinish()); } + private void initializeResources() { + resources = generatedData.getResourcesConsidered(); + } + + } private static class ListenerTracker {