Index: lams_tool_daco/src/java/org/lamsfoundation/lams/tool/daco/DacoConstants.java =================================================================== RCS file: /usr/local/cvsroot/lams_tool_daco/src/java/org/lamsfoundation/lams/tool/daco/DacoConstants.java,v diff -u -r1.13 -r1.14 --- lams_tool_daco/src/java/org/lamsfoundation/lams/tool/daco/DacoConstants.java 27 Mar 2009 18:23:39 -0000 1.13 +++ lams_tool_daco/src/java/org/lamsfoundation/lams/tool/daco/DacoConstants.java 10 Feb 2011 22:29:41 -0000 1.14 @@ -193,6 +193,8 @@ public static final String ATTR_QUESTION_SUMMARIES = "questionSummaries"; public static final String ATTR_TOTAL_RECORD_COUNT = "totalRecordCount"; + + public static final String ATTR_IS_GROUPED_ACTIVITY = "isGroupedActivity"; // error message keys public static final String ERROR_MSG_DESC_BLANK = "error.question.desc.blank"; Index: lams_tool_daco/src/java/org/lamsfoundation/lams/tool/daco/service/DacoServiceImpl.java =================================================================== RCS file: /usr/local/cvsroot/lams_tool_daco/src/java/org/lamsfoundation/lams/tool/daco/service/DacoServiceImpl.java,v diff -u -r1.12 -r1.13 --- lams_tool_daco/src/java/org/lamsfoundation/lams/tool/daco/service/DacoServiceImpl.java 8 Nov 2010 11:52:49 -0000 1.12 +++ lams_tool_daco/src/java/org/lamsfoundation/lams/tool/daco/service/DacoServiceImpl.java 10 Feb 2011 22:29:41 -0000 1.13 @@ -660,6 +660,10 @@ } return learnerService.completeToolSession(toolSessionId, learnerId); } + + public boolean isGroupedActivity(long toolContentID) { + return toolService.isGroupedActivity(toolContentID); + } // ******************************************************************************* // ToolContentManager, ToolSessionManager methods Index: lams_tool_daco/src/java/org/lamsfoundation/lams/tool/daco/service/IDacoService.java =================================================================== RCS file: /usr/local/cvsroot/lams_tool_daco/src/java/org/lamsfoundation/lams/tool/daco/service/IDacoService.java,v diff -u -r1.9 -r1.10 --- lams_tool_daco/src/java/org/lamsfoundation/lams/tool/daco/service/IDacoService.java 14 Nov 2008 04:05:26 -0000 1.9 +++ lams_tool_daco/src/java/org/lamsfoundation/lams/tool/daco/service/IDacoService.java 10 Feb 2011 22:29:41 -0000 1.10 @@ -314,4 +314,6 @@ * @return */ public int getRecordNum(Long userID, Long sessionId); + + boolean isGroupedActivity(long toolContentID); } Index: lams_tool_daco/src/java/org/lamsfoundation/lams/tool/daco/web/action/MonitoringAction.java =================================================================== RCS file: /usr/local/cvsroot/lams_tool_daco/src/java/org/lamsfoundation/lams/tool/daco/web/action/MonitoringAction.java,v diff -u -r1.9 -r1.10 --- lams_tool_daco/src/java/org/lamsfoundation/lams/tool/daco/web/action/MonitoringAction.java 7 Dec 2009 07:54:04 -0000 1.9 +++ lams_tool_daco/src/java/org/lamsfoundation/lams/tool/daco/web/action/MonitoringAction.java 10 Feb 2011 22:29:41 -0000 1.10 @@ -163,6 +163,8 @@ sessionMap.put(DacoConstants.ATTR_MONITORING_SUMMARY, monitoringSummaryList); if (newSession) { + boolean isGroupedActivity = service.isGroupedActivity(contentId); + sessionMap.put(DacoConstants.ATTR_IS_GROUPED_ACTIVITY, isGroupedActivity); sessionMap.put(DacoConstants.ATTR_DACO, daco); sessionMap.put(AttributeNames.PARAM_TOOL_CONTENT_ID, contentId); sessionMap.put(AttributeNames.PARAM_CONTENT_FOLDER_ID, WebUtil.readStrParam(request, Index: lams_tool_daco/web/pages/monitoring/summary.jsp =================================================================== RCS file: /usr/local/cvsroot/lams_tool_daco/web/pages/monitoring/summary.jsp,v diff -u -r1.7 -r1.8 --- lams_tool_daco/web/pages/monitoring/summary.jsp 27 Mar 2009 18:23:38 -0000 1.7 +++ lams_tool_daco/web/pages/monitoring/summary.jsp 10 Feb 2011 22:29:41 -0000 1.8 @@ -142,11 +142,13 @@ - - - : ${sessionSummary.sessionName} - - + + + + : ${sessionSummary.sessionName} + + + Index: lams_tool_dimdim/src/java/org/lamsfoundation/lams/tool/dimdim/service/DimdimService.java =================================================================== RCS file: /usr/local/cvsroot/lams_tool_dimdim/src/java/org/lamsfoundation/lams/tool/dimdim/service/DimdimService.java,v diff -u -r1.18 -r1.19 --- lams_tool_dimdim/src/java/org/lamsfoundation/lams/tool/dimdim/service/DimdimService.java 30 Jul 2009 20:58:40 -0000 1.18 +++ lams_tool_dimdim/src/java/org/lamsfoundation/lams/tool/dimdim/service/DimdimService.java 10 Feb 2011 22:35:12 -0000 1.19 @@ -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 =================================================================== RCS file: /usr/local/cvsroot/lams_tool_dimdim/src/java/org/lamsfoundation/lams/tool/dimdim/service/Attic/IDimdimService.java,v diff -u -r1.12 -r1.13 --- lams_tool_dimdim/src/java/org/lamsfoundation/lams/tool/dimdim/service/IDimdimService.java 30 Jul 2009 20:58:40 -0000 1.12 +++ lams_tool_dimdim/src/java/org/lamsfoundation/lams/tool/dimdim/service/IDimdimService.java 10 Feb 2011 22:35:12 -0000 1.13 @@ -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 =================================================================== RCS file: /usr/local/cvsroot/lams_tool_dimdim/src/java/org/lamsfoundation/lams/tool/dimdim/util/Attic/Constants.java,v diff -u -r1.10 -r1.11 --- lams_tool_dimdim/src/java/org/lamsfoundation/lams/tool/dimdim/util/Constants.java 30 Jul 2009 20:58:40 -0000 1.10 +++ lams_tool_dimdim/src/java/org/lamsfoundation/lams/tool/dimdim/util/Constants.java 10 Feb 2011 22:35:12 -0000 1.11 @@ -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 =================================================================== RCS file: /usr/local/cvsroot/lams_tool_dimdim/src/java/org/lamsfoundation/lams/tool/dimdim/web/actions/MonitoringAction.java,v diff -u -r1.14 -r1.15 --- lams_tool_dimdim/src/java/org/lamsfoundation/lams/tool/dimdim/web/actions/MonitoringAction.java 30 Jul 2009 20:58:40 -0000 1.14 +++ lams_tool_dimdim/src/java/org/lamsfoundation/lams/tool/dimdim/web/actions/MonitoringAction.java 10 Feb 2011 22:35:12 -0000 1.15 @@ -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 =================================================================== RCS file: /usr/local/cvsroot/lams_tool_dimdim/web/pages/monitoring/Attic/summary.jsp,v diff -u -r1.12 -r1.13 --- lams_tool_dimdim/web/pages/monitoring/summary.jsp 22 Nov 2008 22:41:50 -0000 1.12 +++ lams_tool_dimdim/web/pages/monitoring/summary.jsp 10 Feb 2011 22:35:12 -0000 1.13 @@ -51,9 +51,11 @@ -

- ${session.sessionName} -

+ +

+ ${session.sessionName} +

+

Index: lams_tool_forum/src/java/org/lamsfoundation/lams/tool/forum/service/ForumService.java =================================================================== RCS file: /usr/local/cvsroot/lams_tool_forum/src/java/org/lamsfoundation/lams/tool/forum/service/ForumService.java,v diff -u -r1.107 -r1.108 --- lams_tool_forum/src/java/org/lamsfoundation/lams/tool/forum/service/ForumService.java 19 Nov 2010 19:08:31 -0000 1.107 +++ lams_tool_forum/src/java/org/lamsfoundation/lams/tool/forum/service/ForumService.java 10 Feb 2011 22:38:02 -0000 1.108 @@ -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 =================================================================== RCS file: /usr/local/cvsroot/lams_tool_forum/src/java/org/lamsfoundation/lams/tool/forum/service/IForumService.java,v diff -u -r1.47 -r1.48 --- lams_tool_forum/src/java/org/lamsfoundation/lams/tool/forum/service/IForumService.java 27 Oct 2010 17:27:35 -0000 1.47 +++ lams_tool_forum/src/java/org/lamsfoundation/lams/tool/forum/service/IForumService.java 10 Feb 2011 22:38:02 -0000 1.48 @@ -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 =================================================================== RCS file: /usr/local/cvsroot/lams_tool_forum/src/java/org/lamsfoundation/lams/tool/forum/web/actions/MonitoringAction.java,v diff -u -r1.41 -r1.42 --- lams_tool_forum/src/java/org/lamsfoundation/lams/tool/forum/web/actions/MonitoringAction.java 7 Dec 2010 20:02:25 -0000 1.41 +++ lams_tool_forum/src/java/org/lamsfoundation/lams/tool/forum/web/actions/MonitoringAction.java 10 Feb 2011 22:38:02 -0000 1.42 @@ -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 =================================================================== RCS file: /usr/local/cvsroot/lams_tool_forum/web/jsps/monitoring/summary.jsp,v diff -u -r1.16 -r1.17 --- lams_tool_forum/web/jsps/monitoring/summary.jsp 18 Nov 2010 13:20:30 -0000 1.16 +++ lams_tool_forum/web/jsps/monitoring/summary.jsp 10 Feb 2011 22:38:02 -0000 1.17 @@ -281,18 +281,21 @@ - - - + + + + +
- - -
-

- : -

+
+ +
+

+ : +

+