Index: lams_tool_lamc/src/java/org/lamsfoundation/lams/tool/mc/McGeneralLearnerFlowDTO.java
===================================================================
RCS file: /usr/local/cvsroot/lams_tool_lamc/src/java/org/lamsfoundation/lams/tool/mc/McGeneralLearnerFlowDTO.java,v
diff -u -r1.11 -r1.12
--- lams_tool_lamc/src/java/org/lamsfoundation/lams/tool/mc/McGeneralLearnerFlowDTO.java	2 Oct 2006 02:06:35 -0000	1.11
+++ lams_tool_lamc/src/java/org/lamsfoundation/lams/tool/mc/McGeneralLearnerFlowDTO.java	11 Oct 2006 22:44:03 -0000	1.12
@@ -104,9 +104,24 @@
     
     protected String questionListingMode;
     
+    protected String totalUserMark;
+    
+    protected String totalMarksPossible;
 
         
     /**
+     * @return Returns the totalUserMark.
+     */
+    public String getTotalUserMark() {
+        return totalUserMark;
+    }
+    /**
+     * @param totalUserMark The totalUserMark to set.
+     */
+    public void setTotalUserMark(String totalUserMark) {
+        this.totalUserMark = totalUserMark;
+    }
+    /**
      * @return Returns the questionListingMode.
      */
     public String getQuestionListingMode() {
@@ -556,4 +571,16 @@
     public void setUserName(String userName) {
         this.userName = userName;
     }
+    /**
+     * @return Returns the totalMarksPossible.
+     */
+    public String getTotalMarksPossible() {
+        return totalMarksPossible;
+    }
+    /**
+     * @param totalMarksPossible The totalMarksPossible to set.
+     */
+    public void setTotalMarksPossible(String totalMarksPossible) {
+        this.totalMarksPossible = totalMarksPossible;
+    }
 }
Index: lams_tool_lamc/src/java/org/lamsfoundation/lams/tool/mc/McTempDataHolderDTO.java
===================================================================
RCS file: /usr/local/cvsroot/lams_tool_lamc/src/java/org/lamsfoundation/lams/tool/mc/Attic/McTempDataHolderDTO.java,v
diff -u -r1.3 -r1.4
--- lams_tool_lamc/src/java/org/lamsfoundation/lams/tool/mc/McTempDataHolderDTO.java	2 Oct 2006 02:06:35 -0000	1.3
+++ lams_tool_lamc/src/java/org/lamsfoundation/lams/tool/mc/McTempDataHolderDTO.java	11 Oct 2006 22:44:03 -0000	1.4
@@ -37,6 +37,8 @@
     protected String learnerMark;
     protected String totalUserWeight;
     protected String totalUserMark;
+    protected String totalReportableUserMark;
+    protected String totalMarksPossible;
 
     
 	public int compareTo(Object o)
@@ -54,6 +56,8 @@
             .append("learnerMark: ", learnerMark)
             .append("totalUserWeight : ", totalUserWeight)
             .append("totalUserMark : ", totalUserMark)
+            .append("totalReportableUserMark : ", totalReportableUserMark)
+            .append("totalMarksPossible : ", totalMarksPossible)
             .toString();
     }
     
@@ -93,4 +97,29 @@
     public void setTotalUserMark(String totalUserMark) {
         this.totalUserMark = totalUserMark;
     }
+    
+    /**
+     * @return Returns the totalReportableUserMark.
+     */
+    public String getTotalReportableUserMark() {
+        return totalReportableUserMark;
+    }
+    /**
+     * @param totalReportableUserMark The totalReportableUserMark to set.
+     */
+    public void setTotalReportableUserMark(String totalReportableUserMark) {
+        this.totalReportableUserMark = totalReportableUserMark;
+    }
+    /**
+     * @return Returns the totalMarksPossible.
+     */
+    public String getTotalMarksPossible() {
+        return totalMarksPossible;
+    }
+    /**
+     * @param totalMarksPossible The totalMarksPossible to set.
+     */
+    public void setTotalMarksPossible(String totalMarksPossible) {
+        this.totalMarksPossible = totalMarksPossible;
+    }
 }
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.45 -r1.46
--- lams_tool_lamc/src/java/org/lamsfoundation/lams/tool/mc/web/McLearningAction.java	2 Oct 2006 01:59:34 -0000	1.45
+++ lams_tool_lamc/src/java/org/lamsfoundation/lams/tool/mc/web/McLearningAction.java	11 Oct 2006 22:44:04 -0000	1.46
@@ -553,12 +553,15 @@
         int mark=0;
         int userWeight=0;
         int userMarks=0;
+        int totalMarksPossible=0;
         
+        
         Set questionUids=parseLearnerInput(learnerInput, mcContent, mcService);
         logger.debug("set questionUids: " + questionUids);
         
         List questionAndCandidateAnswersList= new LinkedList();
         
+        int totalUserMarks= 0;
         Iterator setQuestionUidsIterator=questionUids.iterator();
         while (setQuestionUidsIterator.hasNext())
     	{
@@ -577,6 +580,11 @@
     		mcLearnerAnswersDTO.setQuestionUid(mcQueContent.getUid().toString());
     		mcLearnerAnswersDTO.setMark(mcQueContent.getMark().toString());
     		
+    		int currentMark= mcQueContent.getMark().intValue();
+    		logger.debug("currentMark: " + currentMark);
+    		totalMarksPossible+=currentMark;
+    		
+    		
     		String feedback=mcQueContent.getFeedback();
     		if (feedback == null) feedback="";
     		logger.debug("feedback: " + feedback);
@@ -640,10 +648,8 @@
             	int weight=mcQueContent.getWeight().intValue();
             	logger.debug("weight: " +  weight);
             	
-            	int currentMark=mcQueContent.getMark().intValue();
-            	logger.debug("currentMark: " +  currentMark);
+            	totalUserMarks+=currentMark;	
             	
-            	
             	userWeight=userWeight + weight;
             	userMarks=userMarks + currentMark;;
             }
@@ -653,19 +659,25 @@
             }
         	logger.debug("assesment complete");
         	logger.debug("mark:: " + mark);
+        	logger.debug("totalUserMarks: " + totalUserMarks);
         	
         	questionAndCandidateAnswersList.add(mcLearnerAnswersDTO);
     	}
         logger.debug("final questionAndCandidateAnswersList: " + questionAndCandidateAnswersList);
         logger.debug("final mark: " + mark);
         logger.debug("final userWeight: " + userWeight);
         logger.debug("final userMarks: " + userMarks);
+        logger.debug("totalUserMarks: " + totalUserMarks);
+        logger.debug("totalMarksPossible: " + totalMarksPossible);
         
         
         mcTempDataHolderDTO.setLearnerMark(new Integer(mark).toString());
         mcTempDataHolderDTO.setTotalUserWeight(new Integer(userWeight).toString());
         mcTempDataHolderDTO.setTotalUserMark(new Integer(userMarks).toString());
+        mcTempDataHolderDTO.setTotalReportableUserMark(new Integer(totalUserMarks).toString());
+        mcTempDataHolderDTO.setTotalMarksPossible(new Integer(totalMarksPossible).toString());
         
+        
         logger.debug("mcTempDataHolderDTO before return : " + mcTempDataHolderDTO);
         
         return questionAndCandidateAnswersList;
@@ -808,6 +820,8 @@
 		String totalUserMark=mcTempDataHolderDTO.getTotalUserMark();
 		logger.debug("totalUserMark: " + totalUserMark);
 		
+		String totalMarksPossible=mcTempDataHolderDTO.getTotalMarksPossible(); 
+		logger.debug("totalMarksPossible: " + totalMarksPossible);
 		
 		McGeneralLearnerFlowDTO mcGeneralLearnerFlowDTO=LearningUtil.buildMcGeneralLearnerFlowDTO(mcContent);
     	logger.debug("constructed a new mcGeneralLearnerFlowDTO");
@@ -817,6 +831,9 @@
     	logger.debug("totalQuestionCount: " + totalQuestionCount);
     	mcGeneralLearnerFlowDTO.setTotalQuestionCount(new Integer(totalQuestionCount).toString());
     	
+    	mcGeneralLearnerFlowDTO.setTotalUserMark(totalUserMark);
+    	mcGeneralLearnerFlowDTO.setTotalMarksPossible(totalMarksPossible);
+    	
 		mcGeneralLearnerFlowDTO.setLearnerMark(learnerMark.toString());
     	
 		Integer passMark=mcContent.getPassMark();
Index: lams_tool_lamc/web/authoring/AuthoringTabsHolder.jsp
===================================================================
RCS file: /usr/local/cvsroot/lams_tool_lamc/web/authoring/AuthoringTabsHolder.jsp,v
diff -u -r1.4 -r1.5
--- lams_tool_lamc/web/authoring/AuthoringTabsHolder.jsp	4 Oct 2006 07:42:04 -0000	1.4
+++ lams_tool_lamc/web/authoring/AuthoringTabsHolder.jsp	11 Oct 2006 22:44:02 -0000	1.5
@@ -172,6 +172,13 @@
 			<!-- tab content 3 (Instructions) -->
 			<lams:TabBody id="3" titleKey="label.instructions" page="InstructionsContent.jsp" />
 			<!-- end of content (Instructions) -->
+
+
+			<c:set var="formBean" value="<%= request.getAttribute(org.apache.struts.taglib.html.Constants.BEAN_KEY) %>" />
+			<lams:AuthoringButton formID="authoringForm" clearSessionActionUrl="/clearsession.do" toolSignature="lamc11" 
+			cancelButtonLabelKey="label.cancel" saveButtonLabelKey="label.save" toolContentID="${formBean.toolContentID}" 
+			contentFolderID="${formBean.contentFolderID}" />
+			
 		</c:if> 			
 
 		<c:if test="${ (mcGeneralAuthoringDTO.activeModule == 'defineLater') && (mcGeneralAuthoringDTO.defineLaterInEditMode != 'true') }"> 			
Index: lams_tool_lamc/web/authoring/BasicContent.jsp
===================================================================
RCS file: /usr/local/cvsroot/lams_tool_lamc/web/authoring/BasicContent.jsp,v
diff -u -r1.31 -r1.32
--- lams_tool_lamc/web/authoring/BasicContent.jsp	3 Oct 2006 21:53:56 -0000	1.31
+++ lams_tool_lamc/web/authoring/BasicContent.jsp	11 Oct 2006 22:44:03 -0000	1.32
@@ -142,12 +142,6 @@
 									
 								</c:if> 					
 					
-						      	<c:if test="${mcGeneralAuthoringDTO.activeModule == 'authoring'}"> 					
-									<c:set var="formBean" value="<%= request.getAttribute(org.apache.struts.taglib.html.Constants.BEAN_KEY) %>" />
-									<lams:AuthoringButton formID="authoringForm" clearSessionActionUrl="/clearsession.do" toolSignature="lamc11" 
-									cancelButtonLabelKey="label.cancel" saveButtonLabelKey="label.save" toolContentID="${formBean.toolContentID}" 
-									contentFolderID="${formBean.contentFolderID}" />
-								</c:if> 						      	
 							</td> 
 					  	</tr>
 				 </table>
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.28 -r1.29
--- lams_tool_lamc/web/learning/IndividualLearnerResults.jsp	3 Oct 2006 23:24:16 -0000	1.28
+++ lams_tool_lamc/web/learning/IndividualLearnerResults.jsp	11 Oct 2006 22:44:03 -0000	1.29
@@ -85,9 +85,9 @@
 					  <tr>
 					  	<td NOWRAP align=right valign=top colspan=2> 
 						  	<b> <bean:message key="label.mark"/> </b>
-							<c:out value="${mcGeneralLearnerFlowDTO.learnerMark}"/>  &nbsp
+							<c:out value="${mcGeneralLearnerFlowDTO.totalUserMark}"/>  &nbsp
 							<bean:message key="label.outof"/> &nbsp
-						  	<c:out value="${mcGeneralLearnerFlowDTO.totalQuestionCount}"/>
+						  	<c:out value="${mcGeneralLearnerFlowDTO.totalMarksPossible}"/>
 					  	</td>
 					  </tr>	
 
@@ -114,7 +114,6 @@
 						<table align=left>
 								<c:forEach var="dto" varStatus="status" items="${requestScope.listSelectedQuestionCandidateAnswersDto}">
 								
-								<c:out value="${dto.attemptCorrect}" escapeXml="false"/> <br>
 									  <tr>
 									  	<td NOWRAP align=left valign=top> 
 											<b> <bean:message key="label.question.col"/> </b>