Index: lams_tool_spreadsheet/src/java/org/lamsfoundation/lams/tool/spreadsheet/SpreadsheetConstants.java =================================================================== diff -u -re044a561b88b3eb68dc50846451a30d258108e0f -r7bd98bf484806ec5ce961fe49e34c0bd24997d85 --- lams_tool_spreadsheet/src/java/org/lamsfoundation/lams/tool/spreadsheet/SpreadsheetConstants.java (.../SpreadsheetConstants.java) (revision e044a561b88b3eb68dc50846451a30d258108e0f) +++ lams_tool_spreadsheet/src/java/org/lamsfoundation/lams/tool/spreadsheet/SpreadsheetConstants.java (.../SpreadsheetConstants.java) (revision 7bd98bf484806ec5ce961fe49e34c0bd24997d85) @@ -70,6 +70,7 @@ public static final String ATTR_TITLE = "title"; public static final String ATTR_INSTRUCTIONS = "instructions"; public static final String ATTR_USER_FINISHED = "userFinished"; + public static final String ATTR_IS_GROUPED_ACTIVITY = "isGroupedActivity"; //error message keys public static final String ERROR_MSG_MARKS_BLANK = "error.summary.marks.blank"; Index: lams_tool_spreadsheet/src/java/org/lamsfoundation/lams/tool/spreadsheet/service/ISpreadsheetService.java =================================================================== diff -u -re044a561b88b3eb68dc50846451a30d258108e0f -r7bd98bf484806ec5ce961fe49e34c0bd24997d85 --- lams_tool_spreadsheet/src/java/org/lamsfoundation/lams/tool/spreadsheet/service/ISpreadsheetService.java (.../ISpreadsheetService.java) (revision e044a561b88b3eb68dc50846451a30d258108e0f) +++ lams_tool_spreadsheet/src/java/org/lamsfoundation/lams/tool/spreadsheet/service/ISpreadsheetService.java (.../ISpreadsheetService.java) (revision 7bd98bf484806ec5ce961fe49e34c0bd24997d85) @@ -230,5 +230,13 @@ * @param sessionId */ public void releaseMarksForSession(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_spreadsheet/src/java/org/lamsfoundation/lams/tool/spreadsheet/service/SpreadsheetServiceImpl.java =================================================================== diff -u -r1a5446e3a1f962f1bb831c1bbaef14acf9d3635c -r7bd98bf484806ec5ce961fe49e34c0bd24997d85 --- lams_tool_spreadsheet/src/java/org/lamsfoundation/lams/tool/spreadsheet/service/SpreadsheetServiceImpl.java (.../SpreadsheetServiceImpl.java) (revision 1a5446e3a1f962f1bb831c1bbaef14acf9d3635c) +++ lams_tool_spreadsheet/src/java/org/lamsfoundation/lams/tool/spreadsheet/service/SpreadsheetServiceImpl.java (.../SpreadsheetServiceImpl.java) (revision 7bd98bf484806ec5ce961fe49e34c0bd24997d85) @@ -509,6 +509,10 @@ } } } + + public boolean isGroupedActivity(long toolContentID) { + return toolService.isGroupedActivity(toolContentID); + } // ***************************************************************************** // private methods Index: lams_tool_spreadsheet/src/java/org/lamsfoundation/lams/tool/spreadsheet/web/action/MonitoringAction.java =================================================================== diff -u -rbcc173ec7635b144dd12f22e8472bd81a2b5f12e -r7bd98bf484806ec5ce961fe49e34c0bd24997d85 --- lams_tool_spreadsheet/src/java/org/lamsfoundation/lams/tool/spreadsheet/web/action/MonitoringAction.java (.../MonitoringAction.java) (revision bcc173ec7635b144dd12f22e8472bd81a2b5f12e) +++ lams_tool_spreadsheet/src/java/org/lamsfoundation/lams/tool/spreadsheet/web/action/MonitoringAction.java (.../MonitoringAction.java) (revision 7bd98bf484806ec5ce961fe49e34c0bd24997d85) @@ -133,6 +133,7 @@ sessionMap.put(SpreadsheetConstants.ATTR_REFLECT_LIST, reflectList); sessionMap.put(AttributeNames.PARAM_CONTENT_FOLDER_ID, WebUtil.readStrParam(request, AttributeNames.PARAM_CONTENT_FOLDER_ID)); + sessionMap.put(SpreadsheetConstants.ATTR_IS_GROUPED_ACTIVITY, service.isGroupedActivity(contentId)); return mapping.findForward(SpreadsheetConstants.SUCCESS); } @@ -148,8 +149,11 @@ public ActionForward doStatistic(ActionMapping mapping, ActionForm form, HttpServletRequest request, HttpServletResponse response) { Long contentId = new Long(WebUtil.readLongParam(request, AttributeNames.PARAM_TOOL_CONTENT_ID)); - List statisticList = getSpreadsheetService().getStatistics(contentId); + ISpreadsheetService service = getSpreadsheetService(); + + List statisticList = service.getStatistics(contentId); request.setAttribute(SpreadsheetConstants.ATTR_STATISTIC_LIST, statisticList); + request.setAttribute(SpreadsheetConstants.ATTR_IS_GROUPED_ACTIVITY, service.isGroupedActivity(contentId)); return mapping.findForward(SpreadsheetConstants.SUCCESS); } Index: lams_tool_spreadsheet/web/pages/monitoring/parts/statisticspart.jsp =================================================================== diff -u -r56d116683b7554e8ad3677cd0e12866ac3feb834 -r7bd98bf484806ec5ce961fe49e34c0bd24997d85 --- lams_tool_spreadsheet/web/pages/monitoring/parts/statisticspart.jsp (.../statisticspart.jsp) (revision 56d116683b7554e8ad3677cd0e12866ac3feb834) +++ lams_tool_spreadsheet/web/pages/monitoring/parts/statisticspart.jsp (.../statisticspart.jsp) (revision 7bd98bf484806ec5ce961fe49e34c0bd24997d85) @@ -2,12 +2,14 @@ <%@ include file="/common/taglibs.jsp"%> + + + + + - - - Index: lams_tool_spreadsheet/web/pages/monitoring/parts/summarylist.jsp =================================================================== diff -u -r943ef2ac69e4ce13ac802a4264ed9bb6864507f0 -r7bd98bf484806ec5ce961fe49e34c0bd24997d85 --- lams_tool_spreadsheet/web/pages/monitoring/parts/summarylist.jsp (.../summarylist.jsp) (revision 943ef2ac69e4ce13ac802a4264ed9bb6864507f0) +++ lams_tool_spreadsheet/web/pages/monitoring/parts/summarylist.jsp (.../summarylist.jsp) (revision 7bd98bf484806ec5ce961fe49e34c0bd24997d85) @@ -11,10 +11,15 @@
-

${summary.sessionName}

+ +

+ ${summary.sessionName} +

+
+

+
+ +
- -
-