Index: lams_tool_assessment/conf/language/lams/ApplicationResources.properties
===================================================================
diff -u -rc18a564ab91e850651bed4ba9e4b648d3cc7cf62 -r1d6afb88d2e239ea9e5c7ba3c6a3f5735c96a2e1
--- lams_tool_assessment/conf/language/lams/ApplicationResources.properties	(.../ApplicationResources.properties)	(revision c18a564ab91e850651bed4ba9e4b648d3cc7cf62)
+++ lams_tool_assessment/conf/language/lams/ApplicationResources.properties	(.../ApplicationResources.properties)	(revision 1d6afb88d2e239ea9e5c7ba3c6a3f5735c96a2e1)
@@ -360,6 +360,8 @@
 admin.return = Return to maintain LAMS
 admin.button.save = Save
 admin.hide.titles = Hide question titles for learners
+label.vsa.allocate.button = Allocate VSAs
+label.vsa.allocate.description = Allocate students' answers by dragging and dropping them to correct options
 label.answer.queue = Answer queue
 label.drag.and.drop = drag and drop answer to tick or cross
 label.correct = Correct
Index: lams_tool_assessment/src/java/org/lamsfoundation/lams/tool/assessment/web/controller/MonitoringController.java
===================================================================
diff -u -re194f22014c7cbffaf5168f1982aa89e7c34c34d -r1d6afb88d2e239ea9e5c7ba3c6a3f5735c96a2e1
--- lams_tool_assessment/src/java/org/lamsfoundation/lams/tool/assessment/web/controller/MonitoringController.java	(.../MonitoringController.java)	(revision e194f22014c7cbffaf5168f1982aa89e7c34c34d)
+++ lams_tool_assessment/src/java/org/lamsfoundation/lams/tool/assessment/web/controller/MonitoringController.java	(.../MonitoringController.java)	(revision 1d6afb88d2e239ea9e5c7ba3c6a3f5735c96a2e1)
@@ -206,20 +206,26 @@
 
 	// display student choices only if all questions are multiple choice
 	boolean displayStudentChoices = true;
+	boolean vsaPresent = false;
 	int maxOptionsInQuestion = 0;
 
 	for (AssessmentQuestion question : assessment.getQuestions()) {
-	    if (question.getType() == QbQuestion.TYPE_MULTIPLE_CHOICE) {
+	    if (displayStudentChoices && question.getType() == QbQuestion.TYPE_MULTIPLE_CHOICE) {
 		int optionsInQuestion = question.getQbQuestion().getQbOptions().size();
 		if (optionsInQuestion > maxOptionsInQuestion) {
 		    maxOptionsInQuestion = optionsInQuestion;
 		}
 	    } else {
 		displayStudentChoices = false;
-		break;
 	    }
+
+	    if (question.getType() == QbQuestion.TYPE_VERY_SHORT_ANSWERS) {
+		vsaPresent = true;
+	    }
 	}
 
+	request.setAttribute("vsaPresent", vsaPresent);
+
 	request.setAttribute("displayStudentChoices", displayStudentChoices);
 	if (displayStudentChoices) {
 	    request.setAttribute("maxOptionsInQuestion", maxOptionsInQuestion);
@@ -301,6 +307,25 @@
 	return "pages/monitoring/parts/questionsummary";
     }
 
+    @RequestMapping("/displayVsaAllocate")
+    public String displayVsaAllocate(HttpServletRequest request, HttpServletResponse response) {
+	SessionMap<String, Object> sessionMap = getSessionMap(request);
+
+	Long contentId = (Long) sessionMap.get(AssessmentConstants.ATTR_TOOL_CONTENT_ID);
+	Assessment assessment = service.getAssessmentByContentId(contentId);
+
+	List<QuestionSummary> questionSummaries = new ArrayList<>();
+	for (AssessmentQuestion question : assessment.getQuestions()) {
+	    if (question.getType().equals(QbQuestion.TYPE_VERY_SHORT_ANSWERS)) {
+		QuestionSummary questionSummary = service.getQuestionSummary(contentId, question.getUid());
+		questionSummaries.add(questionSummary);
+	    }
+	}
+	request.setAttribute("questionSummaries", questionSummaries);
+
+	return "pages/monitoring/vsaAllocate";
+    }
+
     @RequestMapping(path = "/allocateUserAnswer", method = RequestMethod.POST)
     @ResponseBody
     public String allocateUserAnswer(HttpServletRequest request, HttpServletResponse response,
Index: lams_tool_assessment/web/pages/monitoring/summary.jsp
===================================================================
diff -u -r06f1e38880dbcfae6f115c7d9c9236fc4a377ce3 -r1d6afb88d2e239ea9e5c7ba3c6a3f5735c96a2e1
--- lams_tool_assessment/web/pages/monitoring/summary.jsp	(.../summary.jsp)	(revision 06f1e38880dbcfae6f115c7d9c9236fc4a377ce3)
+++ lams_tool_assessment/web/pages/monitoring/summary.jsp	(.../summary.jsp)	(revision 1d6afb88d2e239ea9e5c7ba3c6a3f5735c96a2e1)
@@ -553,6 +553,15 @@
 			</c:if>
 		</div>
 	</c:if>
+	
+	<c:if test="${vsaPresent}">
+		<div class="voffset5">
+			<a class="thickbox btn btn-default"
+			   href='<c:url value="/monitoring/displayVsaAllocate.do?sessionMapID=${sessionMapID}&KeepThis=true&TB_iframe=true&modal=true"/>'>
+				<fmt:message key="label.vsa.allocate.button" />
+			</a>
+		</div>
+	</c:if>
 </c:if>
 
 <br/>
Index: lams_tool_assessment/web/pages/monitoring/vsaAllocate.jsp
===================================================================
diff -u
--- lams_tool_assessment/web/pages/monitoring/vsaAllocate.jsp	(revision 0)
+++ lams_tool_assessment/web/pages/monitoring/vsaAllocate.jsp	(revision 1d6afb88d2e239ea9e5c7ba3c6a3f5735c96a2e1)
@@ -0,0 +1,214 @@
+<!DOCTYPE html>
+<%@ include file="/common/taglibs.jsp"%>
+<c:set var="sessionMap" value="${sessionScope[sessionMapID]}"/>
+<% pageContext.setAttribute("newLineChar", "\r\n"); %>
+
+<lams:html>
+	<lams:head>
+		<%@ include file="/common/header.jsp"%>
+		
+		<style>
+			body {
+				padding: 10px;
+			}
+			
+			.sortable-on {
+				background: lightgoldenrodyellow;
+    			min-height: 110px;
+    			padding: 10px;
+			}
+			
+			.filtered {
+			    background-color: lightgrey;
+			}
+			
+			.list-group-item {
+				cursor: pointer;
+			}
+			
+			#page-description, .question-description {
+				margin-bottom: 20px;
+			}
+		</style>
+		
+	 	<script type="text/javascript" src="${lams}includes/javascript/portrait.js"></script>
+	 	<script type="text/javascript" src="${lams}includes/javascript/Sortable.js"></script>
+
+  	    <script>
+	  	$(document).ready(function(){
+		    //init options sorting feature
+			$('.sortable-on').each(function() {
+				let questionUid = $(this).data('question-uid');
+				
+			    new Sortable(this, {
+			    	group: 'question' + questionUid,
+				    animation: 150,
+				  	filter: '.filtered', // 'filtered' class is not draggable
+				    //ghostClass: 'sortable-placeholder',
+				    //direction: 'vertical',
+					onStart: function (evt) {
+						//stop answers' hover effect, once element dragging started
+						//$("#option-table").removeClass("hover-active");
+					},
+					onEnd: function (evt) {
+				        $.ajax({
+				            url: '<c:url value="/monitoring/allocateUserAnswer.do"/>',
+				            data: {
+				            	sessionMapID: "${sessionMapID}",
+				            	questionUid: questionUid,
+				            	targetOptionUid: $(evt.to).data("option-uid"),
+				            	previousOptionUid: $(evt.from).data("option-uid"),
+				            	questionResultUid: $(evt.item).data("question-result-uid"),
+								"<csrf:tokenname/>":"<csrf:tokenvalue/>"
+						    },
+				            method: 'post',
+				          	dataType: "json",
+  				        success: function (data) {
+  				            if (data.isAnswerDuplicated) {
+	  				        	alert("<fmt:message key="label.someone.allocated.this.answer" />");
+	  				        	$(evt.item).appendTo("#answer-group" + data.optionUid);
+	  				        	$(evt.item).addClass("filtered");
+		  				    }
+  				        }
+				            	
+				       	});
+					}
+				});
+			});
+	  	});
+	  	
+   		function refreshPage() { 
+       		location.href = '<c:url value="/monitoring/displayVsaAllocate.do?sessionMapID=${sessionMapID}"/>';	
+   		}
+
+   		function closePage() { 
+   			self.parent.tb_remove();
+   		}
+  		</script>
+	</lams:head>
+	
+<body>
+	<a href="#nogo" onclick="javascript:closePage()" class="btn btn-default pull-right loffset20">
+		<i class="fa fa-close"></i>
+		<fmt:message key="label.close" /> 
+	</a>
+	<a href="#nogo" onclick="javascript:refreshPage()" class="btn btn-primary pull-right">
+		<i class="fa fa-refresh"></i>
+		<fmt:message key="label.refresh" /> 
+	</a>
+		
+	<h4 id="page-description"><fmt:message key="label.vsa.allocate.description" /></h4>
+
+	
+	<c:forEach var="questionSummary" items="${questionSummaries}">
+		<c:set var="questionDto" value="${questionSummary.questionDto}"/>
+		
+		<div class="panel panel-default">
+			<div class="panel-heading">
+				<div class="panel-title">
+					<c:out value="${questionDto.title}" escapeXml="true"/>
+				</div>
+			</div>
+				
+			<div class="panel-body">
+				<lams:errors/>
+		         
+		        <c:if test="${not empty questionDto.question}">
+			        <div class="question-description">
+			        	<c:out value="${questionDto.question}" escapeXml="false"/>
+					</div>
+				</c:if>
+				
+		        <!--allocate responses-->
+				<div class="row">
+					<div class="col-sm-4 text-center">
+						<c:set var="option0" value="${questionDto.optionDtos.toArray()[0]}"/>
+						<h4>
+							<c:choose>
+								<c:when test="${questionSummary.tbl && option0.maxMark == 1}">
+									<i class="fa fa-check fa-lg text-success"></i> <fmt:message key="label.correct" />
+								</c:when>
+								<c:when test="${questionSummary.tbl && option0.maxMark == 0}">
+									<i class="fa fa-times fa-lg text-danger"></i>	<fmt:message key="label.incorrect" />
+								</c:when>
+								<c:otherwise>
+									<fmt:message key="label.authoring.basic.option.grade"/>: ${option0.maxMark}
+								</c:otherwise>
+							</c:choose>
+						</h4>
+						
+						<div class="list-group col sortable-on" data-question-uid="${questionDto.uid}"
+							 data-option-uid="${option0.uid}" id="answer-group${option0.uid}"></div>
+						
+						<fmt:message key="label.answer.alternatives" />: 
+						${fn:replace(option0.name, newLineChar, ', ')}
+					</div>
+					
+					<div class="col-sm-4 text-center">
+		            	<h4><fmt:message key="label.answer.queue" /></h4>
+		           		
+		           		<div class="list-group col sortable-on" data-question-uid="${questionDto.uid}" 
+		           			 data-option-uid="-1" id="answer-group-1">
+		            		<c:forEach var="questionResult" items="${questionSummary.notAllocatedQuestionResults}">
+		            			<div class="list-group-item" data-question-result-uid="${questionResult.uid}">
+		            				<lams:Portrait userId="${questionResult.assessmentResult.user.userId}"/>&nbsp;
+		            				${questionResult.answer}
+		            			</div>
+		            		</c:forEach>
+		           		</div>		
+					</div>
+					
+					<div class="col-sm-4 text-center">
+						<c:set var="option1" value="${questionDto.optionDtos.toArray()[1]}"/>
+						<h4>
+							<c:choose>
+								<c:when test="${questionSummary.tbl && option1.maxMark == 1}">
+									<i class="fa fa-check fa-lg text-success"></i> <fmt:message key="label.correct" />
+								</c:when>
+								<c:when test="${questionSummary.tbl && option1.maxMark == 0}">
+									<i class="fa fa-times fa-lg text-danger"></i>	<fmt:message key="label.incorrect" />
+								</c:when>
+								<c:otherwise>
+									<fmt:message key="label.authoring.basic.option.grade"/>: ${option1.maxMark}
+								</c:otherwise>
+							</c:choose>
+						</h4>
+						
+						<div class="list-group col sortable-on" data-question-uid="${questionDto.uid}"
+							 data-option-uid="${option1.uid}" id="answer-group${option1.uid}"></div>	
+						
+						<fmt:message key="label.answer.alternatives" />: 
+						${fn:replace(option1.name, newLineChar, ', ')}
+					</div>
+				</div>
+				
+				<c:forEach var="optionDto" items="${questionDto.optionDtos}" begin="2" varStatus="status">
+				
+					<c:if test="${status.count % 3 == 0}">
+						<div class="row">
+					</c:if>
+				
+					<div class="col-sm-4 text-center">
+						<h4>
+							<fmt:message key="label.authoring.basic.option.grade"/>: ${optionDto.maxMark}
+						</h4>
+						
+						<div class="list-group col sortable-on" data-question-uid="${questionDto.uid}"
+							 data-option-uid="${optionDto.uid}" id="answer-group${optionDto.uid}"></div>	
+						
+						<fmt:message key="label.answer.alternatives" />: 
+						${fn:replace(optionDto.name, newLineChar, ', ')}
+					</div>
+					
+					<c:if test="${status.count % 3 == 0 || status.last}">
+						</div>
+					</c:if>
+				</c:forEach>
+			</div>
+		</div>
+	</c:forEach>		
+	
+	<div id="footer">
+	</div>
+</body>
+</lams:html>
\ No newline at end of file