diff --git a/navalplanner-business/src/main/java/org/navalplanner/business/planner/entities/DayAssignment.java b/navalplanner-business/src/main/java/org/navalplanner/business/planner/entities/DayAssignment.java index ad1e8e309..5059dc364 100644 --- a/navalplanner-business/src/main/java/org/navalplanner/business/planner/entities/DayAssignment.java +++ b/navalplanner-business/src/main/java/org/navalplanner/business/planner/entities/DayAssignment.java @@ -39,6 +39,21 @@ import org.navalplanner.business.resources.entities.Resource; public abstract class DayAssignment extends BaseEntity { + public static List getAtInterval( + List orderedAssignments, LocalDate startInclusive, + LocalDate endExclusive) { + List result = new ArrayList(); + for (T dayAssignment : orderedAssignments) { + if (dayAssignment.getDay().compareTo(endExclusive) >= 0) { + break; + } + if (dayAssignment.includedIn(startInclusive, endExclusive)) { + result.add(dayAssignment); + } + } + return result; + } + public static int sum(Collection assignments) { int result = 0; for (DayAssignment dayAssignment : assignments) { diff --git a/navalplanner-business/src/main/java/org/navalplanner/business/planner/entities/ResourceAllocation.java b/navalplanner-business/src/main/java/org/navalplanner/business/planner/entities/ResourceAllocation.java index 00711beaf..1a710792e 100644 --- a/navalplanner-business/src/main/java/org/navalplanner/business/planner/entities/ResourceAllocation.java +++ b/navalplanner-business/src/main/java/org/navalplanner/business/planner/entities/ResourceAllocation.java @@ -577,19 +577,10 @@ public abstract class ResourceAllocation extends public List getAssignments(LocalDate start, LocalDate endExclusive) { - List result = new ArrayList(); - for (DayAssignment dayAssignment : getAssignments()) { - if (dayAssignment.getDay().compareTo(endExclusive) >= 0) { - break; - } - if (dayAssignment.includedIn(start, endExclusive)) { - result.add(dayAssignment); - } - } - return result; + return new ArrayList(DayAssignment.getAtInterval( + getAssignments(), start, endExclusive)); } - public int getAssignedHours(LocalDate start, LocalDate endExclusive) { return getAssignedHours(getAssignments(start, endExclusive)); }