Index: lams_tool_assessment/web/pages/monitoring/parts/mcqStudentChoices5.jsp
===================================================================
diff -u -ra898da07b88fd1549722167d5d557dd96e7ef819 -rf0d9e9587649ab1a2c5ed4cd182a05daaf124fa6
--- lams_tool_assessment/web/pages/monitoring/parts/mcqStudentChoices5.jsp	(.../mcqStudentChoices5.jsp)	(revision a898da07b88fd1549722167d5d557dd96e7ef819)
+++ lams_tool_assessment/web/pages/monitoring/parts/mcqStudentChoices5.jsp	(.../mcqStudentChoices5.jsp)	(revision f0d9e9587649ab1a2c5ed4cd182a05daaf124fa6)
@@ -5,7 +5,7 @@
 <script>
 	$('#allocate-vsas-button').toggle(${vsaPresent});
 	$(function () {
-		$('[data-toggle="tooltip"]').tooltip()
+		$('[data-toggle="tooltip"]').tooltip();
 	})	
 </script>
 
@@ -87,7 +87,7 @@
 
 <!-- Question detail modal -->
 <c:forEach var="question" items="${questions}" varStatus="i">
-	<div class="modal fade" id="question${i.index}Modal">
+	<div class="modal fade iraQuestionModal" id="question${i.index}Modal">
 	<div class="modal-dialog modal-dialog-centered">
 	<div class="modal-content">
 		<div class="modal-header align-items-start">
@@ -114,7 +114,10 @@
 									<c:out value="${option.name}" escapeXml="false"/>
 								</td>
 								<td class="${cssClass}">
-									<fmt:formatNumber type="number" maxFractionDigits="2" value="${option.percentage}"/>%
+									<c:choose>
+										<c:when test="${option.percentage == -1}">-</c:when>
+										<c:otherwise><fmt:formatNumber type="number" maxFractionDigits="2" value="${option.percentage}"/>%</c:otherwise>
+									</c:choose>
 								</td>
 							</tr>
 						</c:forEach>
@@ -123,12 +126,6 @@
 				</table>
 			</div>
 		</div>
-	            
-		<div class="modal-footer">	
-			<a href="#" data-bs-dismiss="modal" class="btn btn-secondary">
-				<fmt:message key="label.ok"/>
-			</a>
-		</div>
 	</div>
 	</div>
 	</div>
Index: lams_tool_assessment/web/pages/tblmonitoring/iraAssessmentStudentChoices.jsp
===================================================================
diff -u -rac8d72126e5c0f76d0cb23eb5d66a7bd4f213268 -rf0d9e9587649ab1a2c5ed4cd182a05daaf124fa6
--- lams_tool_assessment/web/pages/tblmonitoring/iraAssessmentStudentChoices.jsp	(.../iraAssessmentStudentChoices.jsp)	(revision ac8d72126e5c0f76d0cb23eb5d66a7bd4f213268)
+++ lams_tool_assessment/web/pages/tblmonitoring/iraAssessmentStudentChoices.jsp	(.../iraAssessmentStudentChoices.jsp)	(revision f0d9e9587649ab1a2c5ed4cd182a05daaf124fa6)
@@ -51,11 +51,22 @@
 			if (!event.data) {
 				return;
 			}
-			var data = JSON.parse(decodeURIComponent(event.data));
+			
+			let data = JSON.parse(decodeURIComponent(event.data));
 			drawActivityCompletionChart(data, true);
 			drawAnsweredQuestionsChart(data, ${groupsInAnsweredQuestionsChart}, true);
 
-			$('#student-choices-table').load('<lams:WebAppURL />tblmonitoring/iraAssessmentStudentChoicesTable.do?toolContentID=${toolContentID}');
+			// if in student choice table a question modal is open, postpone the table update until the modal is closed
+			let openQuestionModal = $('.iraQuestionModal.show');
+			if (openQuestionModal.length == 0) {
+				$('#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}');