[Bug #1236] Sorting orders in some combos of reports
* Order costs per resource * Materials needed at date * Working progress per task FEA: ItEr75S04BugFixing
This commit is contained in:
parent
b7d4ff8622
commit
3aaa1a1258
3 changed files with 5 additions and 0 deletions
|
|
@ -156,6 +156,7 @@ public class OrderCostsPerResourceModel implements IOrderCostsPerResourceModel {
|
|||
|
||||
private void loadAllOrders() {
|
||||
this.allOrders = orderDAO.getOrders();
|
||||
Collections.sort(this.allOrders);
|
||||
}
|
||||
|
||||
@Override
|
||||
|
|
|
|||
|
|
@ -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
|
||||
|
|
|
|||
|
|
@ -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;
|
||||
}
|
||||
|
||||
|
|
|
|||
Loading…
Add table
Reference in a new issue