Index: lams_central/web/qb/authoring/addmarkhedging.jsp
===================================================================
diff -u -r9ebb0762842cde9a358626a248132bc7ca650f3c -rd8bb9e0996a5490f2ab4b047baadf4aa4da9db8a
--- lams_central/web/qb/authoring/addmarkhedging.jsp	(.../addmarkhedging.jsp)	(revision 9ebb0762842cde9a358626a248132bc7ca650f3c)
+++ lams_central/web/qb/authoring/addmarkhedging.jsp	(.../addmarkhedging.jsp)	(revision d8bb9e0996a5490f2ab4b047baadf4aa4da9db8a)
@@ -79,7 +79,7 @@
 			
 			<form:form action="/lams/qb/edit/saveOrUpdateQuestion.do" modelAttribute="assessmentQuestionForm" id="assessmentQuestionForm"
 				method="post" autocomplete="off">
-				<form:checkbox path="authoringRestricted"/>
+				<form:hidden path="authoringRestricted"/>
 				<form:hidden path="sessionMapID" />
 				<form:hidden path="uid" />
 				<form:hidden path="questionId" />
Index: lams_tool_assessment/web/pages/tblmonitoring/teams.jsp
===================================================================
diff -u -r9c3a64b840753192b333afb73c8fe7bdb54be638 -rd8bb9e0996a5490f2ab4b047baadf4aa4da9db8a
--- lams_tool_assessment/web/pages/tblmonitoring/teams.jsp	(.../teams.jsp)	(revision 9c3a64b840753192b333afb73c8fe7bdb54be638)
+++ lams_tool_assessment/web/pages/tblmonitoring/teams.jsp	(.../teams.jsp)	(revision d8bb9e0996a5490f2ab4b047baadf4aa4da9db8a)
@@ -7,7 +7,7 @@
 		<div class="panel-heading">
 			<h4 class="panel-title">
 				<span class="float-left space-right">Q${i.index+1})</span> 
-				<c:out value="${questionResult.questionDto.title}" escapeXml="false"/>
+				<c:out value="${question.title}" escapeXml="false"/>
 			</h4> 
 		</div>
 	              
@@ -17,16 +17,133 @@
 					<tbody>
 						<tr>
 							<td>
-								<%@ include file="userresponse.jsp"%>
-												
-								<!--<c:choose>
-									<c:when test="${userAttempt.mcOptionsContent.correctOption}">
-										<i class="fa fa-check-square"></i>
+								<c:choose>
+									<c:when test="${question.type == 1}">
+										<c:forEach var="option" items="${question.optionDtos}">
+											<c:forEach var="optionAnswer" items="${questionResult.optionAnswers}">
+												<c:if test="${optionAnswer.answerBoolean && (optionAnswer.optionUid == option.uid)}">
+													<div class="clearfix">
+														${option.name}
+													
+														<c:choose>
+															<c:when test="${option.maxMark == 1}">
+																<i class="fa fa-check-square"></i>
+															</c:when>
+															<c:when test="${option.maxMark <= 0}">
+																<i class="fa fa-minus-square"></i>
+															</c:when>
+														</c:choose>
+													</div>
+												</c:if>
+											</c:forEach>					
+										</c:forEach>						
 									</c:when>
-									<c:otherwise>
-										<i class="fa fa-minus-square"></i>
-									</c:otherwise>
-								</c:choose>-->
+														
+									<c:when test="${question.type == 2}">
+										<c:forEach var="option" items="${question.optionDtos}">
+											<div>
+												<div style="float: left;">
+													${option.matchingPair}
+												</div>
+												<div style=" float: right; width: 50%;">
+																 - 
+													<c:forEach var="optionAnswer" items="${questionResult.optionAnswers}">
+														<c:if test="${option.uid == optionAnswer.optionUid}">
+															<c:forEach var="optionIter" items="${question.optionDtos}">
+																<c:if test="${optionIter.uid == optionAnswer.answerInt}">
+																	${optionIter.name}
+																	
+																	<c:choose>
+																		<c:when test="${optionAnswer.optionUid == optionAnswer.answerInt}">
+																			<i class="fa fa-check-square"></i>
+																		</c:when>
+																		<c:otherwise>
+																			<i class="fa fa-minus-square"></i>
+																		</c:otherwise>
+																	</c:choose>
+																</c:if>
+															</c:forEach>
+														</c:if>
+													</c:forEach>										
+												</div>
+											</div>
+											<br>
+										</c:forEach>
+									</c:when>
+														
+									<c:when test="${question.type == 3 || question.type == 4}">
+										${fn:escapeXml(questionResult.answer)}
+
+										<c:choose>
+											<c:when test="${not empty questionResult.qbOption && questionResult.qbOption.maxMark == 1}">
+												<i class="fa fa-check-square"></i>
+											</c:when>
+											<c:when test="${empty questionResult.qbOption || not empty questionResult.qbOption && questionResult.qbOption.maxMark <= 0}">
+												<i class="fa fa-minus-square"></i>
+											</c:when>
+										</c:choose>
+									</c:when>
+														
+									<c:when test="${question.type == 5}">
+										<c:if test="${questionResult.answer != null}">			
+											${questionResult.answerBoolean}
+											
+											<c:choose>
+												<c:when test="${questionResult.answerBoolean == question.correctAnswer}">
+													<i class="fa fa-check-square"></i>
+												</c:when>
+												<c:otherwise>
+													<i class="fa fa-minus-square"></i>
+												</c:otherwise>
+											</c:choose>
+										</c:if>
+									</c:when>
+														
+									<c:when test="${question.type == 6}">
+										${questionResult.answer}
+									</c:when>
+														
+									<c:when test="${question.type == 7}">
+										<c:forEach var="j" begin="0" end="${fn:length(questionResult.optionAnswers) - 1}" step="1">
+											<c:forEach var="optionAnswer" items="${questionResult.optionAnswers}">
+												<c:if test="${optionAnswer.answerInt == j}">		
+													<c:forEach var="option" items="${question.optionDtos}">
+														<c:if test="${optionAnswer.optionUid == option.uid}">
+															${option.name}
+														</c:if>
+													</c:forEach>
+												</c:if>								
+											</c:forEach>
+										</c:forEach>
+									</c:when>
+														
+									<c:when test="${question.type == 8}">
+										<c:forEach var="option" items="${question.optionDtos}">
+											<div>';
+												<div style="float: left;">
+													${option.name}
+												</div>
+												<div style=" float: right; width: 20%;">
+													- 
+													<c:forEach var="optionAnswer" items="${questionResult.optionAnswers}">
+														<c:if test="${option.uid == optionAnswer.optionUid}">
+															${optionAnswer.answerInt}
+															
+															<c:if test="${optionAnswer.answerInt > 0 && option.correct}">
+																<i class="fa fa-check-square"></i>
+															</c:if>
+														</c:if>
+													</c:forEach>										
+												</div>
+											</div>
+											<br>
+										</c:forEach>
+															
+										<c:if test="${question.hedgingJustificationEnabled}">
+											${questionResult.answer}
+										</c:if>
+									</c:when>
+								</c:choose>
 							</td>
 						</tr>
 					</tbody>
Fisheye: Tag d8bb9e0996a5490f2ab4b047baadf4aa4da9db8a refers to a dead (removed) revision in file `lams_tool_assessment/web/pages/tblmonitoring/userresponse.jsp'.
Fisheye: No comparison available.  Pass `N' to diff?