Index: lams_tool_lamc/conf/hibernate/mappings/org/lamsfoundation/lams/tool/mc/McContent.hbm.xml
===================================================================
diff -u -r8522cd628329e0031e21b48f2750b1fd9b1842a6 -r82631c32c25cdbc2d547ee2cdc4a3178cb707f15
--- lams_tool_lamc/conf/hibernate/mappings/org/lamsfoundation/lams/tool/mc/McContent.hbm.xml	(.../McContent.hbm.xml)	(revision 8522cd628329e0031e21b48f2750b1fd9b1842a6)
+++ lams_tool_lamc/conf/hibernate/mappings/org/lamsfoundation/lams/tool/mc/McContent.hbm.xml	(.../McContent.hbm.xml)	(revision 82631c32c25cdbc2d547ee2cdc4a3178cb707f15)
@@ -152,6 +152,15 @@
         length="1"        
    />
     
+
+   <property
+        name="showMarks"
+        type="boolean"
+        access="property"
+        column="showMarks"
+        length="1"        
+   />
+
     
     <property
         name="passMark"
Index: lams_tool_lamc/db/model/lams_tool_mc.clay
===================================================================
diff -u -r771dd93b9ea84cec2b55db5c66a5d187da0874c0 -r82631c32c25cdbc2d547ee2cdc4a3178cb707f15
--- lams_tool_lamc/db/model/lams_tool_mc.clay	(.../lams_tool_mc.clay)	(revision 771dd93b9ea84cec2b55db5c66a5d187da0874c0)
+++ lams_tool_lamc/db/model/lams_tool_mc.clay	(.../lams_tool_mc.clay)	(revision 82631c32c25cdbc2d547ee2cdc4a3178cb707f15)
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8" standalone="yes"?>
-<clay-model clay-version="1.2.0">
+<clay-model clay-version="1.1.0">
 <database-model alias="" author="Ozgur Demirtas" begin-script="" end-script="" name="mcq" remarks="" sql-dialect-id="jp.azzurri.clay.model.physical.dialect.MySQL_4_0_Dialect" version="1.0">
 <database-model-description>MCQ Tool for Lams 1.1</database-model-description>
 <schema-list>
@@ -9,7 +9,7 @@
 <table-list>
 <table alias="" name="tl_lamc11_content" remarks="">
 <table-description></table-description>
-<table-figure-bounds height="267" width="203" x="96" y="391"/>
+<table-figure-bounds height="273" width="203" x="96" y="391"/>
 <column-list>
 <column alias="" auto-increment="true" column-size="20" decimal-digits="0" default-value="" mandatory="true" name="uid" remarks="">
 <column-description></column-description>
@@ -196,6 +196,19 @@
 <variant type-name-pattern="TEXT"/>
 </data-type>
 </column>
+<column alias="" auto-increment="false" column-size="1" decimal-digits="0" default-value="0" mandatory="true" name="showMarks" remarks="">
+<column-description></column-description>
+<data-type jdbc-type="-6" name="TINYINT" selected-variant-pattern="TINYINT(%n)">
+<variant type-name-pattern="TINYINT"/>
+<variant precision-max="1" precision-min="0" precision-variable="%n" type-name-pattern="TINYINT(%n)"/>
+<variant precision-max="1" precision-min="0" precision-variable="%n" type-name-pattern="TINYINT(%n) UNSIGNED"/>
+<variant precision-max="1" precision-min="0" precision-variable="%n" type-name-pattern="TINYINT(%n) UNSIGNED ZEROFILL"/>
+<variant precision-max="1" precision-min="0" precision-variable="%n" type-name-pattern="TINYINT(%n) ZEROFILL"/>
+<variant type-name-pattern="TINYINT UNSIGNED"/>
+<variant type-name-pattern="TINYINT UNSIGNED ZEROFILL"/>
+<variant type-name-pattern="TINYINT ZEROFILL"/>
+</data-type>
+</column>
 </column-list>
 <primary-key alias="" name="PK_TL_LAMC11_CONTENT" remarks="">
 <primary-key-description></primary-key-description>
Index: lams_tool_lamc/db/sql/create_lams_tool_mc.sql
===================================================================
diff -u -rb8f3c00f53850ba790f01edbc1bb56627d1520ed -r82631c32c25cdbc2d547ee2cdc4a3178cb707f15
--- lams_tool_lamc/db/sql/create_lams_tool_mc.sql	(.../create_lams_tool_mc.sql)	(revision b8f3c00f53850ba790f01edbc1bb56627d1520ed)
+++ lams_tool_lamc/db/sql/create_lams_tool_mc.sql	(.../create_lams_tool_mc.sql)	(revision 82631c32c25cdbc2d547ee2cdc4a3178cb707f15)
@@ -17,6 +17,7 @@
      , pass_mark INTEGER
      , show_report TINYINT(1) NOT NULL DEFAULT 0
      , reflectionSubject TEXT
+     , showMarks TINYINT(1) NOT NULL DEFAULT 0
      , UNIQUE UQ_tl_lamc11_content_1 (content_id)
      , PRIMARY KEY (uid)
 )TYPE=InnoDB;
Index: lams_tool_lamc/db/sql/tool_insert.sql
===================================================================
diff -u -r771dd93b9ea84cec2b55db5c66a5d187da0874c0 -r82631c32c25cdbc2d547ee2cdc4a3178cb707f15
--- lams_tool_lamc/db/sql/tool_insert.sql	(.../tool_insert.sql)	(revision 771dd93b9ea84cec2b55db5c66a5d187da0874c0)
+++ lams_tool_lamc/db/sql/tool_insert.sql	(.../tool_insert.sql)	(revision 82631c32c25cdbc2d547ee2cdc4a3178cb707f15)
@@ -34,7 +34,7 @@
 'MCQ',
 'Multiple Choice Questions',
 'mc',
-'20061015',
+'20061113',
 NULL,
 NULL,
 0,
Index: lams_tool_lamc/src/java/org/lamsfoundation/lams/tool/mc/McGeneralAuthoringDTO.java
===================================================================
diff -u -r993fec58a7198f31f151cf47d6ba331148ce4fae -r82631c32c25cdbc2d547ee2cdc4a3178cb707f15
--- lams_tool_lamc/src/java/org/lamsfoundation/lams/tool/mc/McGeneralAuthoringDTO.java	(.../McGeneralAuthoringDTO.java)	(revision 993fec58a7198f31f151cf47d6ba331148ce4fae)
+++ lams_tool_lamc/src/java/org/lamsfoundation/lams/tool/mc/McGeneralAuthoringDTO.java	(.../McGeneralAuthoringDTO.java)	(revision 82631c32c25cdbc2d547ee2cdc4a3178cb707f15)
@@ -59,6 +59,7 @@
     protected String questionsSequenced;
     protected String editActivityEditMode;
     protected String reflectionSubject;
+    protected String showMarks;
     
     protected String monitoredContentInUse;
 
@@ -624,4 +625,17 @@
     public void setTotalMarks(String totalMarks) {
         this.totalMarks = totalMarks;
     }
+    /**
+     * @return Returns the showMarks.
+     */
+    public String getShowMarks() {
+        return showMarks;
+    }
+    /**
+     * @param showMarks The showMarks to set.
+     */
+    public void setShowMarks(String showMarks) {
+        this.showMarks = showMarks;
+    }
+
 }
Index: lams_tool_lamc/src/java/org/lamsfoundation/lams/tool/mc/McGeneralLearnerFlowDTO.java
===================================================================
diff -u -ra5f41e7f6fc1ca084d687da6d36cf710e6138ddc -r82631c32c25cdbc2d547ee2cdc4a3178cb707f15
--- lams_tool_lamc/src/java/org/lamsfoundation/lams/tool/mc/McGeneralLearnerFlowDTO.java	(.../McGeneralLearnerFlowDTO.java)	(revision a5f41e7f6fc1ca084d687da6d36cf710e6138ddc)
+++ lams_tool_lamc/src/java/org/lamsfoundation/lams/tool/mc/McGeneralLearnerFlowDTO.java	(.../McGeneralLearnerFlowDTO.java)	(revision 82631c32c25cdbc2d547ee2cdc4a3178cb707f15)
@@ -86,6 +86,8 @@
     
     protected String learnerProgressUserId;
     
+    protected String showMarks;
+    
     protected Map mapQueAttempts;
 	
     protected Map mapQueCorrectAttempts;
@@ -597,4 +599,16 @@
     public void setTotalMarksPossible(String totalMarksPossible) {
         this.totalMarksPossible = totalMarksPossible;
     }
+    /**
+     * @return Returns the showMarks.
+     */
+    public String getShowMarks() {
+        return showMarks;
+    }
+    /**
+     * @param showMarks The showMarks to set.
+     */
+    public void setShowMarks(String showMarks) {
+        this.showMarks = showMarks;
+    }
 }
Index: lams_tool_lamc/src/java/org/lamsfoundation/lams/tool/mc/McUtils.java
===================================================================
diff -u -rc3b793637eab6ae0c12968c3c07f9993c1ef6f16 -r82631c32c25cdbc2d547ee2cdc4a3178cb707f15
--- lams_tool_lamc/src/java/org/lamsfoundation/lams/tool/mc/McUtils.java	(.../McUtils.java)	(revision c3b793637eab6ae0c12968c3c07f9993c1ef6f16)
+++ lams_tool_lamc/src/java/org/lamsfoundation/lams/tool/mc/McUtils.java	(.../McUtils.java)	(revision 82631c32c25cdbc2d547ee2cdc4a3178cb707f15)
@@ -654,6 +654,12 @@
 		mcAuthoringForm.setQuestionsSequenced(questionsSequenced);
 		mcGeneralAuthoringDTO.setQuestionsSequenced(questionsSequenced);
 
+		String showMarks=request.getParameter("showMarks");
+		logger.debug("showMarks: " + questionsSequenced);
+		mcAuthoringForm.setShowMarks(showMarks);
+		mcGeneralAuthoringDTO.setShowMarks(showMarks);
+		
+		
 		String retries=request.getParameter("retries");
 		logger.debug("retries: " + retries);
 		mcAuthoringForm.setRetries(retries);
Index: lams_tool_lamc/src/java/org/lamsfoundation/lams/tool/mc/pojos/McContent.java
===================================================================
diff -u -r8522cd628329e0031e21b48f2750b1fd9b1842a6 -r82631c32c25cdbc2d547ee2cdc4a3178cb707f15
--- lams_tool_lamc/src/java/org/lamsfoundation/lams/tool/mc/pojos/McContent.java	(.../McContent.java)	(revision 8522cd628329e0031e21b48f2750b1fd9b1842a6)
+++ lams_tool_lamc/src/java/org/lamsfoundation/lams/tool/mc/pojos/McContent.java	(.../McContent.java)	(revision 82631c32c25cdbc2d547ee2cdc4a3178cb707f15)
@@ -95,6 +95,8 @@
     
     private boolean showReport;
     
+    private boolean showMarks;
+    
     /** nullable persistent field */
     private Integer passMark;
 
@@ -112,7 +114,7 @@
     /** full constructor */
     public McContent(Long mcContentId, String content, String title, String instructions, boolean defineLater, boolean runOffline, Date creationDate, 
     		Date updateDate, boolean questionsSequenced,  long createdBy, boolean contentInUse, String offlineInstructions, String onlineInstructions, 
-			Integer passMark, boolean showReport, boolean retries, boolean reflect, String reflectionSubject, Set mcQueContents, Set mcSessions, 
+			Integer passMark, boolean showReport, boolean showMarks, boolean retries, boolean reflect, String reflectionSubject, Set mcQueContents, Set mcSessions, 
 			Set mcAttachments) {
         
         logger.debug("copying properties");
@@ -134,6 +136,7 @@
         this.reflect=reflect;
         this.passMark = passMark;
         this.showReport = showReport;
+        this.showMarks = showMarks;
         this.mcQueContents = mcQueContents;
         this.mcSessions = mcSessions;
         this.mcAttachments = mcAttachments;
@@ -181,6 +184,7 @@
 					 mc.getOnlineInstructions(),
 					 mc.getPassMark(),
 					 mc.isShowReport(),
+					 mc.isShowMarks(),
 					 mc.isRetries(),
 					 mc.isReflect(),
 					 mc.getReflectionSubject(),
@@ -459,4 +463,28 @@
     public void setReflectionSubject(String reflectionSubject) {
         this.reflectionSubject = reflectionSubject;
     }    
+    /**
+     * @return Returns the logger.
+     */
+    public static Logger getLogger() {
+        return logger;
+    }
+    /**
+     * @param logger The logger to set.
+     */
+    public static void setLogger(Logger logger) {
+        McContent.logger = logger;
+    }
+    /**
+     * @return Returns the showMarks.
+     */
+    public boolean isShowMarks() {
+        return showMarks;
+    }
+    /**
+     * @param showMarks The showMarks to set.
+     */
+    public void setShowMarks(boolean showMarks) {
+        this.showMarks = showMarks;
+    }
 }
Index: lams_tool_lamc/src/java/org/lamsfoundation/lams/tool/mc/service/McImportContentVersionFilter.java
===================================================================
diff -u -r40632908af1b31e1af4f1607b0ee4031ab098a84 -r82631c32c25cdbc2d547ee2cdc4a3178cb707f15
--- lams_tool_lamc/src/java/org/lamsfoundation/lams/tool/mc/service/McImportContentVersionFilter.java	(.../McImportContentVersionFilter.java)	(revision 40632908af1b31e1af4f1607b0ee4031ab098a84)
+++ lams_tool_lamc/src/java/org/lamsfoundation/lams/tool/mc/service/McImportContentVersionFilter.java	(.../McImportContentVersionFilter.java)	(revision 82631c32c25cdbc2d547ee2cdc4a3178cb707f15)
@@ -1,8 +1,10 @@
 package org.lamsfoundation.lams.tool.mc.service;
 
 import org.lamsfoundation.lams.learningdesign.service.ToolContentVersionFilter;
+import org.lamsfoundation.lams.tool.mc.pojos.McContent;
 import org.lamsfoundation.lams.tool.mc.pojos.McQueContent;
 import org.lamsfoundation.lams.tool.mc.pojos.McUsrAttempt;
+
 /**
  * Import filter class for different version of MC content.
  * @author steven
@@ -17,5 +19,11 @@
 	public void up10To20061015(){
 		this.removeField(McQueContent.class, "weight");
 		this.removeField(McUsrAttempt.class, "timeZone");
+		
 	}
+	
+	public void up20061015To20061113(){
+		// Change name to suit the version you give the tool.
+	    this.removeField(McContent.class, "showMarks");
+	}
 }
Index: lams_tool_lamc/src/java/org/lamsfoundation/lams/tool/mc/service/McServicePOJO.java
===================================================================
diff -u -re4b2a3cbdfdd26b99ead9b77705faa5a333d326e -r82631c32c25cdbc2d547ee2cdc4a3178cb707f15
--- lams_tool_lamc/src/java/org/lamsfoundation/lams/tool/mc/service/McServicePOJO.java	(.../McServicePOJO.java)	(revision e4b2a3cbdfdd26b99ead9b77705faa5a333d326e)
+++ lams_tool_lamc/src/java/org/lamsfoundation/lams/tool/mc/service/McServicePOJO.java	(.../McServicePOJO.java)	(revision 82631c32c25cdbc2d547ee2cdc4a3178cb707f15)
@@ -2539,6 +2539,7 @@
     	toolContentObj.setUpdateDate(now);
     	toolContentObj.setMcContentId(toolContentId);
     	toolContentObj.setQuestionsSequenced(false);
+    	toolContentObj.setShowMarks(false);
     	// I can't find a use for setShowReport anywhere
     	toolContentObj.setShowReport(false);
     	
Index: lams_tool_lamc/src/java/org/lamsfoundation/lams/tool/mc/web/AuthoringUtil.java
===================================================================
diff -u -r2bd6155d7fad435e1238088f98650b0ec731d0f1 -r82631c32c25cdbc2d547ee2cdc4a3178cb707f15
--- lams_tool_lamc/src/java/org/lamsfoundation/lams/tool/mc/web/AuthoringUtil.java	(.../AuthoringUtil.java)	(revision 2bd6155d7fad435e1238088f98650b0ec731d0f1)
+++ lams_tool_lamc/src/java/org/lamsfoundation/lams/tool/mc/web/AuthoringUtil.java	(.../AuthoringUtil.java)	(revision 82631c32c25cdbc2d547ee2cdc4a3178cb707f15)
@@ -66,6 +66,7 @@
 	protected static void setRadioboxes(McContent mcContent, McAuthoringForm mcAuthoringForm)
 	{
 		mcAuthoringForm.setQuestionsSequenced(mcContent.isQuestionsSequenced()?"1":"0");
+		mcAuthoringForm.setShowMarks(mcContent.isShowMarks()?"1":"0");
 		mcAuthoringForm.setRetries(mcContent.isRetries()?"1":"0");
 		mcAuthoringForm.setSln(mcContent.isShowReport()?"1":"0");
 		mcAuthoringForm.setReflect(mcContent.isReflect()?"1":"0");
@@ -1368,10 +1369,6 @@
         logger.debug("doing saveOrUpdateMcContent, mapCandidatesList: " + mapCandidatesList);
         UserDTO toolUser = (UserDTO) SessionManager.getSession().getAttribute(AttributeNames.USER);
         
-        boolean isQuestionsSequenced=false;
-        boolean isSynchInMonitor=false;
-        boolean isUsernameVisible=false;
-
         String richTextTitle = request.getParameter(TITLE);
         String richTextInstructions = request.getParameter(INSTRUCTIONS);
 
@@ -1383,6 +1380,10 @@
 		
 		String questionsSequenced=request.getParameter("questionsSequenced");
 		logger.debug("questionsSequenced: " + questionsSequenced);
+		
+		String showMarks=request.getParameter("showMarks");
+		logger.debug("showMarks: " + showMarks);
+		
 
 		String retries=request.getParameter("retries");
 		logger.debug("retries: " + retries);
@@ -1403,20 +1404,24 @@
         
         boolean setCommonContent=true; 
         if ((sln == null) || (questionsSequenced == null) || 
-             (retries == null) || (reflect == null))
+             (retries == null) || (reflect == null) || (showMarks == null))
         {
         	setCommonContent=false;
         }
         logger.debug("setCommonContent: " + setCommonContent);
 		
         boolean questionsSequencedBoolean=false;
+        boolean showMarksBoolean=false;
         boolean slnBoolean=false;
         boolean retriesBoolean=false;
         boolean reflectBoolean=false;
 
     	if ((questionsSequenced != null) && (questionsSequenced.equalsIgnoreCase("1")))
             questionsSequencedBoolean=true;            
-        
+
+    	if ((showMarks != null) && (showMarks.equalsIgnoreCase("1")))
+    	    showMarksBoolean=true;            
+    	
         if ((sln != null) && (sln.equalsIgnoreCase("1")))
             slnBoolean=true;            
         
@@ -1494,6 +1499,7 @@
          	mcContent.setOnlineInstructions(richTextOnlineInstructions);
          	mcContent.setOfflineInstructions(richTextOfflineInstructions);
          	mcContent.setQuestionsSequenced(questionsSequencedBoolean);
+         	mcContent.setShowMarks(showMarksBoolean);
          	mcContent.setRetries(retriesBoolean);
          	mcContent.setShowReport(slnBoolean);	
          	mcContent.setReflect(reflectBoolean);
Index: lams_tool_lamc/src/java/org/lamsfoundation/lams/tool/mc/web/McAuthoringForm.java
===================================================================
diff -u -r525fef17717ea250350b7204056960f735ce02cb -r82631c32c25cdbc2d547ee2cdc4a3178cb707f15
--- lams_tool_lamc/src/java/org/lamsfoundation/lams/tool/mc/web/McAuthoringForm.java	(.../McAuthoringForm.java)	(revision 525fef17717ea250350b7204056960f735ce02cb)
+++ lams_tool_lamc/src/java/org/lamsfoundation/lams/tool/mc/web/McAuthoringForm.java	(.../McAuthoringForm.java)	(revision 82631c32c25cdbc2d547ee2cdc4a3178cb707f15)
@@ -46,6 +46,8 @@
 	protected String activeModule;
 	protected String editOptionsMode;
 	
+	protected String showMarks;
+	
 	protected String fileItem;
 	protected String uuid;
 	
@@ -167,6 +169,8 @@
 		this.submitOfflineFile=null;
 		this.submitOnlineFile=null;
 		this.offlineFile=null;
+		
+		this.showMarks=null;
 
     	this.dispatch=null;
 
@@ -998,4 +1002,16 @@
     public void setCurrentField(String currentField) {
         this.currentField = currentField;
     }
+    /**
+     * @return Returns the showMarks.
+     */
+    public String getShowMarks() {
+        return showMarks;
+    }
+    /**
+     * @param showMarks The showMarks to set.
+     */
+    public void setShowMarks(String showMarks) {
+        this.showMarks = showMarks;
+    }
 }
Index: lams_tool_lamc/src/java/org/lamsfoundation/lams/tool/mc/web/McLearningAction.java
===================================================================
diff -u -ra1e99b6f8540f06181bf25489e28f86014b91823 -r82631c32c25cdbc2d547ee2cdc4a3178cb707f15
--- lams_tool_lamc/src/java/org/lamsfoundation/lams/tool/mc/web/McLearningAction.java	(.../McLearningAction.java)	(revision a1e99b6f8540f06181bf25489e28f86014b91823)
+++ lams_tool_lamc/src/java/org/lamsfoundation/lams/tool/mc/web/McLearningAction.java	(.../McLearningAction.java)	(revision 82631c32c25cdbc2d547ee2cdc4a3178cb707f15)
@@ -976,6 +976,9 @@
 		mcGeneralLearnerFlowDTO.setLowestMark(new Integer(lowestMark).toString());
 		mcGeneralLearnerFlowDTO.setAverageMark(new Integer(averageMark).toString());
 
+		boolean showMarks=mcContent.isShowMarks();
+		logger.debug("showMarks: " + showMarks);
+		mcGeneralLearnerFlowDTO.setShowMarks(new Boolean(showMarks).toString());
 		
 		request.setAttribute(MC_GENERAL_LEARNER_FLOW_DTO, mcGeneralLearnerFlowDTO);
 		logger.debug("MC_GENERAL_LEARNER_FLOW_DTO: " +  request.getAttribute(MC_GENERAL_LEARNER_FLOW_DTO));
@@ -1550,10 +1553,12 @@
 	    logger.debug("totalMarksPossible: " + totalMarksPossible);
 	    mcGeneralLearnerFlowDTO.setTotalMarksPossible(totalMarksPossible);
 
-		
+		boolean showMarks=mcContent.isShowMarks();
+		logger.debug("showMarks: " + showMarks);
+		mcGeneralLearnerFlowDTO.setShowMarks(new Boolean(showMarks).toString());
+	    
 		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.");
Index: lams_tool_lamc/src/java/org/lamsfoundation/lams/tool/mc/web/McStarterAction.java
===================================================================
diff -u -r993fec58a7198f31f151cf47d6ba331148ce4fae -r82631c32c25cdbc2d547ee2cdc4a3178cb707f15
--- lams_tool_lamc/src/java/org/lamsfoundation/lams/tool/mc/web/McStarterAction.java	(.../McStarterAction.java)	(revision 993fec58a7198f31f151cf47d6ba331148ce4fae)
+++ lams_tool_lamc/src/java/org/lamsfoundation/lams/tool/mc/web/McStarterAction.java	(.../McStarterAction.java)	(revision 82631c32c25cdbc2d547ee2cdc4a3178cb707f15)
@@ -446,6 +446,8 @@
 		
 		mcAuthoringForm.setSln(mcContent.isShowReport()?"1":"0");
 		mcAuthoringForm.setQuestionsSequenced(mcContent.isQuestionsSequenced()?"1":"0");
+		mcAuthoringForm.setShowMarks(mcContent.isShowMarks()?"1":"0");
+		
 		mcAuthoringForm.setRetries(mcContent.isRetries()?"1":"0");
 	    mcAuthoringForm.setReflect(mcContent.isReflect()?"1":"0");
 	    mcAuthoringForm.setReflectionSubject(mcContent.getReflectionSubject());		
Index: lams_tool_lamc/web/authoring/AdvancedContent.jsp
===================================================================
diff -u -r3fd819922a296471faff719edc4a98de7cdaa657 -r82631c32c25cdbc2d547ee2cdc4a3178cb707f15
--- lams_tool_lamc/web/authoring/AdvancedContent.jsp	(.../AdvancedContent.jsp)	(revision 3fd819922a296471faff719edc4a98de7cdaa657)
+++ lams_tool_lamc/web/authoring/AdvancedContent.jsp	(.../AdvancedContent.jsp)	(revision 82631c32c25cdbc2d547ee2cdc4a3178cb707f15)
@@ -29,6 +29,18 @@
 	</label>
 </p>
 
+
+<p class="small-space-top">
+	<html:checkbox property="showMarks" value="1" styleId="showMarks"
+		styleClass="noBorder">
+	</html:checkbox>
+	<label for="showMarks">
+		<fmt:message key="label.showMarks" />
+	</label>
+</p>
+
+
+
 <p>
 	<html:checkbox property="retries" value="1" styleId="retries"
 		onclick="javascript:updatePass(this); submitMethod('updateMarksList');" styleClass="noBorder">
Index: lams_tool_lamc/web/authoring/BasicContent.jsp
===================================================================
diff -u -rdce733c3ba2918b8f6f7a5c0bf2b0db48826e39a -r82631c32c25cdbc2d547ee2cdc4a3178cb707f15
--- lams_tool_lamc/web/authoring/BasicContent.jsp	(.../BasicContent.jsp)	(revision dce733c3ba2918b8f6f7a5c0bf2b0db48826e39a)
+++ lams_tool_lamc/web/authoring/BasicContent.jsp	(.../BasicContent.jsp)	(revision 82631c32c25cdbc2d547ee2cdc4a3178cb707f15)
@@ -105,7 +105,7 @@
 	<c:if
 		test="${mcGeneralAuthoringDTO.activeModule == 'authoring' || mcGeneralAuthoringDTO.activeModule == 'defineLater'}">
 		<a
-			href="javascript:showMessage('<html:rewrite page="/authoring.do?dispatch=newQuestionBox&requestType=direct&contentFolderID=${mcGeneralAuthoringDTO.contentFolderID}&httpSessionID=${mcGeneralAuthoringDTO.httpSessionID}&toolContentID=${mcGeneralAuthoringDTO.toolContentID}&activeModule=${mcGeneralAuthoringDTO.activeModule}&defaultContentIdStr=${mcGeneralAuthoringDTO.defaultContentIdStr}&sln=${mcGeneralAuthoringDTO.sln}&questionsSequenced=${mcGeneralAuthoringDTO.questionsSequenced}&retries=${mcGeneralAuthoringDTO.retries}"/>');"
+			href="javascript:showMessage('<html:rewrite page="/authoring.do?dispatch=newQuestionBox&requestType=direct&contentFolderID=${mcGeneralAuthoringDTO.contentFolderID}&httpSessionID=${mcGeneralAuthoringDTO.httpSessionID}&toolContentID=${mcGeneralAuthoringDTO.toolContentID}&activeModule=${mcGeneralAuthoringDTO.activeModule}&defaultContentIdStr=${mcGeneralAuthoringDTO.defaultContentIdStr}&sln=${mcGeneralAuthoringDTO.sln}&showMarks=${mcGeneralAuthoringDTO.showMarks}&questionsSequenced=${mcGeneralAuthoringDTO.questionsSequenced}&retries=${mcGeneralAuthoringDTO.retries}"/>');"
 			class="button-add-item"> <fmt:message
 				key="label.add.new.question" /> </a>
 	</c:if>
Index: lams_tool_lamc/web/authoring/InstructionsContent.jsp
===================================================================
diff -u -rce4c0733db9e3f9bfdb2a82fea931139b2db3909 -r82631c32c25cdbc2d547ee2cdc4a3178cb707f15
--- lams_tool_lamc/web/authoring/InstructionsContent.jsp	(.../InstructionsContent.jsp)	(revision ce4c0733db9e3f9bfdb2a82fea931139b2db3909)
+++ lams_tool_lamc/web/authoring/InstructionsContent.jsp	(.../InstructionsContent.jsp)	(revision 82631c32c25cdbc2d547ee2cdc4a3178cb707f15)
@@ -57,7 +57,7 @@
 							</html:link>
 							&nbsp;
 							<html:link
-								page="/authoring.do?dispatch=deleteFile&amp;httpSessionID=${mcGeneralAuthoringDTO.httpSessionID}&amp;toolContentID=${mcGeneralAuthoringDTO.toolContentID}&amp;contentFolderID=${mcGeneralAuthoringDTO.contentFolderID}&amp;activeModule=${mcGeneralAuthoringDTO.activeModule}&amp;defaultContentIdStr=${mcGeneralAuthoringDTO.defaultContentIdStr}&amp;sln=${mcGeneralAuthoringDTO.sln}&amp;questionsSequenced=${mcGeneralAuthoringDTO.questionsSequenced}&amp;retries=${mcGeneralAuthoringDTO.retries}&amp;reflect=${mcGeneralAuthoringDTO.reflect}&amp;reflectionSubject=${mcGeneralAuthoringDTO.reflectionSubject}&amp;passmark=${mcGeneralAuthoringDTO.passMarkValue}"
+								page="/authoring.do?dispatch=deleteFile&amp;httpSessionID=${mcGeneralAuthoringDTO.httpSessionID}&amp;toolContentID=${mcGeneralAuthoringDTO.toolContentID}&amp;contentFolderID=${mcGeneralAuthoringDTO.contentFolderID}&amp;activeModule=${mcGeneralAuthoringDTO.activeModule}&amp;defaultContentIdStr=${mcGeneralAuthoringDTO.defaultContentIdStr}&amp;sln=${mcGeneralAuthoringDTO.sln}&amp;showMarks=${mcGeneralAuthoringDTO.showMarks}&amp&questionsSequenced=${mcGeneralAuthoringDTO.questionsSequenced}&amp;retries=${mcGeneralAuthoringDTO.retries}&amp;reflect=${mcGeneralAuthoringDTO.reflect}&amp;reflectionSubject=${mcGeneralAuthoringDTO.reflectionSubject}&amp;passmark=${mcGeneralAuthoringDTO.passMarkValue}"
 								paramId="uuid" paramName="attachment" paramProperty="uuid"
 								onclick="javascript:return confirm('Are you sure you want to delete this file?')"
 								target="_self">
@@ -125,7 +125,7 @@
 							</html:link>
 							&nbsp;
 							<html:link
-								page="/authoring.do?dispatch=deleteFile&amp;httpSessionID=${mcGeneralAuthoringDTO.httpSessionID}&amp;toolContentID=${mcGeneralAuthoringDTO.toolContentID}&amp;contentFolderID=${mcGeneralAuthoringDTO.contentFolderID}&amp;activeModule=${mcGeneralAuthoringDTO.activeModule}&amp;defaultContentIdStr=${mcGeneralAuthoringDTO.defaultContentIdStr}&amp;sln=${mcGeneralAuthoringDTO.sln}&amp;questionsSequenced=${mcGeneralAuthoringDTO.questionsSequenced}&amp;retries=${mcGeneralAuthoringDTO.retries}&amp;reflect=${mcGeneralAuthoringDTO.reflect}&amp;reflectionSubject=${mcGeneralAuthoringDTO.reflectionSubject}&amp;passmark=${mcGeneralAuthoringDTO.passMarkValue}"
+								page="/authoring.do?dispatch=deleteFile&amp;httpSessionID=${mcGeneralAuthoringDTO.httpSessionID}&amp;toolContentID=${mcGeneralAuthoringDTO.toolContentID}&amp;contentFolderID=${mcGeneralAuthoringDTO.contentFolderID}&amp;activeModule=${mcGeneralAuthoringDTO.activeModule}&amp;defaultContentIdStr=${mcGeneralAuthoringDTO.defaultContentIdStr}&amp;sln=${mcGeneralAuthoringDTO.sln}&amp;questionsSequenced=${mcGeneralAuthoringDTO.questionsSequenced}&amp;showMarks=${mcGeneralAuthoringDTO.showMarks}&amp;retries=${mcGeneralAuthoringDTO.retries}&amp;reflect=${mcGeneralAuthoringDTO.reflect}&amp;reflectionSubject=${mcGeneralAuthoringDTO.reflectionSubject}&amp;passmark=${mcGeneralAuthoringDTO.passMarkValue}"
 								paramId="uuid" paramName="attachment" paramProperty="uuid"
 								onclick="javascript:return confirm('Are you sure you want to delete this file?')"
 								target="_self">
Index: lams_tool_lamc/web/authoring/itemlist.jsp
===================================================================
diff -u -r203e994b1e52ee66e6a4531e2b9508423a12e2e4 -r82631c32c25cdbc2d547ee2cdc4a3178cb707f15
--- lams_tool_lamc/web/authoring/itemlist.jsp	(.../itemlist.jsp)	(revision 203e994b1e52ee66e6a4531e2b9508423a12e2e4)
+++ lams_tool_lamc/web/authoring/itemlist.jsp	(.../itemlist.jsp)	(revision 82631c32c25cdbc2d547ee2cdc4a3178cb707f15)
@@ -106,7 +106,7 @@
 				<td width="10%">
 					<img src="<c:out value="${tool}"/>images/edit.gif" border="0"
 						title="<fmt:message key='label.tip.editQuestion'/>"
-						onclick="javascript:showMessage('<html:rewrite page="/authoring.do?dispatch=newEditableQuestionBox&questionIndex=${queIndex}&contentFolderID=${mcGeneralAuthoringDTO.contentFolderID}&httpSessionID=${mcGeneralAuthoringDTO.httpSessionID}&toolContentID=${mcGeneralAuthoringDTO.toolContentID}&activeModule=${mcGeneralAuthoringDTO.activeModule}&defaultContentIdStr=${mcGeneralAuthoringDTO.defaultContentIdStr}&sln=${mcGeneralAuthoringDTO.sln}&questionsSequenced=${mcGeneralAuthoringDTO.questionsSequenced}&retries=${mcGeneralAuthoringDTO.retries}&reflect=${mcGeneralAuthoringDTO.reflect}&reflectionSubject=${mcGeneralAuthoringDTO.reflectionSubject}"/>');">
+						onclick="javascript:showMessage('<html:rewrite page="/authoring.do?dispatch=newEditableQuestionBox&questionIndex=${queIndex}&contentFolderID=${mcGeneralAuthoringDTO.contentFolderID}&httpSessionID=${mcGeneralAuthoringDTO.httpSessionID}&toolContentID=${mcGeneralAuthoringDTO.toolContentID}&activeModule=${mcGeneralAuthoringDTO.activeModule}&defaultContentIdStr=${mcGeneralAuthoringDTO.defaultContentIdStr}&sln=${mcGeneralAuthoringDTO.sln}&showMarks=${mcGeneralAuthoringDTO.showMarks}&questionsSequenced=${mcGeneralAuthoringDTO.questionsSequenced}&retries=${mcGeneralAuthoringDTO.retries}&reflect=${mcGeneralAuthoringDTO.reflect}&reflectionSubject=${mcGeneralAuthoringDTO.reflectionSubject}"/>');">
 				</td>
 
 				<td width="10%" align="center">
Index: lams_tool_lamc/web/learning/IndividualLearnerResults.jsp
===================================================================
diff -u -racc5f651c03bd0895c8b189c932ea35dea91dc7d -r82631c32c25cdbc2d547ee2cdc4a3178cb707f15
--- lams_tool_lamc/web/learning/IndividualLearnerResults.jsp	(.../IndividualLearnerResults.jsp)	(revision acc5f651c03bd0895c8b189c932ea35dea91dc7d)
+++ lams_tool_lamc/web/learning/IndividualLearnerResults.jsp	(.../IndividualLearnerResults.jsp)	(revision 82631c32c25cdbc2d547ee2cdc4a3178cb707f15)
@@ -142,41 +142,45 @@
 				</div>
 			</c:forEach>
 
-			<h4>
-				<fmt:message key="label.group.results" />
-			</h4>
+			<c:if test="${mcGeneralLearnerFlowDTO.showMarks == 'true'}">
+				<h4>
+					<fmt:message key="label.group.results" />
+				</h4>
+				
+				<table class="alternative-color" cellspacing="0">
+				  <tr>
+				  	<td width="30%"> 
+					  	  <strong> <fmt:message key="label.topMark"/> </strong>
+					 </td> 
+					 <td>	
+						  	 <c:out value="${mcGeneralLearnerFlowDTO.topMark}"/>
+				  	</td>
+				  </tr>	
+	
+				  <tr>
+				  	<td> 
+					  	 <strong><fmt:message key="label.avMark"/> </strong>
+				  	</td>
+				  	<td>
+						  	<c:out value="${mcGeneralLearnerFlowDTO.averageMark}"/>
+				  	</td>
+				  </tr>	
+				</table>
+			</c:if>				
 			
-			<table class="alternative-color" cellspacing="0">
-			  <tr>
-			  	<td width="30%"> 
-				  	  <strong> <fmt:message key="label.topMark"/> </strong>
-				 </td> 
-				 <td>	
-					  	 <c:out value="${mcGeneralLearnerFlowDTO.topMark}"/>
-			  	</td>
-			  </tr>	
 
-			  <tr>
-			  	<td> 
-				  	 <strong><fmt:message key="label.avMark"/> </strong>
-			  	</td>
-			  	<td>
-					  	<c:out value="${mcGeneralLearnerFlowDTO.averageMark}"/>
-			  	</td>
-			  </tr>	
-			</table>
-			
 
-
 			<c:if test="${mcGeneralLearnerFlowDTO.retries == 'true'}">
 
 				<html:submit property="redoQuestions" styleClass="button">
 					<fmt:message key="label.redo.questions" />
 				</html:submit>
 
-				<html:submit property="viewSummary" styleClass="button">
-					<fmt:message key="label.view.summary" />
-				</html:submit>
+				<c:if test="${mcGeneralLearnerFlowDTO.showMarks == 'true'}">
+					<html:submit property="viewSummary" styleClass="button">
+						<fmt:message key="label.view.summary" />
+					</html:submit>
+				</c:if>				
 
 				<div class="space-bottom-top" align="right">
 					<c:if
@@ -199,9 +203,11 @@
 
 			<c:if test="${mcGeneralLearnerFlowDTO.retries != 'true'}">
 
-				<html:submit property="viewSummary" styleClass="button">
-					<fmt:message key="label.view.summary" />
-				</html:submit>
+				<c:if test="${mcGeneralLearnerFlowDTO.showMarks == 'true'}">
+					<html:submit property="viewSummary" styleClass="button">
+						<fmt:message key="label.view.summary" />
+					</html:submit>
+				</c:if>								
 
 				<div class="space-bottom-top" align="right">
 					<c:if test="${mcGeneralLearnerFlowDTO.reflection != 'true'}">
Index: lams_tool_lamc/web/learning/ViewAnswers.jsp
===================================================================
diff -u -r14a018dc1d6fa388bc2d671dfe4f1041e991ba3b -r82631c32c25cdbc2d547ee2cdc4a3178cb707f15
--- lams_tool_lamc/web/learning/ViewAnswers.jsp	(.../ViewAnswers.jsp)	(revision 14a018dc1d6fa388bc2d671dfe4f1041e991ba3b)
+++ lams_tool_lamc/web/learning/ViewAnswers.jsp	(.../ViewAnswers.jsp)	(revision 82631c32c25cdbc2d547ee2cdc4a3178cb707f15)
@@ -170,9 +170,12 @@
 						<html:submit property="redoQuestions" styleClass="button">
 							<fmt:message key="label.redo.questions" />
 						</html:submit>
-						<html:submit property="viewSummary" styleClass="button">
-							<fmt:message key="label.view.summary" />
-						</html:submit>
+						
+						<c:if test="${mcGeneralLearnerFlowDTO.showMarks == 'true'}">						
+							<html:submit property="viewSummary" styleClass="button">
+								<fmt:message key="label.view.summary" />
+							</html:submit>
+						</c:if>						
 
 						<div class="right-buttons">
 							<c:if
@@ -195,11 +198,12 @@
 
 
 					<c:if test="${mcGeneralLearnerFlowDTO.retries != 'true'}">
+						<c:if test="${mcGeneralLearnerFlowDTO.showMarks == 'true'}">						
+							<html:submit property="viewSummary" styleClass="button">
+								<fmt:message key="label.view.summary" />
+							</html:submit>
+						</c:if>						
 
-						<html:submit property="viewSummary" styleClass="button">
-							<fmt:message key="label.view.summary" />
-						</html:submit>
-
 						<div class="right-buttons">
 							<c:if test="${mcGeneralLearnerFlowDTO.reflection != 'true'}">
 								<html:submit property="learnerFinished" styleClass="button">