From 82bad8a1a72b68d702a4e526afae7e1bc0e5b068 Mon Sep 17 00:00:00 2001
From: Manuel Rego Casasnovas <rego@igalia.com>
Date: Mon, 5 Nov 2012 08:03:41 +0100
Subject: [PATCH] Add new field updatedFromTimesheets to TaskElement

FEA: ItEr77S12AdaptPlanningAccordingTimesheets
---
 .../planner/entities/TaskElement.java         | 11 +++++++++++
 .../src/main/resources/db.changelog-1.3.xml   | 19 ++++++++++++++++++-
 .../business/planner/entities/Tasks.hbm.xml   |  3 +++
 3 files changed, 32 insertions(+), 1 deletion(-)

diff --git a/libreplan-business/src/main/java/org/libreplan/business/planner/entities/TaskElement.java b/libreplan-business/src/main/java/org/libreplan/business/planner/entities/TaskElement.java
index 3afb60855..0498ff21f 100644
--- a/libreplan-business/src/main/java/org/libreplan/business/planner/entities/TaskElement.java
+++ b/libreplan-business/src/main/java/org/libreplan/business/planner/entities/TaskElement.java
@@ -37,6 +37,7 @@ import java.util.Set;
 import java.util.SortedMap;
 import java.util.TreeMap;
 
+import org.apache.commons.lang.BooleanUtils;
 import org.apache.commons.lang.Validate;
 import org.apache.commons.logging.Log;
 import org.apache.commons.logging.LogFactory;
@@ -182,6 +183,8 @@ public abstract class TaskElement extends BaseEntity {
 
     private Boolean simplifiedAssignedStatusCalculationEnabled = false;
 
+    private Boolean updatedFromTimesheets = false;
+
     public void initializeDatesIfNeeded() {
         if (getIntraDayEndDate() == null || getIntraDayStartDate() == null) {
             initializeDates();
@@ -833,4 +836,12 @@ public abstract class TaskElement extends BaseEntity {
         return result;
     }
 
+    public Boolean isUpdatedFromTimesheets() {
+        return updatedFromTimesheets;
+    }
+
+    public void setUpdatedFromTimesheets(Boolean updatedFromTimesheets) {
+        this.updatedFromTimesheets = BooleanUtils.isTrue(updatedFromTimesheets);
+    }
+
 }
diff --git a/libreplan-business/src/main/resources/db.changelog-1.3.xml b/libreplan-business/src/main/resources/db.changelog-1.3.xml
index ca9640cf5..2a5a8c764 100644
--- a/libreplan-business/src/main/resources/db.changelog-1.3.xml
+++ b/libreplan-business/src/main/resources/db.changelog-1.3.xml
@@ -119,7 +119,6 @@
             columnDataType="BOOLEAN" />
     </changeSet>
 
-
     <changeSet id="add-new-column-finished_timesheets-to-sum_charged_effort"
         author="mrego">
         <comment>
@@ -138,4 +137,22 @@
             columnDataType="BOOLEAN" />
     </changeSet>
 
+    <changeSet id="add-new-column-updated_from_timesheets-to-task_element"
+        author="mrego">
+        <comment>
+            Add new column updated_from_timesheets with default value FALSE to
+            task_element table.
+        </comment>
+        <addColumn tableName="task_element">
+            <column name="updated_from_timesheets" type="BOOLEAN" />
+        </addColumn>
+        <addDefaultValue tableName="task_element"
+            columnName="updated_from_timesheets"
+            defaultValueBoolean="FALSE" />
+        <addNotNullConstraint tableName="task_element"
+            columnName="updated_from_timesheets"
+            defaultNullValue="FALSE"
+            columnDataType="BOOLEAN" />
+    </changeSet>
+
 </databaseChangeLog>
diff --git a/libreplan-business/src/main/resources/org/libreplan/business/planner/entities/Tasks.hbm.xml b/libreplan-business/src/main/resources/org/libreplan/business/planner/entities/Tasks.hbm.xml
index 43357189d..a370b9024 100644
--- a/libreplan-business/src/main/resources/org/libreplan/business/planner/entities/Tasks.hbm.xml
+++ b/libreplan-business/src/main/resources/org/libreplan/business/planner/entities/Tasks.hbm.xml
@@ -52,6 +52,9 @@
         <many-to-one name="calendar" column="base_calendar_id" cascade="none"
             class="org.libreplan.business.calendars.entities.BaseCalendar"/>
 
+        <property name="updatedFromTimesheets"
+            column="updated_from_timesheets" />
+
         <joined-subclass name="Task" table="task">
             <key column="task_element_id"></key>
             <property name="calculatedValue" column="calculated_value">