Index: lams_tool_wiki/src/java/org/lamsfoundation/lams/tool/wiki/service/IWikiService.java =================================================================== diff -u -rf08d91b95c1892c71594dd4f7fd6e9b4509cccc7 -r6d29456e3a6b018730d32c60729d6f2e693ac55e --- lams_tool_wiki/src/java/org/lamsfoundation/lams/tool/wiki/service/IWikiService.java (.../IWikiService.java) (revision f08d91b95c1892c71594dd4f7fd6e9b4509cccc7) +++ lams_tool_wiki/src/java/org/lamsfoundation/lams/tool/wiki/service/IWikiService.java (.../IWikiService.java) (revision 6d29456e3a6b018730d32c60729d6f2e693ac55e) @@ -325,4 +325,12 @@ * @return */ List getMonitorsByToolSessionId(Long sessionId); + + /** + * 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_wiki/src/java/org/lamsfoundation/lams/tool/wiki/service/WikiService.java =================================================================== diff -u -rc22fec13a9cc724397d5b3564cb08d72740013ba -r6d29456e3a6b018730d32c60729d6f2e693ac55e --- lams_tool_wiki/src/java/org/lamsfoundation/lams/tool/wiki/service/WikiService.java (.../WikiService.java) (revision c22fec13a9cc724397d5b3564cb08d72740013ba) +++ lams_tool_wiki/src/java/org/lamsfoundation/lams/tool/wiki/service/WikiService.java (.../WikiService.java) (revision 6d29456e3a6b018730d32c60729d6f2e693ac55e) @@ -804,6 +804,10 @@ public void setAuditService(IAuditService auditService) { this.auditService = auditService; } + + public boolean isGroupedActivity(long toolContentID) { + return toolService.isGroupedActivity(toolContentID); + } private NodeKey processFile(FormFile file, String type) { NodeKey node = null; Index: lams_tool_wiki/src/java/org/lamsfoundation/lams/tool/wiki/util/WikiConstants.java =================================================================== diff -u -rf08d91b95c1892c71594dd4f7fd6e9b4509cccc7 -r6d29456e3a6b018730d32c60729d6f2e693ac55e --- lams_tool_wiki/src/java/org/lamsfoundation/lams/tool/wiki/util/WikiConstants.java (.../WikiConstants.java) (revision f08d91b95c1892c71594dd4f7fd6e9b4509cccc7) +++ lams_tool_wiki/src/java/org/lamsfoundation/lams/tool/wiki/util/WikiConstants.java (.../WikiConstants.java) (revision 6d29456e3a6b018730d32c60729d6f2e693ac55e) @@ -63,6 +63,7 @@ public static final String ATTR_FINISHED_ACTIVITY = "finishedActivity"; public static final String ATTR_CONTENT_EDITAVLE = "contentEditable"; public static final String ATTR_MAIN_PAGE_TITLE = "mainPageTitle"; + public static final String ATTR_IS_GROUPED_ACTIVITY = "isGroupedActivity"; // Events public static final String EVENT_NOTIFY_TEACHERS = "wikiNotifyTeachers"; Index: lams_tool_wiki/src/java/org/lamsfoundation/lams/tool/wiki/web/actions/MonitoringAction.java =================================================================== diff -u -raa23536bf893527084d4b72019050dc457c8b23c -r6d29456e3a6b018730d32c60729d6f2e693ac55e --- lams_tool_wiki/src/java/org/lamsfoundation/lams/tool/wiki/web/actions/MonitoringAction.java (.../MonitoringAction.java) (revision aa23536bf893527084d4b72019050dc457c8b23c) +++ lams_tool_wiki/src/java/org/lamsfoundation/lams/tool/wiki/web/actions/MonitoringAction.java (.../MonitoringAction.java) (revision 6d29456e3a6b018730d32c60729d6f2e693ac55e) @@ -113,6 +113,7 @@ request.setAttribute(WikiConstants.ATTR_WIKI_DTO, wikiDT0); request.setAttribute(WikiConstants.ATTR_CONTENT_FOLDER_ID, contentFolderID); + request.setAttribute(WikiConstants.ATTR_IS_GROUPED_ACTIVITY, wikiService.isGroupedActivity(toolContentID)); return mapping.findForward("success"); } @@ -167,6 +168,7 @@ WikiSession wikiSession = wikiService.getSessionBySessionId(toolSessionId); WikiSessionDTO sessionDTO = new WikiSessionDTO(wikiSession); + Long toolContentId = wikiSession.getWiki().getToolContentId(); // Add all the user notebook entries to the session dto for (WikiUserDTO userDTO : sessionDTO.getUserDTOs()) { @@ -218,6 +220,7 @@ } request.setAttribute(WikiConstants.ATTR_WIKI_PAGE_CONTENT_HISTORY, currentWikiPageHistoryDTOs); request.setAttribute(WikiConstants.ATTR_CONTENT_FOLDER_ID, contentFolderID); + request.setAttribute(WikiConstants.ATTR_IS_GROUPED_ACTIVITY, wikiService.isGroupedActivity(toolContentId)); return mapping.findForward("wiki_display"); } Index: lams_tool_wiki/web/pages/monitoring/statistics.jsp =================================================================== diff -u -r1082bdcc357c105126a5641cecc68acfa645b66b -r6d29456e3a6b018730d32c60729d6f2e693ac55e --- lams_tool_wiki/web/pages/monitoring/statistics.jsp (.../statistics.jsp) (revision 1082bdcc357c105126a5641cecc68acfa645b66b) +++ lams_tool_wiki/web/pages/monitoring/statistics.jsp (.../statistics.jsp) (revision 6d29456e3a6b018730d32c60729d6f2e693ac55e) @@ -3,15 +3,17 @@ - - - - -
-

- ${session.sessionName} -

-
+ + + + + +
+

+ ${session.sessionName} +

+
+
Index: lams_tool_wiki/web/pages/monitoring/wikiDisplay.jsp =================================================================== diff -u -r8179037dc958585c054547eb7de9be14c6aed233 -r6d29456e3a6b018730d32c60729d6f2e693ac55e --- lams_tool_wiki/web/pages/monitoring/wikiDisplay.jsp (.../wikiDisplay.jsp) (revision 8179037dc958585c054547eb7de9be14c6aed233) +++ lams_tool_wiki/web/pages/monitoring/wikiDisplay.jsp (.../wikiDisplay.jsp) (revision 6d29456e3a6b018730d32c60729d6f2e693ac55e) @@ -18,9 +18,11 @@
-

- ${sessionDTO.sessionName} -

+ +

+ ${sessionDTO.sessionName} +

+