Index: lams_tool_wiki/src/java/org/lamsfoundation/lams/tool/wiki/service/IWikiService.java =================================================================== RCS file: /usr/local/cvsroot/lams_tool_wiki/src/java/org/lamsfoundation/lams/tool/wiki/service/IWikiService.java,v diff -u -r1.6 -r1.7 --- lams_tool_wiki/src/java/org/lamsfoundation/lams/tool/wiki/service/IWikiService.java 21 Oct 2008 03:20:19 -0000 1.6 +++ lams_tool_wiki/src/java/org/lamsfoundation/lams/tool/wiki/service/IWikiService.java 15 Feb 2011 20:37:59 -0000 1.7 @@ -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 =================================================================== RCS file: /usr/local/cvsroot/lams_tool_wiki/src/java/org/lamsfoundation/lams/tool/wiki/service/WikiService.java,v diff -u -r1.15 -r1.16 --- lams_tool_wiki/src/java/org/lamsfoundation/lams/tool/wiki/service/WikiService.java 4 Sep 2009 04:01:22 -0000 1.15 +++ lams_tool_wiki/src/java/org/lamsfoundation/lams/tool/wiki/service/WikiService.java 15 Feb 2011 20:37:59 -0000 1.16 @@ -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 =================================================================== RCS file: /usr/local/cvsroot/lams_tool_wiki/src/java/org/lamsfoundation/lams/tool/wiki/util/WikiConstants.java,v diff -u -r1.5 -r1.6 --- lams_tool_wiki/src/java/org/lamsfoundation/lams/tool/wiki/util/WikiConstants.java 21 Oct 2008 03:20:19 -0000 1.5 +++ lams_tool_wiki/src/java/org/lamsfoundation/lams/tool/wiki/util/WikiConstants.java 15 Feb 2011 20:37:59 -0000 1.6 @@ -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 =================================================================== RCS file: /usr/local/cvsroot/lams_tool_wiki/src/java/org/lamsfoundation/lams/tool/wiki/web/actions/MonitoringAction.java,v diff -u -r1.8 -r1.9 --- lams_tool_wiki/src/java/org/lamsfoundation/lams/tool/wiki/web/actions/MonitoringAction.java 14 Nov 2008 07:29:52 -0000 1.8 +++ lams_tool_wiki/src/java/org/lamsfoundation/lams/tool/wiki/web/actions/MonitoringAction.java 15 Feb 2011 20:37:59 -0000 1.9 @@ -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 =================================================================== RCS file: /usr/local/cvsroot/lams_tool_wiki/web/pages/monitoring/statistics.jsp,v diff -u -r1.1 -r1.2 --- lams_tool_wiki/web/pages/monitoring/statistics.jsp 8 Oct 2008 05:33:00 -0000 1.1 +++ lams_tool_wiki/web/pages/monitoring/statistics.jsp 15 Feb 2011 20:37:59 -0000 1.2 @@ -3,15 +3,17 @@ - - - - -
-

- ${session.sessionName} -

-
+ + + + + +
+

+ ${session.sessionName} +

+
+
Index: lams_tool_wiki/web/pages/monitoring/wikiDisplay.jsp =================================================================== RCS file: /usr/local/cvsroot/lams_tool_wiki/web/pages/monitoring/wikiDisplay.jsp,v diff -u -r1.15 -r1.16 --- lams_tool_wiki/web/pages/monitoring/wikiDisplay.jsp 6 Oct 2010 10:16:46 -0000 1.15 +++ lams_tool_wiki/web/pages/monitoring/wikiDisplay.jsp 15 Feb 2011 20:37:59 -0000 1.16 @@ -18,9 +18,11 @@
-

- ${sessionDTO.sessionName} -

+ +

+ ${sessionDTO.sessionName} +

+