Index: lams_tool_forum/src/java/org/lamsfoundation/lams/tool/forum/persistence/hibernate/ForumUserDao.java =================================================================== diff -u -r2b4141f8f15fe552ea1ba29d0b302544943cb6b0 -r37d10ebef40f685086bcba48e41ac99325fd3131 --- lams_tool_forum/src/java/org/lamsfoundation/lams/tool/forum/persistence/hibernate/ForumUserDao.java (.../ForumUserDao.java) (revision 2b4141f8f15fe552ea1ba29d0b302544943cb6b0) +++ lams_tool_forum/src/java/org/lamsfoundation/lams/tool/forum/persistence/hibernate/ForumUserDao.java (.../ForumUserDao.java) (revision 37d10ebef40f685086bcba48e41ac99325fd3131) @@ -106,10 +106,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 -r2b4141f8f15fe552ea1ba29d0b302544943cb6b0 -r37d10ebef40f685086bcba48e41ac99325fd3131 --- lams_tool_forum/src/java/org/lamsfoundation/lams/tool/forum/util/MessageDTOByDateComparator.java (.../MessageDTOByDateComparator.java) (revision 2b4141f8f15fe552ea1ba29d0b302544943cb6b0) +++ lams_tool_forum/src/java/org/lamsfoundation/lams/tool/forum/util/MessageDTOByDateComparator.java (.../MessageDTOByDateComparator.java) (revision 37d10ebef40f685086bcba48e41ac99325fd3131) @@ -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 -r2b4141f8f15fe552ea1ba29d0b302544943cb6b0 -r37d10ebef40f685086bcba48e41ac99325fd3131 --- lams_tool_forum/src/java/org/lamsfoundation/lams/tool/forum/web/actions/MonitoringAction.java (.../MonitoringAction.java) (revision 2b4141f8f15fe552ea1ba29d0b302544943cb6b0) +++ lams_tool_forum/src/java/org/lamsfoundation/lams/tool/forum/web/actions/MonitoringAction.java (.../MonitoringAction.java) (revision 37d10ebef40f685086bcba48e41ac99325fd3131) @@ -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));