Index: lams_tool_task/src/java/org/lamsfoundation/lams/tool/taskList/TaskListConstants.java =================================================================== RCS file: /usr/local/cvsroot/lams_tool_task/src/java/org/lamsfoundation/lams/tool/taskList/TaskListConstants.java,v diff -u -r1.12 -r1.13 --- lams_tool_task/src/java/org/lamsfoundation/lams/tool/taskList/TaskListConstants.java 26 Jun 2008 02:30:17 -0000 1.12 +++ lams_tool_task/src/java/org/lamsfoundation/lams/tool/taskList/TaskListConstants.java 11 Feb 2011 08:41:44 -0000 1.13 @@ -85,6 +85,7 @@ public static final String ATTR_TASK_LIST_ITEM_UID = "taskListItemUid"; public static final String ATTR_USER_LOGIN = "userLogin"; public static final String ATTR_TASK_LIST_ITEM_DTOS = "itemDTOs"; + public static final String ATTR_IS_GROUPED_ACTIVITY = "isGroupedActivity"; //error message keys public static final String ERROR_MSG_TITLE_BLANK = "error.resource.item.title.blank"; Index: lams_tool_task/src/java/org/lamsfoundation/lams/tool/taskList/service/ITaskListService.java =================================================================== RCS file: /usr/local/cvsroot/lams_tool_task/src/java/org/lamsfoundation/lams/tool/taskList/service/ITaskListService.java,v diff -u -r1.21 -r1.22 --- lams_tool_task/src/java/org/lamsfoundation/lams/tool/taskList/service/ITaskListService.java 26 Jun 2008 02:30:17 -0000 1.21 +++ lams_tool_task/src/java/org/lamsfoundation/lams/tool/taskList/service/ITaskListService.java 11 Feb 2011 08:41:44 -0000 1.22 @@ -361,5 +361,13 @@ */ ItemSummary getItemSummary(Long contentId, Long taskListItemUid, boolean isExportProcessing); + /** + * 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_task/src/java/org/lamsfoundation/lams/tool/taskList/service/TaskListServiceImpl.java =================================================================== RCS file: /usr/local/cvsroot/lams_tool_task/src/java/org/lamsfoundation/lams/tool/taskList/service/TaskListServiceImpl.java,v diff -u -r1.28 -r1.29 --- lams_tool_task/src/java/org/lamsfoundation/lams/tool/taskList/service/TaskListServiceImpl.java 26 Jul 2009 22:17:42 -0000 1.28 +++ lams_tool_task/src/java/org/lamsfoundation/lams/tool/taskList/service/TaskListServiceImpl.java 11 Feb 2011 08:41:44 -0000 1.29 @@ -701,6 +701,10 @@ public void updateEntry(NotebookEntry notebookEntry) { coreNotebookService.updateEntry(notebookEntry); } + + public boolean isGroupedActivity(long toolContentID) { + return toolService.isGroupedActivity(toolContentID); + } // ***************************************************************************** // Set methods for Spring Bean Index: lams_tool_task/src/java/org/lamsfoundation/lams/tool/taskList/web/action/MonitoringAction.java =================================================================== RCS file: /usr/local/cvsroot/lams_tool_task/src/java/org/lamsfoundation/lams/tool/taskList/web/action/MonitoringAction.java,v diff -u -r1.12 -r1.13 --- lams_tool_task/src/java/org/lamsfoundation/lams/tool/taskList/web/action/MonitoringAction.java 26 Jun 2008 02:30:19 -0000 1.12 +++ lams_tool_task/src/java/org/lamsfoundation/lams/tool/taskList/web/action/MonitoringAction.java 11 Feb 2011 08:41:44 -0000 1.13 @@ -103,6 +103,7 @@ sessionMap.put(TaskListConstants.ATTR_RESOURCE, taskList); sessionMap.put(TaskListConstants.ATTR_TOOL_CONTENT_ID, contentId); sessionMap.put(AttributeNames.PARAM_CONTENT_FOLDER_ID,WebUtil.readStrParam(request,AttributeNames.PARAM_CONTENT_FOLDER_ID)); + sessionMap.put(TaskListConstants.ATTR_IS_GROUPED_ACTIVITY, service.isGroupedActivity(contentId)); return mapping.findForward(TaskListConstants.SUCCESS); } @@ -115,6 +116,7 @@ ItemSummary ItemSummary = service.getItemSummary(contentId, taskListItemId, false); request.setAttribute(TaskListConstants.ATTR_ITEM_SUMMARY, ItemSummary); + request.setAttribute(TaskListConstants.ATTR_IS_GROUPED_ACTIVITY, service.isGroupedActivity(contentId)); return mapping.findForward(TaskListConstants.SUCCESS); } Index: lams_tool_task/web/pages/monitoring/itemsummary.jsp =================================================================== RCS file: /usr/local/cvsroot/lams_tool_task/web/pages/monitoring/itemsummary.jsp,v diff -u -r1.4 -r1.5 --- lams_tool_task/web/pages/monitoring/itemsummary.jsp 26 Jun 2008 02:30:17 -0000 1.4 +++ lams_tool_task/web/pages/monitoring/itemsummary.jsp 11 Feb 2011 08:41:44 -0000 1.5 @@ -75,7 +75,9 @@ -

${groupSummary.sessionName}

+ +

${groupSummary.sessionName}

+
Index: lams_tool_task/web/pages/monitoring/statistic.jsp =================================================================== RCS file: /usr/local/cvsroot/lams_tool_task/web/pages/monitoring/statistic.jsp,v diff -u -r1.4 -r1.5 --- lams_tool_task/web/pages/monitoring/statistic.jsp 29 May 2008 04:46:53 -0000 1.4 +++ lams_tool_task/web/pages/monitoring/statistic.jsp 11 Feb 2011 08:41:44 -0000 1.5 @@ -10,7 +10,9 @@ <%-- display group name on first row--%> -

${summary.sessionName}

+ +

${summary.sessionName}

+
Index: lams_tool_task/web/pages/monitoring/summary.jsp =================================================================== RCS file: /usr/local/cvsroot/lams_tool_task/web/pages/monitoring/summary.jsp,v diff -u -r1.13 -r1.14 --- lams_tool_task/web/pages/monitoring/summary.jsp 28 Jul 2008 04:37:46 -0000 1.13 +++ lams_tool_task/web/pages/monitoring/summary.jsp 11 Feb 2011 08:41:44 -0000 1.14 @@ -138,10 +138,17 @@ -

${summary.sessionName}

-

+ +

+ ${summary.sessionName} +

+
+ +

+ +

+
-