From 3aaa1a12585c1ef48091e678cc68236b6f4f722f Mon Sep 17 00:00:00 2001
From: Ignacio Diaz Teijido <ignacio.diaz@cafedered.com>
Date: Wed, 2 Nov 2011 18:13:22 +0100
Subject: [PATCH] [Bug #1236] Sorting orders in some combos of reports

* Order costs per resource
* Materials needed at date
* Working progress per task

FEA: ItEr75S04BugFixing
---
 .../org/libreplan/web/reports/OrderCostsPerResourceModel.java   | 1 +
 .../libreplan/web/reports/TimeLineRequiredMaterialModel.java    | 2 ++
 .../org/libreplan/web/reports/WorkingProgressPerTaskModel.java  | 2 ++
 3 files changed, 5 insertions(+)

diff --git a/libreplan-webapp/src/main/java/org/libreplan/web/reports/OrderCostsPerResourceModel.java b/libreplan-webapp/src/main/java/org/libreplan/web/reports/OrderCostsPerResourceModel.java
index fdc605d40..65787f719 100644
--- a/libreplan-webapp/src/main/java/org/libreplan/web/reports/OrderCostsPerResourceModel.java
+++ b/libreplan-webapp/src/main/java/org/libreplan/web/reports/OrderCostsPerResourceModel.java
@@ -156,6 +156,7 @@ public class OrderCostsPerResourceModel implements IOrderCostsPerResourceModel {
 
     private void loadAllOrders() {
         this.allOrders = orderDAO.getOrders();
+        Collections.sort(this.allOrders);
     }
 
     @Override
diff --git a/libreplan-webapp/src/main/java/org/libreplan/web/reports/TimeLineRequiredMaterialModel.java b/libreplan-webapp/src/main/java/org/libreplan/web/reports/TimeLineRequiredMaterialModel.java
index 1fccfe673..f3fa22552 100644
--- a/libreplan-webapp/src/main/java/org/libreplan/web/reports/TimeLineRequiredMaterialModel.java
+++ b/libreplan-webapp/src/main/java/org/libreplan/web/reports/TimeLineRequiredMaterialModel.java
@@ -23,6 +23,7 @@ package org.libreplan.web.reports;
 
 import java.util.ArrayList;
 import java.util.Collection;
+import java.util.Collections;
 import java.util.Date;
 import java.util.List;
 
@@ -106,6 +107,7 @@ public class TimeLineRequiredMaterialModel implements
 
     private void loadAllOrders() {
         allOrders = orderDAO.getOrdersByScenario(scenarioManager.getCurrent());
+        Collections.sort(allOrders);
     }
 
     @Override
diff --git a/libreplan-webapp/src/main/java/org/libreplan/web/reports/WorkingProgressPerTaskModel.java b/libreplan-webapp/src/main/java/org/libreplan/web/reports/WorkingProgressPerTaskModel.java
index e5be5d995..0f724c66a 100644
--- a/libreplan-webapp/src/main/java/org/libreplan/web/reports/WorkingProgressPerTaskModel.java
+++ b/libreplan-webapp/src/main/java/org/libreplan/web/reports/WorkingProgressPerTaskModel.java
@@ -22,6 +22,7 @@
 package org.libreplan.web.reports;
 
 import java.util.ArrayList;
+import java.util.Collections;
 import java.util.Date;
 import java.util.HashSet;
 import java.util.Iterator;
@@ -105,6 +106,7 @@ public class WorkingProgressPerTaskModel implements IWorkingProgressPerTaskModel
     public List<Order> getOrders() {
         List<Order> result = orderDAO.getOrdersByScenario(scenarioManager
                 .getCurrent());
+        Collections.sort(result);
         return result;
     }