Index: lams_tool_assessment/db/sql/create_lams_tool_assessment.sql
===================================================================
diff -u -r9727106bb7f305a094b00c9a0b29a09dee57990b -rc7ffb298078fad531d8a90d4bc12e588b16db93b
--- lams_tool_assessment/db/sql/create_lams_tool_assessment.sql	(.../create_lams_tool_assessment.sql)	(revision 9727106bb7f305a094b00c9a0b29a09dee57990b)
+++ lams_tool_assessment/db/sql/create_lams_tool_assessment.sql	(.../create_lams_tool_assessment.sql)	(revision c7ffb298078fad531d8a90d4bc12e588b16db93b)
@@ -42,6 +42,7 @@
    allow_wrong_answers tinyint,
    allow_grades_after_attempt tinyint,
    allow_history_responses tinyint,
+   display_summary tinyint,
    questions_per_page integer DEFAULT 0,
    shuffled tinyint,
    attempt_completion_notify tinyint DEFAULT 0,
@@ -171,7 +172,7 @@
 
 INSERT INTO `tl_laasse10_assessment` (`uid`, `create_date`, `update_date`, `create_by`, `title`, `run_offline`, 
  `instructions`, `online_instructions`, `offline_instructions`, `content_in_use`, `define_later`, `content_id`, `allow_question_feedback`, 
- `allow_overall_feedback`, `allow_right_answers`, `allow_wrong_answers`, `allow_grades_after_attempt`, `allow_history_responses`, `shuffled`) VALUES
-  (1,NULL,NULL,NULL,'Assessment','0','Instructions ',null,null,0,0,${default_content_id},0,0,0,0,0,0,0);
+ `allow_overall_feedback`, `allow_right_answers`, `allow_wrong_answers`, `allow_grades_after_attempt`, `allow_history_responses`, `display_summary`, `shuffled`) VALUES
+  (1,NULL,NULL,NULL,'Assessment','0','Instructions ',null,null,0,0,${default_content_id},0,0,0,0,0,0,0,0);
 
 SET FOREIGN_KEY_CHECKS=1;
Index: lams_tool_assessment/src/java/org/lamsfoundation/lams/tool/assessment/dbupdates/patch20110413_updateTo236.sql
===================================================================
diff -u -r9727106bb7f305a094b00c9a0b29a09dee57990b -rc7ffb298078fad531d8a90d4bc12e588b16db93b
--- lams_tool_assessment/src/java/org/lamsfoundation/lams/tool/assessment/dbupdates/patch20110413_updateTo236.sql	(.../patch20110413_updateTo236.sql)	(revision 9727106bb7f305a094b00c9a0b29a09dee57990b)
+++ lams_tool_assessment/src/java/org/lamsfoundation/lams/tool/assessment/dbupdates/patch20110413_updateTo236.sql	(.../patch20110413_updateTo236.sql)	(revision c7ffb298078fad531d8a90d4bc12e588b16db93b)
@@ -8,6 +8,10 @@
 -- LDEV-2657 Date and time restriction 
 ALTER TABLE tl_laasse10_assessment ADD COLUMN submission_deadline DATETIME DEFAULT null;
 
+-- LDEV-2684 Option for not displaying answers summary
+
+ALTER TABLE tl_laasse10_assessment ADD COLUMN display_summary tinyint DEFAULT false;
+
 ----------------------Put all sql statements above here-------------------------
 
 -- If there were no errors, commit and restore autocommit to on
Index: lams_tool_assessment/src/java/org/lamsfoundation/lams/tool/assessment/model/Assessment.java
===================================================================
diff -u -r9727106bb7f305a094b00c9a0b29a09dee57990b -rc7ffb298078fad531d8a90d4bc12e588b16db93b
--- lams_tool_assessment/src/java/org/lamsfoundation/lams/tool/assessment/model/Assessment.java	(.../Assessment.java)	(revision 9727106bb7f305a094b00c9a0b29a09dee57990b)
+++ lams_tool_assessment/src/java/org/lamsfoundation/lams/tool/assessment/model/Assessment.java	(.../Assessment.java)	(revision c7ffb298078fad531d8a90d4bc12e588b16db93b)
@@ -83,6 +83,8 @@
     
     private boolean allowHistoryResponses;
     
+    private boolean displaySummary;
+    
     private boolean defineLater;
 
     private boolean contentInUse;
@@ -598,6 +600,20 @@
     }
     
     /**
+     * @hibernate.property column="display_summary"
+     * @return
+     */
+	public boolean isDisplaySummary() {
+		return displaySummary;
+	}
+
+	public void setDisplaySummary(boolean displaySummary) {
+		this.displaySummary = displaySummary;
+	}
+
+	
+
+	/**
      * @hibernate.property column="questions_per_page"
      * @return
      */
Index: lams_tool_assessment/src/java/org/lamsfoundation/lams/tool/assessment/web/form/AssessmentForm.java
===================================================================
diff -u -rdf5031224eb701a152c791bc8b4f4dee76fa1833 -rc7ffb298078fad531d8a90d4bc12e588b16db93b
--- lams_tool_assessment/src/java/org/lamsfoundation/lams/tool/assessment/web/form/AssessmentForm.java	(.../AssessmentForm.java)	(revision df5031224eb701a152c791bc8b4f4dee76fa1833)
+++ lams_tool_assessment/src/java/org/lamsfoundation/lams/tool/assessment/web/form/AssessmentForm.java	(.../AssessmentForm.java)	(revision c7ffb298078fad531d8a90d4bc12e588b16db93b)
@@ -81,6 +81,7 @@
 	    assessment.setDefineLater(false);
 	    assessment.setShuffled(false);
 	    assessment.setRunOffline(false);
+	    assessment.setDisplaySummary(false);
 	}
     }
 
Index: lams_tool_assessment/web/pages/authoring/advance.jsp
===================================================================
diff -u -rdf5031224eb701a152c791bc8b4f4dee76fa1833 -rc7ffb298078fad531d8a90d4bc12e588b16db93b
--- lams_tool_assessment/web/pages/authoring/advance.jsp	(.../advance.jsp)	(revision df5031224eb701a152c791bc8b4f4dee76fa1833)
+++ lams_tool_assessment/web/pages/authoring/advance.jsp	(.../advance.jsp)	(revision c7ffb298078fad531d8a90d4bc12e588b16db93b)
@@ -96,6 +96,14 @@
 </p>
 
 <p>
+	<html:checkbox property="assessment.displaySummary" styleClass="noBorder" styleId="displaySummary">
+	</html:checkbox>
+	<label for="displaySummary">
+		<fmt:message key="label.authoring.advance.display.summary" />
+	</label>
+</p>
+
+<p>
 	<html:checkbox property="assessment.notifyTeachersOnAttemptCompletion"
 		styleClass="noBorder" styleId="notifyTeachersOnAttemptCompletion">
 	</html:checkbox>
Index: lams_tool_assessment/web/pages/learning/learning.jsp
===================================================================
diff -u -r9727106bb7f305a094b00c9a0b29a09dee57990b -rc7ffb298078fad531d8a90d4bc12e588b16db93b
--- lams_tool_assessment/web/pages/learning/learning.jsp	(.../learning.jsp)	(revision 9727106bb7f305a094b00c9a0b29a09dee57990b)
+++ lams_tool_assessment/web/pages/learning/learning.jsp	(.../learning.jsp)	(revision c7ffb298078fad531d8a90d4bc12e588b16db93b)
@@ -174,71 +174,15 @@
 		<br>
 		
 		<%@ include file="parts/attemptsummary.jsp"%>
-
-		<form id="answers" name="answers" method="post" >
-			<table cellspacing="0" class="alternative-color">
-				<c:forEach var="question" items="${sessionMap.pagedQuestions[pageNumber-1]}" varStatus="status">
-					<tr>
-						<td style="padding: 15px 15px 15px; width: 10px; font-weight: bold;" >
-							${status.index + sessionMap.questionNumberingOffset} 
-						</td>
-						<td style="padding-left: 0px;">
-							<input type="hidden" name="questionUid${status.index}" id="questionUid${status.index}" value="${question.uid}" />						
-							
-							<div class="field-name" style="padding: 10px 15px 15px;">
-								${question.question}
-							</div>
-							
-							<c:choose>
-								<c:when test="${question.type == 1}">
-									<%@ include file="parts/multiplechoice.jsp"%>
-								</c:when>
-								<c:when test="${question.type == 2}">
-									<%@ include file="parts/matchingpairs.jsp"%>
-								</c:when>
-								<c:when test="${question.type == 3}">
-									<%@ include file="parts/shortanswer.jsp"%>
-								</c:when>
-								<c:when test="${question.type == 4}">
-									<%@ include file="parts/numerical.jsp"%>
-								</c:when>
-								<c:when test="${question.type == 5}">
-									<%@ include file="parts/truefalse.jsp"%>
-								</c:when>
-								<c:when test="${question.type == 6}">
-									<%@ include file="parts/essay.jsp"%>
-								</c:when>
-								<c:when test="${question.type == 7}">
-									<%@ include file="parts/ordering.jsp"%>
-								</c:when>
-							</c:choose>
-							
-							<%@ include file="parts/questionsummary.jsp"%>
-						</td>
-					</tr>
-				</c:forEach>
-			</table>
-		</form>
 		
-		<!--Paging-->
-		<c:if test="${fn:length(sessionMap.pagedQuestions) > 1}">
-			<div style="text-align: center; padding-top: 60px;">
-				<fmt:message key="label.learning.page" />
-				<c:forEach var="questions" items="${sessionMap.pagedQuestions}" varStatus="status">
-					<c:choose>
-						<c:when	test="${(status.index+1) == pageNumber}">
-							<a href="#" onclick="return nextPage(${status.index + 1})" style="margin-left: 10px; font-size: 130%; color: red;">
-						</c:when>
-						<c:otherwise>
-							<a href="#" onclick="return nextPage(${status.index + 1})" style="margin-left: 10px; font-size: 130%;">
-						</c:otherwise>
-					</c:choose>				
-						${status.index + 1} 
-					</a>
-				</c:forEach>		
-			</div>
+		<c:if test="${not finishedLock}">
+			<%@ include file="parts/allquestions.jsp"%>
 		</c:if>
 
+		<c:if test="${finishedLock && assessment.displaySummary}">
+			<%@ include file="parts/allquestions.jsp"%>
+		</c:if>
+
 		<c:if test="${mode != 'teacher'}">
 			<div class="space-bottom-top align-right">
 				<c:choose>
Index: lams_tool_assessment/web/pages/learning/parts/allquestions.jsp
===================================================================
diff -u
--- lams_tool_assessment/web/pages/learning/parts/allquestions.jsp	(revision 0)
+++ lams_tool_assessment/web/pages/learning/parts/allquestions.jsp	(revision c7ffb298078fad531d8a90d4bc12e588b16db93b)
@@ -0,0 +1,64 @@
+		<form id="answers" name="answers" method="post" >
+			<table cellspacing="0" class="alternative-color">
+				<c:forEach var="question" items="${sessionMap.pagedQuestions[pageNumber-1]}" varStatus="status">
+					<tr>
+						<td style="padding: 15px 15px 15px; width: 10px; font-weight: bold;" >
+							${status.index + sessionMap.questionNumberingOffset} 
+						</td>
+						<td style="padding-left: 0px;">
+							<input type="hidden" name="questionUid${status.index}" id="questionUid${status.index}" value="${question.uid}" />						
+							
+							<div class="field-name" style="padding: 10px 15px 15px;">
+								${question.question}
+							</div>
+							
+							<c:choose>
+								<c:when test="${question.type == 1}">
+									<%@ include file="multiplechoice.jsp"%>
+								</c:when>
+								<c:when test="${question.type == 2}">
+									<%@ include file="matchingpairs.jsp"%>
+								</c:when>
+								<c:when test="${question.type == 3}">
+									<%@ include file="shortanswer.jsp"%>
+								</c:when>
+								<c:when test="${question.type == 4}">
+									<%@ include file="numerical.jsp"%>
+								</c:when>
+								<c:when test="${question.type == 5}">
+									<%@ include file="truefalse.jsp"%>
+								</c:when>
+								<c:when test="${question.type == 6}">
+									<%@ include file="essay.jsp"%>
+								</c:when>
+								<c:when test="${question.type == 7}">
+									<%@ include file="ordering.jsp"%>
+								</c:when>
+							</c:choose>
+							
+							<%@ include file="questionsummary.jsp"%>
+						</td>
+					</tr>
+				</c:forEach>
+			</table>
+		</form>
+		
+		
+		<!--Paging-->
+		<c:if test="${fn:length(sessionMap.pagedQuestions) > 1}">
+			<div style="text-align: center; padding-top: 60px;">
+				<fmt:message key="label.learning.page" />
+				<c:forEach var="questions" items="${sessionMap.pagedQuestions}" varStatus="status">
+					<c:choose>
+						<c:when	test="${(status.index+1) == pageNumber}">
+							<a href="#" onclick="return nextPage(${status.index + 1})" style="margin-left: 10px; font-size: 130%; color: red;">
+						</c:when>
+						<c:otherwise>
+							<a href="#" onclick="return nextPage(${status.index + 1})" style="margin-left: 10px; font-size: 130%;">
+						</c:otherwise>
+					</c:choose>				
+						${status.index + 1} 
+					</a>
+				</c:forEach>		
+			</div>
+		</c:if>