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.36 -r1.37
--- lams_tool_lamc/src/java/org/lamsfoundation/lams/tool/mc/web/McLearningAction.java	9 Aug 2006 12:53:09 -0000	1.36
+++ lams_tool_lamc/src/java/org/lamsfoundation/lams/tool/mc/web/McLearningAction.java	19 Aug 2006 16:27:37 -0000	1.37
@@ -803,8 +803,8 @@
         logger.debug("learnerMarkAtLeast:" + learnerMarkAtLeast);
         mcGeneralLearnerFlowDTO.setLearnerMarkAtLeast (new Integer(learnerMarkAtLeast).toString());
 		
-        logger.debug("user over passmark:" + mcLearningForm.getUserOverPassMark());
-        logger.debug("is passmark applicable:" + mcLearningForm.getPassMarkApplicable());
+        logger.debug("user over passmark:" + mcGeneralLearnerFlowDTO.getUserOverPassMark());
+        logger.debug("is passmark applicable:" + mcGeneralLearnerFlowDTO.getPassMarkApplicable());
 		
 		request.setAttribute(MC_GENERAL_LEARNER_FLOW_DTO, mcGeneralLearnerFlowDTO);
 		logger.debug("MC_GENERAL_LEARNER_FLOW_DTO: " +  request.getAttribute(MC_GENERAL_LEARNER_FLOW_DTO));
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.60 -r1.61
--- lams_tool_lamc/src/java/org/lamsfoundation/lams/tool/mc/web/McLearningStarterAction.java	30 Jul 2006 22:27:24 -0000	1.60
+++ lams_tool_lamc/src/java/org/lamsfoundation/lams/tool/mc/web/McLearningStarterAction.java	19 Aug 2006 16:27:37 -0000	1.61
@@ -436,15 +436,24 @@
 	    		
 	    		boolean isRetries=mcContent.isRetries();
 	    		logger.debug("isRetries: " + isRetries);
-	    		if (isRetries == true)
-	    		    return (mapping.findForward(REDO_QUESTIONS));
-	    		else
-	    		{
-		    		McLearningAction mcLearningAction= new McLearningAction();
-			    	logger.debug("present to learner with previous attempts data");
-			    	mcLearningForm.setReportViewOnly(new Boolean(true).toString());
-			    	return mcLearningAction.viewAnswers(mapping, mcLearningForm, request, response);
-	    		}
+	    		McLearningAction mcLearningAction= new McLearningAction();
+		    	logger.debug("present to learner with previous attempts data");
+		    	
+		    	String sessionStatus=mcUserSession.getSessionStatus(); 
+		    	logger.debug("sessionStatus: " +sessionStatus);
+		    	/*one limitation by design here is that once a user finishes the activity, subsequent users in the same group are also assumed finished
+		    	 * since they belong to the same ungrouped activity and these users have the same tool session id*/
+		    	if (sessionStatus.equals(COMPLETED))
+		    	{
+			    	mcLearningForm.setReportViewOnly(new Boolean(true).toString());		    	    
+		    	}
+		    	else
+		    	{
+		    	    mcLearningForm.setReportViewOnly(new Boolean(false).toString());
+		    	}
+		    	
+
+		    	return mcLearningAction.viewAnswers(mapping, mcLearningForm, request, response);
 	    	}
 	    }
 	    else if (mode.equals("teacher"))
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> 																		
 					
Index: lams_tool_lamc/web/learning/ViewAnswers.jsp
===================================================================
RCS file: /usr/local/cvsroot/lams_tool_lamc/web/learning/ViewAnswers.jsp,v
diff -u -r1.24 -r1.25
--- lams_tool_lamc/web/learning/ViewAnswers.jsp	9 Aug 2006 12:53:09 -0000	1.24
+++ lams_tool_lamc/web/learning/ViewAnswers.jsp	19 Aug 2006 16:27:36 -0000	1.25
@@ -167,40 +167,43 @@
 					</c:forEach>
 
 
-					<c:if test="${mcGeneralLearnerFlowDTO.learnerProgress != 'true'}"> 							  
-					 		<c:if test="${mcGeneralLearnerFlowDTO.retries == 'true'}"> 					  	   
-				  	   		  <tr>
-							  	<td NOWRAP valign=top> 
-							  			<html:submit property="redoQuestions" styleClass="button">
-											<bean:message key="label.redo.questions"/>
-										</html:submit>	 		
-					       
-				   						<html:submit property="viewSummary" styleClass="button">
-											<bean:message key="label.view.summary"/>
-										</html:submit>	 				 		  					
-							  	 </td>
-							  </tr>
-							</c:if> 																		
-		
-							<c:if test="${mcGeneralLearnerFlowDTO.retries != 'true'}"> 							  
-				  	   		  <tr>
-				  	   		    <td  valign=top>
+
+					<c:if test="${mcGeneralLearnerFlowDTO.reportViewOnly != 'true'}"> 							  
+						<c:if test="${mcGeneralLearnerFlowDTO.learnerProgress != 'true'}"> 							  
+						 		<c:if test="${mcGeneralLearnerFlowDTO.retries == 'true'}"> 					  	   
+					  	   		  <tr>
+								  	<td NOWRAP valign=top> 
+								  			<html:submit property="redoQuestions" styleClass="button">
+												<bean:message key="label.redo.questions"/>
+											</html:submit>	 		
+						       
 					   						<html:submit property="viewSummary" styleClass="button">
 												<bean:message key="label.view.summary"/>
 											</html:submit>	 				 		  					
-							  	 </td>
-							  	 
-	 			  	   		    <td  valign=top>
-		    	  						<div class="right-buttons">
-									  	   <html:submit property="learnerFinished" styleClass="button">
-														<bean:message key="label.finished"/>
-										   </html:submit>
-										</div>
-							  	 </td>
-							  	 
-							  </tr>
-							</c:if> 																		
-					</c:if> 																								
+								  	 </td>
+								  </tr>
+								</c:if> 																		
+			
+								<c:if test="${mcGeneralLearnerFlowDTO.retries != 'true'}"> 							  
+					  	   		  <tr>
+					  	   		    <td  valign=top>
+						   						<html:submit property="viewSummary" styleClass="button">
+													<bean:message key="label.view.summary"/>
+												</html:submit>	 				 		  					
+								  	 </td>
+								  	 
+		 			  	   		    <td  valign=top>
+			    	  						<div class="right-buttons">
+										  	   <html:submit property="learnerFinished" styleClass="button">
+															<bean:message key="label.finished"/>
+											   </html:submit>
+											</div>
+								  	 </td>
+								  	 
+								  </tr>
+								</c:if> 																		
+						</c:if> 																								
+					</c:if> 																														
 					
 				  	<html:hidden property="doneLearnerProgress"/>						   
 				</table>