From 333d8f49f37ab5ac26eb8a360e284ebe34e62380 Mon Sep 17 00:00:00 2001 From: fred-fri <fred-fri@dsv.su.se> Date: Fri, 4 May 2012 20:59:51 +0900 Subject: [PATCH] more sorting, but some rows mysteriously disapper. try sorting on name and see first meeting disappear when sort order is descending --- .../datatables/CheckListTemplateDataPanel.java | 15 ++++++++++++--- 1 file changed, 12 insertions(+), 3 deletions(-) diff --git a/src/main/java/se/su/dsv/scipro/datatables/CheckListTemplateDataPanel.java b/src/main/java/se/su/dsv/scipro/datatables/CheckListTemplateDataPanel.java index 5fb2cc1177..fc389cafee 100644 --- a/src/main/java/se/su/dsv/scipro/datatables/CheckListTemplateDataPanel.java +++ b/src/main/java/se/su/dsv/scipro/datatables/CheckListTemplateDataPanel.java @@ -72,8 +72,9 @@ public class CheckListTemplateDataPanel extends Panel { }; columns[1] = new PropertyColumn<CheckListTemplate>(Model.of("Creator"), "creator", "creator"); - columns[2] = new PropertyColumn<CheckListTemplate>(Model.of("Categories"), "categories", "categories"); - columns[3] = new PropertyColumn<CheckListTemplate>(Model.of("Created"), "dateCreated", "dateCreated"); + columns[2] = new PropertyColumn<CheckListTemplate>(Model.of("Categories"), "categories"); +// columns[3] = new PropertyColumn<CheckListTemplate>(Model.of("Created"), "dateCreated", "dateCreated"); + columns[3] = new PropertyColumn<CheckListTemplate>(Model.of("Updated"), "lastModified", "lastModified"); table = new DataTable<CheckListTemplate>("datatable", columns, checklistTemplateProvider = new ChecklistTemplateProvider(), 10); @@ -96,7 +97,15 @@ public class CheckListTemplateDataPanel extends Panel { public Iterator<? extends CheckListTemplate> iterator(int first, int count) { // Sort(Direction direction, String... properties) // new Sort(Sort.Direction.ASC, "name") - return checklistTemplateService.find(filterString, new PageRequest(table.getCurrentPage(), count, new Sort(Sort.Direction.ASC, "name"))).iterator(); + Sort sort; + if (getSort().isAscending()){ + sort = new Sort(Sort.Direction.ASC, getSort().getProperty()); + } + else { + sort = new Sort(Sort.Direction.DESC, getSort().getProperty()); + } +// new Sort(Sort.Direction.ASC, getSort().toString()) + return checklistTemplateService.find(filterString, new PageRequest(table.getCurrentPage(), count, sort)).iterator(); } @Override