Index: lams_tool_forum/src/java/org/lamsfoundation/lams/tool/forum/web/actions/MonitoringAction.java =================================================================== diff -u -r3399163940c61c9132223c758d274486e57ff9b7 -r6ce3c7af9cb3c623af52224b4556e875a637f3da --- lams_tool_forum/src/java/org/lamsfoundation/lams/tool/forum/web/actions/MonitoringAction.java (.../MonitoringAction.java) (revision 3399163940c61c9132223c758d274486e57ff9b7) +++ lams_tool_forum/src/java/org/lamsfoundation/lams/tool/forum/web/actions/MonitoringAction.java (.../MonitoringAction.java) (revision 6ce3c7af9cb3c623af52224b4556e875a637f3da) @@ -184,7 +184,7 @@ forumService = getForumService(); // create sessionMap - SessionMap sessionMap = new SessionMap(); + SessionMap sessionMap = new SessionMap<>(); request.getSession().setAttribute(sessionMap.getSessionID(), sessionMap); request.setAttribute(ForumConstants.ATTR_SESSION_MAP_ID, sessionMap.getSessionID()); @@ -193,7 +193,7 @@ List sessions = forumService.getSessionsByContentId(toolContentId); - Set sessionDtos = new TreeSet(new SessionDTOComparator()); + Set sessionDtos = new TreeSet<>(new SessionDTOComparator()); // build a map with all users in the forumSessionList for (ForumToolSession session : sessions) { Long sessionId = session.getSessionId(); @@ -312,7 +312,7 @@ if (topicsByUser.get(user) != null) { // sort messages by date - TreeSet messages = new TreeSet(new MessageDTOByDateComparator()); + TreeSet messages = new TreeSet<>(new MessageDTOByDateComparator()); messages.addAll(topicsByUser.get(user)); MessageDTO lastMessage = messages.last(); @@ -322,7 +322,7 @@ lastMessageDate = DateUtil.convertToTimeZoneFromDefault(teacherTimeZone, lastMessageDate); DateFormat dateFormatter = new SimpleDateFormat("d MMMM yyyy h:mm:ss a"); responseRow.put("lastMessageDate", dateFormatter.format(lastMessageDate)); - + responseRow.put("timeAgo", DateUtil.convertToStringForTimeagoJSON(lastMessageDate)); numberOfPosts = messages.size(); for (MessageDTO message : messages) { if (message.getMark() != null) { @@ -571,7 +571,8 @@ request.setAttribute("topicList", sessionTopicsMap); request.setAttribute("markAverage", sessionAvaMarkMap); request.setAttribute("totalMessage", sessionTotalMsgMap); - request.setAttribute(ForumConstants.ATTR_SESSION_MAP_ID, WebUtil.readStrParam(request, ForumConstants.ATTR_SESSION_MAP_ID)); + request.setAttribute(ForumConstants.ATTR_SESSION_MAP_ID, + WebUtil.readStrParam(request, ForumConstants.ATTR_SESSION_MAP_ID)); } /** @@ -865,7 +866,7 @@ * @return */ private Map> getTopicsSortedByAuthor(List topics) { - Map> topicsByUser = new TreeMap>( + Map> topicsByUser = new TreeMap<>( new ForumUserComparator()); for (MessageDTO topic : topics) { if (topic.getMessage().getIsAuthored()) { @@ -876,7 +877,7 @@ List topicsByUserExist = topicsByUser.get(user); if (topicsByUserExist == null) { - topicsByUserExist = new ArrayList(); + topicsByUserExist = new ArrayList<>(); topicsByUser.put(user, topicsByUserExist); } topicsByUserExist.add(topic); Index: lams_tool_forum/web/jsps/monitoring/summary.jsp =================================================================== diff -u -r4ee94091f26f844f9d5ed4439fd4f96c404b7649 -r6ce3c7af9cb3c623af52224b4556e875a637f3da --- lams_tool_forum/web/jsps/monitoring/summary.jsp (.../summary.jsp) (revision 4ee94091f26f844f9d5ed4439fd4f96c404b7649) +++ lams_tool_forum/web/jsps/monitoring/summary.jsp (.../summary.jsp) (revision 6ce3c7af9cb3c623af52224b4556e875a637f3da) @@ -25,6 +25,8 @@ }; + +