Index: lams_tool_lamc/web/learning/IndividualLearnerResults.jsp
===================================================================
RCS file: /usr/local/cvsroot/lams_tool_lamc/web/learning/Attic/IndividualLearnerResults.jsp,v
diff -u -r1.10 -r1.11
--- lams_tool_lamc/web/learning/IndividualLearnerResults.jsp	2 Jun 2006 08:01:30 -0000	1.10
+++ lams_tool_lamc/web/learning/IndividualLearnerResults.jsp	9 Jun 2006 16:43:07 -0000	1.11
@@ -225,7 +225,6 @@
 				 		</td>
 			  	   </tr>
 
-			  	   
 
 			 		<c:if test="${sessionScope.isRetries == 'true'}"> 					  	   
 		  	   		  <tr>
@@ -235,12 +234,12 @@
 									<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>
-						  	   </c:if>
-	
+						  	   </c:if>	
+						  	   
 		   						<html:submit property="viewSummary" styleClass="button">
 									<bean:message key="label.view.summary"/>
 								</html:submit>	 				 		  					
@@ -253,11 +252,9 @@
 		  	   		  <tr>
 		  	   		    <td NOWRAP 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"/>