From cda89627f916d5c8daafc594be4516603fa9a619 Mon Sep 17 00:00:00 2001 From: Manuel Rego Casasnovas Date: Wed, 6 Jun 2012 07:53:05 +0200 Subject: [PATCH] Sort tasks in my tasks area FEA: ItEr76S28UserDashboard --- .../web/users/dashboard/MyTasksAreaModel.java | 16 ++++++++++++++++ .../src/main/webapp/myaccount/_myTasksArea.zul | 3 ++- 2 files changed, 18 insertions(+), 1 deletion(-) diff --git a/libreplan-webapp/src/main/java/org/libreplan/web/users/dashboard/MyTasksAreaModel.java b/libreplan-webapp/src/main/java/org/libreplan/web/users/dashboard/MyTasksAreaModel.java index 407e72e72..b1cb9eff3 100644 --- a/libreplan-webapp/src/main/java/org/libreplan/web/users/dashboard/MyTasksAreaModel.java +++ b/libreplan-webapp/src/main/java/org/libreplan/web/users/dashboard/MyTasksAreaModel.java @@ -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.List; import org.libreplan.business.advance.entities.AdvanceMeasurement; @@ -70,9 +72,23 @@ public class MyTasksAreaModel implements IMyTasksAreaModel { forceLoad(task); tasks.add(task); } + + sortTasksDescendingByStartDate(tasks); + return tasks; } + private void sortTasksDescendingByStartDate(List tasks) { + Collections.sort(tasks, new Comparator() { + + @Override + public int compare(Task o1, Task o2) { + return o2.getIntraDayStartDate().compareTo( + o1.getIntraDayStartDate()); + } + }); + } + private void forceLoad(Task task) { task.getName(); task.getOrderElement().getOrder().getName(); diff --git a/libreplan-webapp/src/main/webapp/myaccount/_myTasksArea.zul b/libreplan-webapp/src/main/webapp/myaccount/_myTasksArea.zul index 8f72bcc0f..ac43980ee 100644 --- a/libreplan-webapp/src/main/webapp/myaccount/_myTasksArea.zul +++ b/libreplan-webapp/src/main/webapp/myaccount/_myTasksArea.zul @@ -31,7 +31,8 @@ + sort="auto(startDate)" + sortDirection="descending" />