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" /> - @@ -138,4 +137,22 @@ columnDataType="BOOLEAN" /> + + + Add new column updated_from_timesheets with default value FALSE to + task_element table. + + + + + + + + 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 @@ + +