Index: lams_tool_assessment/src/java/org/lamsfoundation/lams/tool/assessment/web/controller/MonitoringController.java =================================================================== diff -u -r1d6afb88d2e239ea9e5c7ba3c6a3f5735c96a2e1 -r9416dfbb422c46b7ee5f22c1cab3db64ef29570a --- lams_tool_assessment/src/java/org/lamsfoundation/lams/tool/assessment/web/controller/MonitoringController.java (.../MonitoringController.java) (revision 1d6afb88d2e239ea9e5c7ba3c6a3f5735c96a2e1) +++ lams_tool_assessment/src/java/org/lamsfoundation/lams/tool/assessment/web/controller/MonitoringController.java (.../MonitoringController.java) (revision 9416dfbb422c46b7ee5f22c1cab3db64ef29570a) @@ -309,9 +309,7 @@ @RequestMapping("/displayVsaAllocate") public String displayVsaAllocate(HttpServletRequest request, HttpServletResponse response) { - SessionMap sessionMap = getSessionMap(request); - - Long contentId = (Long) sessionMap.get(AssessmentConstants.ATTR_TOOL_CONTENT_ID); + Long contentId = WebUtil.readLongParam(request, AssessmentConstants.ATTR_TOOL_CONTENT_ID); Assessment assessment = service.getAssessmentByContentId(contentId); List questionSummaries = new ArrayList<>(); Index: lams_tool_assessment/src/java/org/lamsfoundation/lams/tool/assessment/web/controller/TblMonitoringController.java =================================================================== diff -u -re194f22014c7cbffaf5168f1982aa89e7c34c34d -r9416dfbb422c46b7ee5f22c1cab3db64ef29570a --- lams_tool_assessment/src/java/org/lamsfoundation/lams/tool/assessment/web/controller/TblMonitoringController.java (.../TblMonitoringController.java) (revision e194f22014c7cbffaf5168f1982aa89e7c34c34d) +++ lams_tool_assessment/src/java/org/lamsfoundation/lams/tool/assessment/web/controller/TblMonitoringController.java (.../TblMonitoringController.java) (revision 9416dfbb422c46b7ee5f22c1cab3db64ef29570a) @@ -85,6 +85,7 @@ Set questionDtos = new LinkedHashSet<>(); int maxOptionsInQuestion = 0; int displayOrder = 1; + boolean vsaPresent = false; for (AssessmentQuestion question : questionList) { if (QbQuestion.TYPE_MULTIPLE_CHOICE == question.getType() || QbQuestion.TYPE_VERY_SHORT_ANSWERS == question.getType()) { @@ -94,9 +95,14 @@ if (question.getQbQuestion().getQbOptions().size() > maxOptionsInQuestion) { maxOptionsInQuestion = question.getQbQuestion().getQbOptions().size(); } + + if (QbQuestion.TYPE_VERY_SHORT_ANSWERS == question.getType()) { + vsaPresent = true; + } } } request.setAttribute("maxOptionsInQuestion", maxOptionsInQuestion); + request.setAttribute("vsaPresent", vsaPresent); int totalNumberOfUsers = assessmentService.getCountUsersByContentId(toolContentId); if (totalNumberOfUsers > 0) { Index: lams_tool_assessment/web/pages/monitoring/summary.jsp =================================================================== diff -u -r1d6afb88d2e239ea9e5c7ba3c6a3f5735c96a2e1 -r9416dfbb422c46b7ee5f22c1cab3db64ef29570a --- lams_tool_assessment/web/pages/monitoring/summary.jsp (.../summary.jsp) (revision 1d6afb88d2e239ea9e5c7ba3c6a3f5735c96a2e1) +++ lams_tool_assessment/web/pages/monitoring/summary.jsp (.../summary.jsp) (revision 9416dfbb422c46b7ee5f22c1cab3db64ef29570a) @@ -557,7 +557,7 @@ Index: lams_tool_assessment/web/pages/monitoring/vsaAllocate.jsp =================================================================== diff -u -r1d6afb88d2e239ea9e5c7ba3c6a3f5735c96a2e1 -r9416dfbb422c46b7ee5f22c1cab3db64ef29570a --- lams_tool_assessment/web/pages/monitoring/vsaAllocate.jsp (.../vsaAllocate.jsp) (revision 1d6afb88d2e239ea9e5c7ba3c6a3f5735c96a2e1) +++ lams_tool_assessment/web/pages/monitoring/vsaAllocate.jsp (.../vsaAllocate.jsp) (revision 9416dfbb422c46b7ee5f22c1cab3db64ef29570a) @@ -7,6 +7,7 @@ <%@ include file="/common/header.jsp"%> + <fmt:message key="label.vsa.allocate.button" />