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.18 -r1.19
--- lams_tool_lamc/web/learning/IndividualLearnerResults.jsp	23 Jul 2006 20:14:31 -0000	1.18
+++ lams_tool_lamc/web/learning/IndividualLearnerResults.jsp	19 Aug 2006 16:27:36 -0000	1.19
@@ -170,6 +170,11 @@
 										<bean:message key="label.finished"/>
 								   </html:submit>
 						  	   </c:if>	
+								<c:if test="${(mcGeneralLearnerFlowDTO.passMarkApplicable != 'true')}">
+							  	   <html:submit property="learnerFinished" styleClass="button">
+										<bean:message key="label.finished"/>
+								   </html:submit>
+						  	   </c:if>	
 					  	 </td>
 					  </tr>
 					</c:if> 																		
@@ -181,13 +186,26 @@
 									<bean:message key="label.view.summary"/>
 								</html:submit>	 				 		  					
 						</td>
-		  	   		    <td NOWRAP valign=top>
-	  						<div class="right-buttons">
+
+						<c:if test="${((mcGeneralLearnerFlowDTO.passMarkApplicable == 'true') && (mcGeneralLearnerFlowDTO.userOverPassMark == 'true'))}">
+			  	   		    <td NOWRAP valign=top>
+		  						<div class="right-buttons">						
 							  	   <html:submit property="learnerFinished" styleClass="button">
-												<bean:message key="label.finished"/>
+										<bean:message key="label.finished"/>
 								   </html:submit>
-							</div>
-					  	 </td>
+	 							</div>
+							</td> 							
+				  	   </c:if>	
+						<c:if test="${(mcGeneralLearnerFlowDTO.passMarkApplicable != 'true')}">
+			  	   		    <td NOWRAP valign=top>						
+		  						<div class="right-buttons">												
+							  	   <html:submit property="learnerFinished" styleClass="button">
+										<bean:message key="label.finished"/>
+								   </html:submit>
+	 							</div>						   
+							</td> 							 							
+				  	   </c:if>	
+					  	 
 					  </tr>
 					</c:if>