Introduce close tree test result request

[gpl/argeo-slc.git] / org.argeo.slc.server / src / main / java / org / argeo / slc / web / mvc / result / ResultListController.java

diff --git a/org.argeo.slc.server/src/main/java/org/argeo/slc/web/mvc/result/ResultListController.java b/org.argeo.slc.server/src/main/java/org/argeo/slc/web/mvc/result/ResultListController.java
index 16de958406f2ad747e873289caba7bc4ad5dcbc9..a83653105cccb686cbafa1ee7bb1ebcf691ab3d3 100644 (file)
--- a/org.argeo.slc.server/src/main/java/org/argeo/slc/web/mvc/result/ResultListController.java
+++ b/org.argeo.slc.server/src/main/java/org/argeo/slc/web/mvc/result/ResultListController.java
@@ -1,6 +1,8 @@
 package org.argeo.slc.web.mvc.result;\r
 \r
-import java.util.List;\r
+import java.util.Comparator;\r
+import java.util.SortedSet;\r
+import java.util.TreeSet;\r
 \r
 import javax.servlet.http.HttpServletRequest;\r
 import javax.servlet.http.HttpServletResponse;\r
@@ -24,7 +26,25 @@ public class ResultListController extends ParameterizableViewController {
 \r
                ModelAndView modelAndView = new ModelAndView();\r
 \r
-               List<TreeTestResult> results = testResultDao.listTestResults();\r
+               Comparator<TreeTestResult> comparator = new Comparator<TreeTestResult>() {\r
+\r
+                       public int compare(TreeTestResult arg0, TreeTestResult arg1) {\r
+                               if (arg0.getCloseDate() != null && arg1.getCloseDate() != null) {\r
+                                       return -arg0.getCloseDate().compareTo(arg1.getCloseDate());\r
+                               } else if (arg0.getCloseDate() != null\r
+                                               && arg1.getCloseDate() == null) {\r
+                                       return 1;\r
+                               } else if (arg0.getCloseDate() == null\r
+                                               && arg1.getCloseDate() != null) {\r
+                                       return -1;\r
+                               } else {\r
+                                       return arg0.getUuid().compareTo(arg1.getUuid());\r
+                               }\r
+                       }\r
+               };\r
+               SortedSet<TreeTestResult> results = new TreeSet<TreeTestResult>(\r
+                               comparator);\r
+               results.addAll(testResultDao.listTestResults());\r
                modelAndView.addObject("results", results);\r
                modelAndView.setViewName(getViewName());\r
                return modelAndView;\r