Index: lams_tool_lamc/web/learning/ViewAnswers.jsp
===================================================================
RCS file: /usr/local/cvsroot/lams_tool_lamc/web/learning/ViewAnswers.jsp,v
diff -u -r1.12 -r1.13
--- lams_tool_lamc/web/learning/ViewAnswers.jsp	2 Jun 2006 08:01:30 -0000	1.12
+++ lams_tool_lamc/web/learning/ViewAnswers.jsp	9 Jun 2006 16:43:07 -0000	1.13
@@ -174,7 +174,7 @@
 				 		</td>
 			  	   </tr>
 
-			  	   
+
 			 		<c:if test="${sessionScope.learningMode == 'learner'}"> 					  	   
 				 		<c:if test="${sessionScope.isRetries == 'true'}"> 					  	   
 			  	   		  <tr>
@@ -184,7 +184,7 @@
 										<bean:message key="label.redo.questions"/>
 									</html:submit>	 		
 				       
-									<c:if test="${sessionScope.userPassed == 'true'}">
+									<c:if test="${((McLearningForm.passMarkApplicable == 'true') && (McLearningForm.userOverPassMark == 'true'))}">
 								  	   <html:submit property="learnerFinished" styleClass="button">
 											<bean:message key="label.finished"/>
 									   </html:submit>
@@ -202,11 +202,9 @@
 			  	   		  <tr>
 			  	   		    <td colspan=2 align=right  valign=top>
 				  	   		    <font size=2>
-					  	   		  	<c:if test="${sessionScope.userPassed == 'true'}">
-								  	   <html:submit property="learnerFinished" styleClass="button">
-													<bean:message key="label.finished"/>
-									   </html:submit>
-						  	   		</c:if>
+							  	   <html:submit property="learnerFinished" styleClass="button">
+												<bean:message key="label.finished"/>
+								   </html:submit>
 		
 			   						<html:submit property="viewSummary" styleClass="button">
 										<bean:message key="label.view.summary"/>