RenJuan/TASKPM
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

[Bug #1154] Sorts the report by order name.

Browse source 
* Order entity implements now Comparable with the field name.

FEA: ItEr75S04BugFixing
This commit is contained in:
Ignacio Diaz Teijido 2011-09-16 11:26:09 +02:00 • committed by Manuel Rego Casasnovas
parent a3b22f2ec6
commit 8ca1ab1d44
2 changed files with 9 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
navalplanner-business/src/main/java/org/navalplanner/business/orders/entities/Order.java
View file

@ -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());
}
}

3
navalplanner-webapp/src/main/java/org/navalplanner/web/reports/SchedulingProgressPerOrderModel.java
View file

@ -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());