From a935a579b0cd01bb9b319cdf4d5cb9e4ea25f345 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jacobo=20Aragunde=20P=C3=A9rez?= Date: Wed, 10 Mar 2010 12:39:44 +0100 Subject: [PATCH] ItEr50S13AdaptacionServiciosRESTItEr49S18: Added the field generateCodeForResources to the Configuration interface. --- .../web/common/ConfigurationController.java | 8 ++++++++ .../web/common/ConfigurationModel.java | 15 +++++++++++++++ .../web/common/IConfigurationModel.java | 3 +++ .../src/main/webapp/common/configuration.zul | 4 ++++ 4 files changed, 30 insertions(+) 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 ab620560d..980559369 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 @@ -155,6 +155,14 @@ public class ConfigurationController extends GenericForwardComposer { configurationModel.setGenerateCodeForWorkReport(generateCodeForWorkReport); } + public Boolean getGenerateCodeForResources() { + return configurationModel.getGenerateCodeForResources(); + } + + public void setGenerateCodeForResources(Boolean generateCodeForResources) { + configurationModel.setGenerateCodeForResources(generateCodeForResources); + } + public List getOrderSequences() { return configurationModel.getOrderSequences(); } 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 5cd30be7b..e8be15b10 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 @@ -251,6 +251,21 @@ public class ConfigurationModel implements IConfigurationModel { } } + @Override + public Boolean getGenerateCodeForResources() { + if (configuration == null) { + return null; + } + return configuration.getGenerateCodeForResources(); + } + + @Override + public void setGenerateCodeForResources(Boolean generateCodeForResources) { + if (configuration != null) { + configuration.setGenerateCodeForResources(generateCodeForResources); + } + } + @Override public List getOrderSequences() { return Collections.unmodifiableList(orderSequences); 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 76fef0e2e..d2b0b458e 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 @@ -60,6 +60,9 @@ public interface IConfigurationModel { Boolean getGenerateCodeForWorkReport(); void setGenerateCodeForWorkReport(Boolean generateCodeForWorkReport); + Boolean getGenerateCodeForResources(); + void setGenerateCodeForResources(Boolean generateCodeForResources); + List getOrderSequences(); void addOrderSequence(); void removeOrderSequence(OrderSequence orderSequence) diff --git a/navalplanner-webapp/src/main/webapp/common/configuration.zul b/navalplanner-webapp/src/main/webapp/common/configuration.zul index d90f978f4..10f87d999 100644 --- a/navalplanner-webapp/src/main/webapp/common/configuration.zul +++ b/navalplanner-webapp/src/main/webapp/common/configuration.zul @@ -73,6 +73,10 @@