Index: lams_tool_survey/build.properties
===================================================================
diff -u -r7b79396263b36a933d66390fb9ab12821956d59d -r13b73687bb274100057f20c3e95518d005a11675
--- lams_tool_survey/build.properties	(.../build.properties)	(revision 7b79396263b36a933d66390fb9ab12821956d59d)
+++ lams_tool_survey/build.properties	(.../build.properties)	(revision 13b73687bb274100057f20c3e95518d005a11675)
@@ -12,7 +12,7 @@
 project.displayname = lams survey tool
 
 # project version
-tool.version=20081021
+tool.version=20110406
 
 # hide tool option
 hideTool=false
Index: lams_tool_survey/conf/xdoclet/struts-actions.xml
===================================================================
diff -u -r7b79396263b36a933d66390fb9ab12821956d59d -r13b73687bb274100057f20c3e95518d005a11675
--- lams_tool_survey/conf/xdoclet/struts-actions.xml	(.../struts-actions.xml)	(revision 7b79396263b36a933d66390fb9ab12821956d59d)
+++ lams_tool_survey/conf/xdoclet/struts-actions.xml	(.../struts-actions.xml)	(revision 13b73687bb274100057f20c3e95518d005a11675)
@@ -282,6 +282,11 @@
 			type="org.lamsfoundation.lams.tool.survey.web.action.MonitoringAction"
 			parameter="exportSurvey" >
 		</action>
+		
+		<action path="/monitoring/setSubmissionDeadline"
+			type="org.lamsfoundation.lams.tool.survey.web.action.MonitoringAction"
+			parameter="setSubmissionDeadline" >
+		</action>		
 		<!-- ========== BEGIN: Common ============================== -->
 		<action path="/clearsession"
 			type="org.lamsfoundation.lams.tool.survey.web.action.ClearSessionAction">
Index: lams_tool_survey/web/pages/learning/learning.jsp
===================================================================
diff -u -reba9c28a1a43b03830d28d70b6fa172af29eaf1f -r13b73687bb274100057f20c3e95518d005a11675
--- lams_tool_survey/web/pages/learning/learning.jsp	(.../learning.jsp)	(revision eba9c28a1a43b03830d28d70b6fa172af29eaf1f)
+++ lams_tool_survey/web/pages/learning/learning.jsp	(.../learning.jsp)	(revision 13b73687bb274100057f20c3e95518d005a11675)
@@ -51,7 +51,13 @@
 			<p>
 				<c:out value="${sessionMap.instructions}" escapeXml="false" />
 			</p>
-
+			<c:if test="${not empty sessionMap.submissionDeadline}">
+				<div class="info">
+					<fmt:message key="authoring.info.teacher.set.restriction" >
+						<fmt:param><lams:Date value="${sessionMap.submissionDeadline}" /></fmt:param>
+					</fmt:message>
+				</div>
+			</c:if>	
 			<c:choose>
 				<%-- Show on one page or when learner does not choose edit one question --%>
 				<c:when
Index: lams_tool_survey/web/pages/learning/runoffline.jsp
===================================================================
diff -u -r5fb79bfdb5aef13754618da0ca5e516e8b6d03b2 -r13b73687bb274100057f20c3e95518d005a11675
--- lams_tool_survey/web/pages/learning/runoffline.jsp	(.../runoffline.jsp)	(revision 5fb79bfdb5aef13754618da0ca5e516e8b6d03b2)
+++ lams_tool_survey/web/pages/learning/runoffline.jsp	(.../runoffline.jsp)	(revision 13b73687bb274100057f20c3e95518d005a11675)
@@ -28,11 +28,22 @@
 		<h1>
 			${sessionMap.title}
 		</h1>
+		
+		<c:choose>
+			<c:when test="${empty sessionMap.submissionDeadline}">
+				<p>
+					<fmt:message key="run.offline.message" />
+				</p>			
+			</c:when>
+			<c:otherwise>
+				<div class="warning">
+					<fmt:message key="authoring.info.teacher.set.restriction" >
+						<fmt:param><lams:Date value="${sessionMap.submissionDeadline}" /></fmt:param>
+					</fmt:message>
+				</div>
+			</c:otherwise>
+		</c:choose>
 
-		<p>
-			<fmt:message key="run.offline.message" />
-		</p>
-
 		<c:if test="${sessionMap.userFinished and sessionMap.reflectOn}">
 			<div class="small-space-top">
 				<h2>
Index: lams_tool_survey/web/pages/monitoring/daterestriction.jsp
===================================================================
diff -u
--- lams_tool_survey/web/pages/monitoring/daterestriction.jsp	(revision 0)
+++ lams_tool_survey/web/pages/monitoring/daterestriction.jsp	(revision 13b73687bb274100057f20c3e95518d005a11675)
@@ -0,0 +1,43 @@
+<%@include file="/common/taglibs.jsp"%>
+
+<h1 style="padding-bottom: 10px;">
+	<img src="<lams:LAMSURL/>/images/tree_closed.gif" id="restrictUsageTreeIcon" onclick="javascript:toggleAdvancedOptionsVisibility(document.getElementById('restrictUsageDiv'), document.getElementById('restrictUsageTreeIcon'), '<lams:LAMSURL/>');" />
+
+	<a href="javascript:toggleAdvancedOptionsVisibility(document.getElementById('restrictUsageDiv'), document.getElementById('restrictUsageTreeIcon'),'<lams:LAMSURL/>');" >
+		<fmt:message key="monitor.summary.date.restriction" />
+	</a>
+</h1>
+<br />
+
+<div class="monitoring-advanced" id="restrictUsageDiv" style="display:none; ">
+
+	<div>
+		<fmt:message key="monitor.summary.when.date.restriction.is.set" />
+	</div>
+		
+	<div id="datetimeDiv" <c:if test='${not empty sessionMap.submissionDeadline}'> style="display: none;" </c:if>>
+		<span>
+			<fmt:message key="monitor.summary.after.date" />
+		</span>
+		
+		<input type="text" name="datetime" id="datetime" value=""/>
+				
+		<html:link	href="javascript:setSubmissionDeadline();" styleClass="button">
+			<fmt:message key="monitor.summary.set.restriction" />
+		</html:link>
+	</div>
+
+	<div id="dateInfoDiv" <c:if test='${empty sessionMap.submissionDeadline}'> style="display: none;" </c:if>>
+		<span>
+			<fmt:message key="monitor.summary.after.date" />
+		</span>
+		
+		<span id="dateInfo">
+		</span>
+				
+		<html:link	href="javascript:removeSubmissionDeadline();" styleClass="button">
+			<fmt:message key="monitor.summary.unset.restriction" />
+		</html:link>
+	</div>
+
+</div>
\ No newline at end of file
Index: lams_tool_survey/web/pages/monitoring/summary.jsp
===================================================================
diff -u -rf0450cb2776a8eba5e274ec3e72f83a333f5d229 -r13b73687bb274100057f20c3e95518d005a11675
--- lams_tool_survey/web/pages/monitoring/summary.jsp	(.../summary.jsp)	(revision f0450cb2776a8eba5e274ec3e72f83a333f5d229)
+++ lams_tool_survey/web/pages/monitoring/summary.jsp	(.../summary.jsp)	(revision 13b73687bb274100057f20c3e95518d005a11675)
@@ -3,7 +3,18 @@
 <c:set var="summaryList" value="${sessionMap.summaryList}"/>
 <c:set var="tool"><lams:WebAppURL/></c:set>
 
-<script type="text/javascript" src="<lams:LAMSURL/>/includes/javascript/monitorToolSummaryAdvanced.js" ></script>
+<c:set var="lams">
+ 		<lams:LAMSURL />
+</c:set>
+
+<link type="text/css" href="${lams}/css/jquery-ui-1.8.11.flick-theme.css" rel="stylesheet">
+<link type="text/css" href="${lams}/css/jquery-ui-timepicker-addon.css" rel="stylesheet">
+<script type="text/javascript" src="${lams}/includes/javascript/monitorToolSummaryAdvanced.js" ></script>
+<script type="text/javascript" src="${lams}includes/javascript/jquery-1.5.1.min.js"></script>
+<script type="text/javascript" src="${lams}includes/javascript/jquery-ui-1.8.11.custom.min.js"></script>
+<script type="text/javascript" src="${lams}includes/javascript/jquery-ui-timepicker-addon.js"></script>
+<script type="text/javascript" src="${lams}includes/javascript/jquery.blockUI.js"></script>  
+
 <script type="text/javascript">
 	function exportSurvey(sessionId){
 		var url = "<c:url value="/monitoring/exportSurvey.do"/>";
@@ -12,9 +23,77 @@
 		url = url + param;
 		location.href=url;
 	}
+
+	$(function(){
+		$("#datetime").datetimepicker();
+
+		var submissionDeadline = '${sessionMap.submissionDeadline}';
+		if (submissionDeadline != "") {
+			var date = new Date(eval(submissionDeadline));
+			
+			$("#dateInfo").html( formatDate(date) );
+			
+			//open up date restriction area
+			toggleAdvancedOptionsVisibility(document.getElementById('restrictUsageDiv'), document.getElementById('restrictUsageTreeIcon'),'${lams}');
+		
+		}
+		
+	});
+
+	function formatDate(date) {
+		var currHour = "" + date.getHours();
+		if (currHour.length == 1) {
+			currHour = "0" + currHour;
+		}  
+		var currMin = "" + date.getMinutes();
+		if (currMin.length == 1) {
+			currMin = "0" + currMin;
+		}
+		return $.datepicker.formatDate( 'mm/dd/yy', date ) + " " + currHour + ":" + currMin;
+	}
+
+	function setSubmissionDeadline() {
+		//get the timestamp in milliseconds since midnight Jan 1, 1970
+		var date = $("#datetime").datetimepicker('getDate');
+		if (date == null) {
+			return;
+		}
+
+		var reqIDVar = new Date();
+		var url = "<c:url value="/monitoring/setSubmissionDeadline.do"/>?toolContentID=${param.toolContentID}&submissionDeadline="
+					+ date.getTime() + "&reqID=" + reqIDVar.getTime();
+
+		$.ajax({
+			url : url,
+			success : function() {
+				$.growlUI('<fmt:message key="monitor.summary.notification" />', '<fmt:message key="monitor.summary.date.restriction.set" />');
+				$("#datetimeDiv").hide();
+				$("#dateInfo").html(formatDate(date) );
+				$("#dateInfoDiv").show();
+			}
+		});
+	}
+	function removeSubmissionDeadline() {
+		var reqIDVar = new Date();
+		var url = "<c:url value="/monitoring/setSubmissionDeadline.do"/>?toolContentID=${param.toolContentID}&submissionDeadline="
+					+ "&reqID=" + reqIDVar.getTime();
+
+		$.ajax({
+			url : url,
+			success : function() {
+				$.growlUI('<fmt:message key="monitor.summary.notification" />', '<fmt:message key="monitor.summary.date.restriction.removed" />');
+				$("#dateInfoDiv").hide();
+				
+				$("#datetimeDiv").show();
+				$("#datetime").val("");
+			}
+		});
+	}
+		
+			
 </script>	
 
-<h1>
+<h1 style="padding-bottom: 10px;">
 	<img src="<lams:LAMSURL/>/images/tree_closed.gif" id="treeIcon" onclick="javascript:toggleAdvancedOptionsVisibility(document.getElementById('advancedDiv'), document.getElementById('treeIcon'), '<lams:LAMSURL/>');" />
 
 	<a href="javascript:toggleAdvancedOptionsVisibility(document.getElementById('advancedDiv'), document.getElementById('treeIcon'),'<lams:LAMSURL/>');" >
@@ -107,6 +186,8 @@
 </table>
 </div>
 
+<%@include file="daterestriction.jsp"%>
+
 <br />
 
 <c:if test="${empty summaryList}">