Index: lams_tool_lamc/src/java/org/lamsfoundation/lams/tool/mc/web/LearningUtil.java
===================================================================
diff -u -r771dd93b9ea84cec2b55db5c66a5d187da0874c0 -radb09a70c5f6e06556e11745cb8266861c03c07b
--- lams_tool_lamc/src/java/org/lamsfoundation/lams/tool/mc/web/LearningUtil.java	(.../LearningUtil.java)	(revision 771dd93b9ea84cec2b55db5c66a5d187da0874c0)
+++ lams_tool_lamc/src/java/org/lamsfoundation/lams/tool/mc/web/LearningUtil.java	(.../LearningUtil.java)	(revision adb09a70c5f6e06556e11745cb8266861c03c07b)
@@ -65,7 +65,7 @@
 	 */
 	public static void saveFormRequestData(HttpServletRequest request, McLearningForm mcLearningForm, boolean prepareViewAnswersDataMode)
 	{
-	    logger.debug("prepareViewAnswersDataMode: " + prepareViewAnswersDataMode);
+	    logger.debug("starting saveFormRequestData:");
 	    
 	 	String httpSessionID=request.getParameter("httpSessionID");
 	 	logger.debug("httpSessionID: " + httpSessionID);
@@ -100,7 +100,7 @@
 	 	mcLearningForm.setQuestionListingMode(questionListingMode);
 
 
-	 	logger.debug("done saving form request data.");
+	 	logger.debug("ending saveFormRequestData:");
 	}
 	
     
@@ -148,8 +148,38 @@
 		logger.debug("totalUserWeight: " + totalUserWeight);
 		return totalUserWeight;
 	}
+
+
+    public static String getTotalMarksPossible(McContent mcContent)
+    {
+        logger.debug("starting getTotalMarksPossible: " + mcContent);
+        
+        int totalMarksPossible=0;
+        Iterator itQuestions=mcContent.getMcQueContents().iterator() ;
+        while (itQuestions.hasNext())
+        {
+            McQueContent mcQueContent = (McQueContent)itQuestions.next(); 
+            logger.debug("mcQueContent: " + mcQueContent);
+            
+            Integer mark=mcQueContent.getMark();
+            logger.debug("mark: " + mark);
+            
+            int intMark=0;
+            if (mark != null)
+                intMark=mark.intValue();
+            
+            logger.debug("intMark: " + intMark);
+
+            totalMarksPossible+=intMark;
+        }
+        logger.debug("totalMarksPossible: " + totalMarksPossible);
+        
+        String strTotalMarksPossible= new Integer(totalMarksPossible).toString();
+        return strTotalMarksPossible;
+    }
     
     
+    
     /**
      * calculates the mark of a learner
      * getMark(Map mapLeanerAssessmentResults)
@@ -1053,55 +1083,5 @@
        logger.debug("returning mapWeightsExcludeHighestWeight: " + mapMarksExcludeHighestMark);
        return mapMarksExcludeHighestMark; 
 	}
-	
-	
     
-    /**
-     * 
-     * cleanUpLearningSession(HttpServletRequest request)
-     * removes Learning session attributes
-     * 
-     * @param request
-     */
-    public static void cleanUpLearningSession(HttpServletRequest request)
-    {
-    	request.getSession().removeAttribute(TOOL_CONTENT_ID);
-    	request.getSession().removeAttribute(TOOL_SESSION_ID);
-    	request.getSession().removeAttribute(QUESTION_LISTING_MODE);
-    	request.getSession().removeAttribute(QUESTION_LISTING_MODE_SEQUENTIAL);
-    	request.getSession().removeAttribute(QUESTION_LISTING_MODE_COMBINED);
-    	request.getSession().removeAttribute(MAP_OPTIONS_CONTENT);
-    	request.getSession().removeAttribute(MAP_QUESTION_CONTENT_LEARNER);
-    	request.getSession().removeAttribute(TOTAL_QUESTION_COUNT);
-    	request.getSession().removeAttribute(CURRENT_QUESTION_INDEX);
-    	request.getSession().removeAttribute(LEARNER_LAST_ATTEMPT_ORDER);
-    	request.getSession().removeAttribute(LEARNER_BEST_MARK);
-    	request.getSession().removeAttribute(PASSMARK);
-    	request.getSession().removeAttribute(REPORT_TITLE_LEARNER);
-    	request.getSession().removeAttribute(IS_CONTENT_IN_USE);
-    	request.getSession().removeAttribute(IS_TOOL_ACTIVITY_OFFLINE);
-    	request.getSession().removeAttribute(IS_USERNAME_VISIBLE);
-    	request.getSession().removeAttribute(IS_SHOW_FEEDBACK);
-    	request.getSession().removeAttribute(TOTAL_COUNT_REACHED);
-    	request.getSession().removeAttribute(COUNT_SESSION_COMPLETE);
-    	request.getSession().removeAttribute(CURRENT_QUESTION_INDEX);
-    	request.getSession().removeAttribute(TOP_MARK);
-    	request.getSession().removeAttribute(LOWEST_MARK);
-    	request.getSession().removeAttribute(AVERAGE_MARK);
-    	request.getSession().removeAttribute(MAP_GENERAL_CHECKED_OPTIONS_CONTENT);
-    	request.getSession().removeAttribute(MAP_LEARNER_ASSESSMENT_RESULTS);
-    	request.getSession().removeAttribute(MAP_LEARNER_FEEDBACK_INCORRECT);
-    	request.getSession().removeAttribute(MAP_LEARNER_FEEDBACK_CORRECT);
-    	request.getSession().removeAttribute(MAP_QUE_ATTEMPTS);
-    	request.getSession().removeAttribute(MAP_QUE_CORRECT_ATTEMPTS);
-    	request.getSession().removeAttribute(MAP_QUE_INCORRECT_ATTEMPTS);
-    	request.getSession().removeAttribute(MAP_QUESTION_WEIGHTS);
-    	request.getSession().removeAttribute(USER_EXCEPTION_USERID_NOTAVAILABLE);
-    	request.getSession().removeAttribute(USER_EXCEPTION_TOOLSESSIONID_REQUIRED);
-    	request.getSession().removeAttribute(USER_EXCEPTION_NUMBERFORMAT);
-    	request.getSession().removeAttribute(LEARNING_MODE);
-    	request.getSession().removeAttribute(PREVIEW_ONLY);
-    	request.getSession().removeAttribute(LEARNER_PROGRESS);
-    	request.getSession().removeAttribute(LEARNER_PROGRESS_USERID);
-    }
  }
Index: lams_tool_lamc/src/java/org/lamsfoundation/lams/tool/mc/web/McLearningAction.java
===================================================================
diff -u -r771dd93b9ea84cec2b55db5c66a5d187da0874c0 -radb09a70c5f6e06556e11745cb8266861c03c07b
--- lams_tool_lamc/src/java/org/lamsfoundation/lams/tool/mc/web/McLearningAction.java	(.../McLearningAction.java)	(revision 771dd93b9ea84cec2b55db5c66a5d187da0874c0)
+++ lams_tool_lamc/src/java/org/lamsfoundation/lams/tool/mc/web/McLearningAction.java	(.../McLearningAction.java)	(revision adb09a70c5f6e06556e11745cb8266861c03c07b)
@@ -93,7 +93,7 @@
       		scope="request"
       		input="/learning/AnswersContent.jsp"
       		parameter="method"
-      		unknown="false"
+      		u7nknown="false"
       		validate="false">
 	  	<forward
 		    name="loadLearner"
@@ -240,7 +240,7 @@
 	 	if ((mcLearningForm.getNextQuestionSelected() != null) && 
 	 	    (!mcLearningForm.getNextQuestionSelected().equals(""))) 
 	 	{
-	 	   logger.debug("presenting next question...");
+	 	   logger.debug("processing getNextQuestionSelected...");
 	 	   LearningUtil.saveFormRequestData(request, mcLearningForm, false);
 	 	   mcLearningForm.resetParameters();
 	   	   setContentInUse(request, toolContentId, mcService);
@@ -250,56 +250,65 @@
     	
     	if (mcLearningForm.getContinueOptionsCombined() != null)
     	{
+    	 	logger.debug("processing getContinueOptionsCombined...");
     	    LearningUtil.saveFormRequestData(request, mcLearningForm, false);
     		setContentInUse(request, toolContentId, mcService);
     		return continueOptionsCombined(mapping, form, request, response);
     	}
     	else if (mcLearningForm.getNextOptions() != null)
 	 	{
+    	 	logger.debug("processing getNextOptions...");
     	    LearningUtil.saveFormRequestData(request, mcLearningForm, false);
     	    setContentInUse(request, toolContentId, mcService);
 	 		return getNextOptions(mapping, form, request, response);
 	 	}
     	else if (mcLearningForm.getRedoQuestions() != null)
     	{
+    	    logger.debug("processing getRedoQuestions...");
     	    LearningUtil.saveFormRequestData(request, mcLearningForm, false);
     	    setContentInUse(request, toolContentId, mcService);
     		return redoQuestions(mapping, form, request, response);
     	}
     	else if (mcLearningForm.getRedoQuestionsOk() != null)
     	{
+    	    logger.debug("processing getRedoQuestionsOk...");
     	    LearningUtil.saveFormRequestData(request, mcLearningForm, false);
     	    setContentInUse(request, toolContentId, mcService);
     		logger.debug("requested redoQuestionsOk, user is sure to redo the questions.");
     		return redoQuestions(request, mcLearningForm, mapping);
     	}
     	else if (mcLearningForm.getViewAnswers() != null)
     	{
+    	    logger.debug("processing getViewAnswers...");
     	    LearningUtil.saveFormRequestData(request, mcLearningForm, false);
     	    setContentInUse(request, toolContentId, mcService);
     	    mcLearningForm.setLearnerProgress(new Boolean(false).toString());
     		return viewAnswers(mapping, mcLearningForm, request, response);
     	}
     	else if (mcLearningForm.getViewSummary() != null)
     	{
+    	    logger.debug("processing getViewSummary...");
     	    LearningUtil.saveFormRequestData(request, mcLearningForm, false);
     	    setContentInUse(request, toolContentId, mcService);
 			return viewSummary(mapping, form, request, response);
     	}
     	else if (mcLearningForm.getSubmitReflection() != null)
     	{
+    	    logger.debug("processing getSubmitReflection...");
     	    LearningUtil.saveFormRequestData(request, mcLearningForm, false);
     	    setContentInUse(request, toolContentId, mcService);
     		return submitReflection(mapping, form, request, response);
     	}
     	else if (mcLearningForm.getForwardtoReflection() != null)
     	{
+    	    logger.debug("processing getForwardtoReflection...");
     	    LearningUtil.saveFormRequestData(request, mcLearningForm, false);
     	    setContentInUse(request, toolContentId, mcService);
     		return forwardtoReflection(mapping, form, request, response);
     	}
     	else if (mcLearningForm.getLearnerFinished() != null)
     	{
+    	    logger.debug("processing getLearnerFinished...");
     	    LearningUtil.saveFormRequestData(request, mcLearningForm, false);
     	    setContentInUse(request, toolContentId, mcService);
     		return endLearning(mapping, form, request, response);
@@ -483,7 +492,7 @@
      */
     protected Set parseLearnerInput(List learnerInput, McContent mcContent, IMcService mcService)
     {
-        logger.debug("learnerInput: " + learnerInput);
+        logger.debug("starting parseLearnerInput: " + learnerInput);
         logger.debug("mcContent: " + mcContent);
         logger.debug("mcContent uid: " + mcContent.getUid());
         
@@ -546,11 +555,12 @@
     protected List buildSelectedQuestionAndCandidateAnswersDTO(List learnerInput, McTempDataHolderDTO mcTempDataHolderDTO, 
             IMcService mcService, McContent mcContent)
     {
-        logger.debug("mcService: " + mcService);
+        logger.debug("starting buildSelectedQuestionAndCandidateAnswersDTO: " + learnerInput);
         logger.debug("mcContent: " + mcContent);
         
         logger.debug("learnerInput: " + learnerInput);
         int mark=0;
+        int userWeight=0;
         int userMarks=0;
         int totalMarksPossible=0;
         
@@ -643,9 +653,8 @@
             {
             	mcLearnerAnswersDTO.setFeedbackCorrect(mcQueContent.getFeedback());
             	++mark;
-            	
+
             	totalUserMarks+=currentMark;	
-            	
             	userMarks=userMarks + currentMark;;
             }
             else
@@ -660,6 +669,7 @@
     	}
         logger.debug("final questionAndCandidateAnswersList: " + questionAndCandidateAnswersList);
         logger.debug("final mark: " + mark);
+
         logger.debug("final userMarks: " + userMarks);
         logger.debug("totalUserMarks: " + totalUserMarks);
         logger.debug("totalMarksPossible: " + totalMarksPossible);
@@ -700,23 +710,21 @@
 		McLearningForm mcLearningForm = (McLearningForm) form;
 	 	IMcService mcService = McServiceProxy.getMcService(getServlet().getServletContext());
 		logger.debug("retrieving mcService: " + mcService);
-	    
+
+ 	    String httpSessionID=mcLearningForm.getHttpSessionID();
+ 	    logger.debug("httpSessionID: " + httpSessionID);
+ 	    
+	    SessionMap sessionMap = (SessionMap) request.getSession().getAttribute(httpSessionID);
+	    logger.debug("sessionMap: " + sessionMap);
+
 	    String questionListingMode=mcLearningForm.getQuestionListingMode();
 	    logger.debug("questionListingMode: " + questionListingMode);
 	    
-	    
 	    List learnerInput= new LinkedList();
 	    if (questionListingMode.equals(QUESTION_LISTING_MODE_SEQUENTIAL))
 	    {
 	        logger.debug("listing mode is : " + QUESTION_LISTING_MODE_SEQUENTIAL);
 	        
-	 	    String httpSessionID=mcLearningForm.getHttpSessionID();
-	 	    logger.debug("httpSessionID: " + httpSessionID);
-	 	    
-		    SessionMap sessionMap = (SessionMap) request.getSession().getAttribute(httpSessionID);
-		    logger.debug("sessionMap: " + sessionMap);
-		    
-		    
 		    List sequentialCheckedCa=(List)sessionMap.get(QUESTION_AND_CANDIDATE_ANSWERS_KEY);
 		    logger.debug("pre sequentialCheckedCa: " + sequentialCheckedCa);
 		    
@@ -860,7 +868,18 @@
     		mcGeneralLearnerFlowDTO.setPassMarkApplicable(new Boolean(false).toString());
     	}
     	
+    	String passMarkApplicable=mcGeneralLearnerFlowDTO.getPassMarkApplicable();
+    	logger.debug("passMarkApplicable: " + passMarkApplicable);
+    	sessionMap.put(PASSMARK_APPLICABLE, passMarkApplicable);
     	
+    	String userOverPassMark=mcGeneralLearnerFlowDTO.getUserOverPassMark();
+    	logger.debug("userOverPassMark: " + userOverPassMark);
+    	sessionMap.put(USER_OVER_PASSMARK, userOverPassMark);
+    	
+	    request.getSession().setAttribute(httpSessionID, sessionMap);
+    	
+    	
+    	
         Long toolSessionUid=mcSession.getUid();
         logger.debug("toolSessionUid: " + toolSessionUid);
 
@@ -927,9 +946,6 @@
     	LearningUtil.createLearnerAttempt(request, mcQueUsr, selectedQuestionAndCandidateAnswersDTO, new Integer(learnerMark).intValue(), passed, new Integer(highestAttemptOrder).intValue(), null, mcService);
     	logger.debug("created user attempt in the db");
     		
-        //Map mapQuestionWeights=LearningUtil.buildWeightsMap(request, mcContent.getMcContentId(), mcService);
-        //logger.debug("mapQuestionWeights:" + mapQuestionWeights);
-        
         Map mapQuestionMarks=LearningUtil.buildMarksMap(request, mcContent.getMcContentId(), mcService);
         logger.debug("mapQuestionMarks:" + mapQuestionMarks);
         
@@ -946,7 +962,14 @@
 		logger.debug("reflection subject: " + mcContent.getReflectionSubject());
 		mcGeneralLearnerFlowDTO.setReflectionSubject(mcContent.getReflectionSubject());
 
+		logger.debug("mcGeneralLearnerFlowDTO for jsp: " +  mcGeneralLearnerFlowDTO);
 		
+		
+	    totalMarksPossible=LearningUtil.getTotalMarksPossible(mcContent);
+	    logger.debug("totalMarksPossible: " + totalMarksPossible);
+	    mcGeneralLearnerFlowDTO.setTotalMarksPossible(totalMarksPossible);
+
+		
 		request.setAttribute(MC_GENERAL_LEARNER_FLOW_DTO, mcGeneralLearnerFlowDTO);
 		logger.debug("MC_GENERAL_LEARNER_FLOW_DTO: " +  request.getAttribute(MC_GENERAL_LEARNER_FLOW_DTO));
 		
@@ -1066,6 +1089,14 @@
 		logger.debug("reflection subject: " + mcContent.getReflectionSubject());
 		mcGeneralLearnerFlowDTO.setReflectionSubject(mcContent.getReflectionSubject());
     		
+		mcGeneralLearnerFlowDTO.setRetries(new Boolean(mcContent.isRetries()).toString());
+		
+	    String totalMarksPossible=LearningUtil.getTotalMarksPossible(mcContent);
+	    logger.debug("totalMarksPossible: " + totalMarksPossible);
+	    mcGeneralLearnerFlowDTO.setTotalMarksPossible(totalMarksPossible);
+
+		
+		logger.debug("mcGeneralLearnerFlowDTO for jsp: " +  mcGeneralLearnerFlowDTO);
        	mcGeneralLearnerFlowDTO.setQuestionIndex(new Integer(questionIndex).toString());
        	request.setAttribute(MC_GENERAL_LEARNER_FLOW_DTO, mcGeneralLearnerFlowDTO);
 
@@ -1117,9 +1148,27 @@
 		McGeneralLearnerFlowDTO mcGeneralLearnerFlowDTO=LearningUtil.buildMcGeneralLearnerFlowDTO(mcContent);
 		mcGeneralLearnerFlowDTO.setCurrentQuestionIndex(new Integer(1).toString());
 		mcGeneralLearnerFlowDTO.setTotalCountReached(new Boolean(false).toString());
+
+		/*use existing session to extract PASSMARK_APPLICABLE and USER_OVER_PASSMARK*/
+ 	    String httpSessionID=mcLearningForm.getHttpSessionID();
+ 	    logger.debug("httpSessionID: " + httpSessionID);
+ 	    
+	    SessionMap sessionMap = (SessionMap) request.getSession().getAttribute(httpSessionID);
+	    logger.debug("sessionMap: " + sessionMap);
+
+    	String passMarkApplicable=(String)sessionMap.get(PASSMARK_APPLICABLE);
+    	logger.debug("passMarkApplicable: " + passMarkApplicable);
+    	mcGeneralLearnerFlowDTO.setPassMarkApplicable(passMarkApplicable);
+    	mcLearningForm.setPassMarkApplicable(passMarkApplicable);
+    	
+    	String userOverPassMark=(String)sessionMap.get(USER_OVER_PASSMARK);
+    	logger.debug("userOverPassMark: " + userOverPassMark);
+    	mcGeneralLearnerFlowDTO.setUserOverPassMark (userOverPassMark);
+    	mcLearningForm.setUserOverPassMark (userOverPassMark);
+
 		
-		
-	    SessionMap sessionMap = new SessionMap();
+    	/*create a new session*/
+		sessionMap = new SessionMap();
 	    List sequentialCheckedCa= new LinkedList();
 	    sessionMap.put(QUESTION_AND_CANDIDATE_ANSWERS_KEY, sequentialCheckedCa);
 	    request.getSession().setAttribute(sessionMap.getSessionID(), sessionMap);
@@ -1155,8 +1204,17 @@
 	    mcGeneralLearnerFlowDTO.setReflection(new Boolean(mcContent.isReflect()).toString());
 		logger.debug("reflection subject: " + mcContent.getReflectionSubject());
 		mcGeneralLearnerFlowDTO.setReflectionSubject(mcContent.getReflectionSubject());
+		
+		logger.debug("mcContent.isRetries(): " + mcContent.isRetries());
+		mcGeneralLearnerFlowDTO.setRetries(new Boolean(mcContent.isRetries()).toString());
+		
+	    String totalMarksPossible=LearningUtil.getTotalMarksPossible(mcContent);
+	    logger.debug("totalMarksPossible: " + totalMarksPossible);
+	    mcGeneralLearnerFlowDTO.setTotalMarksPossible(totalMarksPossible);
 
 		
+		logger.debug("mcGeneralLearnerFlowDTO for jsp: " +  mcGeneralLearnerFlowDTO);
+		
 		request.setAttribute(MC_GENERAL_LEARNER_FLOW_DTO, mcGeneralLearnerFlowDTO);
 		logger.debug("MC_GENERAL_LEARNER_FLOW_DTO: " +  request.getAttribute(MC_GENERAL_LEARNER_FLOW_DTO));
 		
@@ -1391,7 +1449,11 @@
 		logger.debug("reflection subject: " + mcContent.getReflectionSubject());
 		mcGeneralLearnerFlowDTO.setReflectionSubject(mcContent.getReflectionSubject());
 		
+		logger.debug("mcContent.isRetries(): " + mcContent.isRetries());
+		mcGeneralLearnerFlowDTO.setRetries(new Boolean(mcContent.isRetries()).toString());
+
 		
+		
         String userID = "";
 	    HttpSession ss = SessionManager.getSession();
 	    logger.debug("ss: " + ss);
@@ -1423,6 +1485,88 @@
 		logger.debug("reportViewOnly: " + reportViewOnly);
 		
 		mcGeneralLearnerFlowDTO.setReportViewOnly(reportViewOnly);
+		
+		
+		logger.debug("mcContent.isRetries(): " + mcContent.isRetries());
+		mcGeneralLearnerFlowDTO.setRetries(new Boolean(mcContent.isRetries()).toString());
+		
+		
+		
+ 	    String httpSessionID=mcLearningForm.getHttpSessionID();
+ 	    logger.debug("httpSessionID: " + httpSessionID);
+ 	    
+	    SessionMap sessionMap = (SessionMap) request.getSession().getAttribute(httpSessionID);
+	    logger.debug("sessionMap: " + sessionMap);
+
+	    String requestByStarter = (String) request.getAttribute(REQUEST_BY_STARTER);
+	    logger.debug("requestByStarter: " + requestByStarter);
+    	
+	    String passMarkApplicable=null;
+	    String userOverPassMark =null;
+
+    	passMarkApplicable=(String)sessionMap.get(PASSMARK_APPLICABLE);
+    	logger.debug("passMarkApplicable: " + passMarkApplicable);
+    	
+    	if (passMarkApplicable == null)
+    	{
+			logger.debug("reading request parameters");
+			passMarkApplicable=request.getParameter("passMarkApplicable");
+		 	logger.debug("passMarkApplicable: " + passMarkApplicable);
+    	}
+    	        
+    	userOverPassMark=(String)sessionMap.get(USER_OVER_PASSMARK);
+	 	logger.debug("userOverPassMark: " + userOverPassMark);
+	 	
+    	if (userOverPassMark == null)
+    	{
+    	    userOverPassMark=request.getParameter("userOverPassMark");
+		 	logger.debug("userOverPassMark: " + userOverPassMark);
+    	}
+
+	    
+	    /*
+	    if (requestByStarter.equals("true"))
+	    {
+	        logger.debug("requestByStarter is true");
+	        
+	    	passMarkApplicable=(String)sessionMap.get(PASSMARK_APPLICABLE);
+	    	logger.debug("passMarkApplicable: " + passMarkApplicable);
+	    	
+	    	userOverPassMark=(String)sessionMap.get(USER_OVER_PASSMARK);
+	    	logger.debug("userOverPassMark: " + userOverPassMark);
+	    }
+	    else
+	    {
+	        logger.debug("requestByStarter is not true");
+			logger.debug("reading request parameters");
+			passMarkApplicable=request.getParameter("passMarkApplicable");
+		 	logger.debug("passMarkApplicable: " + passMarkApplicable);
+		 	
+		 	userOverPassMark=request.getParameter("userOverPassMark");
+		 	logger.debug("userOverPassMark: " + userOverPassMark);
+	    }
+	    */
+
+    	mcGeneralLearnerFlowDTO.setPassMarkApplicable(passMarkApplicable);
+    	mcLearningForm.setPassMarkApplicable(passMarkApplicable);
+	    
+    	mcGeneralLearnerFlowDTO.setUserOverPassMark (userOverPassMark);
+    	mcLearningForm.setUserOverPassMark (userOverPassMark);
+
+    	
+    	sessionMap.put(PASSMARK_APPLICABLE, passMarkApplicable);
+    	sessionMap.put(USER_OVER_PASSMARK, userOverPassMark);
+    	request.getSession().setAttribute(httpSessionID, sessionMap);
+    	
+
+	    String totalMarksPossible=LearningUtil.getTotalMarksPossible(mcContent);
+	    logger.debug("totalMarksPossible: " + totalMarksPossible);
+	    mcGeneralLearnerFlowDTO.setTotalMarksPossible(totalMarksPossible);
+
+		
+		logger.debug("mcGeneralLearnerFlowDTO for jsp: " +  mcGeneralLearnerFlowDTO);
+		
+		
 		request.setAttribute(MC_GENERAL_LEARNER_FLOW_DTO, mcGeneralLearnerFlowDTO);
 		logger.debug("MC_GENERAL_LEARNER_FLOW_DTO: " +  request.getAttribute(MC_GENERAL_LEARNER_FLOW_DTO));    	
 		logger.debug("end of prepareViewAnswersData.");
@@ -1549,7 +1693,56 @@
 	    mcGeneralLearnerFlowDTO.setReflection(new Boolean(mcContent.isReflect()).toString());
 		logger.debug("reflection subject: " + mcContent.getReflectionSubject());
 		mcGeneralLearnerFlowDTO.setReflectionSubject(mcContent.getReflectionSubject());
+		
+		logger.debug("mcContent.isRetries(): " + mcContent.isRetries());
+		mcGeneralLearnerFlowDTO.setRetries(new Boolean(mcContent.isRetries()).toString());
 
+		
+ 	    String httpSessionID=mcLearningForm.getHttpSessionID();
+ 	    logger.debug("httpSessionID: " + httpSessionID);
+ 	    
+	    SessionMap sessionMap = (SessionMap) request.getSession().getAttribute(httpSessionID);
+	    logger.debug("sessionMap: " + sessionMap);
+		
+		
+    	String passMarkApplicable=(String)sessionMap.get(PASSMARK_APPLICABLE);
+    	logger.debug("passMarkApplicable: " + passMarkApplicable);
+    	
+    	String userOverPassMark=(String)sessionMap.get(USER_OVER_PASSMARK);
+    	logger.debug("userOverPassMark: " + userOverPassMark);
+    	
+		
+    	if (passMarkApplicable == null)
+    	{
+    		passMarkApplicable=request.getParameter("passMarkApplicable");
+    	}
+	 	logger.debug("passMarkApplicable: " + passMarkApplicable);
+	 	mcLearningForm.setPassMarkApplicable(passMarkApplicable);
+	 	mcGeneralLearnerFlowDTO.setPassMarkApplicable(passMarkApplicable);
+	 	
+    	if (userOverPassMark == null)
+    	{
+    	    userOverPassMark=request.getParameter("userOverPassMark");    
+    	}
+	 	logger.debug("userOverPassMark: " + userOverPassMark);
+	 	mcLearningForm.setUserOverPassMark(userOverPassMark);
+    	mcGeneralLearnerFlowDTO.setUserOverPassMark (userOverPassMark);
+    	
+    	
+    	sessionMap.put(PASSMARK_APPLICABLE, passMarkApplicable);
+    	sessionMap.put(USER_OVER_PASSMARK, userOverPassMark);
+    	request.getSession().setAttribute(httpSessionID, sessionMap);
+
+    	
+    	
+
+	    String totalMarksPossible=LearningUtil.getTotalMarksPossible(mcContent);
+	    logger.debug("totalMarksPossible: " + totalMarksPossible);
+	    mcGeneralLearnerFlowDTO.setTotalMarksPossible(totalMarksPossible);
+
+
+		logger.debug("mcGeneralLearnerFlowDTO for jsp: " +  mcGeneralLearnerFlowDTO);
+
 		request.setAttribute(MC_GENERAL_LEARNER_FLOW_DTO, mcGeneralLearnerFlowDTO);
 		logger.debug("MC_GENERAL_LEARNER_FLOW_DTO: " +  request.getAttribute(MC_GENERAL_LEARNER_FLOW_DTO));
 		
@@ -1622,7 +1815,33 @@
 	    mcGeneralLearnerFlowDTO.setReflection(new Boolean(mcContent.isReflect()).toString());
 		logger.debug("reflection subject: " + mcContent.getReflectionSubject());
 		mcGeneralLearnerFlowDTO.setReflectionSubject(mcContent.getReflectionSubject());
+		
+		logger.debug("mcContent.isRetries(): " + mcContent.isRetries());
+		mcGeneralLearnerFlowDTO.setRetries(new Boolean(mcContent.isRetries()).toString());
+		
+ 	    String httpSessionID=mcLearningForm.getHttpSessionID();
+ 	    logger.debug("httpSessionID: " + httpSessionID);
+ 	    
+	    SessionMap sessionMap = (SessionMap) request.getSession().getAttribute(httpSessionID);
+	    logger.debug("sessionMap: " + sessionMap);
+		
+		
+    	String passMarkApplicable=(String)sessionMap.get(PASSMARK_APPLICABLE);
+    	logger.debug("passMarkApplicable: " + passMarkApplicable);
+    	mcGeneralLearnerFlowDTO.setPassMarkApplicable(passMarkApplicable);
+    	mcLearningForm.setPassMarkApplicable(passMarkApplicable);
+    	
+    	String userOverPassMark=(String)sessionMap.get(USER_OVER_PASSMARK);
+    	logger.debug("userOverPassMark: " + userOverPassMark);
+    	mcGeneralLearnerFlowDTO.setUserOverPassMark (userOverPassMark);
+    	mcLearningForm.setUserOverPassMark (userOverPassMark);
 
+	    String totalMarksPossible=LearningUtil.getTotalMarksPossible(mcContent);
+	    logger.debug("totalMarksPossible: " + totalMarksPossible);
+	    mcGeneralLearnerFlowDTO.setTotalMarksPossible(totalMarksPossible);
+
+    	
+		logger.debug("mcGeneralLearnerFlowDTO for jsp: " +  mcGeneralLearnerFlowDTO);
 		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
===================================================================
diff -u -r8522cd628329e0031e21b48f2750b1fd9b1842a6 -radb09a70c5f6e06556e11745cb8266861c03c07b
--- lams_tool_lamc/src/java/org/lamsfoundation/lams/tool/mc/web/McLearningStarterAction.java	(.../McLearningStarterAction.java)	(revision 8522cd628329e0031e21b48f2750b1fd9b1842a6)
+++ lams_tool_lamc/src/java/org/lamsfoundation/lams/tool/mc/web/McLearningStarterAction.java	(.../McLearningStarterAction.java)	(revision adb09a70c5f6e06556e11745cb8266861c03c07b)
@@ -332,6 +332,8 @@
 		    LearningUtil.saveFormRequestData(request, mcLearningForm, true);
 		    logger.debug("learnerProgress before presenting learner Progress screen: " + mcLearningForm.getLearnerProgress());
 		    
+		    
+		    request.setAttribute(REQUEST_BY_STARTER, new Boolean (true).toString());
 		    return mcLearningAction.viewAnswers(mapping, mcLearningForm, request, response);
 		}
     	
@@ -452,7 +454,7 @@
 			    	    mcLearningForm.setReportViewOnly(new Boolean(false).toString());
 			    	}
 
-
+			    	request.setAttribute(REQUEST_BY_STARTER, new Boolean (true).toString());
 			    	return mcLearningAction.viewAnswers(mapping, mcLearningForm, request, response);
 		    	}
 	        }
@@ -517,6 +519,7 @@
 		}
 
 
+		
 		request.setAttribute(MC_GENERAL_LEARNER_FLOW_DTO, mcGeneralLearnerFlowDTO);
 		logger.debug("MC_GENERAL_LEARNER_FLOW_DTO: " +  request.getAttribute(MC_GENERAL_LEARNER_FLOW_DTO));
 	}