Index: lams_tool_larsrc/src/java/org/lamsfoundation/lams/tool/rsrc/ResourceConstants.java =================================================================== diff -u -r37b49e5e78d2b57936d98e68f6057539472b7725 -r6fb9beec407d0532645a9ff3331955bf7e5dd95b --- lams_tool_larsrc/src/java/org/lamsfoundation/lams/tool/rsrc/ResourceConstants.java (.../ResourceConstants.java) (revision 37b49e5e78d2b57936d98e68f6057539472b7725) +++ lams_tool_larsrc/src/java/org/lamsfoundation/lams/tool/rsrc/ResourceConstants.java (.../ResourceConstants.java) (revision 6fb9beec407d0532645a9ff3331955bf7e5dd95b) @@ -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 =================================================================== diff -u -ref2417616a93e7d6f1eaee601fd78455a90564d6 -r6fb9beec407d0532645a9ff3331955bf7e5dd95b --- lams_tool_larsrc/src/java/org/lamsfoundation/lams/tool/rsrc/service/IResourceService.java (.../IResourceService.java) (revision ef2417616a93e7d6f1eaee601fd78455a90564d6) +++ lams_tool_larsrc/src/java/org/lamsfoundation/lams/tool/rsrc/service/IResourceService.java (.../IResourceService.java) (revision 6fb9beec407d0532645a9ff3331955bf7e5dd95b) @@ -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 =================================================================== diff -u -r37b49e5e78d2b57936d98e68f6057539472b7725 -r6fb9beec407d0532645a9ff3331955bf7e5dd95b --- lams_tool_larsrc/src/java/org/lamsfoundation/lams/tool/rsrc/service/ResourceServiceImpl.java (.../ResourceServiceImpl.java) (revision 37b49e5e78d2b57936d98e68f6057539472b7725) +++ lams_tool_larsrc/src/java/org/lamsfoundation/lams/tool/rsrc/service/ResourceServiceImpl.java (.../ResourceServiceImpl.java) (revision 6fb9beec407d0532645a9ff3331955bf7e5dd95b) @@ -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 =================================================================== diff -u -ref2417616a93e7d6f1eaee601fd78455a90564d6 -r6fb9beec407d0532645a9ff3331955bf7e5dd95b --- lams_tool_larsrc/src/java/org/lamsfoundation/lams/tool/rsrc/web/action/MonitoringAction.java (.../MonitoringAction.java) (revision ef2417616a93e7d6f1eaee601fd78455a90564d6) +++ lams_tool_larsrc/src/java/org/lamsfoundation/lams/tool/rsrc/web/action/MonitoringAction.java (.../MonitoringAction.java) (revision 6fb9beec407d0532645a9ff3331955bf7e5dd95b) @@ -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 =================================================================== diff -u -r71cccb6c7558909803c2886472385427cdc4a281 -r6fb9beec407d0532645a9ff3331955bf7e5dd95b --- lams_tool_larsrc/web/pages/monitoring/statistic.jsp (.../statistic.jsp) (revision 71cccb6c7558909803c2886472385427cdc4a281) +++ lams_tool_larsrc/web/pages/monitoring/statistic.jsp (.../statistic.jsp) (revision 6fb9beec407d0532645a9ff3331955bf7e5dd95b) @@ -16,9 +16,14 @@ - ${item.sessionName} + + ${item.sessionName} + + + - + + Index: lams_tool_larsrc/web/pages/monitoring/summary.jsp =================================================================== diff -u -r05ab55ef4acdc0c374af7405c58fb0e0fe8eb6b7 -r6fb9beec407d0532645a9ff3331955bf7e5dd95b --- lams_tool_larsrc/web/pages/monitoring/summary.jsp (.../summary.jsp) (revision 05ab55ef4acdc0c374af7405c58fb0e0fe8eb6b7) +++ lams_tool_larsrc/web/pages/monitoring/summary.jsp (.../summary.jsp) (revision 6fb9beec407d0532645a9ff3331955bf7e5dd95b) @@ -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 =================================================================== diff -u -rf31b75c40cca57454726c6f43dfba57cc2dae37c -r6fb9beec407d0532645a9ff3331955bf7e5dd95b --- lams_tool_pixlr/src/java/org/lamsfoundation/lams/tool/pixlr/service/IPixlrService.java (.../IPixlrService.java) (revision f31b75c40cca57454726c6f43dfba57cc2dae37c) +++ lams_tool_pixlr/src/java/org/lamsfoundation/lams/tool/pixlr/service/IPixlrService.java (.../IPixlrService.java) (revision 6fb9beec407d0532645a9ff3331955bf7e5dd95b) @@ -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 =================================================================== diff -u -r1a5446e3a1f962f1bb831c1bbaef14acf9d3635c -r6fb9beec407d0532645a9ff3331955bf7e5dd95b --- lams_tool_pixlr/src/java/org/lamsfoundation/lams/tool/pixlr/service/PixlrService.java (.../PixlrService.java) (revision 1a5446e3a1f962f1bb831c1bbaef14acf9d3635c) +++ lams_tool_pixlr/src/java/org/lamsfoundation/lams/tool/pixlr/service/PixlrService.java (.../PixlrService.java) (revision 6fb9beec407d0532645a9ff3331955bf7e5dd95b) @@ -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 =================================================================== diff -u -rb703d43cf69269e0afcc716321fd5ef42c249a43 -r6fb9beec407d0532645a9ff3331955bf7e5dd95b --- lams_tool_pixlr/src/java/org/lamsfoundation/lams/tool/pixlr/web/actions/MonitoringAction.java (.../MonitoringAction.java) (revision b703d43cf69269e0afcc716321fd5ef42c249a43) +++ lams_tool_pixlr/src/java/org/lamsfoundation/lams/tool/pixlr/web/actions/MonitoringAction.java (.../MonitoringAction.java) (revision 6fb9beec407d0532645a9ff3331955bf7e5dd95b) @@ -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 =================================================================== diff -u -rb703d43cf69269e0afcc716321fd5ef42c249a43 -r6fb9beec407d0532645a9ff3331955bf7e5dd95b --- lams_tool_pixlr/web/pages/monitoring/statistics.jsp (.../statistics.jsp) (revision b703d43cf69269e0afcc716321fd5ef42c249a43) +++ lams_tool_pixlr/web/pages/monitoring/statistics.jsp (.../statistics.jsp) (revision 6fb9beec407d0532645a9ff3331955bf7e5dd95b) @@ -3,15 +3,17 @@ - - - - -
-

- ${session.sessionName} -

-
+ + + + + +
+

+ ${session.sessionName} +

+
+
Index: lams_tool_pixlr/web/pages/monitoring/summary.jsp =================================================================== diff -u -rce3e782fd6844641f7298e09104f8d7554f073ff -r6fb9beec407d0532645a9ff3331955bf7e5dd95b --- lams_tool_pixlr/web/pages/monitoring/summary.jsp (.../summary.jsp) (revision ce3e782fd6844641f7298e09104f8d7554f073ff) +++ lams_tool_pixlr/web/pages/monitoring/summary.jsp (.../summary.jsp) (revision 6fb9beec407d0532645a9ff3331955bf7e5dd95b) @@ -97,9 +97,11 @@ -

- ${session.sessionName} -

+ +

+ ${session.sessionName} +

+
Index: lams_tool_sbmt/src/java/org/lamsfoundation/lams/tool/sbmt/service/ISubmitFilesService.java =================================================================== diff -u -r02696b4b5a761a0fcc9f72a677d3599656ffb725 -r6fb9beec407d0532645a9ff3331955bf7e5dd95b --- lams_tool_sbmt/src/java/org/lamsfoundation/lams/tool/sbmt/service/ISubmitFilesService.java (.../ISubmitFilesService.java) (revision 02696b4b5a761a0fcc9f72a677d3599656ffb725) +++ lams_tool_sbmt/src/java/org/lamsfoundation/lams/tool/sbmt/service/ISubmitFilesService.java (.../ISubmitFilesService.java) (revision 6fb9beec407d0532645a9ff3331955bf7e5dd95b) @@ -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 =================================================================== diff -u -r37b49e5e78d2b57936d98e68f6057539472b7725 -r6fb9beec407d0532645a9ff3331955bf7e5dd95b --- lams_tool_sbmt/src/java/org/lamsfoundation/lams/tool/sbmt/service/SubmitFilesService.java (.../SubmitFilesService.java) (revision 37b49e5e78d2b57936d98e68f6057539472b7725) +++ lams_tool_sbmt/src/java/org/lamsfoundation/lams/tool/sbmt/service/SubmitFilesService.java (.../SubmitFilesService.java) (revision 6fb9beec407d0532645a9ff3331955bf7e5dd95b) @@ -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 =================================================================== diff -u -r0deb16204d87ee066914a10b3b545cf25eb4d714 -r6fb9beec407d0532645a9ff3331955bf7e5dd95b --- lams_tool_sbmt/src/java/org/lamsfoundation/lams/tool/sbmt/util/SbmtConstants.java (.../SbmtConstants.java) (revision 0deb16204d87ee066914a10b3b545cf25eb4d714) +++ lams_tool_sbmt/src/java/org/lamsfoundation/lams/tool/sbmt/util/SbmtConstants.java (.../SbmtConstants.java) (revision 6fb9beec407d0532645a9ff3331955bf7e5dd95b) @@ -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 =================================================================== diff -u -r02696b4b5a761a0fcc9f72a677d3599656ffb725 -r6fb9beec407d0532645a9ff3331955bf7e5dd95b --- lams_tool_sbmt/src/java/org/lamsfoundation/lams/tool/sbmt/web/MonitoringAction.java (.../MonitoringAction.java) (revision 02696b4b5a761a0fcc9f72a677d3599656ffb725) +++ lams_tool_sbmt/src/java/org/lamsfoundation/lams/tool/sbmt/web/MonitoringAction.java (.../MonitoringAction.java) (revision 6fb9beec407d0532645a9ff3331955bf7e5dd95b) @@ -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 =================================================================== diff -u -r1a4f84968ef805223c9f5bf4f8971885aaeb07d3 -r6fb9beec407d0532645a9ff3331955bf7e5dd95b --- lams_tool_sbmt/web/monitoring/parts/statisticpart.jsp (.../statisticpart.jsp) (revision 1a4f84968ef805223c9f5bf4f8971885aaeb07d3) +++ lams_tool_sbmt/web/monitoring/parts/statisticpart.jsp (.../statisticpart.jsp) (revision 6fb9beec407d0532645a9ff3331955bf7e5dd95b) @@ -4,12 +4,15 @@
+ + + + + + - - - Index: lams_tool_sbmt/web/monitoring/parts/summary.jsp =================================================================== diff -u -r05ab55ef4acdc0c374af7405c58fb0e0fe8eb6b7 -r6fb9beec407d0532645a9ff3331955bf7e5dd95b --- lams_tool_sbmt/web/monitoring/parts/summary.jsp (.../summary.jsp) (revision 05ab55ef4acdc0c374af7405c58fb0e0fe8eb6b7) +++ lams_tool_sbmt/web/monitoring/parts/summary.jsp (.../summary.jsp) (revision 6fb9beec407d0532645a9ff3331955bf7e5dd95b) @@ -197,14 +197,17 @@
+ : +
- : -
- - - + + + + + +
-

- : - -

-
+

+ : + +

+