Index: lams_tool_lamc/conf/hibernate/mappings/org/lamsfoundation/lams/tool/mc/McContent.hbm.xml
===================================================================
diff -u -r027758c2ee944683de01e4cd689fe3244d031920 -r3ff06f3f26058ef66d171ad6673eab70e76cd662
--- lams_tool_lamc/conf/hibernate/mappings/org/lamsfoundation/lams/tool/mc/McContent.hbm.xml	(.../McContent.hbm.xml)	(revision 027758c2ee944683de01e4cd689fe3244d031920)
+++ lams_tool_lamc/conf/hibernate/mappings/org/lamsfoundation/lams/tool/mc/McContent.hbm.xml	(.../McContent.hbm.xml)	(revision 3ff06f3f26058ef66d171ad6673eab70e76cd662)
@@ -169,6 +169,13 @@
         length="1"        
    />
 
+   <property
+        name="displayAnswers"
+        type="boolean"
+        access="property"
+        column="displayAnswers"
+        length="1"        
+   />
 
     
     <property
Index: lams_tool_lamc/db/sql/create_lams_tool_mc.sql
===================================================================
diff -u -rf04e5eaf5a3b6bd01c39426e993609857686d936 -r3ff06f3f26058ef66d171ad6673eab70e76cd662
--- lams_tool_lamc/db/sql/create_lams_tool_mc.sql	(.../create_lams_tool_mc.sql)	(revision f04e5eaf5a3b6bd01c39426e993609857686d936)
+++ lams_tool_lamc/db/sql/create_lams_tool_mc.sql	(.../create_lams_tool_mc.sql)	(revision 3ff06f3f26058ef66d171ad6673eab70e76cd662)
@@ -19,6 +19,7 @@
      , reflectionSubject TEXT
      , showMarks TINYINT(1) NOT NULL DEFAULT 0
      , randomize TINYINT(1) NOT NULL DEFAULT 0
+     , displayAnswers TINYINT(1) NOT NULL DEFAULT 1
      , UNIQUE UQ_tl_lamc11_content_1 (content_id)
      , PRIMARY KEY (uid)
 )TYPE=InnoDB;
Index: lams_tool_lamc/db/sql/updatescripts/updateTo20070820.sql
===================================================================
diff -u -rf904f1ca438a16ce81f5dd68df2388c751510fde -r3ff06f3f26058ef66d171ad6673eab70e76cd662
--- lams_tool_lamc/db/sql/updatescripts/updateTo20070820.sql	(.../updateTo20070820.sql)	(revision f904f1ca438a16ce81f5dd68df2388c751510fde)
+++ lams_tool_lamc/db/sql/updatescripts/updateTo20070820.sql	(.../updateTo20070820.sql)	(revision 3ff06f3f26058ef66d171ad6673eab70e76cd662)
@@ -5,6 +5,9 @@
 ADD COLUMN last_attempt_order INTEGER
 , ADD COLUMN last_attempt_total_mark INTEGER;
 
+ALTER TABLE tl_lamc11_content
+ADD COLUMN displayAnswers TINYINT(1) NOT NULL DEFAULT 1 AFTER randomize;
+
 -- Fix problems with the marks in the attempt table. It was recording the number of questions answered correctly for the activity.
 -- Now it records the mark for each question. The overall mark is put in the  que_usr table.
 update tl_lamc11_usr_attempt a
Index: lams_tool_lamc/src/java/org/lamsfoundation/lams/tool/mc/McGeneralAuthoringDTO.java
===================================================================
diff -u -r1b2382ace1129a3f32efaee5d802e1dbc9b9f1b7 -r3ff06f3f26058ef66d171ad6673eab70e76cd662
--- lams_tool_lamc/src/java/org/lamsfoundation/lams/tool/mc/McGeneralAuthoringDTO.java	(.../McGeneralAuthoringDTO.java)	(revision 1b2382ace1129a3f32efaee5d802e1dbc9b9f1b7)
+++ lams_tool_lamc/src/java/org/lamsfoundation/lams/tool/mc/McGeneralAuthoringDTO.java	(.../McGeneralAuthoringDTO.java)	(revision 3ff06f3f26058ef66d171ad6673eab70e76cd662)
@@ -58,6 +58,7 @@
     protected String synchInMonitor;
     protected String questionsSequenced;
     protected String randomize;
+    protected String displayAnswers;
     protected String editActivityEditMode;
     protected String reflectionSubject;
     protected String showMarks;
@@ -652,4 +653,17 @@
     public void setRandomize(String randomize) {
         this.randomize = randomize;
     }
+
+    /**
+     * @return Returns the displayAnswers.
+     */
+    public String getDisplayAnswers() {
+        return displayAnswers;
+    }
+    /**
+     * @param randomize The randomize to set.
+     */
+    public void setDisplayAnswers(String displayAnswers) {
+        this.displayAnswers = displayAnswers;
+    }    
 }
Index: lams_tool_lamc/src/java/org/lamsfoundation/lams/tool/mc/pojos/McContent.java
===================================================================
diff -u -r51190e07e3d8dfaee600d9912e0a3d723363570a -r3ff06f3f26058ef66d171ad6673eab70e76cd662
--- lams_tool_lamc/src/java/org/lamsfoundation/lams/tool/mc/pojos/McContent.java	(.../McContent.java)	(revision 51190e07e3d8dfaee600d9912e0a3d723363570a)
+++ lams_tool_lamc/src/java/org/lamsfoundation/lams/tool/mc/pojos/McContent.java	(.../McContent.java)	(revision 3ff06f3f26058ef66d171ad6673eab70e76cd662)
@@ -99,6 +99,8 @@
     
     private boolean randomize;
     
+    private boolean displayAnswers;
+
     private boolean showMarks;
     
     /** nullable persistent field */
@@ -118,7 +120,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 randomize, boolean showMarks, boolean retries, boolean reflect, String reflectionSubject, Set mcQueContents, Set mcSessions, 
+			Integer passMark, boolean showReport, boolean randomize, boolean displayAnswers, boolean showMarks, boolean retries, boolean reflect, String reflectionSubject, Set mcQueContents, Set mcSessions, 
 			Set mcAttachments) {
         
         logger.debug("copying properties");
@@ -141,6 +143,7 @@
         this.passMark = passMark;
         this.showReport = showReport;
         this.randomize = randomize;
+        this.displayAnswers = displayAnswers;
         this.showMarks = showMarks;
         this.mcQueContents = mcQueContents;
         this.mcSessions = mcSessions;
@@ -190,6 +193,7 @@
 					 mc.getPassMark(),
 					 mc.isShowReport(),
 					 mc.isRandomize(),
+					 mc.isDisplayAnswers(),
 					 mc.isShowMarks(),
 					 mc.isRetries(),
 					 mc.isReflect(),
@@ -505,6 +509,18 @@
     public void setRandomize(boolean randomize) {
         this.randomize = randomize;
     }
+    /**
+     * @return Returns the displayAnswers.
+     */
+    public boolean isDisplayAnswers() {
+        return displayAnswers;
+    }
+    /**
+     * @param displayAnswers The displayAnswers to set.
+     */
+    public void setDisplayAnswers(boolean displayAnswers) {
+    	this.displayAnswers = displayAnswers;
+    }
     
     /**
      * Get total possible marks for this content. Iterates over the McQueContents set 
Index: lams_tool_lamc/src/java/org/lamsfoundation/lams/tool/mc/service/McImportContentVersionFilter.java
===================================================================
diff -u -r16fb0a3e0a5f843ef1b2c02d20b3e420a0be8b28 -r3ff06f3f26058ef66d171ad6673eab70e76cd662
--- lams_tool_lamc/src/java/org/lamsfoundation/lams/tool/mc/service/McImportContentVersionFilter.java	(.../McImportContentVersionFilter.java)	(revision 16fb0a3e0a5f843ef1b2c02d20b3e420a0be8b28)
+++ lams_tool_lamc/src/java/org/lamsfoundation/lams/tool/mc/service/McImportContentVersionFilter.java	(.../McImportContentVersionFilter.java)	(revision 3ff06f3f26058ef66d171ad6673eab70e76cd662)
@@ -30,4 +30,11 @@
 	    this.addField(McContent.class, "randomize",new Boolean(false));
 	    this.addField(McOptsContent.class, "displayOrder",new Integer(0));
 	}
+	
+	public void up20061113To20070820() {
+		// Adds displayAnswers LDEV-1156
+		
+		this.addField(McContent.class, "displayAnswers", new Boolean(true));
+		
+	}
 }
Index: lams_tool_lamc/src/java/org/lamsfoundation/lams/tool/mc/service/McServicePOJO.java
===================================================================
diff -u -r7ec5fb1ceecbc55268fd3a8cc5ce950eaef7e3bb -r3ff06f3f26058ef66d171ad6673eab70e76cd662
--- lams_tool_lamc/src/java/org/lamsfoundation/lams/tool/mc/service/McServicePOJO.java	(.../McServicePOJO.java)	(revision 7ec5fb1ceecbc55268fd3a8cc5ce950eaef7e3bb)
+++ lams_tool_lamc/src/java/org/lamsfoundation/lams/tool/mc/service/McServicePOJO.java	(.../McServicePOJO.java)	(revision 3ff06f3f26058ef66d171ad6673eab70e76cd662)
@@ -2259,6 +2259,7 @@
     	toolContentObj.setQuestionsSequenced(false);
     	toolContentObj.setShowMarks(false);
     	toolContentObj.setRandomize(false);
+    	toolContentObj.setDisplayAnswers(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 -r027758c2ee944683de01e4cd689fe3244d031920 -r3ff06f3f26058ef66d171ad6673eab70e76cd662
--- lams_tool_lamc/src/java/org/lamsfoundation/lams/tool/mc/web/AuthoringUtil.java	(.../AuthoringUtil.java)	(revision 027758c2ee944683de01e4cd689fe3244d031920)
+++ lams_tool_lamc/src/java/org/lamsfoundation/lams/tool/mc/web/AuthoringUtil.java	(.../AuthoringUtil.java)	(revision 3ff06f3f26058ef66d171ad6673eab70e76cd662)
@@ -67,6 +67,7 @@
 	{
 		mcAuthoringForm.setQuestionsSequenced(mcContent.isQuestionsSequenced()?"1":"0");
 		mcAuthoringForm.setRandomize(mcContent.isRandomize ()?"1":"0");
+		mcAuthoringForm.setDisplayAnswers(mcContent.isDisplayAnswers ()?"1":"0");
 		mcAuthoringForm.setShowMarks(mcContent.isShowMarks()?"1":"0");
 		mcAuthoringForm.setRetries(mcContent.isRetries()?"1":"0");
 		mcAuthoringForm.setSln(mcContent.isShowReport()?"1":"0");
@@ -1384,6 +1385,9 @@
 
 		String randomize=request.getParameter("randomize");
 		logger.debug("randomize: " + randomize);
+
+		String displayAnswers=request.getParameter("displayAnswers");
+		logger.debug("displayAnswers: " + displayAnswers);
 		
 		String showMarks=request.getParameter("showMarks");
 		logger.debug("showMarks: " + showMarks);
@@ -1416,6 +1420,7 @@
 		
         boolean questionsSequencedBoolean=false;
         boolean randomizeBoolean=false;
+        boolean displayAnswersBoolean=false;
         boolean showMarksBoolean=false;
         boolean slnBoolean=false;
         boolean retriesBoolean=false;
@@ -1426,6 +1431,9 @@
     	
     	if ((randomize != null) && (randomize.equalsIgnoreCase("1")))
     	    randomizeBoolean=true;            
+
+    	if ((displayAnswers != null) && (displayAnswers.equalsIgnoreCase("1")))
+    		displayAnswersBoolean=true;         	
     	
     	if ((showMarks != null) && (showMarks.equalsIgnoreCase("1")))
     	    showMarksBoolean=true;            
@@ -1508,6 +1516,7 @@
          	mcContent.setOfflineInstructions(richTextOfflineInstructions);
          	mcContent.setQuestionsSequenced(questionsSequencedBoolean);
          	mcContent.setRandomize(randomizeBoolean);
+         	mcContent.setDisplayAnswers(displayAnswersBoolean);
          	mcContent.setShowMarks(showMarksBoolean);
          	mcContent.setRetries(retriesBoolean);
          	mcContent.setShowReport(slnBoolean);	
Index: lams_tool_lamc/src/java/org/lamsfoundation/lams/tool/mc/web/McAuthoringForm.java
===================================================================
diff -u -r027758c2ee944683de01e4cd689fe3244d031920 -r3ff06f3f26058ef66d171ad6673eab70e76cd662
--- lams_tool_lamc/src/java/org/lamsfoundation/lams/tool/mc/web/McAuthoringForm.java	(.../McAuthoringForm.java)	(revision 027758c2ee944683de01e4cd689fe3244d031920)
+++ lams_tool_lamc/src/java/org/lamsfoundation/lams/tool/mc/web/McAuthoringForm.java	(.../McAuthoringForm.java)	(revision 3ff06f3f26058ef66d171ad6673eab70e76cd662)
@@ -48,6 +48,7 @@
 	
 	protected String showMarks;
 	protected String randomize;
+	protected String displayAnswers;
 	
 	protected String fileItem;
 	protected String uuid;
@@ -202,6 +203,7 @@
 		this.monitoringReportTitle=null;
 		this.questionsSequenced=null;
 		this.randomize =null;
+		this.displayAnswers =null;
 		this.showFeedback=null;
 		this.retries=null;
 		this.sln=null;
@@ -1028,4 +1030,18 @@
     public void setRandomize(String randomize) {
         this.randomize = randomize;
     }
+
+    /**
+     * @return Returns the displayAnswers.
+     */
+    public String getDisplayAnswers() {
+        return displayAnswers;
+    }
+    /**
+     * @param displayAnswers The displayAnswers to set.
+     */
+    public void setDisplayAnswers(String displayAnswers) {
+        this.displayAnswers = displayAnswers;
+    }
+
 }
Index: lams_tool_lamc/src/java/org/lamsfoundation/lams/tool/mc/web/McStarterAction.java
===================================================================
diff -u -rdea5004371152a95bec9fc2db87a455fa84c0887 -r3ff06f3f26058ef66d171ad6673eab70e76cd662
--- lams_tool_lamc/src/java/org/lamsfoundation/lams/tool/mc/web/McStarterAction.java	(.../McStarterAction.java)	(revision dea5004371152a95bec9fc2db87a455fa84c0887)
+++ lams_tool_lamc/src/java/org/lamsfoundation/lams/tool/mc/web/McStarterAction.java	(.../McStarterAction.java)	(revision 3ff06f3f26058ef66d171ad6673eab70e76cd662)
@@ -448,6 +448,7 @@
 		mcAuthoringForm.setSln(mcContent.isShowReport()?"1":"0");
 		mcAuthoringForm.setQuestionsSequenced(mcContent.isQuestionsSequenced()?"1":"0");
 		mcAuthoringForm.setRandomize(mcContent.isRandomize()?"1":"0");
+		mcAuthoringForm.setDisplayAnswers(mcContent.isDisplayAnswers()?"1":"0");
 		mcAuthoringForm.setShowMarks(mcContent.isShowMarks()?"1":"0");
 		
 		mcAuthoringForm.setRetries(mcContent.isRetries()?"1":"0");
@@ -457,6 +458,7 @@
 		mcGeneralAuthoringDTO.setSln(mcContent.isShowReport()?"1":"0");
 		mcGeneralAuthoringDTO.setQuestionsSequenced(mcContent.isQuestionsSequenced()?"1":"0");
 		mcGeneralAuthoringDTO.setRandomize(mcContent.isRandomize()?"1":"0");
+		mcGeneralAuthoringDTO.setDisplayAnswers(mcContent.isDisplayAnswers()?"1":"0");
 		mcGeneralAuthoringDTO.setRetries(mcContent.isRetries()?"1":"0");
 	    mcGeneralAuthoringDTO.setReflect(mcContent.isReflect()?"1":"0");
 	    mcGeneralAuthoringDTO.setReflectionSubject(mcContent.getReflectionSubject());
Index: lams_tool_lamc/web/authoring/AdvancedContent.jsp
===================================================================
diff -u -r1977f2d6d4038839d28238041d7e5cd4dfd35036 -r3ff06f3f26058ef66d171ad6673eab70e76cd662
--- lams_tool_lamc/web/authoring/AdvancedContent.jsp	(.../AdvancedContent.jsp)	(revision 1977f2d6d4038839d28238041d7e5cd4dfd35036)
+++ lams_tool_lamc/web/authoring/AdvancedContent.jsp	(.../AdvancedContent.jsp)	(revision 3ff06f3f26058ef66d171ad6673eab70e76cd662)
@@ -49,9 +49,16 @@
 	</label>
 </p>
 
+<p class="small-space-top">
+	<html:checkbox property="displayAnswers" value="1" styleId="displayAnswers"
+		styleClass="noBorder">
+	</html:checkbox>
+	<label for="displayAnswers">
+		<fmt:message key="label.displayAnswers" />
+	</label>
+</p>
 
 
-
 <p>
 	<html:checkbox property="retries" value="1" styleId="retries"
 		onclick="javascript:updatePass(this); submitMethod('updateMarksList');" styleClass="noBorder">