From 8ca1ab1d4432e562ca5aad0f0bf40bc420f8cfcc Mon Sep 17 00:00:00 2001
From: Ignacio Diaz Teijido <ignacio.diaz@comtecsf.es>
Date: Fri, 16 Sep 2011 11:26:09 +0200
Subject: [PATCH] [Bug #1154] Sorts the report by order name.

* Order entity implements now Comparable with the field name.

FEA: ItEr75S04BugFixing
---
 .../org/navalplanner/business/orders/entities/Order.java   | 7 ++++++-
 .../web/reports/SchedulingProgressPerOrderModel.java       | 3 +++
 2 files changed, 9 insertions(+), 1 deletion(-)

diff --git a/navalplanner-business/src/main/java/org/navalplanner/business/orders/entities/Order.java b/navalplanner-business/src/main/java/org/navalplanner/business/orders/entities/Order.java
index 4355418b9..2bcc0464c 100644
--- a/navalplanner-business/src/main/java/org/navalplanner/business/orders/entities/Order.java
+++ b/navalplanner-business/src/main/java/org/navalplanner/business/orders/entities/Order.java
@@ -58,7 +58,7 @@ import org.navalplanner.business.util.deepcopy.DeepCopy;
  * It represents an {@link Order} with its related information. <br />
  * @author Óscar González Fernández <ogonzalez@igalia.com>
  */
-public class Order extends OrderLineGroup {
+public class Order extends OrderLineGroup implements Comparable {
 
     public static Order create() {
         Order order = new Order();
@@ -560,4 +560,9 @@ public class Order extends OrderLineGroup {
 
     }
 
+    @Override
+    public int compareTo(Object o) {
+        return this.getName().compareToIgnoreCase(((Order) o).getName());
+    }
+
 }
diff --git a/navalplanner-webapp/src/main/java/org/navalplanner/web/reports/SchedulingProgressPerOrderModel.java b/navalplanner-webapp/src/main/java/org/navalplanner/web/reports/SchedulingProgressPerOrderModel.java
index 4129a4cd7..249a3cc1a 100644
--- a/navalplanner-webapp/src/main/java/org/navalplanner/web/reports/SchedulingProgressPerOrderModel.java
+++ b/navalplanner-webapp/src/main/java/org/navalplanner/web/reports/SchedulingProgressPerOrderModel.java
@@ -22,6 +22,7 @@
 package org.navalplanner.web.reports;
 
 import java.util.ArrayList;
+import java.util.Collections;
 import java.util.Date;
 import java.util.List;
 import java.util.Set;
@@ -89,6 +90,8 @@ public class SchedulingProgressPerOrderModel implements ISchedulingProgressPerOr
         allOrders = orderDAO.getOrdersByScenario(scenarioManager
                 .getCurrent());
 
+        Collections.sort(allOrders);
+
         for (Order each : allOrders) {
             each.useSchedulingDataFor(scenarioManager.getCurrent());
             initializeTasks(each.getTaskElements());