Index: lams_tool_forum/src/java/org/lamsfoundation/lams/tool/forum/persistence/ForumUserDao.java =================================================================== diff -u -r2cb29f8bc144ad08d33c6efe3e4c96f814a9a571 -rd6a6dfa17df8276ed171ef9b7c071136505e45f1 --- lams_tool_forum/src/java/org/lamsfoundation/lams/tool/forum/persistence/ForumUserDao.java (.../ForumUserDao.java) (revision 2cb29f8bc144ad08d33c6efe3e4c96f814a9a571) +++ lams_tool_forum/src/java/org/lamsfoundation/lams/tool/forum/persistence/ForumUserDao.java (.../ForumUserDao.java) (revision d6a6dfa17df8276ed171ef9b7c071136505e45f1) @@ -95,10 +95,10 @@ sortingOrder = "user.lastName DESC, user.firstName DESC"; break; case ForumConstants.SORT_BY_LAST_POSTING_ASC: - sortingOrder = " MAX(message.created) ASC"; + sortingOrder = " MAX(message.updated) ASC"; break; case ForumConstants.SORT_BY_LAST_POSTING_DESC: - sortingOrder = " MAX(message.created) DESC"; + sortingOrder = " MAX(message.updated) DESC"; break; case ForumConstants.SORT_BY_NUMBER_OF_POSTS_ASC: sortingOrder = " COUNT(message) ASC"; Index: lams_tool_forum/src/java/org/lamsfoundation/lams/tool/forum/util/MessageDTOByDateComparator.java =================================================================== diff -u -r57866bdc14371374aa386fcbec9394604a0d9b2a -rd6a6dfa17df8276ed171ef9b7c071136505e45f1 --- lams_tool_forum/src/java/org/lamsfoundation/lams/tool/forum/util/MessageDTOByDateComparator.java (.../MessageDTOByDateComparator.java) (revision 57866bdc14371374aa386fcbec9394604a0d9b2a) +++ lams_tool_forum/src/java/org/lamsfoundation/lams/tool/forum/util/MessageDTOByDateComparator.java (.../MessageDTOByDateComparator.java) (revision d6a6dfa17df8276ed171ef9b7c071136505e45f1) @@ -18,9 +18,9 @@ * * http://www.gnu.org/licenses/gpl.txt * **************************************************************** - */ - -/* $Id$ */ + */ + +/* $Id$ */ package org.lamsfoundation.lams.tool.forum.util; import java.util.Comparator; @@ -38,12 +38,11 @@ @Override public int compare(MessageDTO o1, MessageDTO o2) { if (o1 != null && o2 != null) { - Date o1Date = (o1.getMessage().getUpdated() == null) ? o1.getMessage().getCreated() : o1.getMessage() - .getUpdated(); - Date o2Date = (o2.getMessage().getUpdated() == null) ? o2.getMessage().getCreated() : o2.getMessage() - .getUpdated(); + Date o1Date = o1.getMessage().getUpdated(); + Date o2Date = o2.getMessage().getUpdated(); - return o1Date.compareTo(o2Date); + return o1Date.compareTo(o2Date) == 0 ? o1.getMessage().getUid().compareTo(o2.getMessage().getUid()) + : o1Date.compareTo(o2Date); } else if (o1 != null) { return 1; } else { Index: lams_tool_forum/src/java/org/lamsfoundation/lams/tool/forum/web/actions/MonitoringAction.java =================================================================== diff -u -r7b7aa3abd22de2b778d5608144ba9f92e16d1b4c -rd6a6dfa17df8276ed171ef9b7c071136505e45f1 --- lams_tool_forum/src/java/org/lamsfoundation/lams/tool/forum/web/actions/MonitoringAction.java (.../MonitoringAction.java) (revision 7b7aa3abd22de2b778d5608144ba9f92e16d1b4c) +++ lams_tool_forum/src/java/org/lamsfoundation/lams/tool/forum/web/actions/MonitoringAction.java (.../MonitoringAction.java) (revision d6a6dfa17df8276ed171ef9b7c071136505e45f1) @@ -264,16 +264,16 @@ sorting = ForumConstants.SORT_BY_USER_NAME_DESC; } else if ((isSort2 != null) && isSort2.equals(0)) { - sorting = ForumConstants.SORT_BY_LAST_POSTING_ASC; + sorting = ForumConstants.SORT_BY_NUMBER_OF_POSTS_ASC; } else if ((isSort2 != null) && isSort2.equals(1)) { - sorting = ForumConstants.SORT_BY_LAST_POSTING_DESC; + sorting = ForumConstants.SORT_BY_NUMBER_OF_POSTS_DESC; } else if ((isSort3 != null) && isSort3.equals(0)) { - sorting = ForumConstants.SORT_BY_NUMBER_OF_POSTS_ASC; + sorting = ForumConstants.SORT_BY_LAST_POSTING_ASC; } else if ((isSort3 != null) && isSort3.equals(1)) { - sorting = ForumConstants.SORT_BY_NUMBER_OF_POSTS_DESC; + sorting = ForumConstants.SORT_BY_LAST_POSTING_DESC; } Set sessionDtos = (Set) sessionMap.get(ForumConstants.ATTR_SESSION_DTOS); @@ -310,7 +310,7 @@ MessageDTO lastMessage = messages.last(); // format lastEdited date - Date lastMessageDate = lastMessage.getMessage().getCreated(); + Date lastMessageDate = lastMessage.getMessage().getUpdated(); lastMessageDate = DateUtil.convertToTimeZoneFromDefault(teacherTimeZone, lastMessageDate); DateFormat dateFormatter = new SimpleDateFormat("d MMMM yyyy h:mm:ss a"); responseRow.put("lastMessageDate", dateFormatter.format(lastMessageDate));