Index: lams_tool_nb/src/java/org/lamsfoundation/lams/tool/noticeboard/service/INoticeboardService.java =================================================================== diff -u -rd07409f014674f056d1bd67d865ba77f0f8298e9 -rf621e87b80149d33e8a6a3bd10137dc31acce569 --- lams_tool_nb/src/java/org/lamsfoundation/lams/tool/noticeboard/service/INoticeboardService.java (.../INoticeboardService.java) (revision d07409f014674f056d1bd67d865ba77f0f8298e9) +++ lams_tool_nb/src/java/org/lamsfoundation/lams/tool/noticeboard/service/INoticeboardService.java (.../INoticeboardService.java) (revision f621e87b80149d33e8a6a3bd10137dc31acce569) @@ -330,4 +330,12 @@ public void updateEntry(NotebookEntry notebookEntry); public List getUsersBySession(Long sessionId); + + /** + * Returns whether activity is grouped and therefore it is expected more than one tool session. + * + * @param toolContentID + * @return + */ + boolean isGroupedActivity(long toolContentID); } \ No newline at end of file Index: lams_tool_nb/src/java/org/lamsfoundation/lams/tool/noticeboard/service/NoticeboardServicePOJO.java =================================================================== diff -u -r1a5446e3a1f962f1bb831c1bbaef14acf9d3635c -rf621e87b80149d33e8a6a3bd10137dc31acce569 --- lams_tool_nb/src/java/org/lamsfoundation/lams/tool/noticeboard/service/NoticeboardServicePOJO.java (.../NoticeboardServicePOJO.java) (revision 1a5446e3a1f962f1bb831c1bbaef14acf9d3635c) +++ lams_tool_nb/src/java/org/lamsfoundation/lams/tool/noticeboard/service/NoticeboardServicePOJO.java (.../NoticeboardServicePOJO.java) (revision f621e87b80149d33e8a6a3bd10137dc31acce569) @@ -670,6 +670,10 @@ throws RepositoryCheckedException { return nbToolContentHandler.uploadFile(istream, filename, contentType, fileType); } + + public boolean isGroupedActivity(long toolContentID) { + return toolService.isGroupedActivity(toolContentID); + } /* ===============Methods implemented from ToolContentManager =============== */ Index: lams_tool_nb/src/java/org/lamsfoundation/lams/tool/noticeboard/web/NbMonitoringAction.java =================================================================== diff -u -r0e74773075ee5caec97c424a716df82265e1ba48 -rf621e87b80149d33e8a6a3bd10137dc31acce569 --- lams_tool_nb/src/java/org/lamsfoundation/lams/tool/noticeboard/web/NbMonitoringAction.java (.../NbMonitoringAction.java) (revision 0e74773075ee5caec97c424a716df82265e1ba48) +++ lams_tool_nb/src/java/org/lamsfoundation/lams/tool/noticeboard/web/NbMonitoringAction.java (.../NbMonitoringAction.java) (revision f621e87b80149d33e8a6a3bd10137dc31acce569) @@ -149,6 +149,9 @@ } monitorForm.setGroupStatsMap(map); + boolean isGroupedActivity = nbService.isGroupedActivity(toolContentId); + request.setAttribute("isGroupedActivity", isGroupedActivity); + // Set reflection statistics, if reflection is set request.setAttribute("reflectOnActivity", content.getReflectOnActivity()); request.setAttribute("reflectInstructions", content.getReflectInstructions()); Index: lams_tool_nb/web/monitoring/m_Statistics.jsp =================================================================== diff -u -r4aae0391a4892385de3df761a655e0ab8b1c0183 -rf621e87b80149d33e8a6a3bd10137dc31acce569 --- lams_tool_nb/web/monitoring/m_Statistics.jsp (.../m_Statistics.jsp) (revision 4aae0391a4892385de3df761a655e0ab8b1c0183) +++ lams_tool_nb/web/monitoring/m_Statistics.jsp (.../m_Statistics.jsp) (revision f621e87b80149d33e8a6a3bd10137dc31acce569) @@ -1,17 +1,20 @@ <%@ include file="/includes/taglibs.jsp"%> - - + +

+ + + + + + + +

+ - - - - - - - - + +