Index: lams_tool_spreadsheet/src/java/org/lamsfoundation/lams/tool/spreadsheet/SpreadsheetConstants.java =================================================================== RCS file: /usr/local/cvsroot/lams_tool_spreadsheet/src/java/org/lamsfoundation/lams/tool/spreadsheet/SpreadsheetConstants.java,v diff -u -r1.3 -r1.4 --- lams_tool_spreadsheet/src/java/org/lamsfoundation/lams/tool/spreadsheet/SpreadsheetConstants.java 23 Jul 2008 04:46:03 -0000 1.3 +++ lams_tool_spreadsheet/src/java/org/lamsfoundation/lams/tool/spreadsheet/SpreadsheetConstants.java 11 Feb 2011 08:18:44 -0000 1.4 @@ -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 =================================================================== RCS file: /usr/local/cvsroot/lams_tool_spreadsheet/src/java/org/lamsfoundation/lams/tool/spreadsheet/service/ISpreadsheetService.java,v diff -u -r1.4 -r1.5 --- lams_tool_spreadsheet/src/java/org/lamsfoundation/lams/tool/spreadsheet/service/ISpreadsheetService.java 23 Jul 2008 04:46:03 -0000 1.4 +++ lams_tool_spreadsheet/src/java/org/lamsfoundation/lams/tool/spreadsheet/service/ISpreadsheetService.java 11 Feb 2011 08:18:44 -0000 1.5 @@ -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 =================================================================== RCS file: /usr/local/cvsroot/lams_tool_spreadsheet/src/java/org/lamsfoundation/lams/tool/spreadsheet/service/SpreadsheetServiceImpl.java,v diff -u -r1.6 -r1.7 --- lams_tool_spreadsheet/src/java/org/lamsfoundation/lams/tool/spreadsheet/service/SpreadsheetServiceImpl.java 26 Jul 2009 22:20:52 -0000 1.6 +++ lams_tool_spreadsheet/src/java/org/lamsfoundation/lams/tool/spreadsheet/service/SpreadsheetServiceImpl.java 11 Feb 2011 08:18:44 -0000 1.7 @@ -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 =================================================================== RCS file: /usr/local/cvsroot/lams_tool_spreadsheet/src/java/org/lamsfoundation/lams/tool/spreadsheet/web/action/MonitoringAction.java,v diff -u -r1.6 -r1.7 --- lams_tool_spreadsheet/src/java/org/lamsfoundation/lams/tool/spreadsheet/web/action/MonitoringAction.java 17 Sep 2008 02:28:50 -0000 1.6 +++ lams_tool_spreadsheet/src/java/org/lamsfoundation/lams/tool/spreadsheet/web/action/MonitoringAction.java 11 Feb 2011 08:18:44 -0000 1.7 @@ -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 =================================================================== RCS file: /usr/local/cvsroot/lams_tool_spreadsheet/web/pages/monitoring/parts/statisticspart.jsp,v diff -u -r1.1 -r1.2 --- lams_tool_spreadsheet/web/pages/monitoring/parts/statisticspart.jsp 13 Jul 2008 08:53:49 -0000 1.1 +++ lams_tool_spreadsheet/web/pages/monitoring/parts/statisticspart.jsp 11 Feb 2011 08:18:44 -0000 1.2 @@ -2,12 +2,14 @@ <%@ include file="/common/taglibs.jsp"%> + + + + + - - - Index: lams_tool_spreadsheet/web/pages/monitoring/parts/summarylist.jsp =================================================================== RCS file: /usr/local/cvsroot/lams_tool_spreadsheet/web/pages/monitoring/parts/summarylist.jsp,v diff -u -r1.2 -r1.3 --- lams_tool_spreadsheet/web/pages/monitoring/parts/summarylist.jsp 23 Jul 2008 06:27:22 -0000 1.2 +++ lams_tool_spreadsheet/web/pages/monitoring/parts/summarylist.jsp 11 Feb 2011 08:18:44 -0000 1.3 @@ -11,10 +11,15 @@
-

${summary.sessionName}

+ +

+ ${summary.sessionName} +

+
+

+
+ +
- -
-