Index: lams_tool_assessment/src/java/org/lamsfoundation/lams/tool/assessment/web/controller/MonitoringController.java
===================================================================
diff -u -ra1044423d025101e48d3c1fc42716eb0661c18b5 -r0f007d6cdf27dc2764f3e9daa33c2814015534f9
--- lams_tool_assessment/src/java/org/lamsfoundation/lams/tool/assessment/web/controller/MonitoringController.java	(.../MonitoringController.java)	(revision a1044423d025101e48d3c1fc42716eb0661c18b5)
+++ lams_tool_assessment/src/java/org/lamsfoundation/lams/tool/assessment/web/controller/MonitoringController.java	(.../MonitoringController.java)	(revision 0f007d6cdf27dc2764f3e9daa33c2814015534f9)
@@ -224,7 +224,7 @@
 		displayStudentChoices = false;
 	    }
 
-	    if (question.getType() == QbQuestion.TYPE_VERY_SHORT_ANSWERS) {
+	    if (question.getType().equals(QbQuestion.TYPE_VERY_SHORT_ANSWERS)) {
 		vsaPresent = true;
 	    }
 	}
Index: lams_tool_assessment/src/java/org/lamsfoundation/lams/tool/assessment/web/controller/TblMonitoringController.java
===================================================================
diff -u -ra1044423d025101e48d3c1fc42716eb0661c18b5 -r0f007d6cdf27dc2764f3e9daa33c2814015534f9
--- lams_tool_assessment/src/java/org/lamsfoundation/lams/tool/assessment/web/controller/TblMonitoringController.java	(.../TblMonitoringController.java)	(revision a1044423d025101e48d3c1fc42716eb0661c18b5)
+++ lams_tool_assessment/src/java/org/lamsfoundation/lams/tool/assessment/web/controller/TblMonitoringController.java	(.../TblMonitoringController.java)	(revision 0f007d6cdf27dc2764f3e9daa33c2814015534f9)
@@ -71,6 +71,13 @@
 	request.setAttribute("groupsInAnsweredQuestionsChart", assessment.isUseSelectLeaderToolOuput());
 	request.setAttribute("assessment", assessment);
 
+	for (AssessmentQuestion question : assessment.getQuestions()) {
+	    if (question.getType().equals(QbQuestion.TYPE_VERY_SHORT_ANSWERS)) {
+		request.setAttribute("vsaPresent", true);
+		break;
+	    }
+	}
+
 	return "pages/tblmonitoring/iraAssessmentStudentChoices";
     }
 
@@ -211,8 +218,8 @@
     @RequestMapping("aesStudentChoicesTable")
     public String aesStudentChoicesTable(HttpServletRequest request) {
 	Long toolContentId = WebUtil.readLongParam(request, AttributeNames.PARAM_TOOL_CONTENT_ID);
-	List<TblAssessmentQuestionDTO> tblQuestionDtos = TblMonitoringController
-		.getTblAssessmentQuestionDtos(toolContentId, false, assessmentService);
+	List<TblAssessmentQuestionDTO> tblQuestionDtos = TblMonitoringController.getTblAssessmentQuestionDtos(
+		toolContentId, false, assessmentService);
 
 	Assessment assessment = assessmentService.getAssessmentByContentId(toolContentId);
 	SortedSet<AssessmentSession> sessions = new TreeSet<>(new AssessmentSessionComparator());
@@ -235,8 +242,8 @@
 
 	    TblAssessmentQuestionDTO tblQuestionDto = new TblAssessmentQuestionDTO();
 	    tblQuestionDto.setTitle(questionDto.getTitle());
-	    tblQuestionDto
-		    .setQuestionTypeLabel(AssessmentServiceImpl.getQuestionTypeLanguageLabel(questionDto.getType()));
+	    tblQuestionDto.setQuestionTypeLabel(
+		    AssessmentServiceImpl.getQuestionTypeLanguageLabel(questionDto.getType()));
 	    tblQuestionDto.setCorrectAnswer(TblMonitoringController.getAssessmentCorrectAnswer(questionDto));
 
 	    tblQuestionDtos.add(tblQuestionDto);
@@ -267,8 +274,7 @@
 	    }
 
 	    List<TblAssessmentQuestionResultDTO> sessionQuestionResults = new ArrayList<>();
-	    for (List<AssessmentQuestionResult> questionResultsPerSession : questionSummary
-		    .getQuestionResultsPerSession()) {
+	    for (List<AssessmentQuestionResult> questionResultsPerSession : questionSummary.getQuestionResultsPerSession()) {
 
 		TblAssessmentQuestionResultDTO tblQuestionResultDto = new TblAssessmentQuestionResultDTO();
 		String answer = "";
@@ -303,8 +309,8 @@
 				}
 			    }
 			} else {
-			    correct = questionResult.getPenalty() + questionResult.getMark() + 0.1 >= questionResult
-				    .getMaxMark();
+			    correct = questionResult.getPenalty() + questionResult.getMark() + 0.1
+				    >= questionResult.getMaxMark();
 			}
 		    }
 
@@ -401,4 +407,4 @@
 	return "pages/tblmonitoring/teams";
     }
 
-}
+}
\ No newline at end of file
Index: lams_tool_assessment/web/pages/tblmonitoring/iraAssessmentStudentChoices.jsp
===================================================================
diff -u -rf0d9e9587649ab1a2c5ed4cd182a05daaf124fa6 -r0f007d6cdf27dc2764f3e9daa33c2814015534f9
--- lams_tool_assessment/web/pages/tblmonitoring/iraAssessmentStudentChoices.jsp	(.../iraAssessmentStudentChoices.jsp)	(revision f0d9e9587649ab1a2c5ed4cd182a05daaf124fa6)
+++ lams_tool_assessment/web/pages/tblmonitoring/iraAssessmentStudentChoices.jsp	(.../iraAssessmentStudentChoices.jsp)	(revision 0f007d6cdf27dc2764f3e9daa33c2814015534f9)
@@ -13,45 +13,45 @@
 <style>
 
 </style>
-	
+
 <lams:JSImport src="includes/javascript/chart5.js" relative="true" />
 
-<script>	
+<script>
 	var WEB_APP_URL = '<lams:WebAppURL />',
 
-		LABELS = $.extend(LABELS, {
-			<fmt:message key="label.monitoring.summary.completion" var="ACTIVITY_COMPLETION_CHART_TITLE_VAR"/>
-			ACTIVITY_COMPLETION_CHART_TITLE : '<c:out value="${ACTIVITY_COMPLETION_CHART_TITLE_VAR}" />',
-			<fmt:message key="label.monitoring.summary.completion.possible" var="ACTIVITY_COMPLETION_CHART_POSSIBLE_LEARNERS_VAR"/>
-			ACTIVITY_COMPLETION_CHART_POSSIBLE_LEARNERS : '<c:out value="${ACTIVITY_COMPLETION_CHART_POSSIBLE_LEARNERS_VAR}" />',
-			<fmt:message key="label.monitoring.summary.completion.started" var="ACTIVITY_COMPLETION_CHART_STARTED_LEARNERS_VAR"/>
-			ACTIVITY_COMPLETION_CHART_STARTED_LEARNERS : '<c:out value="${ACTIVITY_COMPLETION_CHART_STARTED_LEARNERS_VAR}" />',	
-			<fmt:message key="label.monitoring.summary.completion.completed" var="ACTIVITY_COMPLETION_CHART_COMPLETED_LEARNERS_VAR"/>
-			ACTIVITY_COMPLETION_CHART_COMPLETED_LEARNERS : '<c:out value="${ACTIVITY_COMPLETION_CHART_COMPLETED_LEARNERS_VAR}" />',	
-			<fmt:message key="label.monitoring.summary.answered.questions" var="ANSWERED_QUESTIONS_CHART_TITLE_VAR"/>
-			ANSWERED_QUESTIONS_CHART_TITLE : '<c:out value="${ANSWERED_QUESTIONS_CHART_TITLE_VAR}" />',
-			<fmt:message key="label.monitoring.summary.answered.questions.groups" var="ANSWERED_QUESTIONS_CHART_TITLE_GROUPS_VAR"/>
-			ANSWERED_QUESTIONS_CHART_TITLE_GROUPS : '<c:out value="${ANSWERED_QUESTIONS_CHART_TITLE_GROUPS_VAR}" />',
-			<fmt:message key="label.monitoring.summary.answered.questions.x.axis" var="ANSWERED_QUESTIONS_CHART_X_AXIS_VAR"/>
-			ANSWERED_QUESTIONS_CHART_X_AXIS : '<c:out value="${ANSWERED_QUESTIONS_CHART_X_AXIS_VAR}" />',
-			<fmt:message key="label.monitoring.summary.answered.questions.y.axis.students" var="ANSWERED_QUESTIONS_CHART_Y_AXIS_STUDENTS_VAR"/>
-			ANSWERED_QUESTIONS_CHART_Y_AXIS_STUDENTS : '<c:out value="${ANSWERED_QUESTIONS_CHART_Y_AXIS_STUDENTS_VAR}" />',
-			<fmt:message key="label.monitoring.summary.answered.questions.y.axis.groups" var="ANSWERED_QUESTIONS_CHART_Y_AXIS_GROUPS_VAR"/>
-			ANSWERED_QUESTIONS_CHART_Y_AXIS_GROUPS : '<c:out value="${ANSWERED_QUESTIONS_CHART_Y_AXIS_GROUPS_VAR}" />'
-		}),
-		
-		activityCompletionChart = null,
-		answeredQuestionsChart = null,
-		// do not refresh charts automatically
-		// they will be redrawn on page auto reload
-		COMPLETION_CHART_UPDATE_INTERVAL = 0;
-	
+			LABELS = $.extend(LABELS, {
+				<fmt:message key="label.monitoring.summary.completion" var="ACTIVITY_COMPLETION_CHART_TITLE_VAR"/>
+				ACTIVITY_COMPLETION_CHART_TITLE : '<c:out value="${ACTIVITY_COMPLETION_CHART_TITLE_VAR}" />',
+				<fmt:message key="label.monitoring.summary.completion.possible" var="ACTIVITY_COMPLETION_CHART_POSSIBLE_LEARNERS_VAR"/>
+				ACTIVITY_COMPLETION_CHART_POSSIBLE_LEARNERS : '<c:out value="${ACTIVITY_COMPLETION_CHART_POSSIBLE_LEARNERS_VAR}" />',
+				<fmt:message key="label.monitoring.summary.completion.started" var="ACTIVITY_COMPLETION_CHART_STARTED_LEARNERS_VAR"/>
+				ACTIVITY_COMPLETION_CHART_STARTED_LEARNERS : '<c:out value="${ACTIVITY_COMPLETION_CHART_STARTED_LEARNERS_VAR}" />',
+				<fmt:message key="label.monitoring.summary.completion.completed" var="ACTIVITY_COMPLETION_CHART_COMPLETED_LEARNERS_VAR"/>
+				ACTIVITY_COMPLETION_CHART_COMPLETED_LEARNERS : '<c:out value="${ACTIVITY_COMPLETION_CHART_COMPLETED_LEARNERS_VAR}" />',
+				<fmt:message key="label.monitoring.summary.answered.questions" var="ANSWERED_QUESTIONS_CHART_TITLE_VAR"/>
+				ANSWERED_QUESTIONS_CHART_TITLE : '<c:out value="${ANSWERED_QUESTIONS_CHART_TITLE_VAR}" />',
+				<fmt:message key="label.monitoring.summary.answered.questions.groups" var="ANSWERED_QUESTIONS_CHART_TITLE_GROUPS_VAR"/>
+				ANSWERED_QUESTIONS_CHART_TITLE_GROUPS : '<c:out value="${ANSWERED_QUESTIONS_CHART_TITLE_GROUPS_VAR}" />',
+				<fmt:message key="label.monitoring.summary.answered.questions.x.axis" var="ANSWERED_QUESTIONS_CHART_X_AXIS_VAR"/>
+				ANSWERED_QUESTIONS_CHART_X_AXIS : '<c:out value="${ANSWERED_QUESTIONS_CHART_X_AXIS_VAR}" />',
+				<fmt:message key="label.monitoring.summary.answered.questions.y.axis.students" var="ANSWERED_QUESTIONS_CHART_Y_AXIS_STUDENTS_VAR"/>
+				ANSWERED_QUESTIONS_CHART_Y_AXIS_STUDENTS : '<c:out value="${ANSWERED_QUESTIONS_CHART_Y_AXIS_STUDENTS_VAR}" />',
+				<fmt:message key="label.monitoring.summary.answered.questions.y.axis.groups" var="ANSWERED_QUESTIONS_CHART_Y_AXIS_GROUPS_VAR"/>
+				ANSWERED_QUESTIONS_CHART_Y_AXIS_GROUPS : '<c:out value="${ANSWERED_QUESTIONS_CHART_Y_AXIS_GROUPS_VAR}" />'
+			}),
+
+			activityCompletionChart = null,
+			answeredQuestionsChart = null,
+			// do not refresh charts automatically
+			// they will be redrawn on page auto reload
+			COMPLETION_CHART_UPDATE_INTERVAL = 0;
+
 	$(document).ready(function(){
 		openEventSource('<lams:WebAppURL />monitoring/getCompletionChartsData.do?toolContentId=${toolContentID}', function(event) {
 			if (!event.data) {
 				return;
 			}
-			
+
 			let data = JSON.parse(decodeURIComponent(event.data));
 			drawActivityCompletionChart(data, true);
 			drawAnsweredQuestionsChart(data, ${groupsInAnsweredQuestionsChart}, true);
@@ -62,33 +62,33 @@
 				$('#student-choices-table').load('<lams:WebAppURL />tblmonitoring/iraAssessmentStudentChoicesTable.do?toolContentID=${toolContentID}');
 				return;
 			}
-			
+
 			openQuestionModal.one('hidden.bs.modal', function() {
 				$('#student-choices-table').load('<lams:WebAppURL />tblmonitoring/iraAssessmentStudentChoicesTable.do?toolContentID=${toolContentID}');
 			});
-			
+
 		});
-		
+
 		$('#time-limit-panel-placeholder').load('${timeLimitPanelUrl}');
 	});
-			
+
 	function exportExcel(){
 		//dynamically create a form and submit it
 		var exportExcelUrl = "<lams:LAMSURL/>tool/laasse10/monitoring/exportSummary.do?toolContentID=${toolContentID}&downloadTokenValue=dummy&fileName=assessment_export.xlsx&reqID=" + (new Date()).getTime();
 		var form = $('<form method="post" action="' + exportExcelUrl + '"></form>');
-	    var hiddenInput = $('<input type="hidden" name="<csrf:tokenname/>" value="<csrf:tokenvalue/>"></input>');
-	    form.append(hiddenInput);
-	    $(document.body).append(form);
-	    form.submit();
+		var hiddenInput = $('<input type="hidden" name="<csrf:tokenname/>" value="<csrf:tokenvalue/>"></input>');
+		form.append(hiddenInput);
+		$(document.body).append(form);
+		form.submit();
 	};
 </script>
 <div class="container-fluid">
 	<div class="row">
 		<div class="col-10 offset-1 text-right">
-			<!-- Notifications -->  
+			<!-- Notifications -->
 			<div class="float-end">
 				<a href="#nogo" type="button" class="btn btn-secondary buttons_column"
-						onclick="javascript:loadTab('irat', $('#load-irat-tab-btn'))">
+				   onclick="javascript:loadTab('irat', $('#load-irat-tab-btn'))">
 					<i class="fa fa-clipboard-question"></i>
 					<fmt:message key="label.hide.students.choices"/>
 				</a>
@@ -100,25 +100,27 @@
 					<i class="fa fa-file-excel"></i>
 					<fmt:message key="label.excel.export"/>
 				</a>
-				<a class="btn btn-secondary buttons_column d-none" target="_blank" id="allocate-vsas-button"
-				   href='<lams:LAMSURL />qb/vsa/displayVsaAllocate.do?toolContentID=${toolContentID}'>
-					<fmt:message key="label.vsa.allocate.button" />
-				</a>
+				<c:if test="${vsaPresent}">
+					<a class="btn btn-secondary buttons_column" target="_blank" id="allocate-vsas-button"
+					   href='<lams:LAMSURL />qb/vsa/displayVsaAllocate.do?toolContentID=${toolContentID}'>
+						<fmt:message key="label.vsa.allocate.button" />
+					</a>
+				</c:if>
 			</div>
 			<!-- End notifications -->
 			<h3>
 				<fmt:message key="label.ira.questions.marks"/>
 			</h3>
 		</div>
 	</div>
-	
+
 	<div class="row" id="completion-charts-container">
 		<div class="col-md-5 col-sm-12 offset-md-1 me-2 my-4">
 			<div class="monitoring-panel">
 				<canvas id="activity-completion-chart"></canvas>
 			</div>
 		</div>
-		
+
 		<div class="col-md-5 col-sm-12 ms-2 my-4">
 			<div class="monitoring-panel">
 				<h4 id="answered-questions-chart-none" class="text-center position-relative top-50">
@@ -128,16 +130,16 @@
 			</div>
 		</div>
 	</div>
-	
+
 	<%-- Include student's choices part --%>
 	<div class="row">
 		<div class="col-10 offset-1" id="student-choices-table">
 			<%@ include file="/pages/monitoring/parts/mcqStudentChoices5.jsp" %>
 		</div>
 	</div>
-	
+
 	<div class="row">
 		<div class="col-10 offset-1" id="time-limit-panel-placeholder">
 		</div>
 	</div>
-</div>
+</div>
\ No newline at end of file