Index: lams_tool_task/src/java/org/lamsfoundation/lams/tool/taskList/TaskListConstants.java =================================================================== diff -u -r3f118a66718ff89ec94041602e7e60db6ee06722 -r0d23815a0217cc440544b56c2a964cef24d7de50 --- lams_tool_task/src/java/org/lamsfoundation/lams/tool/taskList/TaskListConstants.java (.../TaskListConstants.java) (revision 3f118a66718ff89ec94041602e7e60db6ee06722) +++ lams_tool_task/src/java/org/lamsfoundation/lams/tool/taskList/TaskListConstants.java (.../TaskListConstants.java) (revision 0d23815a0217cc440544b56c2a964cef24d7de50) @@ -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 =================================================================== diff -u -r3f118a66718ff89ec94041602e7e60db6ee06722 -r0d23815a0217cc440544b56c2a964cef24d7de50 --- lams_tool_task/src/java/org/lamsfoundation/lams/tool/taskList/service/ITaskListService.java (.../ITaskListService.java) (revision 3f118a66718ff89ec94041602e7e60db6ee06722) +++ lams_tool_task/src/java/org/lamsfoundation/lams/tool/taskList/service/ITaskListService.java (.../ITaskListService.java) (revision 0d23815a0217cc440544b56c2a964cef24d7de50) @@ -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 =================================================================== diff -u -r1a5446e3a1f962f1bb831c1bbaef14acf9d3635c -r0d23815a0217cc440544b56c2a964cef24d7de50 --- lams_tool_task/src/java/org/lamsfoundation/lams/tool/taskList/service/TaskListServiceImpl.java (.../TaskListServiceImpl.java) (revision 1a5446e3a1f962f1bb831c1bbaef14acf9d3635c) +++ lams_tool_task/src/java/org/lamsfoundation/lams/tool/taskList/service/TaskListServiceImpl.java (.../TaskListServiceImpl.java) (revision 0d23815a0217cc440544b56c2a964cef24d7de50) @@ -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 =================================================================== diff -u -r3f118a66718ff89ec94041602e7e60db6ee06722 -r0d23815a0217cc440544b56c2a964cef24d7de50 --- lams_tool_task/src/java/org/lamsfoundation/lams/tool/taskList/web/action/MonitoringAction.java (.../MonitoringAction.java) (revision 3f118a66718ff89ec94041602e7e60db6ee06722) +++ lams_tool_task/src/java/org/lamsfoundation/lams/tool/taskList/web/action/MonitoringAction.java (.../MonitoringAction.java) (revision 0d23815a0217cc440544b56c2a964cef24d7de50) @@ -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 =================================================================== diff -u -r3f118a66718ff89ec94041602e7e60db6ee06722 -r0d23815a0217cc440544b56c2a964cef24d7de50 --- lams_tool_task/web/pages/monitoring/itemsummary.jsp (.../itemsummary.jsp) (revision 3f118a66718ff89ec94041602e7e60db6ee06722) +++ lams_tool_task/web/pages/monitoring/itemsummary.jsp (.../itemsummary.jsp) (revision 0d23815a0217cc440544b56c2a964cef24d7de50) @@ -75,7 +75,9 @@ -

${groupSummary.sessionName}

+ +

${groupSummary.sessionName}

+
Index: lams_tool_task/web/pages/monitoring/statistic.jsp =================================================================== diff -u -r51dd63725c1359785962a1c8a08382540d9e2343 -r0d23815a0217cc440544b56c2a964cef24d7de50 --- lams_tool_task/web/pages/monitoring/statistic.jsp (.../statistic.jsp) (revision 51dd63725c1359785962a1c8a08382540d9e2343) +++ lams_tool_task/web/pages/monitoring/statistic.jsp (.../statistic.jsp) (revision 0d23815a0217cc440544b56c2a964cef24d7de50) @@ -10,7 +10,9 @@ <%-- display group name on first row--%> -

${summary.sessionName}

+ +

${summary.sessionName}

+
Index: lams_tool_task/web/pages/monitoring/summary.jsp =================================================================== diff -u -r21426016e175d5da7fbef2be7da330fd539ddfa0 -r0d23815a0217cc440544b56c2a964cef24d7de50 --- lams_tool_task/web/pages/monitoring/summary.jsp (.../summary.jsp) (revision 21426016e175d5da7fbef2be7da330fd539ddfa0) +++ lams_tool_task/web/pages/monitoring/summary.jsp (.../summary.jsp) (revision 0d23815a0217cc440544b56c2a964cef24d7de50) @@ -138,10 +138,17 @@ -

${summary.sessionName}

-

+ +

+ ${summary.sessionName} +

+
+ +

+ +

+
-