Index: lams_tool_dimdim/src/java/org/lamsfoundation/lams/tool/dimdim/service/DimdimService.java =================================================================== diff -u -rec79327ab1a4c1e87d301fb8f48f6ff38f8e06f0 -r1201a49ea259a27ba1f79763f898b8d1cdd2fa08 --- lams_tool_dimdim/src/java/org/lamsfoundation/lams/tool/dimdim/service/DimdimService.java (.../DimdimService.java) (revision ec79327ab1a4c1e87d301fb8f48f6ff38f8e06f0) +++ lams_tool_dimdim/src/java/org/lamsfoundation/lams/tool/dimdim/service/DimdimService.java (.../DimdimService.java) (revision 1201a49ea259a27ba1f79763f898b8d1cdd2fa08) @@ -614,6 +614,10 @@ throw new DimdimException("Login failed." + e.getMessage()); } } + + public boolean isGroupedActivity(long toolContentID) { + return toolService.isGroupedActivity(toolContentID); + } /* * ===============Methods implemented from ToolContentImport102Manager =============== Index: lams_tool_dimdim/src/java/org/lamsfoundation/lams/tool/dimdim/service/IDimdimService.java =================================================================== diff -u -rec79327ab1a4c1e87d301fb8f48f6ff38f8e06f0 -r1201a49ea259a27ba1f79763f898b8d1cdd2fa08 --- lams_tool_dimdim/src/java/org/lamsfoundation/lams/tool/dimdim/service/IDimdimService.java (.../IDimdimService.java) (revision ec79327ab1a4c1e87d301fb8f48f6ff38f8e06f0) +++ lams_tool_dimdim/src/java/org/lamsfoundation/lams/tool/dimdim/service/IDimdimService.java (.../IDimdimService.java) (revision 1201a49ea259a27ba1f79763f898b8d1cdd2fa08) @@ -211,5 +211,13 @@ // * @return Meeting url // */ // public String joinMeeting(DimdimUser user) throws Exception; + + /** + * Returns whether activity is grouped and therefore it is expected more than one tool session. + * + * @param toolContentID + * @return + */ + boolean isGroupedActivity(long toolContentID); } Index: lams_tool_dimdim/src/java/org/lamsfoundation/lams/tool/dimdim/util/Constants.java =================================================================== diff -u -rec79327ab1a4c1e87d301fb8f48f6ff38f8e06f0 -r1201a49ea259a27ba1f79763f898b8d1cdd2fa08 --- lams_tool_dimdim/src/java/org/lamsfoundation/lams/tool/dimdim/util/Constants.java (.../Constants.java) (revision ec79327ab1a4c1e87d301fb8f48f6ff38f8e06f0) +++ lams_tool_dimdim/src/java/org/lamsfoundation/lams/tool/dimdim/util/Constants.java (.../Constants.java) (revision 1201a49ea259a27ba1f79763f898b8d1cdd2fa08) @@ -38,6 +38,7 @@ public static final String ATTR_SESSION_MAP = "sessionMap"; public static final String ATTR_TOOL_SESSION_ID = "toolSessionID"; public static final String ATTR_USER_DTO = "userDTO"; + public static final String ATTR_IS_GROUPED_ACTIVITY = "isGroupedActivity"; // Configuration key public static final String CFG_SERVER_URL = "server_url"; Index: lams_tool_dimdim/src/java/org/lamsfoundation/lams/tool/dimdim/web/actions/MonitoringAction.java =================================================================== diff -u -rec79327ab1a4c1e87d301fb8f48f6ff38f8e06f0 -r1201a49ea259a27ba1f79763f898b8d1cdd2fa08 --- lams_tool_dimdim/src/java/org/lamsfoundation/lams/tool/dimdim/web/actions/MonitoringAction.java (.../MonitoringAction.java) (revision ec79327ab1a4c1e87d301fb8f48f6ff38f8e06f0) +++ lams_tool_dimdim/src/java/org/lamsfoundation/lams/tool/dimdim/web/actions/MonitoringAction.java (.../MonitoringAction.java) (revision 1201a49ea259a27ba1f79763f898b8d1cdd2fa08) @@ -96,7 +96,9 @@ Long currentTab = WebUtil.readLongParam(request, AttributeNames.PARAM_CURRENT_TAB, true); contentDT0.setCurrentTab(currentTab); - + + boolean isGroupedActivity = dimdimService.isGroupedActivity(toolContentID); + request.setAttribute(Constants.ATTR_IS_GROUPED_ACTIVITY, isGroupedActivity); request.setAttribute(Constants.ATTR_CONTENT_DTO, contentDT0); request.setAttribute(Constants.ATTR_CONTENT_FOLDER_ID, contentFolderID); return mapping.findForward("success"); Index: lams_tool_dimdim/web/pages/monitoring/summary.jsp =================================================================== diff -u -r0030d56dd29101427d6db03c137fc18407264c76 -r1201a49ea259a27ba1f79763f898b8d1cdd2fa08 --- lams_tool_dimdim/web/pages/monitoring/summary.jsp (.../summary.jsp) (revision 0030d56dd29101427d6db03c137fc18407264c76) +++ lams_tool_dimdim/web/pages/monitoring/summary.jsp (.../summary.jsp) (revision 1201a49ea259a27ba1f79763f898b8d1cdd2fa08) @@ -51,9 +51,11 @@ -

- ${session.sessionName} -

+ +

+ ${session.sessionName} +

+

Index: lams_tool_forum/src/java/org/lamsfoundation/lams/tool/forum/service/ForumService.java =================================================================== diff -u -r68fb65f1bcd80e6387b4da0d20e0ce73a21207fc -r1201a49ea259a27ba1f79763f898b8d1cdd2fa08 --- lams_tool_forum/src/java/org/lamsfoundation/lams/tool/forum/service/ForumService.java (.../ForumService.java) (revision 68fb65f1bcd80e6387b4da0d20e0ce73a21207fc) +++ lams_tool_forum/src/java/org/lamsfoundation/lams/tool/forum/service/ForumService.java (.../ForumService.java) (revision 1201a49ea259a27ba1f79763f898b8d1cdd2fa08) @@ -699,6 +699,10 @@ public void updateEntry(NotebookEntry notebookEntry) { coreNotebookService.updateEntry(notebookEntry); } + + public boolean isGroupedActivity(long toolContentID) { + return toolService.isGroupedActivity(toolContentID); + } // *************************************************************************************************************** // ToolContentManager and ToolSessionManager methods Index: lams_tool_forum/src/java/org/lamsfoundation/lams/tool/forum/service/IForumService.java =================================================================== diff -u -r1ef4b877aea0883709c641351e07595c6be84361 -r1201a49ea259a27ba1f79763f898b8d1cdd2fa08 --- lams_tool_forum/src/java/org/lamsfoundation/lams/tool/forum/service/IForumService.java (.../IForumService.java) (revision 1ef4b877aea0883709c641351e07595c6be84361) +++ lams_tool_forum/src/java/org/lamsfoundation/lams/tool/forum/service/IForumService.java (.../IForumService.java) (revision 1201a49ea259a27ba1f79763f898b8d1cdd2fa08) @@ -433,4 +433,12 @@ public void deleteCondition(ForumCondition condition) throws PersistenceException; void sendNotificationsOnNewPosting(Long forumId, Long sessionId, Message message); + + /** + * Returns whether activity is grouped and therefore it is expected more than one tool session. + * + * @param toolContentID + * @return + */ + boolean isGroupedActivity(long toolContentID); } Index: lams_tool_forum/src/java/org/lamsfoundation/lams/tool/forum/web/actions/MonitoringAction.java =================================================================== diff -u -r8e7bae5bbcffc1c7ef3bd8a9b280363d8bc24a9e -r1201a49ea259a27ba1f79763f898b8d1cdd2fa08 --- lams_tool_forum/src/java/org/lamsfoundation/lams/tool/forum/web/actions/MonitoringAction.java (.../MonitoringAction.java) (revision 8e7bae5bbcffc1c7ef3bd8a9b280363d8bc24a9e) +++ lams_tool_forum/src/java/org/lamsfoundation/lams/tool/forum/web/actions/MonitoringAction.java (.../MonitoringAction.java) (revision 1201a49ea259a27ba1f79763f898b8d1cdd2fa08) @@ -262,6 +262,8 @@ sessionUsersMap.put(sessionDto, dtoList); } + boolean isGroupedActivity = forumService.isGroupedActivity(toolContentID); + request.setAttribute("isGroupedActivity", isGroupedActivity); // request.setAttribute(AttributeNames.PARAM_TOOL_SESSION_ID,sessionID); request.setAttribute("sessionUserMap", sessionUsersMap); } Index: lams_tool_forum/web/jsps/monitoring/summary.jsp =================================================================== diff -u -r1c2b6676cf65452d0dc887534cf4ff6621ae8e8c -r1201a49ea259a27ba1f79763f898b8d1cdd2fa08 --- lams_tool_forum/web/jsps/monitoring/summary.jsp (.../summary.jsp) (revision 1c2b6676cf65452d0dc887534cf4ff6621ae8e8c) +++ lams_tool_forum/web/jsps/monitoring/summary.jsp (.../summary.jsp) (revision 1201a49ea259a27ba1f79763f898b8d1cdd2fa08) @@ -281,18 +281,21 @@ - - - + + + + +
- - -
-

- : -

+
+ +
+

+ : +

+