Index: lams_tool_larsrc/src/java/org/lamsfoundation/lams/tool/rsrc/ResourceConstants.java =================================================================== RCS file: /usr/local/cvsroot/lams_tool_larsrc/src/java/org/lamsfoundation/lams/tool/rsrc/ResourceConstants.java,v diff -u -r1.38 -r1.39 --- lams_tool_larsrc/src/java/org/lamsfoundation/lams/tool/rsrc/ResourceConstants.java 2 Aug 2009 20:14:54 -0000 1.38 +++ lams_tool_larsrc/src/java/org/lamsfoundation/lams/tool/rsrc/ResourceConstants.java 10 Feb 2011 23:05:45 -0000 1.39 @@ -121,6 +121,8 @@ 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_TITLE_BLANK = "error.resource.item.title.blank"; Index: lams_tool_larsrc/src/java/org/lamsfoundation/lams/tool/rsrc/service/IResourceService.java =================================================================== RCS file: /usr/local/cvsroot/lams_tool_larsrc/src/java/org/lamsfoundation/lams/tool/rsrc/service/IResourceService.java,v diff -u -r1.26 -r1.27 --- lams_tool_larsrc/src/java/org/lamsfoundation/lams/tool/rsrc/service/IResourceService.java 10 Oct 2008 00:37:16 -0000 1.26 +++ lams_tool_larsrc/src/java/org/lamsfoundation/lams/tool/rsrc/service/IResourceService.java 10 Feb 2011 23:05:45 -0000 1.27 @@ -307,4 +307,12 @@ * @return list of teachers that monitor the lesson which contains the tool with given session ID */ public List getMonitorsByToolSessionId(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_larsrc/src/java/org/lamsfoundation/lams/tool/rsrc/service/ResourceServiceImpl.java =================================================================== RCS file: /usr/local/cvsroot/lams_tool_larsrc/src/java/org/lamsfoundation/lams/tool/rsrc/service/ResourceServiceImpl.java,v diff -u -r1.63 -r1.64 --- lams_tool_larsrc/src/java/org/lamsfoundation/lams/tool/rsrc/service/ResourceServiceImpl.java 2 Aug 2009 20:14:54 -0000 1.63 +++ lams_tool_larsrc/src/java/org/lamsfoundation/lams/tool/rsrc/service/ResourceServiceImpl.java 10 Feb 2011 23:05:45 -0000 1.64 @@ -808,6 +808,10 @@ return null; } } + + public boolean isGroupedActivity(long toolContentID) { + return toolService.isGroupedActivity(toolContentID); + } // ***************************************************************************** // set methods for Spring Bean Index: lams_tool_larsrc/src/java/org/lamsfoundation/lams/tool/rsrc/web/action/MonitoringAction.java =================================================================== RCS file: /usr/local/cvsroot/lams_tool_larsrc/src/java/org/lamsfoundation/lams/tool/rsrc/web/action/MonitoringAction.java,v diff -u -r1.18 -r1.19 --- lams_tool_larsrc/src/java/org/lamsfoundation/lams/tool/rsrc/web/action/MonitoringAction.java 10 Oct 2008 00:37:15 -0000 1.18 +++ lams_tool_larsrc/src/java/org/lamsfoundation/lams/tool/rsrc/web/action/MonitoringAction.java 10 Feb 2011 23:05:45 -0000 1.19 @@ -162,6 +162,7 @@ sessionMap.put(ResourceConstants.ATTR_RESOURCE, resource); sessionMap.put(ResourceConstants.ATTR_TOOL_CONTENT_ID, contentId); sessionMap.put(ResourceConstants.ATTR_REFLECT_LIST, relectList); + sessionMap.put(ResourceConstants.ATTR_IS_GROUPED_ACTIVITY, service.isGroupedActivity(contentId)); return mapping.findForward(ResourceConstants.SUCCESS); } Index: lams_tool_larsrc/web/pages/monitoring/statistic.jsp =================================================================== RCS file: /usr/local/cvsroot/lams_tool_larsrc/web/pages/monitoring/statistic.jsp,v diff -u -r1.9 -r1.10 --- lams_tool_larsrc/web/pages/monitoring/statistic.jsp 25 Aug 2006 07:32:59 -0000 1.9 +++ lams_tool_larsrc/web/pages/monitoring/statistic.jsp 10 Feb 2011 23:05:45 -0000 1.10 @@ -16,9 +16,14 @@ - ${item.sessionName} + + ${item.sessionName} + + + - + + Index: lams_tool_larsrc/web/pages/monitoring/summary.jsp =================================================================== RCS file: /usr/local/cvsroot/lams_tool_larsrc/web/pages/monitoring/summary.jsp,v diff -u -r1.17 -r1.18 --- lams_tool_larsrc/web/pages/monitoring/summary.jsp 3 Sep 2008 02:11:20 -0000 1.17 +++ lams_tool_larsrc/web/pages/monitoring/summary.jsp 10 Feb 2011 23:05:45 -0000 1.18 @@ -155,16 +155,24 @@ <%-- display group name on first row--%> - - - ${item.sessionName} - - + + + + ${item.sessionName} + + + + + + + + - - - - + + + + + Index: lams_tool_pixlr/src/java/org/lamsfoundation/lams/tool/pixlr/service/IPixlrService.java =================================================================== RCS file: /usr/local/cvsroot/lams_tool_pixlr/src/java/org/lamsfoundation/lams/tool/pixlr/service/IPixlrService.java,v diff -u -r1.3 -r1.4 --- lams_tool_pixlr/src/java/org/lamsfoundation/lams/tool/pixlr/service/IPixlrService.java 12 Jan 2009 03:15:39 -0000 1.3 +++ lams_tool_pixlr/src/java/org/lamsfoundation/lams/tool/pixlr/service/IPixlrService.java 10 Feb 2011 23:10:17 -0000 1.4 @@ -178,5 +178,13 @@ * @param item */ public void saveOrUpdatePixlrConfigItem(PixlrConfigItem item); + + /** + * 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_pixlr/src/java/org/lamsfoundation/lams/tool/pixlr/service/PixlrService.java =================================================================== RCS file: /usr/local/cvsroot/lams_tool_pixlr/src/java/org/lamsfoundation/lams/tool/pixlr/service/PixlrService.java,v diff -u -r1.7 -r1.8 --- lams_tool_pixlr/src/java/org/lamsfoundation/lams/tool/pixlr/service/PixlrService.java 26 Jul 2009 22:18:39 -0000 1.7 +++ lams_tool_pixlr/src/java/org/lamsfoundation/lams/tool/pixlr/service/PixlrService.java 10 Feb 2011 23:10:17 -0000 1.8 @@ -585,6 +585,10 @@ } return node; } + + public boolean isGroupedActivity(long toolContentID) { + return toolService.isGroupedActivity(toolContentID); + } /** * This method verifies the credentials of the SubmitFiles Tool and gives it the Ticket to login and Index: lams_tool_pixlr/src/java/org/lamsfoundation/lams/tool/pixlr/web/actions/MonitoringAction.java =================================================================== RCS file: /usr/local/cvsroot/lams_tool_pixlr/src/java/org/lamsfoundation/lams/tool/pixlr/web/actions/MonitoringAction.java,v diff -u -r1.1 -r1.2 --- lams_tool_pixlr/src/java/org/lamsfoundation/lams/tool/pixlr/web/actions/MonitoringAction.java 7 Jan 2009 22:37:49 -0000 1.1 +++ lams_tool_pixlr/src/java/org/lamsfoundation/lams/tool/pixlr/web/actions/MonitoringAction.java 10 Feb 2011 23:10:17 -0000 1.2 @@ -100,6 +100,7 @@ request.setAttribute("contentFolderID", contentFolderID); request.setAttribute("toolContentID", toolContentID); request.setAttribute("pixlrImageFolderURL", PixlrConstants.LAMS_WWW_PIXLR_FOLDER_URL); + request.setAttribute("isGroupedActivity", pixlrService.isGroupedActivity(toolContentID)); return mapping.findForward("success"); } Index: lams_tool_pixlr/web/pages/monitoring/statistics.jsp =================================================================== RCS file: /usr/local/cvsroot/lams_tool_pixlr/web/pages/monitoring/statistics.jsp,v diff -u -r1.1 -r1.2 --- lams_tool_pixlr/web/pages/monitoring/statistics.jsp 7 Jan 2009 22:37:48 -0000 1.1 +++ lams_tool_pixlr/web/pages/monitoring/statistics.jsp 10 Feb 2011 23:10:17 -0000 1.2 @@ -3,15 +3,17 @@ - - - - -
-

- ${session.sessionName} -

-
+ + + + + +
+

+ ${session.sessionName} +

+
+
Index: lams_tool_pixlr/web/pages/monitoring/summary.jsp =================================================================== RCS file: /usr/local/cvsroot/lams_tool_pixlr/web/pages/monitoring/summary.jsp,v diff -u -r1.2 -r1.3 --- lams_tool_pixlr/web/pages/monitoring/summary.jsp 13 Nov 2009 03:13:55 -0000 1.2 +++ lams_tool_pixlr/web/pages/monitoring/summary.jsp 10 Feb 2011 23:10:17 -0000 1.3 @@ -97,9 +97,11 @@ -

- ${session.sessionName} -

+ +

+ ${session.sessionName} +

+
Index: lams_tool_sbmt/src/java/org/lamsfoundation/lams/tool/sbmt/service/ISubmitFilesService.java =================================================================== RCS file: /usr/local/cvsroot/lams_tool_sbmt/src/java/org/lamsfoundation/lams/tool/sbmt/service/ISubmitFilesService.java,v diff -u -r1.31 -r1.32 --- lams_tool_sbmt/src/java/org/lamsfoundation/lams/tool/sbmt/service/ISubmitFilesService.java 23 Jul 2009 04:45:52 -0000 1.31 +++ lams_tool_sbmt/src/java/org/lamsfoundation/lams/tool/sbmt/service/ISubmitFilesService.java 10 Feb 2011 23:13:36 -0000 1.32 @@ -310,4 +310,12 @@ * @return list of teachers that monitor the lesson which contains the tool with given session ID */ List getMonitorsByToolSessionId(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_sbmt/src/java/org/lamsfoundation/lams/tool/sbmt/service/SubmitFilesService.java =================================================================== RCS file: /usr/local/cvsroot/lams_tool_sbmt/src/java/org/lamsfoundation/lams/tool/sbmt/service/SubmitFilesService.java,v diff -u -r1.83 -r1.84 --- lams_tool_sbmt/src/java/org/lamsfoundation/lams/tool/sbmt/service/SubmitFilesService.java 2 Aug 2009 20:15:20 -0000 1.83 +++ lams_tool_sbmt/src/java/org/lamsfoundation/lams/tool/sbmt/service/SubmitFilesService.java 10 Feb 2011 23:13:36 -0000 1.84 @@ -983,6 +983,10 @@ } return learners; } + + public boolean isGroupedActivity(long toolContentID) { + return toolService.isGroupedActivity(toolContentID); + } /* ===============Methods implemented from ToolContentImport102Manager =============== */ Index: lams_tool_sbmt/src/java/org/lamsfoundation/lams/tool/sbmt/util/SbmtConstants.java =================================================================== RCS file: /usr/local/cvsroot/lams_tool_sbmt/src/java/org/lamsfoundation/lams/tool/sbmt/util/SbmtConstants.java,v diff -u -r1.24 -r1.25 --- lams_tool_sbmt/src/java/org/lamsfoundation/lams/tool/sbmt/util/SbmtConstants.java 13 Aug 2009 09:47:33 -0000 1.24 +++ lams_tool_sbmt/src/java/org/lamsfoundation/lams/tool/sbmt/util/SbmtConstants.java 10 Feb 2011 23:13:36 -0000 1.25 @@ -73,6 +73,8 @@ public static final Object ATTR_ARRIVE_LIMIT = "arriveLimit"; public static final String ATTR_USER_FINISHED = "userFinished"; + + public static final String ATTR_IS_GROUPED_ACTIVITY = "isGroupedActivity"; public static final String EVENT_NAME_NOTIFY_LEARNERS_ON_MARK_RELEASE = "notify_learners_on_mark_release"; Index: lams_tool_sbmt/src/java/org/lamsfoundation/lams/tool/sbmt/web/MonitoringAction.java =================================================================== RCS file: /usr/local/cvsroot/lams_tool_sbmt/src/java/org/lamsfoundation/lams/tool/sbmt/web/MonitoringAction.java,v diff -u -r1.48 -r1.49 --- lams_tool_sbmt/src/java/org/lamsfoundation/lams/tool/sbmt/web/MonitoringAction.java 23 Jul 2009 04:45:51 -0000 1.48 +++ lams_tool_sbmt/src/java/org/lamsfoundation/lams/tool/sbmt/web/MonitoringAction.java 10 Feb 2011 23:13:36 -0000 1.49 @@ -122,6 +122,7 @@ AuthoringDTO authorDto = new AuthoringDTO(persistContent); request.setAttribute(SbmtConstants.AUTHORING_DTO, authorDto); request.setAttribute(SbmtConstants.PAGE_EDITABLE, persistContent.isContentInUse()); + request.setAttribute(SbmtConstants.ATTR_IS_GROUPED_ACTIVITY, submitFilesService.isGroupedActivity(contentID)); DynaActionForm smbtMonitoringForm = (DynaActionForm) form; // smbtMonitoringForm.set("currentTab", WebUtil.readStrParam(request, AttributeNames.PARAM_CURRENT_TAB,true)); Index: lams_tool_sbmt/web/monitoring/parts/statisticpart.jsp =================================================================== RCS file: /usr/local/cvsroot/lams_tool_sbmt/web/monitoring/parts/statisticpart.jsp,v diff -u -r1.2 -r1.3 --- lams_tool_sbmt/web/monitoring/parts/statisticpart.jsp 18 Oct 2006 19:49:51 -0000 1.2 +++ lams_tool_sbmt/web/monitoring/parts/statisticpart.jsp 10 Feb 2011 23:13:36 -0000 1.3 @@ -4,12 +4,15 @@
+ + + + + + - - - Index: lams_tool_sbmt/web/monitoring/parts/summary.jsp =================================================================== RCS file: /usr/local/cvsroot/lams_tool_sbmt/web/monitoring/parts/summary.jsp,v diff -u -r1.10 -r1.11 --- lams_tool_sbmt/web/monitoring/parts/summary.jsp 3 Sep 2008 02:11:21 -0000 1.10 +++ lams_tool_sbmt/web/monitoring/parts/summary.jsp 10 Feb 2011 23:13:36 -0000 1.11 @@ -197,14 +197,17 @@
+ : +
- : -
- - - + + + + + +
-

- : - -

-
+

+ : + +

+