Index: lams_tool_vote/src/java/org/lamsfoundation/lams/tool/vote/service/IVoteService.java =================================================================== RCS file: /usr/local/cvsroot/lams_tool_vote/src/java/org/lamsfoundation/lams/tool/vote/service/IVoteService.java,v diff -u -r1.41 -r1.42 --- lams_tool_vote/src/java/org/lamsfoundation/lams/tool/vote/service/IVoteService.java 2 Jul 2009 13:02:03 -0000 1.41 +++ lams_tool_vote/src/java/org/lamsfoundation/lams/tool/vote/service/IVoteService.java 15 Feb 2011 19:55:57 -0000 1.42 @@ -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 =================================================================== RCS file: /usr/local/cvsroot/lams_tool_vote/src/java/org/lamsfoundation/lams/tool/vote/service/VoteServicePOJO.java,v diff -u -r1.68 -r1.69 --- lams_tool_vote/src/java/org/lamsfoundation/lams/tool/vote/service/VoteServicePOJO.java 17 Mar 2010 10:49:00 -0000 1.68 +++ lams_tool_vote/src/java/org/lamsfoundation/lams/tool/vote/service/VoteServicePOJO.java 15 Feb 2011 19:55:57 -0000 1.69 @@ -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 =================================================================== RCS file: /usr/local/cvsroot/lams_tool_vote/src/java/org/lamsfoundation/lams/tool/vote/web/VoteLearningStarterAction.java,v diff -u -r1.48 -r1.49 --- lams_tool_vote/src/java/org/lamsfoundation/lams/tool/vote/web/VoteLearningStarterAction.java 17 Mar 2010 10:49:00 -0000 1.48 +++ lams_tool_vote/src/java/org/lamsfoundation/lams/tool/vote/web/VoteLearningStarterAction.java 15 Feb 2011 19:55:57 -0000 1.49 @@ -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 =================================================================== RCS file: /usr/local/cvsroot/lams_tool_vote/src/java/org/lamsfoundation/lams/tool/vote/web/VoteMonitoringAction.java,v diff -u -r1.45 -r1.46 --- lams_tool_vote/src/java/org/lamsfoundation/lams/tool/vote/web/VoteMonitoringAction.java 2 Jul 2009 13:02:04 -0000 1.45 +++ lams_tool_vote/src/java/org/lamsfoundation/lams/tool/vote/web/VoteMonitoringAction.java 15 Feb 2011 19:55:57 -0000 1.46 @@ -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 =================================================================== RCS file: /usr/local/cvsroot/lams_tool_vote/web/monitoring/AllSessionsSummary.jsp,v diff -u -r1.18 -r1.19 --- lams_tool_vote/web/monitoring/AllSessionsSummary.jsp 22 May 2008 01:36:24 -0000 1.18 +++ lams_tool_vote/web/monitoring/AllSessionsSummary.jsp 15 Feb 2011 19:55:57 -0000 1.19 @@ -121,10 +121,12 @@ - - - - + + + + + + Index: lams_tool_vote/web/monitoring/IndividualSessionSummary.jsp =================================================================== RCS file: /usr/local/cvsroot/lams_tool_vote/web/monitoring/Attic/IndividualSessionSummary.jsp,v diff -u -r1.19 -r1.20 --- lams_tool_vote/web/monitoring/IndividualSessionSummary.jsp 22 May 2008 01:36:24 -0000 1.19 +++ lams_tool_vote/web/monitoring/IndividualSessionSummary.jsp 15 Feb 2011 19:55:57 -0000 1.20 @@ -117,9 +117,11 @@ - - - + + + + +