diff --git a/navalplanner-business/src/main/java/org/navalplanner/business/planner/entities/GenericDayAssignmentsContainer.java b/navalplanner-business/src/main/java/org/navalplanner/business/planner/entities/GenericDayAssignmentsContainer.java index 8ca74f69a..cc17bb6cf 100644 --- a/navalplanner-business/src/main/java/org/navalplanner/business/planner/entities/GenericDayAssignmentsContainer.java +++ b/navalplanner-business/src/main/java/org/navalplanner/business/planner/entities/GenericDayAssignmentsContainer.java @@ -54,6 +54,11 @@ public class GenericDayAssignmentsContainer extends BaseEntity implements private Set dayAssignments = new HashSet(); + /** + * It can be null + */ + private IntraDayDate intraDayStart; + /** * It can be null */ @@ -106,6 +111,14 @@ public class GenericDayAssignmentsContainer extends BaseEntity implements return GenericDayAssignment.copy(this, assignments); } + public IntraDayDate getIntraDayStart() { + return intraDayStart; + } + + public void setIntraDayStart(IntraDayDate intraDayStart) { + this.intraDayStart = intraDayStart; + } + public IntraDayDate getIntraDayEnd() { return intraDayEnd; } diff --git a/navalplanner-business/src/main/java/org/navalplanner/business/planner/entities/IDayAssignmentsContainer.java b/navalplanner-business/src/main/java/org/navalplanner/business/planner/entities/IDayAssignmentsContainer.java index bd68f25d0..4076cec36 100644 --- a/navalplanner-business/src/main/java/org/navalplanner/business/planner/entities/IDayAssignmentsContainer.java +++ b/navalplanner-business/src/main/java/org/navalplanner/business/planner/entities/IDayAssignmentsContainer.java @@ -43,6 +43,10 @@ public interface IDayAssignmentsContainer { void resetTo(Collection assignments); + IntraDayDate getIntraDayStart(); + + void setIntraDayStart(IntraDayDate intraDayStart); + IntraDayDate getIntraDayEnd(); void setIntraDayEnd(IntraDayDate intraDayEnd); diff --git a/navalplanner-business/src/main/java/org/navalplanner/business/planner/entities/SpecificDayAssignmentsContainer.java b/navalplanner-business/src/main/java/org/navalplanner/business/planner/entities/SpecificDayAssignmentsContainer.java index f2812b5a1..e668ce529 100644 --- a/navalplanner-business/src/main/java/org/navalplanner/business/planner/entities/SpecificDayAssignmentsContainer.java +++ b/navalplanner-business/src/main/java/org/navalplanner/business/planner/entities/SpecificDayAssignmentsContainer.java @@ -54,6 +54,11 @@ public class SpecificDayAssignmentsContainer extends BaseEntity implements private Set dayAssignments = new HashSet(); + /** + * It can be null + */ + private IntraDayDate intraDayStart; + /** * It can be null */ @@ -111,6 +116,16 @@ public class SpecificDayAssignmentsContainer extends BaseEntity implements return SpecificDayAssignment.copy(this, assignments); } + @Override + public IntraDayDate getIntraDayStart() { + return intraDayStart; + } + + @Override + public void setIntraDayStart(IntraDayDate intraDayStart) { + this.intraDayStart = intraDayStart; + } + @Override public IntraDayDate getIntraDayEnd() { return intraDayEnd; diff --git a/navalplanner-business/src/main/resources/org/navalplanner/business/planner/entities/ResourceAllocations.hbm.xml b/navalplanner-business/src/main/resources/org/navalplanner/business/planner/entities/ResourceAllocations.hbm.xml index 584a31c2c..2f0474ef0 100644 --- a/navalplanner-business/src/main/resources/org/navalplanner/business/planner/entities/ResourceAllocations.hbm.xml +++ b/navalplanner-business/src/main/resources/org/navalplanner/business/planner/entities/ResourceAllocations.hbm.xml @@ -88,6 +88,13 @@ + + + + + @@ -116,6 +123,13 @@ + + + + +