Index: lams_tool_vote/src/java/org/lamsfoundation/lams/tool/vote/service/IVoteService.java =================================================================== diff -u -r61e7bbf20d65e2ecb5e50f3154e52264003defa1 -re7c872d97ed5a450f72cfa57325f7d37280efcde --- lams_tool_vote/src/java/org/lamsfoundation/lams/tool/vote/service/IVoteService.java (.../IVoteService.java) (revision 61e7bbf20d65e2ecb5e50f3154e52264003defa1) +++ lams_tool_vote/src/java/org/lamsfoundation/lams/tool/vote/service/IVoteService.java (.../IVoteService.java) (revision e7c872d97ed5a450f72cfa57325f7d37280efcde) @@ -310,4 +310,12 @@ public void saveDataFlowObjectAssigment(DataFlowObject assignedDataFlowObject); public DataFlowObject getAssignedDataFlowObject(Long toolContentId); + + /** + * 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_vote/src/java/org/lamsfoundation/lams/tool/vote/service/VoteServicePOJO.java =================================================================== diff -u -r618abc7cca98f08ef288878ab371a3693492d835 -re7c872d97ed5a450f72cfa57325f7d37280efcde --- lams_tool_vote/src/java/org/lamsfoundation/lams/tool/vote/service/VoteServicePOJO.java (.../VoteServicePOJO.java) (revision 618abc7cca98f08ef288878ab371a3693492d835) +++ lams_tool_vote/src/java/org/lamsfoundation/lams/tool/vote/service/VoteServicePOJO.java (.../VoteServicePOJO.java) (revision e7c872d97ed5a450f72cfa57325f7d37280efcde) @@ -1665,6 +1665,10 @@ voteUploadedFileDAO.cleanUploadedFilesMetaData(); VoteServicePOJO.logger.debug("files meta data has been cleaned up"); } + + public boolean isGroupedActivity(long toolContentID) { + return toolService.isGroupedActivity(toolContentID); + } /** * Get the definitions for possible output for an activity, based on the toolContentId. Currently we have one Index: lams_tool_vote/src/java/org/lamsfoundation/lams/tool/vote/web/VoteLearningStarterAction.java =================================================================== diff -u -r618abc7cca98f08ef288878ab371a3693492d835 -re7c872d97ed5a450f72cfa57325f7d37280efcde --- lams_tool_vote/src/java/org/lamsfoundation/lams/tool/vote/web/VoteLearningStarterAction.java (.../VoteLearningStarterAction.java) (revision 618abc7cca98f08ef288878ab371a3693492d835) +++ lams_tool_vote/src/java/org/lamsfoundation/lams/tool/vote/web/VoteLearningStarterAction.java (.../VoteLearningStarterAction.java) (revision e7c872d97ed5a450f72cfa57325f7d37280efcde) @@ -367,6 +367,9 @@ MonitoringUtil.prepareChartData(request, voteService, null, voteContent.getVoteContentId().toString(), voteSession.getUid().toString(), voteGeneralLearnerFlowDTO, voteGeneralMonitoringDTO, getMessageService()); + + boolean isGroupedActivity = voteService.isGroupedActivity(new Long(voteLearningForm.getToolContentID())); + request.setAttribute("isGroupedActivity", isGroupedActivity); VoteLearningStarterAction.logger.debug("fwd'ing to: " + VoteAppConstants.EXIT_PAGE); return mapping.findForward(VoteAppConstants.EXIT_PAGE); Index: lams_tool_vote/src/java/org/lamsfoundation/lams/tool/vote/web/VoteMonitoringAction.java =================================================================== diff -u -r61e7bbf20d65e2ecb5e50f3154e52264003defa1 -re7c872d97ed5a450f72cfa57325f7d37280efcde --- lams_tool_vote/src/java/org/lamsfoundation/lams/tool/vote/web/VoteMonitoringAction.java (.../VoteMonitoringAction.java) (revision 61e7bbf20d65e2ecb5e50f3154e52264003defa1) +++ lams_tool_vote/src/java/org/lamsfoundation/lams/tool/vote/web/VoteMonitoringAction.java (.../VoteMonitoringAction.java) (revision e7c872d97ed5a450f72cfa57325f7d37280efcde) @@ -260,6 +260,9 @@ VoteMonitoringAction.logger.debug("SELECTION_CASE: " + request.getAttribute(VoteAppConstants.SELECTION_CASE)); request.setAttribute(VoteAppConstants.CURRENT_MONITORED_TOOL_SESSION, currentMonitoredToolSession); + + boolean isGroupedActivity = voteService.isGroupedActivity(new Long(toolContentID)); + request.setAttribute("isGroupedActivity", isGroupedActivity); voteGeneralMonitoringDTO.setCurrentMonitoredToolSession(currentMonitoredToolSession); voteMonitoringForm.setSbmtSuccess(new Boolean(false).toString()); Index: lams_tool_vote/web/monitoring/AllSessionsSummary.jsp =================================================================== diff -u -rc8e631a25cb2503cc740c3267c5039a24c36c93b -re7c872d97ed5a450f72cfa57325f7d37280efcde --- lams_tool_vote/web/monitoring/AllSessionsSummary.jsp (.../AllSessionsSummary.jsp) (revision c8e631a25cb2503cc740c3267c5039a24c36c93b) +++ lams_tool_vote/web/monitoring/AllSessionsSummary.jsp (.../AllSessionsSummary.jsp) (revision e7c872d97ed5a450f72cfa57325f7d37280efcde) @@ -121,10 +121,12 @@ - - - - + + + + + + Index: lams_tool_vote/web/monitoring/IndividualSessionSummary.jsp =================================================================== diff -u -rc8e631a25cb2503cc740c3267c5039a24c36c93b -re7c872d97ed5a450f72cfa57325f7d37280efcde --- lams_tool_vote/web/monitoring/IndividualSessionSummary.jsp (.../IndividualSessionSummary.jsp) (revision c8e631a25cb2503cc740c3267c5039a24c36c93b) +++ lams_tool_vote/web/monitoring/IndividualSessionSummary.jsp (.../IndividualSessionSummary.jsp) (revision e7c872d97ed5a450f72cfa57325f7d37280efcde) @@ -117,9 +117,11 @@ - - - + + + + +