diff --git a/navalplanner-business/src/main/java/org/navalplanner/business/common/entities/Configuration.java b/navalplanner-business/src/main/java/org/navalplanner/business/common/entities/Configuration.java index 62c6a9428..aa58d0354 100644 --- a/navalplanner-business/src/main/java/org/navalplanner/business/common/entities/Configuration.java +++ b/navalplanner-business/src/main/java/org/navalplanner/business/common/entities/Configuration.java @@ -59,6 +59,8 @@ public class Configuration extends BaseEntity { private Boolean expandOrderPlanningViewCharts = true; + private Boolean expandResourceLoadViewCharts = true; + public void setDefaultCalendar(BaseCalendar defaultCalendar) { this.defaultCalendar = defaultCalendar; } @@ -165,4 +167,13 @@ public class Configuration extends BaseEntity { return expandOrderPlanningViewCharts; } + public void setExpandResourceLoadViewCharts( + Boolean expandResourceLoadViewCharts) { + this.expandResourceLoadViewCharts = expandResourceLoadViewCharts; + } + + public Boolean isExpandResourceLoadViewCharts() { + return expandResourceLoadViewCharts; + } + } \ No newline at end of file diff --git a/navalplanner-business/src/main/resources/org/navalplanner/business/common/entities/Configuration.hbm.xml b/navalplanner-business/src/main/resources/org/navalplanner/business/common/entities/Configuration.hbm.xml index 0fb93f284..51a862755 100644 --- a/navalplanner-business/src/main/resources/org/navalplanner/business/common/entities/Configuration.hbm.xml +++ b/navalplanner-business/src/main/resources/org/navalplanner/business/common/entities/Configuration.hbm.xml @@ -26,6 +26,7 @@ + diff --git a/navalplanner-webapp/src/main/java/org/navalplanner/web/common/ConfigurationController.java b/navalplanner-webapp/src/main/java/org/navalplanner/web/common/ConfigurationController.java index 12d0317fb..862787eaa 100644 --- a/navalplanner-webapp/src/main/java/org/navalplanner/web/common/ConfigurationController.java +++ b/navalplanner-webapp/src/main/java/org/navalplanner/web/common/ConfigurationController.java @@ -366,4 +366,14 @@ public class ConfigurationController extends GenericForwardComposer { return configurationModel.isExpandOrderPlanningViewCharts(); } + public void setExpandResourceLoadViewCharts( + Boolean expandResourceLoadViewCharts) { + configurationModel + .setExpandResourceLoadViewCharts(expandResourceLoadViewCharts); + } + + public Boolean isExpandResourceLoadViewCharts() { + return configurationModel.isExpandResourceLoadViewCharts(); + } + } \ No newline at end of file diff --git a/navalplanner-webapp/src/main/java/org/navalplanner/web/common/ConfigurationModel.java b/navalplanner-webapp/src/main/java/org/navalplanner/web/common/ConfigurationModel.java index 6cedbf46b..e5c0cbdcc 100644 --- a/navalplanner-webapp/src/main/java/org/navalplanner/web/common/ConfigurationModel.java +++ b/navalplanner-webapp/src/main/java/org/navalplanner/web/common/ConfigurationModel.java @@ -373,4 +373,22 @@ public class ConfigurationModel implements IConfigurationModel { return configuration.isExpandOrderPlanningViewCharts(); } + + @Override + public void setExpandResourceLoadViewCharts( + Boolean expandResourceLoadViewCharts) { + if (configuration != null) { + configuration + .setExpandResourceLoadViewCharts(expandResourceLoadViewCharts); + } + } + + @Override + public Boolean isExpandResourceLoadViewCharts() { + if (configuration == null) { + return null; + } + return configuration.isExpandResourceLoadViewCharts(); + } + } \ No newline at end of file diff --git a/navalplanner-webapp/src/main/java/org/navalplanner/web/common/IConfigurationModel.java b/navalplanner-webapp/src/main/java/org/navalplanner/web/common/IConfigurationModel.java index 72a45bf17..bef605ba7 100644 --- a/navalplanner-webapp/src/main/java/org/navalplanner/web/common/IConfigurationModel.java +++ b/navalplanner-webapp/src/main/java/org/navalplanner/web/common/IConfigurationModel.java @@ -85,6 +85,10 @@ public interface IConfigurationModel { Boolean isExpandOrderPlanningViewCharts(); + void setExpandResourceLoadViewCharts(Boolean expandResourceLoadViewCharts); + + Boolean isExpandResourceLoadViewCharts(); + /* * Final conversation steps */ diff --git a/navalplanner-webapp/src/main/webapp/common/configuration.zul b/navalplanner-webapp/src/main/webapp/common/configuration.zul index 81348be04..fa69f5f80 100644 --- a/navalplanner-webapp/src/main/webapp/common/configuration.zul +++ b/navalplanner-webapp/src/main/webapp/common/configuration.zul @@ -108,6 +108,10 @@ + + +