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

Sort tasks in monthly timesheet

Browse source 
FEA: ItEr76S28UserDashboard
This commit is contained in:
Manuel Rego Casasnovas 2012-05-30 11:52:19 +02:00
parent 7bedd652fe
commit 0b2a165720
1 changed files with 18 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

18
libreplan-webapp/src/main/java/org/libreplan/web/users/dashboard/MonthlyTimesheetModel.java
View file

@ -20,6 +20,8 @@
package org.libreplan.web.users.dashboard;
import java.util.ArrayList;
import java.util.Collections;
import java.util.Comparator;
import java.util.HashMap;
import java.util.HashSet;
import java.util.List;
@ -239,7 +241,23 @@ public class MonthlyTimesheetModel implements IMonthlyTimesheetModel {
}
@Override
@Transactional(readOnly = true)
public List<OrderElement> getOrderElements() {
Collections.sort(orderElements, new Comparator<OrderElement>() {
@Override
public int compare(OrderElement o1, OrderElement o2) {
Order order1 = getOrder(o1);
Order order2 = getOrder(o2);
int compareOrderName = order1.getName().compareTo(
order2.getName());
if (compareOrderName != 0) {
return compareOrderName;
}
return o1.getName().compareTo(o2.getName());
}
});
return orderElements;
}