From 024f30ab0b7cc8975a9726fa948b8e82509b7a7e Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Lorenzo=20Tilve=20=C3=81lvaro?= <ltilve@igalia.com>
Date: Thu, 6 Jun 2013 21:06:25 +0200
Subject: [PATCH] Included in the interface new settings to enable automatic
 budgeting and the type of hour to use on it

FEA: ItEr77S17AutomaticBudgeting
---
 .../business/common/entities/Configuration.java   |  8 ++++++++
 .../web/common/ConfigurationController.java       |  8 ++++++++
 .../libreplan/web/common/ConfigurationModel.java  | 12 ++++++++++++
 .../libreplan/web/common/IConfigurationModel.java |  4 ++++
 .../src/main/webapp/common/configuration.zul      | 15 +++++++++++++++
 5 files changed, 47 insertions(+)

diff --git a/libreplan-business/src/main/java/org/libreplan/business/common/entities/Configuration.java b/libreplan-business/src/main/java/org/libreplan/business/common/entities/Configuration.java
index 2f05f98d4..e3c6e5194 100644
--- a/libreplan-business/src/main/java/org/libreplan/business/common/entities/Configuration.java
+++ b/libreplan-business/src/main/java/org/libreplan/business/common/entities/Configuration.java
@@ -476,6 +476,14 @@ public class Configuration extends BaseEntity {
         personalTimesheetsTypeOfWorkHours = typeOfWorkHours;
     }
 
+    public TypeOfWorkHours getBudgetDefaultTypeOfWorkHours() {
+        return personalTimesheetsTypeOfWorkHours;
+    }
+
+    public void setBudgetDefaultTypeOfWorkHours(TypeOfWorkHours typeOfWorkHours) {
+        personalTimesheetsTypeOfWorkHours = typeOfWorkHours;
+    }
+
     public PersonalTimesheetsPeriodicityEnum getPersonalTimesheetsPeriodicity() {
         return personalTimesheetsPeriodicity;
     }
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 bef2292c9..6470b2aa9 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
@@ -1002,6 +1002,14 @@ public class ConfigurationController extends GenericForwardComposer {
         configurationModel.setPersonalTimesheetsTypeOfWorkHours(typeOfWorkHours);
     }
 
+    public TypeOfWorkHours getBudgetDefaultTypeOfWorkHours() {
+        return configurationModel.getBudgetDefaultTypeOfWorkHours();
+    }
+
+    public void setBudgetDefaultTypeOfWorkHours(TypeOfWorkHours typeOfWorkHours) {
+        configurationModel.setBudgetDefaultTypeOfWorkHours(typeOfWorkHours);
+    }
+
     public List<PersonalTimesheetsPeriodicityEnum> getPersonalTimesheetsPeriodicities() {
         return Arrays.asList(PersonalTimesheetsPeriodicityEnum.values());
     }
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 fdbcada4c..a6b04e4c5 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
@@ -161,6 +161,7 @@ public class ConfigurationModel implements IConfigurationModel {
     private void forceLoad(Configuration configuration) {
         forceLoad(configuration.getDefaultCalendar());
         forceLoad(configuration.getPersonalTimesheetsTypeOfWorkHours());
+        forceLoad(configuration.getBudgetDefaultTypeOfWorkHours());
     }
 
     private void forceLoad(BaseCalendar calendar) {
@@ -721,4 +722,15 @@ public class ConfigurationModel implements IConfigurationModel {
         return jobSchedulerModel.scheduleOrUnscheduleJobs(connector);
     }
 
+    @Override
+    public TypeOfWorkHours getBudgetDefaultTypeOfWorkHours() {
+        return configuration.getBudgetDefaultTypeOfWorkHours();
+    }
+
+    @Override
+    public void setBudgetDefaultTypeOfWorkHours(TypeOfWorkHours typeOfWorkHours) {
+        if (configuration != null) {
+            configuration.setBudgetDefaultTypeOfWorkHours(typeOfWorkHours);
+        }
+    }
 }
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 c3f488355..9c81a1d2d 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
@@ -192,4 +192,8 @@ public interface IConfigurationModel {
 
     boolean scheduleOrUnscheduleJobs(Connector connector);
 
+    TypeOfWorkHours getBudgetDefaultTypeOfWorkHours();
+
+    void setBudgetDefaultTypeOfWorkHours(TypeOfWorkHours typeOfWorkHours);
+
 }
diff --git a/libreplan-webapp/src/main/webapp/common/configuration.zul b/libreplan-webapp/src/main/webapp/common/configuration.zul
index 8779de873..0f9effd9f 100644
--- a/libreplan-webapp/src/main/webapp/common/configuration.zul
+++ b/libreplan-webapp/src/main/webapp/common/configuration.zul
@@ -210,6 +210,21 @@
                                     label="${i18n:_('MonteCarlo method')}"
                                     checked="@{configurationController.monteCarloMethodTabVisible}" />
                             </row>
+                            <!-- Automatic budget -->
+                            <row>
+                                <label
+                                    value="${i18n:_('Automatic budget')}" />
+                                    <hbox>
+                                <label
+                                    value="${i18n:_('Hours type')}" />
+                                    <bandboxSearch
+                                    finder="TypeOfWorkHoursBandboxFinder"
+                                    selectedElement="@{configurationController.budgetDefaultTypeOfWorkHours, access='both'}" />
+                                        <checkbox
+                                            label="${i18n:_('calculate based on task criteria and cost categories')}"
+                                            checked="@{configurationController.enabledAutomaticBudget}" />
+                                    </hbox>
+                            </row>
                             <row>
                                 <label
                                     value="${i18n:_('Seconds planning warning')}" />