Index: lams_tool_lamc/src/java/org/lamsfoundation/lams/tool/mc/McAppConstants.java
===================================================================
RCS file: /usr/local/cvsroot/lams_tool_lamc/src/java/org/lamsfoundation/lams/tool/mc/McAppConstants.java,v
diff -u -r1.71 -r1.72
--- lams_tool_lamc/src/java/org/lamsfoundation/lams/tool/mc/McAppConstants.java	16 Mar 2006 16:45:59 -0000	1.71
+++ lams_tool_lamc/src/java/org/lamsfoundation/lams/tool/mc/McAppConstants.java	17 Mar 2006 10:34:47 -0000	1.72
@@ -122,6 +122,9 @@
     public static final String MAP_SELECTED_OPTIONS						="mapSelectedOptions";
     public static final String MAP_FEEDBACK_INCORRECT					="mapFeedbackIncorrect";
     public static final String MAP_INCORRECT_FEEDBACK					="mapIncorrectFeedback";
+    
+    public static final String MAP_INCORRECT_FEEDBACK_LEARNER			="mapIncorrectFeedbackLearner";
+    public static final String MAP_CORRECT_FEEDBACK_LEARNER				="mapCorrectFeedbackLearner";
     public static final String MAP_CORRECT_FEEDBACK						="mapCorrectFeedback";
     public static final String MAP_FEEDBACK_CORRECT						="mapFeedbackCorrect";
     
@@ -178,7 +181,10 @@
     public static final String MAP_TOOL_SESSIONS						="mapToolSessions";
     public static final Integer MAX_TOOL_SESSION_COUNT					=new Integer(500);
     public static final String IS_TOOL_SESSION_CHANGED					="isToolSessionChanged";
-    public static final String OPTION_OFF								="false";    
+    public static final String OPTION_OFF								="false";
+    public static final String ACTIVITY_TITLE 							= "activityTitle";
+    public static final String ACTIVITY_INSTRUCTIONS					= "activityInstructions";
+
         
     /*
      * user actions
Index: lams_tool_lamc/src/java/org/lamsfoundation/lams/tool/mc/McUtils.java
===================================================================
RCS file: /usr/local/cvsroot/lams_tool_lamc/src/java/org/lamsfoundation/lams/tool/mc/McUtils.java,v
diff -u -r1.33 -r1.34
--- lams_tool_lamc/src/java/org/lamsfoundation/lams/tool/mc/McUtils.java	16 Mar 2006 16:45:59 -0000	1.33
+++ lams_tool_lamc/src/java/org/lamsfoundation/lams/tool/mc/McUtils.java	17 Mar 2006 10:34:47 -0000	1.34
@@ -722,6 +722,13 @@
     	request.getSession().removeAttribute(MODE);
     	request.getSession().removeAttribute(LEARNING_MODE);
     	request.getSession().removeAttribute(EXPORT_USER_ID);
+    	request.getSession().removeAttribute(MAP_INCORRECT_FEEDBACK);
+    	request.getSession().removeAttribute(MAP_CORRECT_FEEDBACK);
+    	request.getSession().removeAttribute(MAP_INCORRECT_FEEDBACK_LEARNER);
+    	request.getSession().removeAttribute(MAP_CORRECT_FEEDBACK_LEARNER);
+    	request.getSession().removeAttribute(ACTIVITY_TITLE);
+    	request.getSession().removeAttribute(ACTIVITY_INSTRUCTIONS);
+    	
     	cleanUpUserExceptions(request);
     	logger.debug("completely cleaned the session.");
     }
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.39 -r1.40
--- lams_tool_lamc/src/java/org/lamsfoundation/lams/tool/mc/web/McLearningStarterAction.java	13 Mar 2006 23:17:26 -0000	1.39
+++ lams_tool_lamc/src/java/org/lamsfoundation/lams/tool/mc/web/McLearningStarterAction.java	17 Mar 2006 10:34:47 -0000	1.40
@@ -151,6 +151,11 @@
  *
  */
 
+/**
+ *
+ * Note:  Because of MCQ's learning reporting structure, Show Learner Report is always ON even if in authoring it is set to false.
+ */
+
 public class McLearningStarterAction extends Action implements McAppConstants {
 	static Logger logger = Logger.getLogger(McLearningStarterAction.class.getName());
 	 /* Since the toolSessionId is passed, we will derive toolContentId from the toolSessionId
@@ -564,7 +569,10 @@
 	    logger.debug("IS_CONTENT_IN_USE: " + mcContent.isContentInUse());
 	    request.getSession().setAttribute(IS_CONTENT_IN_USE, new Boolean(mcContent.isContentInUse()).toString());
 	    
+	    request.getSession().setAttribute(ACTIVITY_TITLE, mcContent.getTitle());
+	    request.getSession().setAttribute(ACTIVITY_INSTRUCTIONS, mcContent.getInstructions());
 	    
+	    
 	    /*
 	     * Is the tool activity been checked as Run Offline in the property inspector?
 	     */
@@ -591,14 +599,28 @@
 	    Map mapLeanerAssessmentResults= new TreeMap(new McComparator());
 	    request.getSession().setAttribute(MAP_LEARNER_ASSESSMENT_RESULTS, mapLeanerAssessmentResults);
 	    
+	    
 	    Map mapLeanerFeedbackIncorrect=AuthoringUtil.buildInCorrectFeedbackMap(request, mcContent.getMcContentId());
 	    request.getSession().setAttribute(MAP_LEARNER_FEEDBACK_INCORRECT, mapLeanerFeedbackIncorrect);
 	    logger.debug("MAP_LEARNER_FEEDBACK_INCORRECT: " + mapLeanerFeedbackIncorrect);
 	    
 	    Map mapLeanerFeedbackCorrect=AuthoringUtil.buildCorrectFeedbackMap(request, mcContent.getMcContentId());
 	    request.getSession().setAttribute(MAP_LEARNER_FEEDBACK_CORRECT, mapLeanerFeedbackCorrect);
 	    logger.debug("MAP_LEARNER_FEEDBACK_CORRECT: " + mapLeanerFeedbackCorrect);
+
 	    
+	    
+	    /*
+    	Map mapIncorrectFeedback = AuthoringUtil.rebuildIncorrectFeedbackMapfromDB(request, mcContent.getMcContentId());
+    	logger.debug("existing mapIncorrectFeedback:" + mapIncorrectFeedback);
+    	request.getSession().setAttribute(MAP_INCORRECT_FEEDBACK_LEARNER, mapIncorrectFeedback);
+    	
+    	Map mapCorrectFeedback = AuthoringUtil.rebuildCorrectFeedbackMapfromDB(request, mcContent.getMcContentId());
+    	logger.debug("existing mapCorrectFeedback:" + mapCorrectFeedback);
+    	request.getSession().setAttribute(MAP_CORRECT_FEEDBACK_LEARNER, mapCorrectFeedback);
+    	*/
+	    
+	    
 	    Map mapQuestionWeights=LearningUtil.buildWeightsMap(request, mcContent.getMcContentId());
 	    request.getSession().setAttribute(MAP_QUESTION_WEIGHTS, mapQuestionWeights);
 	    logger.debug("MAP_QUESTION_WEIGHTS: " + mapQuestionWeights);
Index: lams_tool_lamc/src/java/org/lamsfoundation/lams/tool/mc/web/McMonitoringAction.java
===================================================================
RCS file: /usr/local/cvsroot/lams_tool_lamc/src/java/org/lamsfoundation/lams/tool/mc/web/McMonitoringAction.java,v
diff -u -r1.17 -r1.18
--- lams_tool_lamc/src/java/org/lamsfoundation/lams/tool/mc/web/McMonitoringAction.java	13 Mar 2006 23:17:26 -0000	1.17
+++ lams_tool_lamc/src/java/org/lamsfoundation/lams/tool/mc/web/McMonitoringAction.java	17 Mar 2006 10:34:47 -0000	1.18
@@ -1026,7 +1026,8 @@
             HttpServletResponse response) throws IOException,
                                          ServletException
     {
-    	McUtils.cleanUpSessionAbsolute(request);
+    	/*not doing anything for the moment*/
+    	/*McUtils.cleanUpSessionAbsolute(request); */
     	request.getSession().setAttribute(IS_MONITORED_CONTENT_IN_USE, new Boolean(false).toString());
     	return (mapping.findForward(LOAD_MONITORING_CONTENT));
     }
Index: lams_tool_lamc/web/learning/AnswersContent.jsp
===================================================================
RCS file: /usr/local/cvsroot/lams_tool_lamc/web/learning/AnswersContent.jsp,v
diff -u -r1.7 -r1.8
--- lams_tool_lamc/web/learning/AnswersContent.jsp	24 Feb 2006 20:25:27 -0000	1.7
+++ lams_tool_lamc/web/learning/AnswersContent.jsp	17 Mar 2006 10:34:47 -0000	1.8
@@ -39,6 +39,7 @@
 </head>
 <body>
 
+
 <html:form  action="/learning?method=displayMc&validate=false" method="POST" target="_self">
 		<c:choose> 
 		  <c:when test="${sessionScope.questionListingMode == sessionScope.questionListingModeSequential}" > 
Index: lams_tool_lamc/web/learning/CombinedAnswersContent.jsp
===================================================================
RCS file: /usr/local/cvsroot/lams_tool_lamc/web/learning/CombinedAnswersContent.jsp,v
diff -u -r1.6 -r1.7
--- lams_tool_lamc/web/learning/CombinedAnswersContent.jsp	24 Feb 2006 20:25:27 -0000	1.6
+++ lams_tool_lamc/web/learning/CombinedAnswersContent.jsp	17 Mar 2006 10:34:47 -0000	1.7
@@ -39,7 +39,19 @@
 					  	</td>
 					  </tr>
 					  
-
+  					  <tr>
+					  	<td NOWRAP align=left class="input" valign=top bgColor="white" colspan=2> 
+						  	<c:out value="${activityTitle}" escapeXml="false" /> 
+					  	</td>
+					  </tr>
+					  
+					  <tr>
+					  	<td NOWRAP align=left class="input" valign=top bgColor="white" colspan=2> 
+						  	<c:out value="${activityInstructions}" escapeXml="false" /> 
+					  	</td>
+					  </tr>
+					  
+			
 			 		<c:if test="${sessionScope.isRetries == 'true'}"> 		
 					  <tr>
 					  	<td NOWRAP align=center class="input" valign=top colspan=2> 
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.5 -r1.6
--- lams_tool_lamc/web/learning/IndividualLearnerResults.jsp	25 Feb 2006 19:27:26 -0000	1.5
+++ lams_tool_lamc/web/learning/IndividualLearnerResults.jsp	17 Mar 2006 10:34:47 -0000	1.6
@@ -35,7 +35,8 @@
 				<table align=center bgcolor="#FFFFFF">
 					  <tr>
 					  	<td NOWRAP align=left class="input" valign=top bgColor="#333366" colspan=2> 
-						  	<font size=2 color="#FFFFFF"> <b>  <bean:message key="label.assessment"/> </b> </font>
+						  	<font size=2 color="#FFFFFF"> <b>  <bean:message key="label.assessment"/> </b> 
+						  	<c:out value="${reportTitleLearner}" escapeXml="false" /></font>
 					  	</td>
 					  </tr>
 				
@@ -181,15 +182,15 @@
 																	<c:if test="${mainEntry.value == 'true'}"> 		
 																		<c:forEach var="feedbackEntry" items="${sessionScope.mapLeanerFeedbackCorrect}">
 																			<c:if test="${feedbackEntry.key == sessionScope.queIndex}"> 		
-																					<c:out value="${feedbackEntry.value}"/>
+																				<c:out value="${feedbackEntry.value}" escapeXml="false" />
 																			</c:if> 																																				
 																		</c:forEach>											
 																	</c:if> 														
 																	
 																	<c:if test="${mainEntry.value == 'false'}"> 		
 																		<c:forEach var="feedbackEntry" items="${sessionScope.mapLeanerFeedbackIncorrect}">
 																			<c:if test="${feedbackEntry.key == sessionScope.queIndex}"> 		
-																					<c:out value="${feedbackEntry.value}"/>
+																				<c:out value="${feedbackEntry.value}" escapeXml="false" />
 																			</c:if> 																																				
 																		</c:forEach>											
 																	</c:if> 														
Index: lams_tool_lamc/web/learning/SingleQuestionAnswersContent.jsp
===================================================================
RCS file: /usr/local/cvsroot/lams_tool_lamc/web/learning/SingleQuestionAnswersContent.jsp,v
diff -u -r1.5 -r1.6
--- lams_tool_lamc/web/learning/SingleQuestionAnswersContent.jsp	24 Feb 2006 20:25:27 -0000	1.5
+++ lams_tool_lamc/web/learning/SingleQuestionAnswersContent.jsp	17 Mar 2006 10:34:47 -0000	1.6
@@ -39,7 +39,20 @@
 					  	</td>
 					  </tr>
 					  
+					  
+					  <tr>
+					  	<td NOWRAP align=left class="input" valign=top bgColor="white" colspan=2> 
+						  	<c:out value="${activityTitle}" escapeXml="false" /> 
+					  	</td>
+					  </tr>
+					  
+					  <tr>
+					  	<td NOWRAP align=left class="input" valign=top bgColor="white" colspan=2> 
+						  	<c:out value="${activityInstructions}" escapeXml="false" /> 
+					  	</td>
+					  </tr>
 
+
 			 		<c:if test="${sessionScope.isRetries == 'true'}"> 		
 					  <tr>
 					  	<td NOWRAP align=center class="input" valign=top colspan=2> 
Index: lams_tool_lamc/web/learning/ViewAnswers.jsp
===================================================================
RCS file: /usr/local/cvsroot/lams_tool_lamc/web/learning/ViewAnswers.jsp,v
diff -u -r1.7 -r1.8
--- lams_tool_lamc/web/learning/ViewAnswers.jsp	25 Feb 2006 19:27:26 -0000	1.7
+++ lams_tool_lamc/web/learning/ViewAnswers.jsp	17 Mar 2006 10:34:47 -0000	1.8
@@ -43,7 +43,8 @@
 				<table align=center bgcolor="#FFFFFF">
 					  <tr>
 					  	<td NOWRAP align=left class="input" valign=top bgColor="#333366" colspan=2> 
-						  	<font size=2 color="#FFFFFF"> <b>  <bean:message key="label.assessment"/> </b> </font>
+						  	<font size=2 color="#FFFFFF"> <b>  <bean:message key="label.assessment"/> </b> 
+						  	<c:out value="${reportTitleLearner}" escapeXml="false" /> </font>
 					  	</td>
 					  </tr>