From 1dd02b41492aceef9691ea0b2252f2d1ade50209 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jacobo=20Aragunde=20P=C3=A9rez?= Date: Fri, 8 Oct 2010 19:44:26 +0200 Subject: [PATCH] [Bug #674] Sorted the tasks by start date before showing them in the company screen. FEA: ItEr61S05BugFixing --- .../web/planner/company/CompanyPlanningModel.java | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/navalplanner-webapp/src/main/java/org/navalplanner/web/planner/company/CompanyPlanningModel.java b/navalplanner-webapp/src/main/java/org/navalplanner/web/planner/company/CompanyPlanningModel.java index 701411c85..bb8f25a96 100644 --- a/navalplanner-webapp/src/main/java/org/navalplanner/web/planner/company/CompanyPlanningModel.java +++ b/navalplanner-webapp/src/main/java/org/navalplanner/web/planner/company/CompanyPlanningModel.java @@ -29,6 +29,7 @@ import java.math.BigDecimal; import java.util.ArrayList; import java.util.Collection; import java.util.Collections; +import java.util.Comparator; import java.util.Date; import java.util.EnumSet; import java.util.HashMap; @@ -723,6 +724,12 @@ public abstract class CompanyPlanningModel implements ICompanyPlanningModel { ordersToShow.add(order); } } + Collections.sort(result,new Comparator(){ + @Override + public int compare(TaskElement arg0, TaskElement arg1) { + return arg0.getStartDate().compareTo(arg1.getStartDate()); + } + }); setDefaultFilterValues(ordersToShow); return result; }