Index: lams_tool_lamc/src/java/org/lamsfoundation/lams/tool/mc/web/McLearningAction.java
===================================================================
RCS file: /usr/local/cvsroot/lams_tool_lamc/src/java/org/lamsfoundation/lams/tool/mc/web/McLearningAction.java,v
diff -u -r1.17 -r1.18
--- lams_tool_lamc/src/java/org/lamsfoundation/lams/tool/mc/web/McLearningAction.java	3 Apr 2006 13:31:03 -0000	1.17
+++ lams_tool_lamc/src/java/org/lamsfoundation/lams/tool/mc/web/McLearningAction.java	9 Jun 2006 16:43:07 -0000	1.18
@@ -398,9 +398,12 @@
     	Map mapQuestionWeights =(Map) request.getSession().getAttribute(MAP_QUESTION_WEIGHTS);
     	logger.debug("mapQuestionWeights: " + mapQuestionWeights);
     	
+    	mcLearningForm.setUserOverPassMark(new Boolean(false).toString());
+    	mcLearningForm.setPassMarkApplicable(new Boolean(false).toString());
     	boolean passed=false;
     	if ((passMark != null) && (passMark.intValue() != 0)) 
 		{
+    	    mcLearningForm.setPassMarkApplicable(new Boolean(true).toString());
     		int totalUserWeight=LearningUtil.calculateWeights(mapLeanerAssessmentResults, mapQuestionWeights);
     		logger.debug("totalUserWeight: " + totalUserWeight);
     		
@@ -414,9 +417,15 @@
     		{
     			logger.debug("USER PASSED");
     			passed=true;
+    			mcLearningForm.setUserOverPassMark(new Boolean(true).toString());
     		}
 		}
 
+    	if (passMark == null)
+    	{
+    	    mcLearningForm.setPassMarkApplicable(new Boolean(false).toString());
+    	}
+    	
     	boolean isUserDefined=LearningUtil.doesUserExists(request);
     	logger.debug("isUserDefined");
     	if (isUserDefined == false)
@@ -449,6 +458,8 @@
         logger.debug("learnerMarkAtLeast:" + learnerMarkAtLeast);
         request.getSession().setAttribute(LEARNER_MARK_ATLEAST, new Integer(learnerMarkAtLeast).toString());
 		
+        logger.debug("user over passmark:" + mcLearningForm.getUserOverPassMark());
+        logger.debug("is passmark applicable:" + mcLearningForm.getPassMarkApplicable());
 		mcLearningForm.resetCommands();
 		return (mapping.findForward(INDIVIDUAL_REPORT));
     }
Index: lams_tool_lamc/src/java/org/lamsfoundation/lams/tool/mc/web/McLearningForm.java
===================================================================
RCS file: /usr/local/cvsroot/lams_tool_lamc/src/java/org/lamsfoundation/lams/tool/mc/web/McLearningForm.java,v
diff -u -r1.14 -r1.15
--- lams_tool_lamc/src/java/org/lamsfoundation/lams/tool/mc/web/McLearningForm.java	3 Apr 2006 13:31:03 -0000	1.14
+++ lams_tool_lamc/src/java/org/lamsfoundation/lams/tool/mc/web/McLearningForm.java	9 Jun 2006 16:43:07 -0000	1.15
@@ -48,9 +48,10 @@
 	protected String donePreview;
 	protected String doneLearnerProgress;
 	
+	protected String userOverPassMark;
+	protected String passMarkApplicable;
 	
 	
-	
 	public void resetCommands()
 	{
 		this.setContinueOptions(null);
@@ -256,4 +257,28 @@
 	public void setDoneLearnerProgress(String doneLearnerProgress) {
 		this.doneLearnerProgress = doneLearnerProgress;
 	}
+    /**
+     * @return Returns the userOverPassMark.
+     */
+    public String getUserOverPassMark() {
+        return userOverPassMark;
+    }
+    /**
+     * @param userOverPassMark The userOverPassMark to set.
+     */
+    public void setUserOverPassMark(String userOverPassMark) {
+        this.userOverPassMark = userOverPassMark;
+    }
+    /**
+     * @return Returns the passMarkApplicable.
+     */
+    public String getPassMarkApplicable() {
+        return passMarkApplicable;
+    }
+    /**
+     * @param passMarkApplicable The passMarkApplicable to set.
+     */
+    public void setPassMarkApplicable(String passMarkApplicable) {
+        this.passMarkApplicable = passMarkApplicable;
+    }
 }
Index: lams_tool_lamc/src/java/org/lamsfoundation/lams/tool/mc/web/McLearningStarterAction.java
===================================================================
RCS file: /usr/local/cvsroot/lams_tool_lamc/src/java/org/lamsfoundation/lams/tool/mc/web/McLearningStarterAction.java,v
diff -u -r1.43 -r1.44
--- lams_tool_lamc/src/java/org/lamsfoundation/lams/tool/mc/web/McLearningStarterAction.java	3 Apr 2006 13:31:03 -0000	1.43
+++ lams_tool_lamc/src/java/org/lamsfoundation/lams/tool/mc/web/McLearningStarterAction.java	9 Jun 2006 16:43:07 -0000	1.44
@@ -189,6 +189,9 @@
 		}
 
 		McLearningForm mcLearningForm = (McLearningForm) form;
+    	mcLearningForm.setPassMarkApplicable(new Boolean(false).toString());
+		mcLearningForm.setUserOverPassMark(new Boolean(false).toString());
+
 		
 		/*
 		 * initialize available question display modes in the session
Index: lams_tool_lamc/src/java/org/lamsfoundation/lams/tool/mc/web/McStarterAction.java
===================================================================
RCS file: /usr/local/cvsroot/lams_tool_lamc/src/java/org/lamsfoundation/lams/tool/mc/web/McStarterAction.java,v
diff -u -r1.70 -r1.71
--- lams_tool_lamc/src/java/org/lamsfoundation/lams/tool/mc/web/McStarterAction.java	3 Jun 2006 16:10:10 -0000	1.70
+++ lams_tool_lamc/src/java/org/lamsfoundation/lams/tool/mc/web/McStarterAction.java	9 Jun 2006 16:43:07 -0000	1.71
@@ -738,7 +738,17 @@
 		request.getSession().setAttribute(PASSMARK, mcContent.getPassMark()); //Integer
 		request.getSession().setAttribute(RICHTEXT_REPORT_TITLE,mcContent.getReportTitle());
 		request.getSession().setAttribute(RICHTEXT_END_LEARNING_MSG,mcContent.getEndLearningMessage());
+		request.getSession().setAttribute(RICHTEXT_INCORRECT_FEEDBACK,"");
+		request.getSession().setAttribute(RICHTEXT_CORRECT_FEEDBACK,"");
 
+		logger.debug("passMark:" +mcContent.getPassMark());
+		if (mcContent.getPassMark() == null)
+			mcContent.setPassMark(new Integer(0));
+
+		mcAuthoringForm.setPassmark(mcContent.getPassMark().toString());
+		request.getSession().setAttribute(PASSMARK, mcContent.getPassMark()); //Integer
+		
+
 		logger.debug("PASSMARK:" + request.getSession().getAttribute(PASSMARK));
 		logger.debug("RICHTEXT_TITLE:" + request.getSession().getAttribute(RICHTEXT_TITLE));
 		logger.debug("getting default content");
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"/>
Index: lams_tool_lamc/web/learning/ResultsSummary.jsp
===================================================================
RCS file: /usr/local/cvsroot/lams_tool_lamc/web/learning/Attic/ResultsSummary.jsp,v
diff -u -r1.10 -r1.11
--- lams_tool_lamc/web/learning/ResultsSummary.jsp	2 Jun 2006 08:01:30 -0000	1.10
+++ lams_tool_lamc/web/learning/ResultsSummary.jsp	9 Jun 2006 16:43:07 -0000	1.11
@@ -123,6 +123,7 @@
 				 		</td>
 			  	   </tr>
 
+
 			 		<c:if test="${sessionScope.isRetries == 'true'}"> 					  	   
 		  	   		  <tr>
 					  	<td NOWRAP colspan=2 align=center valign=top> 
@@ -131,9 +132,11 @@
 									<bean:message key="label.redo.questions"/>
 								</html:submit>	 		
 			       
-						  	   <html:submit property="learnerFinished" styleClass="button">
-									<bean:message key="label.finished"/>
-							   </html:submit>
+								<c:if test="${((McLearningForm.passMarkApplicable == 'true') && (McLearningForm.userOverPassMark == 'true'))}">
+							  	   <html:submit property="learnerFinished" styleClass="button">
+										<bean:message key="label.finished"/>
+								   </html:submit>
+						  	   </c:if>
 							</font>
 					  	 </td>
 					  </tr>
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"/>