diff --git a/navalplanner-business/src/main/java/org/navalplanner/business/planner/entities/Stretch.java b/navalplanner-business/src/main/java/org/navalplanner/business/planner/entities/Stretch.java index 73feba3dc..00af7ef68 100644 --- a/navalplanner-business/src/main/java/org/navalplanner/business/planner/entities/Stretch.java +++ b/navalplanner-business/src/main/java/org/navalplanner/business/planner/entities/Stretch.java @@ -22,6 +22,9 @@ package org.navalplanner.business.planner.entities; import java.math.BigDecimal; +import java.util.Collections; +import java.util.Comparator; +import java.util.List; import org.hibernate.validator.NotNull; import org.joda.time.LocalDate; @@ -43,6 +46,21 @@ public class Stretch { return create(stretch.date, stretch.lengthPercentage, stretch.amountWorkPercentage); } + public static Stretch buildFromConsolidatedProgress(ResourceAllocation resourceAllocation) { + return ConsolidatedStretch.fromConsolidatedProgress(resourceAllocation); + } + + public static List sortByDate( + List stretches) { + Collections.sort(stretches, new Comparator() { + @Override + public int compare(Stretch o1, Stretch o2) { + return o1.getDate().compareTo(o2.getDate()); + } + }); + return stretches; + } + @NotNull private LocalDate date = new LocalDate(); @@ -125,4 +143,4 @@ public class Stretch { readOnly = value; } -} \ No newline at end of file +}