Index: lams_tool_lamc/src/java/org/lamsfoundation/lams/tool/mc/service/IMcService.java =================================================================== diff -u -rdea5004371152a95bec9fc2db87a455fa84c0887 -rf0450cb2776a8eba5e274ec3e72f83a333f5d229 --- lams_tool_lamc/src/java/org/lamsfoundation/lams/tool/mc/service/IMcService.java (.../IMcService.java) (revision dea5004371152a95bec9fc2db87a455fa84c0887) +++ lams_tool_lamc/src/java/org/lamsfoundation/lams/tool/mc/service/IMcService.java (.../IMcService.java) (revision f0450cb2776a8eba5e274ec3e72f83a333f5d229) @@ -258,6 +258,14 @@ * @return top mark, lowest mark, average mark in that order */ public Integer[] getMarkStatistics(McSession mcSession); + + /** + * 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_lamc/src/java/org/lamsfoundation/lams/tool/mc/service/McServicePOJO.java =================================================================== diff -u -r1a5446e3a1f962f1bb831c1bbaef14acf9d3635c -rf0450cb2776a8eba5e274ec3e72f83a333f5d229 --- lams_tool_lamc/src/java/org/lamsfoundation/lams/tool/mc/service/McServicePOJO.java (.../McServicePOJO.java) (revision 1a5446e3a1f962f1bb831c1bbaef14acf9d3635c) +++ lams_tool_lamc/src/java/org/lamsfoundation/lams/tool/mc/service/McServicePOJO.java (.../McServicePOJO.java) (revision f0450cb2776a8eba5e274ec3e72f83a333f5d229) @@ -1560,6 +1560,10 @@ mcUploadedFileDAO.saveUploadFile(mcUploadedFile); McServicePOJO.logger.debug("persisted mcUploadedFile: " + mcUploadedFile); } + + public boolean isGroupedActivity(long toolContentID) { + return toolService.isGroupedActivity(toolContentID); + } /** * @return Returns the logger. Index: lams_tool_lamc/src/java/org/lamsfoundation/lams/tool/mc/web/McMonitoringAction.java =================================================================== diff -u -r97085d29fb96a48e12f9a40d81034dce0b011b98 -rf0450cb2776a8eba5e274ec3e72f83a333f5d229 --- lams_tool_lamc/src/java/org/lamsfoundation/lams/tool/mc/web/McMonitoringAction.java (.../McMonitoringAction.java) (revision 97085d29fb96a48e12f9a40d81034dce0b011b98) +++ lams_tool_lamc/src/java/org/lamsfoundation/lams/tool/mc/web/McMonitoringAction.java (.../McMonitoringAction.java) (revision f0450cb2776a8eba5e274ec3e72f83a333f5d229) @@ -254,8 +254,10 @@ mcGeneralMonitoringDTO.setSummaryToolSessions(populateToolSessions(mcContent)); mcGeneralMonitoringDTO.setDisplayAnswers(new Boolean(mcContent.isDisplayAnswers()).toString()); logger.debug("existing mcContent:" + mcContent); + + boolean isGroupedActivity = mcService.isGroupedActivity(new Long(toolContentID)); + request.setAttribute("isGroupedActivity", isGroupedActivity); - /*setting editable screen properties*/ McGeneralAuthoringDTO mcGeneralAuthoringDTO= new McGeneralAuthoringDTO(); mcGeneralAuthoringDTO.setActivityTitle(mcContent.getTitle()); Index: lams_tool_lamc/src/java/org/lamsfoundation/lams/tool/mc/web/McMonitoringStarterAction.java =================================================================== diff -u -r4f0e1a483aeca1774af6331bec489db8302f5bd1 -rf0450cb2776a8eba5e274ec3e72f83a333f5d229 --- lams_tool_lamc/src/java/org/lamsfoundation/lams/tool/mc/web/McMonitoringStarterAction.java (.../McMonitoringStarterAction.java) (revision 4f0e1a483aeca1774af6331bec489db8302f5bd1) +++ lams_tool_lamc/src/java/org/lamsfoundation/lams/tool/mc/web/McMonitoringStarterAction.java (.../McMonitoringStarterAction.java) (revision f0450cb2776a8eba5e274ec3e72f83a333f5d229) @@ -23,7 +23,6 @@ package org.lamsfoundation.lams.tool.mc.web; import java.io.IOException; -import java.util.ArrayList; import java.util.Iterator; import java.util.LinkedList; import java.util.List; @@ -42,7 +41,6 @@ import org.apache.struts.action.ActionMapping; import org.apache.struts.action.ActionMessage; import org.apache.struts.action.ActionMessages; -import org.lamsfoundation.lams.tool.mc.EditActivityDTO; import org.lamsfoundation.lams.tool.mc.McAppConstants; import org.lamsfoundation.lams.tool.mc.McApplicationException; import org.lamsfoundation.lams.tool.mc.McComparator; @@ -258,6 +256,9 @@ request.setAttribute("reflect", mcContent.isReflect()); request.setAttribute("reflectionSubject", mcContent.getReflectionSubject()); request.setAttribute("passMark", mcContent.getPassMark()); + + boolean isGroupedActivity = mcService.isGroupedActivity(new Long(toolContentID)); + request.setAttribute("isGroupedActivity", isGroupedActivity); // The edit activity code needs a session map SessionMap sessionMap = new SessionMap(); Index: lams_tool_lamc/web/monitoring/AllSessionsSummary.jsp =================================================================== diff -u -r13b3303dd460ab8ee1f9ab0841972620e4b29943 -rf0450cb2776a8eba5e274ec3e72f83a333f5d229 --- lams_tool_lamc/web/monitoring/AllSessionsSummary.jsp (.../AllSessionsSummary.jsp) (revision 13b3303dd460ab8ee1f9ab0841972620e4b29943) +++ lams_tool_lamc/web/monitoring/AllSessionsSummary.jsp (.../AllSessionsSummary.jsp) (revision f0450cb2776a8eba5e274ec3e72f83a333f5d229) @@ -28,12 +28,13 @@ - - : - - + + + : + + + - Index: lams_tool_lamc/web/monitoring/IndividualSessionSummary.jsp =================================================================== diff -u -r13b3303dd460ab8ee1f9ab0841972620e4b29943 -rf0450cb2776a8eba5e274ec3e72f83a333f5d229 --- lams_tool_lamc/web/monitoring/IndividualSessionSummary.jsp (.../IndividualSessionSummary.jsp) (revision 13b3303dd460ab8ee1f9ab0841972620e4b29943) +++ lams_tool_lamc/web/monitoring/IndividualSessionSummary.jsp (.../IndividualSessionSummary.jsp) (revision f0450cb2776a8eba5e274ec3e72f83a333f5d229) @@ -34,10 +34,12 @@ - - : - - + + + : + + + Index: lams_tool_laqa/src/java/org/lamsfoundation/lams/tool/qa/service/IQaService.java =================================================================== diff -u -rc527318c8c79f72151f6261342c5cc1a830d1e4d -rf0450cb2776a8eba5e274ec3e72f83a333f5d229 --- lams_tool_laqa/src/java/org/lamsfoundation/lams/tool/qa/service/IQaService.java (.../IQaService.java) (revision c527318c8c79f72151f6261342c5cc1a830d1e4d) +++ lams_tool_laqa/src/java/org/lamsfoundation/lams/tool/qa/service/IQaService.java (.../IQaService.java) (revision f0450cb2776a8eba5e274ec3e72f83a333f5d229) @@ -356,4 +356,12 @@ public void deleteAllWizardCategories(); public void removeQuestionsFromCache(QaContent qaContent); + + /** + * 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_laqa/src/java/org/lamsfoundation/lams/tool/qa/service/QaServicePOJO.java =================================================================== diff -u -r1a5446e3a1f962f1bb831c1bbaef14acf9d3635c -rf0450cb2776a8eba5e274ec3e72f83a333f5d229 --- lams_tool_laqa/src/java/org/lamsfoundation/lams/tool/qa/service/QaServicePOJO.java (.../QaServicePOJO.java) (revision 1a5446e3a1f962f1bb831c1bbaef14acf9d3635c) +++ lams_tool_laqa/src/java/org/lamsfoundation/lams/tool/qa/service/QaServicePOJO.java (.../QaServicePOJO.java) (revision f0450cb2776a8eba5e274ec3e72f83a333f5d229) @@ -1441,6 +1441,10 @@ return list.get(0); } } + + public boolean isGroupedActivity(long toolContentID) { + return toolService.isGroupedActivity(toolContentID); + } /** * @return Returns the cred. Index: lams_tool_laqa/src/java/org/lamsfoundation/lams/tool/qa/web/QaMonitoringAction.java =================================================================== diff -u -rc336754e3e8e868aba34167fc694f56078a3c66a -rf0450cb2776a8eba5e274ec3e72f83a333f5d229 --- lams_tool_laqa/src/java/org/lamsfoundation/lams/tool/qa/web/QaMonitoringAction.java (.../QaMonitoringAction.java) (revision c336754e3e8e868aba34167fc694f56078a3c66a) +++ lams_tool_laqa/src/java/org/lamsfoundation/lams/tool/qa/web/QaMonitoringAction.java (.../QaMonitoringAction.java) (revision f0450cb2776a8eba5e274ec3e72f83a333f5d229) @@ -817,6 +817,9 @@ MonitoringUtil.buildQaStatsDTO(request, qaService, qaContent); MonitoringUtil.generateGroupsSessionData(request, qaService, qaContent, false); + + boolean isGroupedActivity = qaService.isGroupedActivity(new Long(strToolContentID)); + request.setAttribute("isGroupedActivity", isGroupedActivity); return mapping.findForward(QaAppConstants.LOAD_MONITORING); } Index: lams_tool_laqa/src/java/org/lamsfoundation/lams/tool/qa/web/QaMonitoringStarterAction.java =================================================================== diff -u -rc336754e3e8e868aba34167fc694f56078a3c66a -rf0450cb2776a8eba5e274ec3e72f83a333f5d229 --- lams_tool_laqa/src/java/org/lamsfoundation/lams/tool/qa/web/QaMonitoringStarterAction.java (.../QaMonitoringStarterAction.java) (revision c336754e3e8e868aba34167fc694f56078a3c66a) +++ lams_tool_laqa/src/java/org/lamsfoundation/lams/tool/qa/web/QaMonitoringStarterAction.java (.../QaMonitoringStarterAction.java) (revision f0450cb2776a8eba5e274ec3e72f83a333f5d229) @@ -219,6 +219,9 @@ } MonitoringUtil.buildQaStatsDTO(request, qaService, qaContent); + + boolean isGroupedActivity = qaService.isGroupedActivity(new Long(toolContentID)); + request.setAttribute("isGroupedActivity", isGroupedActivity); request.setAttribute("currentMonitoredToolSession", "All"); MonitoringUtil.generateGroupsSessionData(request, qaService, qaContent, false); Index: lams_tool_laqa/web/monitoring/AllSessionsSummary.jsp =================================================================== diff -u -rcb27e101777d51311c1959e87f6a037ed8ac6a4c -rf0450cb2776a8eba5e274ec3e72f83a333f5d229 --- lams_tool_laqa/web/monitoring/AllSessionsSummary.jsp (.../AllSessionsSummary.jsp) (revision cb27e101777d51311c1959e87f6a037ed8ac6a4c) +++ lams_tool_laqa/web/monitoring/AllSessionsSummary.jsp (.../AllSessionsSummary.jsp) (revision f0450cb2776a8eba5e274ec3e72f83a333f5d229) @@ -25,10 +25,11 @@ - - : - - + + + : + + Index: lams_tool_laqa/web/monitoring/IndividualSessionSummary.jsp =================================================================== diff -u -rcb27e101777d51311c1959e87f6a037ed8ac6a4c -rf0450cb2776a8eba5e274ec3e72f83a333f5d229 --- lams_tool_laqa/web/monitoring/IndividualSessionSummary.jsp (.../IndividualSessionSummary.jsp) (revision cb27e101777d51311c1959e87f6a037ed8ac6a4c) +++ lams_tool_laqa/web/monitoring/IndividualSessionSummary.jsp (.../IndividualSessionSummary.jsp) (revision f0450cb2776a8eba5e274ec3e72f83a333f5d229) @@ -20,11 +20,12 @@ <%@ include file="/common/taglibs.jsp"%> + : + - Index: lams_tool_survey/src/java/org/lamsfoundation/lams/tool/survey/SurveyConstants.java =================================================================== diff -u -r7b79396263b36a933d66390fb9ab12821956d59d -rf0450cb2776a8eba5e274ec3e72f83a333f5d229 --- lams_tool_survey/src/java/org/lamsfoundation/lams/tool/survey/SurveyConstants.java (.../SurveyConstants.java) (revision 7b79396263b36a933d66390fb9ab12821956d59d) +++ lams_tool_survey/src/java/org/lamsfoundation/lams/tool/survey/SurveyConstants.java (.../SurveyConstants.java) (revision f0450cb2776a8eba5e274ec3e72f83a333f5d229) @@ -165,7 +165,9 @@ public static final String ATTR_SURVEY = "survey"; public static final String ATTR_USER_FINISHED = "userFinished"; - + + public static final String ATTR_IS_GROUPED_ACTIVITY = "isGroupedActivity"; + // POSITION public static int POSITION_INSIDE = 0; Index: lams_tool_survey/src/java/org/lamsfoundation/lams/tool/survey/service/ISurveyService.java =================================================================== diff -u -r625dccc46218d5cf4648d73a139af38f21c222ce -rf0450cb2776a8eba5e274ec3e72f83a333f5d229 --- lams_tool_survey/src/java/org/lamsfoundation/lams/tool/survey/service/ISurveyService.java (.../ISurveyService.java) (revision 625dccc46218d5cf4648d73a139af38f21c222ce) +++ lams_tool_survey/src/java/org/lamsfoundation/lams/tool/survey/service/ISurveyService.java (.../ISurveyService.java) (revision f0450cb2776a8eba5e274ec3e72f83a333f5d229) @@ -322,4 +322,12 @@ public String createConditionName(Collection existingConditions); public void deleteCondition(SurveyCondition condition); + + /** + * 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_survey/src/java/org/lamsfoundation/lams/tool/survey/service/SurveyServiceImpl.java =================================================================== diff -u -r1a5446e3a1f962f1bb831c1bbaef14acf9d3635c -rf0450cb2776a8eba5e274ec3e72f83a333f5d229 --- lams_tool_survey/src/java/org/lamsfoundation/lams/tool/survey/service/SurveyServiceImpl.java (.../SurveyServiceImpl.java) (revision 1a5446e3a1f962f1bb831c1bbaef14acf9d3635c) +++ lams_tool_survey/src/java/org/lamsfoundation/lams/tool/survey/service/SurveyServiceImpl.java (.../SurveyServiceImpl.java) (revision f0450cb2776a8eba5e274ec3e72f83a333f5d229) @@ -547,6 +547,10 @@ return summary; } + + public boolean isGroupedActivity(long toolContentID) { + return toolService.isGroupedActivity(toolContentID); + } // ***************************************************************************** // private methods Index: lams_tool_survey/src/java/org/lamsfoundation/lams/tool/survey/web/action/MonitoringAction.java =================================================================== diff -u -r39f271516e207178880a7359aeb79350af6f379e -rf0450cb2776a8eba5e274ec3e72f83a333f5d229 --- lams_tool_survey/src/java/org/lamsfoundation/lams/tool/survey/web/action/MonitoringAction.java (.../MonitoringAction.java) (revision 39f271516e207178880a7359aeb79350af6f379e) +++ lams_tool_survey/src/java/org/lamsfoundation/lams/tool/survey/web/action/MonitoringAction.java (.../MonitoringAction.java) (revision f0450cb2776a8eba5e274ec3e72f83a333f5d229) @@ -151,7 +151,8 @@ sessionMap.put(SurveyConstants.ATTR_SURVEY, survey); sessionMap.put(AttributeNames.PARAM_TOOL_CONTENT_ID, contentId); sessionMap.put(SurveyConstants.ATTR_REFLECT_LIST, relectList); - + sessionMap.put(SurveyConstants.ATTR_IS_GROUPED_ACTIVITY, service.isGroupedActivity(contentId)); + return mapping.findForward(SurveyConstants.SUCCESS); } Index: lams_tool_survey/web/pages/monitoring/summary.jsp =================================================================== diff -u -r05ab55ef4acdc0c374af7405c58fb0e0fe8eb6b7 -rf0450cb2776a8eba5e274ec3e72f83a333f5d229 --- lams_tool_survey/web/pages/monitoring/summary.jsp (.../summary.jsp) (revision 05ab55ef4acdc0c374af7405c58fb0e0fe8eb6b7) +++ lams_tool_survey/web/pages/monitoring/summary.jsp (.../summary.jsp) (revision f0450cb2776a8eba5e274ec3e72f83a333f5d229) @@ -134,12 +134,14 @@ <%-- display group name on first row--%> - - - - <%-- End group title display --%> + + + + + + <%-- End group title display --%>
- ${surveySession.sessionName} -
+ ${surveySession.sessionName} +