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 638ce4ab5..9f8d7db24 100644 --- a/ganttzk/src/main/java/org/zkoss/ganttz/resourceload/ResourcesLoadPanel.java +++ b/ganttzk/src/main/java/org/zkoss/ganttz/resourceload/ResourcesLoadPanel.java @@ -44,6 +44,7 @@ import org.zkoss.zk.ui.HtmlMacroComponent; import org.zkoss.zk.ui.event.Event; import org.zkoss.zk.ui.event.EventListener; import org.zkoss.zk.ui.event.Events; +import org.zkoss.zkex.zul.api.South; import org.zkoss.zul.Button; import org.zkoss.zul.Comboitem; import org.zkoss.zul.ListModel; @@ -99,11 +100,14 @@ public class ResourcesLoadPanel extends HtmlMacroComponent { private WeakReferencedListeners chartVisibilityListeners = WeakReferencedListeners .create(); - public ResourcesLoadPanel(List groups, - TimeTracker timeTracker, Component componentOnWhichGiveFeedback) { - this.componentOnWhichGiveFeedback = componentOnWhichGiveFeedback; - init(groups, timeTracker); + private final boolean expandResourceLoadViewCharts; + public ResourcesLoadPanel(List groups, + TimeTracker timeTracker, Component componentOnWhichGiveFeedback, + boolean expandResourceLoadViewCharts) { + this.componentOnWhichGiveFeedback = componentOnWhichGiveFeedback; + this.expandResourceLoadViewCharts = expandResourceLoadViewCharts; + init(groups, timeTracker); } public void init(List groups, TimeTracker timeTracker) { @@ -312,6 +316,9 @@ public class ResourcesLoadPanel extends HtmlMacroComponent { } getFellow("insertionPointChart").appendChild(loadChart); + + this.visibleChart = expandResourceLoadViewCharts; + ((South) getFellow("graphics")).setOpen(this.visibleChart); } public void clearComponents() { diff --git a/navalplanner-webapp/src/main/java/org/navalplanner/web/resourceload/IResourceLoadModel.java b/navalplanner-webapp/src/main/java/org/navalplanner/web/resourceload/IResourceLoadModel.java index b7fa42529..f28dc2d87 100644 --- a/navalplanner-webapp/src/main/java/org/navalplanner/web/resourceload/IResourceLoadModel.java +++ b/navalplanner-webapp/src/main/java/org/navalplanner/web/resourceload/IResourceLoadModel.java @@ -68,4 +68,6 @@ public interface IResourceLoadModel { List getResources(); + boolean isExpandResourceLoadViewCharts(); + } 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 7ef97a4f1..9b1a5ee68 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 @@ -253,7 +253,8 @@ public class ResourceLoadController implements Composer { } } else { resourcesLoadPanel = new ResourcesLoadPanel(resourceLoadModel - .getLoadTimeLines(), timeTracker, parent); + .getLoadTimeLines(), timeTracker, parent, resourceLoadModel + .isExpandResourceLoadViewCharts()); resourcesLoadPanel.setLoadChart(buildChart()); if(filterBy == null) { addWorkersBandbox(); diff --git a/navalplanner-webapp/src/main/java/org/navalplanner/web/resourceload/ResourceLoadModel.java b/navalplanner-webapp/src/main/java/org/navalplanner/web/resourceload/ResourceLoadModel.java index b49749f31..de182f0d4 100644 --- a/navalplanner-webapp/src/main/java/org/navalplanner/web/resourceload/ResourceLoadModel.java +++ b/navalplanner-webapp/src/main/java/org/navalplanner/web/resourceload/ResourceLoadModel.java @@ -39,6 +39,7 @@ import org.joda.time.LocalDate; import org.navalplanner.business.calendars.daos.IBaseCalendarDAO; import org.navalplanner.business.calendars.entities.ResourceCalendar; import org.navalplanner.business.common.BaseEntity; +import org.navalplanner.business.common.daos.IConfigurationDAO; import org.navalplanner.business.common.exceptions.InstanceNotFoundException; import org.navalplanner.business.orders.daos.IOrderDAO; import org.navalplanner.business.orders.daos.IOrderElementDAO; @@ -121,6 +122,9 @@ public class ResourceLoadModel implements IResourceLoadModel { @Autowired private IBaseCalendarDAO baseCalendarDAO; + @Autowired + private IConfigurationDAO configurationDAO; + @Override @Transactional(readOnly = true) public void initGlobalView(boolean filterByResources) { @@ -777,6 +781,14 @@ public class ResourceLoadModel implements IResourceLoadModel { } return resources; } + + @Override + @Transactional(readOnly = true) + public boolean isExpandResourceLoadViewCharts() { + return configurationDAO.getConfiguration() + .isExpandResourceLoadViewCharts(); + } + } class PeriodsBuilder {