From 4cbd9c9221b658699621a6ed9308701eb3fc3837 Mon Sep 17 00:00:00 2001
From: Manuel Rego Casasnovas <rego@igalia.com>
Date: Wed, 22 Feb 2012 10:01:49 +0100
Subject: [PATCH] Remove scenarios option from configuration window

---
 .../web/common/ConfigurationController.java   | 21 ----------------
 .../web/common/ConfigurationModel.java        | 25 -------------------
 .../web/common/IConfigurationModel.java       |  6 -----
 .../src/main/webapp/common/configuration.zul  | 22 +++-------------
 4 files changed, 3 insertions(+), 71 deletions(-)

diff --git a/libreplan-webapp/src/main/java/org/libreplan/web/common/ConfigurationController.java b/libreplan-webapp/src/main/java/org/libreplan/web/common/ConfigurationController.java
index e928a4294..d26a1816f 100644
--- a/libreplan-webapp/src/main/java/org/libreplan/web/common/ConfigurationController.java
+++ b/libreplan-webapp/src/main/java/org/libreplan/web/common/ConfigurationController.java
@@ -57,7 +57,6 @@ import org.zkoss.zk.ui.event.Events;
 import org.zkoss.zk.ui.event.SelectEvent;
 import org.zkoss.zk.ui.util.GenericForwardComposer;
 import org.zkoss.zul.Button;
-import org.zkoss.zul.Checkbox;
 import org.zkoss.zul.Combobox;
 import org.zkoss.zul.Constraint;
 import org.zkoss.zul.Grid;
@@ -111,8 +110,6 @@ public class ConfigurationController extends GenericForwardComposer {
 
     private Textbox prefixBox;
 
-    private Checkbox scenariosVisible;
-
     private UserRole roles;
 
     private Textbox ldapGroupPath;
@@ -138,12 +135,6 @@ public class ConfigurationController extends GenericForwardComposer {
         initializeProgressTypeList();
         messages = new MessagesForUser(messagesContainer);
         reloadEntitySequences();
-        if (moreScenariosThanMasterCreated()) {
-            scenariosVisible.setChecked(true);
-            scenariosVisible.setDisabled(true);
-            scenariosVisible
-                    .setTooltiptext(_("Scenarios must be enabled as more elements than master exist"));
-        }
         loadRoleStrategyRows();
     }
 
@@ -461,14 +452,6 @@ public class ConfigurationController extends GenericForwardComposer {
         return configurationModel.isMonteCarloMethodTabVisible();
     }
 
-    public void setScenariosVisible(Boolean scenariosVisible) {
-        configurationModel.setScenariosVisible(scenariosVisible);
-    }
-
-    public Boolean isScenariosVisible() {
-        return configurationModel.isScenariosVisible();
-    }
-
     public ProgressTypeRenderer getProgressTypeRenderer() {
         return progressTypeRenderer;
     }
@@ -771,10 +754,6 @@ public class ConfigurationController extends GenericForwardComposer {
         return EntityNameEnum.values();
     }
 
-    public boolean moreScenariosThanMasterCreated() {
-        return configurationModel.moreScenariosThanMasterCreated();
-    }
-
     // Tab ldap properties
     public LDAPConfiguration getLdapConfiguration() {
         return configurationModel.getLdapConfiguration();
diff --git a/libreplan-webapp/src/main/java/org/libreplan/web/common/ConfigurationModel.java b/libreplan-webapp/src/main/java/org/libreplan/web/common/ConfigurationModel.java
index 8f5a69405..0b2bdb143 100644
--- a/libreplan-webapp/src/main/java/org/libreplan/web/common/ConfigurationModel.java
+++ b/libreplan-webapp/src/main/java/org/libreplan/web/common/ConfigurationModel.java
@@ -43,8 +43,6 @@ import org.libreplan.business.common.entities.LDAPConfiguration;
 import org.libreplan.business.common.entities.ProgressType;
 import org.libreplan.business.common.exceptions.InstanceNotFoundException;
 import org.libreplan.business.common.exceptions.ValidationException;
-import org.libreplan.business.scenarios.daos.IScenarioDAO;
-import org.libreplan.business.scenarios.entities.Scenario;
 import org.libreplan.web.common.concurrentdetection.OnConcurrentModification;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.beans.factory.config.BeanDefinition;
@@ -77,9 +75,6 @@ public class ConfigurationModel implements IConfigurationModel {
     @Autowired
     private IEntitySequenceDAO entitySequenceDAO;
 
-    @Autowired
-    private IScenarioDAO scenarioDAO;
-
     @Override
     @Transactional(readOnly = true)
     public List<BaseCalendar> getCalendars() {
@@ -526,26 +521,6 @@ public class ConfigurationModel implements IConfigurationModel {
         configuration.setCompanyLogoURL(companyLogoURL);
     }
 
-    @Override
-    public Boolean isScenariosVisible() {
-        return configuration.isScenariosVisible();
-    }
-
-    @Override
-    public void setScenariosVisible(Boolean scenariosVisible) {
-        configuration.setScenariosVisible(scenariosVisible);
-    }
-
-    @Override
-    @Transactional(readOnly = true)
-    public Boolean moreScenariosThanMasterCreated() {
-        List<Scenario> scenarios = scenarioDAO.getAll();
-        if (scenarios != null) {
-            return scenarios.size() > 1;
-        }
-        return false;
-    }
-
     @Override
     public void setLdapConfiguration(LDAPConfiguration ldapConfiguration) {
         configuration.setLdapConfiguration(ldapConfiguration);
diff --git a/libreplan-webapp/src/main/java/org/libreplan/web/common/IConfigurationModel.java b/libreplan-webapp/src/main/java/org/libreplan/web/common/IConfigurationModel.java
index c070a21a2..7c1a7453b 100644
--- a/libreplan-webapp/src/main/java/org/libreplan/web/common/IConfigurationModel.java
+++ b/libreplan-webapp/src/main/java/org/libreplan/web/common/IConfigurationModel.java
@@ -135,12 +135,6 @@ public interface IConfigurationModel {
 
     void setCompanyLogoURL(String companyLogoURL);
 
-    Boolean isScenariosVisible();
-
-    void setScenariosVisible(Boolean scenariosVisible);
-
-    Boolean moreScenariosThanMasterCreated();
-
     void setLdapConfiguration(LDAPConfiguration ldapConfiguration);
 
     LDAPConfiguration getLdapConfiguration();
diff --git a/libreplan-webapp/src/main/webapp/common/configuration.zul b/libreplan-webapp/src/main/webapp/common/configuration.zul
index 29317ce1a..1d435feb8 100644
--- a/libreplan-webapp/src/main/webapp/common/configuration.zul
+++ b/libreplan-webapp/src/main/webapp/common/configuration.zul
@@ -176,25 +176,9 @@
                             <row>
                                 <label
                                     value="${i18n:_('Perspectives')}" />
-                                <grid>
-                                    <columns>
-                                        <column width="50%" />
-                                        <column />
-                                    </columns>
-                                    <rows>
-                                        <row>
-                                            <checkbox
-                                                label="${i18n:_('MonteCarlo method')}"
-                                                checked="@{configurationController.monteCarloMethodTabVisible}" />
-                                        </row>
-                                        <row>
-                                            <checkbox
-                                                id="scenariosVisible"
-                                                label="${i18n:_('Enable scenarios module')}"
-                                                checked="@{configurationController.scenariosVisible}" />
-                                        </row>
-                                    </rows>
-                                </grid>
+                                <checkbox
+                                    label="${i18n:_('MonteCarlo method')}"
+                                    checked="@{configurationController.monteCarloMethodTabVisible}" />
                             </row>
                         </rows>
                     </grid>