Index: lams_tool_assessment/conf/language/lams/ApplicationResources.properties
===================================================================
diff -u -rb9300513239d652c59e3bfd190d0973295844f37 -r2fe063fefbb629bb00bfa6781e3bfb9071aba7b9
--- lams_tool_assessment/conf/language/lams/ApplicationResources.properties	(.../ApplicationResources.properties)	(revision b9300513239d652c59e3bfd190d0973295844f37)
+++ lams_tool_assessment/conf/language/lams/ApplicationResources.properties	(.../ApplicationResources.properties)	(revision 2fe063fefbb629bb00bfa6781e3bfb9071aba7b9)
@@ -325,6 +325,7 @@
 label.attendance  =Attendance
 label.show.students.choices  =Show students' choices
 label.hide.students.choices  =Hide students' choices
+label.student.choices =Student's choices
 label.print  =Print
 label.excel.export  =Excel export
 label.teams  =Teams
Index: lams_tool_assessment/src/java/org/lamsfoundation/lams/tool/assessment/web/controller/MonitoringController.java
===================================================================
diff -u -r176148cb89d309b36c840ababb3ccdf182897ada -r2fe063fefbb629bb00bfa6781e3bfb9071aba7b9
--- lams_tool_assessment/src/java/org/lamsfoundation/lams/tool/assessment/web/controller/MonitoringController.java	(.../MonitoringController.java)	(revision 176148cb89d309b36c840ababb3ccdf182897ada)
+++ lams_tool_assessment/src/java/org/lamsfoundation/lams/tool/assessment/web/controller/MonitoringController.java	(.../MonitoringController.java)	(revision 2fe063fefbb629bb00bfa6781e3bfb9071aba7b9)
@@ -43,11 +43,14 @@
 import org.apache.commons.lang.StringUtils;
 import org.apache.log4j.Logger;
 import org.lamsfoundation.lams.qb.dto.QbStatsActivityDTO;
+import org.lamsfoundation.lams.qb.model.QbQuestion;
 import org.lamsfoundation.lams.qb.service.IQbService;
 import org.lamsfoundation.lams.tool.assessment.AssessmentConstants;
 import org.lamsfoundation.lams.tool.assessment.dto.AssessmentResultDTO;
 import org.lamsfoundation.lams.tool.assessment.dto.AssessmentUserDTO;
 import org.lamsfoundation.lams.tool.assessment.dto.LeaderResultsDTO;
+import org.lamsfoundation.lams.tool.assessment.dto.OptionDTO;
+import org.lamsfoundation.lams.tool.assessment.dto.QuestionDTO;
 import org.lamsfoundation.lams.tool.assessment.dto.QuestionSummary;
 import org.lamsfoundation.lams.tool.assessment.dto.ReflectDTO;
 import org.lamsfoundation.lams.tool.assessment.dto.SessionDTO;
@@ -166,6 +169,44 @@
 	sessionMap.put(AssessmentConstants.ATTR_TOOL_CONTENT_ID, contentId);
 	sessionMap.put(AttributeNames.PARAM_CONTENT_FOLDER_ID,
 		WebUtil.readStrParam(request, AttributeNames.PARAM_CONTENT_FOLDER_ID));
+
+	// display student choices only if all questions are multiple choice
+	boolean displayStudentChoices = true;
+	int maxOptionsInQuestion = 0;
+	for (AssessmentQuestion question : assessment.getQuestions()) {
+	    if (question.getType() == QbQuestion.TYPE_MULTIPLE_CHOICE) {
+		int optionsInQuestion = question.getQbQuestion().getQbOptions().size();
+		if (optionsInQuestion > maxOptionsInQuestion) {
+		    maxOptionsInQuestion = optionsInQuestion;
+		}
+	    } else {
+		displayStudentChoices = false;
+		break;
+	    }
+	}
+
+	request.setAttribute("displayStudentChoices", displayStudentChoices);
+	if (displayStudentChoices) {
+	    request.setAttribute("maxOptionsInQuestion", maxOptionsInQuestion);
+
+	    int totalNumberOfUsers = service.getCountUsersByContentId(contentId);
+	    
+	    Set<QuestionDTO> questionDtos = new TreeSet<>();
+	    for (AssessmentQuestion question : assessment.getQuestions()) {
+		QuestionDTO questionDto = new QuestionDTO(question);
+		questionDtos.add(questionDto);
+
+		// build candidate dtos
+		for (OptionDTO optionDto : questionDto.getOptionDtos()) {
+		    int optionAttemptCount = service.countAttemptsPerOption(contentId, optionDto.getUid());
+
+		    float percentage = (float) (optionAttemptCount * 100) / totalNumberOfUsers;
+		    optionDto.setPercentage(percentage);
+		}
+	    }
+	    request.setAttribute("questions", questionDtos);
+	}
+
 	return "pages/monitoring/monitoring";
     }
 
Index: lams_tool_assessment/web/pages/monitoring/summary.jsp
===================================================================
diff -u -re6dc4db4137cfd6b07a4aa79711b9d12b39fb78e -r2fe063fefbb629bb00bfa6781e3bfb9071aba7b9
--- lams_tool_assessment/web/pages/monitoring/summary.jsp	(.../summary.jsp)	(revision e6dc4db4137cfd6b07a4aa79711b9d12b39fb78e)
+++ lams_tool_assessment/web/pages/monitoring/summary.jsp	(.../summary.jsp)	(revision 2fe063fefbb629bb00bfa6781e3bfb9071aba7b9)
@@ -326,6 +326,13 @@
 
 <c:if test="${not empty sessionDtos}">
 	
+	<c:if test="${displayStudentChoices}">
+		<h5><fmt:message key="label.student.choices" /></h5>
+		
+		<c:set var="questions" value="${assessment.questions}" />
+		<%@ include file="/pages/monitoring/parts/mcqStudentChoices.jsp" %>
+	</c:if>
+	
 	<button onclick="return exportSummary();" class="btn btn-default btn-sm btn-disable-on-submit pull-right">
 		<i class="fa fa-download" aria-hidden="true"></i> 
 		<fmt:message key="label.monitoring.summary.export.summary" />
Index: lams_tool_assessment/web/pages/tblmonitoring/iraAssessmentStudentChoices.jsp
===================================================================
diff -u -re6dc4db4137cfd6b07a4aa79711b9d12b39fb78e -r2fe063fefbb629bb00bfa6781e3bfb9071aba7b9
--- lams_tool_assessment/web/pages/tblmonitoring/iraAssessmentStudentChoices.jsp	(.../iraAssessmentStudentChoices.jsp)	(revision e6dc4db4137cfd6b07a4aa79711b9d12b39fb78e)
+++ lams_tool_assessment/web/pages/tblmonitoring/iraAssessmentStudentChoices.jsp	(.../iraAssessmentStudentChoices.jsp)	(revision 2fe063fefbb629bb00bfa6781e3bfb9071aba7b9)
@@ -46,101 +46,5 @@
 <br>
 <!-- End notifications -->
 
-<!-- Table -->
-<div class="row no-gutter">
-<div class="col-xs-12 col-md-12 col-lg-12">
-<div class="panel">
-<div class="panel-body">
-<div class="table-responsive" style="margin:0">
-	<table id="questions-data" class="table table-striped table-bordered table-hover table-condensed">
-		<thead>
-			<tr role="row">
-				<th class="text-center">
-					<fmt:message key="label.monitoring.question.summary.question"/>
-				</th>
-				<c:forEach begin="0" end="${maxOptionsInQuestion - 1}" var="i">
-					<th class="text-center">
-						${ALPHABET_CAPITAL_LETTERS[i]}
-					</th>
-				</c:forEach>
-			</tr>
-		</thead>
-		
-		<tbody>
-			<c:forEach var="question" items="${questions}" varStatus="i">
-				<tr>
-					<td class="normal">
-						<a data-toggle="modal" href="#question${i.index}Modal">
-							${i.index+1}
-						</a>
-					</td>
-					
-					<c:forEach var="option" items="${question.optionDtos}">
-						<td class="normal <c:if test='${option.maxMark == 1}'>success</c:if>">
-							<fmt:formatNumber type="number" maxFractionDigits="2" value="${option.percentage}"/>%
-						</td>
-					</c:forEach>
-					
-					<c:forEach begin="1" end="${maxOptionsInQuestion - fn:length(question.optionDtos)}" var="j">
-						<td class="normal"></td>
-					</c:forEach>
-				</tr>
-			</c:forEach>
-		</tbody>
-	</table>
-</div>
-</div>
-</div>          
-</div>
-</div>
-<!-- End table -->
-
-<!-- Question detail modal -->
-<c:forEach var="question" items="${questions}" varStatus="i">
-	<div class="modal fade" id="question${i.index}Modal">
-	<div class="modal-dialog">
-	<div class="modal-content">
-	<div class="modal-body">
-	
-		<div class="panel panel-default">
-			<div class="panel-heading">
-				<h4 class="panel-title"><span class="float-left space-right">Q${i.index+1})</span> ${question.question}</h4>
-			</div>
-			<div class="panel-body">
-				<div class="table-responsive">
-					<table class="table table-striped table-hover">
-						<tbody>
-						
-							<c:forEach var="option" items="${question.optionDtos}" varStatus="j">
-								<c:set var="cssClass"><c:if test='${option.maxMark == 1}'>bg-success</c:if></c:set>
-								<tr>
-									<td width="5px" class="${cssClass}">
-										${ALPHABET[j.index]}.
-									</td>
-									<td class="${cssClass}">
-										<c:out value="${fn:replace(option.name, newLineChar, ', ')}" escapeXml="false"/>
-									</td>
-									<td class="${cssClass}">
-										<fmt:formatNumber type="number" maxFractionDigits="2" value="${option.percentage}"/>%
-									</td>
-								</tr>
-							</c:forEach>
-							
-						</tbody>
-					</table>
-				</div>
-			</div> 
-		</div>
-	            
-		<div class="modal-footer">
-			<a href="#" data-dismiss="modal" class="btn btn-default">
-				<fmt:message key="label.ok"/>
-			</a>
-		</div>
-	
-	</div>
-	</div>
-	</div>
-	</div>
-</c:forEach>
-<!-- End question detail modal -->
+<%-- Include student's choices part --%>
+<%@ include file="/pages/monitoring/parts/mcqStudentChoices.jsp" %>
\ No newline at end of file