Index: lams_tool_laqa/conf/hibernate/mappings/org/lamsfoundation/lams/tool/qa/QaContent.hbm.xml
===================================================================
RCS file: /usr/local/cvsroot/lams_tool_laqa/conf/hibernate/mappings/org/lamsfoundation/lams/tool/qa/QaContent.hbm.xml,v
diff -u -r1.23 -r1.24
--- lams_tool_laqa/conf/hibernate/mappings/org/lamsfoundation/lams/tool/qa/QaContent.hbm.xml	20 Jun 2015 20:48:46 -0000	1.23
+++ lams_tool_laqa/conf/hibernate/mappings/org/lamsfoundation/lams/tool/qa/QaContent.hbm.xml	16 Apr 2016 14:00:08 -0000	1.24
@@ -82,6 +82,14 @@
 		column="submission_deadline"
 		length="10"
 	/>
+	
+	<property
+        name="showOtherAnswersAfterDeadline"
+        type="boolean"
+        access="property"        
+        column="show_other_answers_after_deadline"
+        length="1"
+    />
 
    <property
         name="questionsSequenced"
Index: lams_tool_laqa/conf/language/lams/ApplicationResources_en_AU.properties
===================================================================
RCS file: /usr/local/cvsroot/lams_tool_laqa/conf/language/lams/ApplicationResources_en_AU.properties,v
diff -u -r1.57 -r1.58
--- lams_tool_laqa/conf/language/lams/ApplicationResources_en_AU.properties	22 Feb 2016 14:53:41 -0000	1.57
+++ lams_tool_laqa/conf/language/lams/ApplicationResources_en_AU.properties	16 Apr 2016 14:00:08 -0000	1.58
@@ -286,6 +286,6 @@
 label.search  =Search...
 label.posted.by  ={0} on {1}
 label.noredo.enabled  =Note: after answer these questions, no changes are allowed.
+label.allow.review.other.responses  =Allow review other responses?
 
-
 #======= End labels: Exported 280 labels for en AU =====
Index: lams_tool_laqa/src/java/org/lamsfoundation/lams/tool/qa/QaAppConstants.java
===================================================================
RCS file: /usr/local/cvsroot/lams_tool_laqa/src/java/org/lamsfoundation/lams/tool/qa/QaAppConstants.java,v
diff -u -r1.100 -r1.101
--- lams_tool_laqa/src/java/org/lamsfoundation/lams/tool/qa/QaAppConstants.java	2 Nov 2015 04:32:40 -0000	1.100
+++ lams_tool_laqa/src/java/org/lamsfoundation/lams/tool/qa/QaAppConstants.java	16 Apr 2016 14:00:08 -0000	1.101
@@ -214,6 +214,7 @@
     public static final String NO_TOOL_SESSIONS_AVAILABLE = "noToolSessionAvailable";
     public static final String ATTR_CONTENT = "content";
     public static final String ATTR_SUBMISSION_DEADLINE = "submissionDeadline";
+    public static final String PARAM_SHOW_OTHER_ANSWERS_AFTER_DEADLINE = "showOtherAnswersAfterDeadline";
     public static final String ATTR_IS_SUBMISSION_DEADLINE_PASSED = "isSubmissionDeadlinePassed";
     public static final String ATTR_GROUP_USERS = "groupUsers";
     public static final String ATTR_IS_USER_LEADER = "isUserLeader";
Index: lams_tool_laqa/src/java/org/lamsfoundation/lams/tool/qa/QaContent.java
===================================================================
RCS file: /usr/local/cvsroot/lams_tool_laqa/src/java/org/lamsfoundation/lams/tool/qa/QaContent.java,v
diff -u -r1.35 -r1.36
--- lams_tool_laqa/src/java/org/lamsfoundation/lams/tool/qa/QaContent.java	20 Jun 2015 20:48:46 -0000	1.35
+++ lams_tool_laqa/src/java/org/lamsfoundation/lams/tool/qa/QaContent.java	16 Apr 2016 14:00:08 -0000	1.36
@@ -107,6 +107,8 @@
 
     private Date submissionDeadline;
     
+    private boolean showOtherAnswersAfterDeadline;
+    
     private int maximumRates;
 
     private int minimumRates;
@@ -390,8 +392,23 @@
     public void setSubmissionDeadline(Date submissionDeadline) {
 	this.submissionDeadline = submissionDeadline;
     }
+    
+    /**
+     * @return Returns the showOtherAnswersAfterDeadline.
+     */
+    public boolean isShowOtherAnswersAfterDeadline() {
+	return showOtherAnswersAfterDeadline;
+    }
 
     /**
+     * @param showOtherAnswersAfterDeadline
+     *            The showOtherAnswersAfterDeadline to set.
+     */
+    public void setShowOtherAnswersAfterDeadline(boolean showOtherAnswersAfterDeadline) {
+	this.showOtherAnswersAfterDeadline = showOtherAnswersAfterDeadline;
+    }
+
+    /**
      * @return Returns the usernameVisible.
      */
     public boolean isUsernameVisible() {
Index: lams_tool_laqa/src/java/org/lamsfoundation/lams/tool/qa/dbupdates/patch20160416.sql
===================================================================
RCS file: /usr/local/cvsroot/lams_tool_laqa/src/java/org/lamsfoundation/lams/tool/qa/dbupdates/patch20160416.sql,v
diff -u
--- /dev/null	1 Jan 1970 00:00:00 -0000
+++ lams_tool_laqa/src/java/org/lamsfoundation/lams/tool/qa/dbupdates/patch20160416.sql	16 Apr 2016 14:00:08 -0000	1.1
@@ -0,0 +1,14 @@
+-- Turn off autocommit, so nothing is committed if there is an error
+SET AUTOCOMMIT = 0;
+SET FOREIGN_KEY_CHECKS=0;
+----------------------Put all sql statements below here-------------------------
+
+-- LDEV-3751 Prevent students from submitting questions but allow them to view responses
+ALTER TABLE tl_laqa11_content ADD COLUMN show_other_answers_after_deadline TINYINT(1) NOT NULL DEFAULT 0;
+
+----------------------Put all sql statements above here-------------------------
+
+-- If there were no errors, commit and restore autocommit to on
+COMMIT;
+SET AUTOCOMMIT = 1;
+SET FOREIGN_KEY_CHECKS=1;
\ No newline at end of file
Index: lams_tool_laqa/src/java/org/lamsfoundation/lams/tool/qa/web/QaLearningStarterAction.java
===================================================================
RCS file: /usr/local/cvsroot/lams_tool_laqa/src/java/org/lamsfoundation/lams/tool/qa/web/QaLearningStarterAction.java,v
diff -u -r1.93 -r1.94
--- lams_tool_laqa/src/java/org/lamsfoundation/lams/tool/qa/web/QaLearningStarterAction.java	24 Jun 2015 20:08:44 -0000	1.93
+++ lams_tool_laqa/src/java/org/lamsfoundation/lams/tool/qa/web/QaLearningStarterAction.java	16 Apr 2016 14:00:08 -0000	1.94
@@ -303,7 +303,32 @@
 
 	    // calculate whether submission deadline has passed, and if so forward to "submissionDeadline"
 	    if (currentLearnerDate.after(tzSubmissionDeadline)) {
-		return mapping.findForward("submissionDeadline");
+		
+		//if ShowOtherAnswersAfterDeadline is enabled - show others answers
+		if (qaContent.isShowOtherAnswersAfterDeadline()) {
+		    generalLearnerFlowDTO.setLockWhenFinished(Boolean.TRUE.toString());
+		    generalLearnerFlowDTO.setNoReeditAllowed(true);
+		    /*
+		     * the report should have all the users' entries OR the report should have only the current
+		     * session's entries
+		     */
+		    generalLearnerFlowDTO.setRequestLearningReport(new Boolean(true).toString());
+
+		    QaLearningAction.refreshSummaryData(request, qaContent, qaService, sessionMapId, user,
+			    generalLearnerFlowDTO);
+
+		    if (user.isLearnerFinished()) {
+			generalLearnerFlowDTO.setRequestLearningReportViewOnly(new Boolean(true).toString());
+			return (mapping.findForward(REVISITED_LEARNER_REP));
+		    } else {
+			generalLearnerFlowDTO.setRequestLearningReportViewOnly(new Boolean(false).toString());
+			return (mapping.findForward(LEARNER_REP));
+		    }
+		    
+		// show submissionDeadline page otherwise
+		} else {
+		    return mapping.findForward("submissionDeadline");
+		}
 	    }
 	}
 	
Index: lams_tool_laqa/src/java/org/lamsfoundation/lams/tool/qa/web/QaMonitoringAction.java
===================================================================
RCS file: /usr/local/cvsroot/lams_tool_laqa/src/java/org/lamsfoundation/lams/tool/qa/web/QaMonitoringAction.java,v
diff -u -r1.81 -r1.82
--- lams_tool_laqa/src/java/org/lamsfoundation/lams/tool/qa/web/QaMonitoringAction.java	23 Feb 2016 04:06:26 -0000	1.81
+++ lams_tool_laqa/src/java/org/lamsfoundation/lams/tool/qa/web/QaMonitoringAction.java	16 Apr 2016 14:00:08 -0000	1.82
@@ -123,13 +123,40 @@
 	    UserDTO teacher = (UserDTO) ss.getAttribute(AttributeNames.USER);
 	    TimeZone teacherTimeZone = teacher.getTimeZone();
 	    tzSubmissionDeadline = DateUtil.convertFromTimeZoneToDefault(teacherTimeZone, submissionDeadline);
+	    
+	} else {
+	    //set showOtherAnswersAfterDeadline to false
+	    content.setShowOtherAnswersAfterDeadline(false);
 	}
 	content.setSubmissionDeadline(tzSubmissionDeadline);
 	qaService.saveOrUpdateQaContent(content);
 
 	return null;
     }
+    
+    /**
+     * Set Submission Deadline
+     * 
+     * @param mapping
+     * @param form
+     * @param request
+     * @param response
+     * @return
+     */
+    public ActionForward setShowOtherAnswersAfterDeadline(ActionMapping mapping, ActionForm form, HttpServletRequest request,
+	    HttpServletResponse response) {
+	IQaService qaService = getQAService();
+	
+	Long contentID = WebUtil.readLongParam(request, AttributeNames.PARAM_TOOL_CONTENT_ID);
+	QaContent content = qaService.getQaContent(contentID);
+	
+	boolean showOtherAnswersAfterDeadline = WebUtil.readBooleanParam(request, QaAppConstants.PARAM_SHOW_OTHER_ANSWERS_AFTER_DEADLINE);
+	content.setShowOtherAnswersAfterDeadline(showOtherAnswersAfterDeadline);
+	qaService.saveOrUpdateQaContent(content);
 
+	return null;
+    }
+
     private IQaService getQAService() {
     	return QaServiceProxy.getQaService(getServlet().getServletContext());
     }
Index: lams_tool_laqa/web/monitoring/dateRestriction.jsp
===================================================================
RCS file: /usr/local/cvsroot/lams_tool_laqa/web/monitoring/dateRestriction.jsp,v
diff -u -r1.2 -r1.3
--- lams_tool_laqa/web/monitoring/dateRestriction.jsp	16 May 2011 03:17:57 -0000	1.2
+++ lams_tool_laqa/web/monitoring/dateRestriction.jsp	16 Apr 2016 14:00:08 -0000	1.3
@@ -1,5 +1,43 @@
 <%@include file="/common/taglibs.jsp"%>
 
+<script type="text/javascript"> 
+	$(document).ready(function(){
+
+		//handles disabled state
+		$("#datetime").change(function() {
+			$("#show-other-answers-after-deadline").prop("disabled", ($("#datetime").val() == ""));
+			if ($("#datetime").val() == "") {
+				$("#show-other-answers-after-deadline").prop("checked", false);
+			}
+		});
+
+		//
+	    $('#show-other-answers-after-deadline').change(function() {
+	        if($("#datetime").is(":hidden")) {
+	        	storeShowOtherAnswersAfterDeadline();
+	        }       
+	    });
+	});
+
+	function storeShowOtherAnswersAfterDeadline() {
+		if ($("#datetime").is(":not(:hidden)") && $("#datetime").datetimepicker('getDate') == null) {
+			return;
+		}
+		
+		$.ajax({
+			url : '<c:url value="/monitoring.do?dispatch=setShowOtherAnswersAfterDeadline"/>',
+			data: {
+				toolContentID:'${content.qaContentId}',
+				showOtherAnswersAfterDeadline: $("#show-other-answers-after-deadline").is(":checked"),
+				reqID: (new Date()).getTime()
+			},
+			success : function() {
+			}
+		});
+	}
+
+</script>
+
 <h1>
 	<img src="<lams:LAMSURL/>/images/tree_closed.gif" id="restrictUsageTreeIcon" onclick="javascript:toggleAdvancedOptionsVisibility(document.getElementById('restrictUsageDiv'), document.getElementById('restrictUsageTreeIcon'), '<lams:LAMSURL/>');" />
 
@@ -22,7 +60,7 @@
 		
 		<input type="text" name="datetime" id="datetime" value=""/>
 				
-		<html:link	href="javascript:setSubmissionDeadline();" styleClass="button">
+		<html:link	href="javascript:storeShowOtherAnswersAfterDeadline(); setSubmissionDeadline();" styleClass="button">
 			<fmt:message key="monitor.summary.set.restriction" />
 		</html:link>
 	</div>
@@ -35,9 +73,19 @@
 		<span id="dateInfo">
 		</span>
 				
-		<html:link	href="javascript:removeSubmissionDeadline();" styleClass="button">
+		<html:link	href="javascript:$('#show-other-answers-after-deadline').prop('checked', false); removeSubmissionDeadline();" styleClass="button">
 			<fmt:message key="monitor.summary.unset.restriction" />
 		</html:link>
 	</div>
+	
+	<div class="small-space-top">
+		<input type="checkbox" name="showOtherAnswersAfterDeadline" value="1" id="show-other-answers-after-deadline" class="noBorder"
+			<c:if test="${empty submissionDeadline}">disabled="disabled"</c:if>
+			<c:if test="${content.showOtherAnswersAfterDeadline}">checked="checked"</c:if>
+		/>
+		<label for="show-other-answers-after-deadline">
+			<fmt:message key="label.allow.review.other.responses" />
+		</label>
+	</div>
 
-</div>
\ No newline at end of file
+</div>