Index: lams_tool_lamc/web/learning/ViewAnswers.jsp
===================================================================
RCS file: /usr/local/cvsroot/lams_tool_lamc/web/learning/ViewAnswers.jsp,v
diff -u -r1.71 -r1.72
--- lams_tool_lamc/web/learning/ViewAnswers.jsp	12 Sep 2016 13:31:07 -0000	1.71
+++ lams_tool_lamc/web/learning/ViewAnswers.jsp	29 Sep 2016 11:59:10 -0000	1.72
@@ -48,25 +48,41 @@
 				</fmt:message>
 			</h4>
 		</c:if>
+		
+		<c:if test="${hasEditRight && mcGeneralLearnerFlowDTO.retries == 'true'
+					&& mcGeneralLearnerFlowDTO.userOverPassMark != 'true'
+					&& mcGeneralLearnerFlowDTO.passMarkApplicable == 'true'}">
+			<p>
+				<fmt:message key="label.notEnoughMarks">
+					<fmt:param>
+						<c:if test="${mcGeneralLearnerFlowDTO.passMark != mcGeneralLearnerFlowDTO.totalMarksPossible}">
+							<fmt:message key="label.atleast" />
+						</c:if>
+								
+						<c:out value="${mcGeneralLearnerFlowDTO.passMark}" />
+						<fmt:message key="label.outof" />
+						<c:out value="${mcGeneralLearnerFlowDTO.totalMarksPossible}" />
+					</fmt:param>
+				</fmt:message>
+			</p>
+			<p>
+				<strong><fmt:message key="label.mark" /> </strong>
+				<c:out value="${mcGeneralLearnerFlowDTO.learnerMark}" />
+				<fmt:message key="label.outof" />
+				<c:out value="${mcGeneralLearnerFlowDTO.totalMarksPossible}" />
+			</p>
+		</c:if>	
 
-		<html:form action="/learning?method=displayMc&validate=false" method="POST" target="_self" onsubmit="disableFinishButton();"  styleId="Form1">
+		<html:form action="/learning?method=displayMc&validate=false" method="POST" target="_self" onsubmit="disableFinishButton();" styleId="Form1">
 			<html:hidden property="toolContentID" />
 			<html:hidden property="toolSessionID" />
 			<html:hidden property="httpSessionID" />
 			<html:hidden property="userID" />
 			<html:hidden property="userOverPassMark" />
 			<html:hidden property="passMarkApplicable" />
-			<html:hidden property="learnerProgress" />
-			<html:hidden property="learnerProgressUserId" />
 
 			<h2>
-				<c:if test="${mcGeneralLearnerFlowDTO.learnerProgress != 'true'}">
-					<fmt:message key="label.viewAnswers" />
-				</c:if>
-
-				<c:if test="${mcGeneralLearnerFlowDTO.learnerProgress == 'true'}">
-					<fmt:message key="label.learner.viewAnswers" />
-				</c:if>
+				<fmt:message key="label.viewAnswers" />
 			</h2>
 
 			<!--  QUESTIONS  -->
@@ -139,6 +155,15 @@
 			</c:forEach>
 			<!-- END QUESTION  -->
 			
+			<c:if test="${(mcGeneralLearnerFlowDTO.retries == 'true') && hasEditRight || (mcGeneralLearnerFlowDTO.displayAnswers == 'true')}">
+				<p>
+					<strong><fmt:message key="label.mark" /> </strong>
+					<c:out value="${mcGeneralLearnerFlowDTO.learnerMark}" />
+					<fmt:message key="label.outof" />
+					<c:out value="${mcGeneralLearnerFlowDTO.totalMarksPossible}" />
+				</p>
+			</c:if>	
+			
 			<c:if test="${mcGeneralLearnerFlowDTO.showMarks == 'true'}">
 				<h4>
 					<fmt:message key="label.group.results" />
@@ -163,15 +188,15 @@
 					  	</td>
 					</tr>	
 				</table>
-			</c:if>				
+			</c:if>
 
-			<c:if test="${(mcGeneralLearnerFlowDTO.learnerProgress != 'true') && (mcGeneralLearnerFlowDTO.retries == 'true') && hasEditRight}">
+			<c:if test="${(mcGeneralLearnerFlowDTO.retries == 'true') && hasEditRight}">			
 				<html:submit property="redoQuestions" styleClass="button">
 					<fmt:message key="label.redo.questions" />
 				</html:submit>
 			</c:if>
 									
-			<c:if test="${mcGeneralLearnerFlowDTO.reflection && hasEditRight}">
+			<c:if test="${mcGeneralLearnerFlowDTO.reflection && (notebookEntry != null) && hasEditRight}">
 				<h2>
 					<lams:out value="${mcGeneralLearnerFlowDTO.reflectionSubject}" escapeHtml="true" />		
 				</h2>
@@ -186,43 +211,37 @@
 						</c:otherwise>
 					</c:choose>
 				</p>
-				
 			</c:if>
 
-			<c:if test="${mcGeneralLearnerFlowDTO.learnerProgress != 'true'}">
-				<c:if test="${(mcGeneralLearnerFlowDTO.retries != 'true') || (mcGeneralLearnerFlowDTO.retries == 'true') && (mcGeneralLearnerFlowDTO.passMarkApplicable == 'true') && (mcGeneralLearnerFlowDTO.userOverPassMark == 'true')}">
+			<c:if test="${(mcGeneralLearnerFlowDTO.retries != 'true') 
+				|| (mcGeneralLearnerFlowDTO.retries == 'true') && (mcGeneralLearnerFlowDTO.passMarkApplicable == 'true') && (mcGeneralLearnerFlowDTO.userOverPassMark == 'true')}">
 
-					<div class="space-bottom-top align-right">
-						<c:if test="${(mcGeneralLearnerFlowDTO.reflection != 'true') || !hasEditRight}">
-							<html:hidden property="learnerFinished" value="Finished" />
+				<div class="space-bottom-top align-right">
+					<c:if test="${(mcGeneralLearnerFlowDTO.reflection != 'true') || !hasEditRight}">
+						<html:hidden property="learnerFinished" value="Finished" />
 									
-							<html:link href="#nogo" styleClass="button" styleId="finishButton" onclick="submitForm('finish'); return false;">
-								<span class="nextActivity">
-									<c:choose>
-					 					<c:when test="${activityPosition.last}">
-					 						<fmt:message key="label.submit" />
-					 					</c:when>
-					 					<c:otherwise>
-					 		 				<fmt:message key="label.finished" />
-					 					</c:otherwise>
-						 			</c:choose>
-								</span>
-							</html:link>
-						</c:if>
+						<html:link href="#nogo" styleClass="button" styleId="finishButton" onclick="submitForm('finish'); return false;">
+							<span class="nextActivity">
+								<c:choose>
+				 					<c:when test="${activityPosition.last}">
+				 						<fmt:message key="label.submit" />
+				 					</c:when>
+				 					<c:otherwise>
+				 		 				<fmt:message key="label.finished" />
+				 					</c:otherwise>
+					 			</c:choose>
+							</span>
+						</html:link>
+					</c:if>
 
-						<c:if test="${(mcGeneralLearnerFlowDTO.reflection == 'true') && hasEditRight}">
-							<html:submit property="forwardtoReflection" styleClass="button">
-								<fmt:message key="label.continue" />
-							</html:submit>
-						</c:if>
-					</div>
+					<c:if test="${(mcGeneralLearnerFlowDTO.reflection == 'true') && hasEditRight}">
+						<html:submit property="forwardtoReflection" styleClass="button">
+							<fmt:message key="label.continue" />
+						</html:submit>
+					</c:if>
+				</div>
 					
-				</c:if>
 			</c:if>
-
-			<p>							
-				<html:hidden property="doneLearnerProgress" />
-			</p>
 			
 		</html:form>