Index: lams_tool_laqa/conf/hibernate/mappings/org/lamsfoundation/lams/tool/qa/QaContent.hbm.xml
===================================================================
diff -u -r501ddb69e1c739b90388262f41b4927356cb0449 -rcd0b7b82232971e95d54348b03049beb1dfe0ecb
--- lams_tool_laqa/conf/hibernate/mappings/org/lamsfoundation/lams/tool/qa/QaContent.hbm.xml	(.../QaContent.hbm.xml)	(revision 501ddb69e1c739b90388262f41b4927356cb0449)
+++ lams_tool_laqa/conf/hibernate/mappings/org/lamsfoundation/lams/tool/qa/QaContent.hbm.xml	(.../QaContent.hbm.xml)	(revision cd0b7b82232971e95d54348b03049beb1dfe0ecb)
@@ -86,6 +86,13 @@
         length="10"
     />
 
+	<property
+		name="submissionDeadline"
+		type="java.util.Date"
+		access="property"  
+		column="submission_deadline"
+		length="10"
+	/>
 
    <property
         name="questionsSequenced"
Index: lams_tool_laqa/db/sql/create_lams_tool_qa.sql
===================================================================
diff -u -r91f0740e75daa643981b757e49d1ed2ed7f0a528 -rcd0b7b82232971e95d54348b03049beb1dfe0ecb
--- lams_tool_laqa/db/sql/create_lams_tool_qa.sql	(.../create_lams_tool_qa.sql)	(revision 91f0740e75daa643981b757e49d1ed2ed7f0a528)
+++ lams_tool_laqa/db/sql/create_lams_tool_qa.sql	(.../create_lams_tool_qa.sql)	(revision cd0b7b82232971e95d54348b03049beb1dfe0ecb)
@@ -5,6 +5,7 @@
      , instructions TEXT
      , creation_date DATETIME
      , update_date DATETIME
+     , submission_deadline DATETIME
      , reflect TINYINT(1) NOT NULL DEFAULT 0
      , questions_sequenced TINYINT(1) NOT NULL DEFAULT 0
      , username_visible TINYINT(1) NOT NULL DEFAULT 0
Index: lams_tool_laqa/src/java/org/lamsfoundation/lams/tool/qa/QaAppConstants.java
===================================================================
diff -u -r6578a27494e05e43b274023060899ede28b17e59 -rcd0b7b82232971e95d54348b03049beb1dfe0ecb
--- lams_tool_laqa/src/java/org/lamsfoundation/lams/tool/qa/QaAppConstants.java	(.../QaAppConstants.java)	(revision 6578a27494e05e43b274023060899ede28b17e59)
+++ lams_tool_laqa/src/java/org/lamsfoundation/lams/tool/qa/QaAppConstants.java	(.../QaAppConstants.java)	(revision cd0b7b82232971e95d54348b03049beb1dfe0ecb)
@@ -254,7 +254,10 @@
     public static final String NO_AVAILABLE_SESSIONS = "noAvailableSessions";
     public static final String NO_TOOL_SESSIONS_AVAILABLE = "noToolSessionAvailable";
     public static final String ATTR_CONTENT = "content";
-
+    public static final String ATTR_RUN_OFFLINE = "runOffline";
+    public static final String ATTR_SUBMISSION_DEADLINE = "submissionDeadline";
+    public static final String ATTR_IS_SUBMISSION_DEADLINE_PASSED = "isSubmissionDeadlinePassed";
+   
     public static final String TIMEZONE = "timeZone";
     public static final String TIMEZONE_ID = "timeZoneId";
     /*
Index: lams_tool_laqa/src/java/org/lamsfoundation/lams/tool/qa/QaContent.java
===================================================================
diff -u -r501ddb69e1c739b90388262f41b4927356cb0449 -rcd0b7b82232971e95d54348b03049beb1dfe0ecb
--- lams_tool_laqa/src/java/org/lamsfoundation/lams/tool/qa/QaContent.java	(.../QaContent.java)	(revision 501ddb69e1c739b90388262f41b4927356cb0449)
+++ lams_tool_laqa/src/java/org/lamsfoundation/lams/tool/qa/QaContent.java	(.../QaContent.java)	(revision cd0b7b82232971e95d54348b03049beb1dfe0ecb)
@@ -122,6 +122,8 @@
 
     /** nullable persistent field */
     private Date updateDate;
+    
+    private Date submissionDeadline;
 
     /** persistent field */
     private Set<QaQueContent> qaQueContents;
@@ -440,6 +442,21 @@
     }
 
     /**
+     * @return Returns the submissionDeadline.
+     */
+    public Date getSubmissionDeadline() {
+    	return submissionDeadline;
+    }
+    
+    /**
+     * @param submissionDeadline
+     * The submissionDeadline to set.
+     */
+    public void setSubmissionDeadline(Date submissionDeadline) {
+    	this.submissionDeadline = submissionDeadline;
+    }
+    
+    /**
      * @return Returns the usernameVisible.
      */
     public boolean isUsernameVisible() {
Index: lams_tool_laqa/src/java/org/lamsfoundation/lams/tool/qa/dbupdates/patch20110217_updateTo236.sql
===================================================================
diff -u -rb9c465dcb22dba078a5bf43c7cbda85f9b5f6000 -rcd0b7b82232971e95d54348b03049beb1dfe0ecb
--- lams_tool_laqa/src/java/org/lamsfoundation/lams/tool/qa/dbupdates/patch20110217_updateTo236.sql	(.../patch20110217_updateTo236.sql)	(revision b9c465dcb22dba078a5bf43c7cbda85f9b5f6000)
+++ lams_tool_laqa/src/java/org/lamsfoundation/lams/tool/qa/dbupdates/patch20110217_updateTo236.sql	(.../patch20110217_updateTo236.sql)	(revision cd0b7b82232971e95d54348b03049beb1dfe0ecb)
@@ -25,6 +25,9 @@
 -- 	LDEV-2653 autosave feature
 ALTER TABLE tl_laqa11_usr_resp DROP COLUMN hidden;
 
+-- LDEV-2657 Date and time restriction 
+ALTER TABLE tl_laqa11_content ADD COLUMN submission_deadline DATETIME DEFAULT null;
+
 UPDATE lams_tool SET tool_version = "20110217" WHERE tool_signature = "laqa11";
 
 ----------------------Put all sql statements above here-------------------------
Index: lams_tool_laqa/src/java/org/lamsfoundation/lams/tool/qa/web/MonitoringUtil.java
===================================================================
diff -u -r501ddb69e1c739b90388262f41b4927356cb0449 -rcd0b7b82232971e95d54348b03049beb1dfe0ecb
--- lams_tool_laqa/src/java/org/lamsfoundation/lams/tool/qa/web/MonitoringUtil.java	(.../MonitoringUtil.java)	(revision 501ddb69e1c739b90388262f41b4927356cb0449)
+++ lams_tool_laqa/src/java/org/lamsfoundation/lams/tool/qa/web/MonitoringUtil.java	(.../MonitoringUtil.java)	(revision cd0b7b82232971e95d54348b03049beb1dfe0ecb)
@@ -24,13 +24,17 @@
 package org.lamsfoundation.lams.tool.qa.web;
 
 import java.util.ArrayList;
+import java.util.Date;
 import java.util.Iterator;
 import java.util.LinkedList;
 import java.util.List;
 import java.util.Map;
+import java.util.TimeZone;
 import java.util.TreeMap;
 
+
 import javax.servlet.http.HttpServletRequest;
+import javax.servlet.http.HttpSession;	
 
 import org.apache.log4j.Logger;
 import org.lamsfoundation.lams.notebook.model.NotebookEntry;
@@ -49,6 +53,10 @@
 import org.lamsfoundation.lams.tool.qa.service.IQaService;
 import org.lamsfoundation.lams.tool.qa.util.QaStringComparator;
 import org.lamsfoundation.lams.tool.qa.util.QaUtils;
+import org.lamsfoundation.lams.usermanagement.dto.UserDTO;
+import org.lamsfoundation.lams.util.DateUtil;
+import org.lamsfoundation.lams.web.session.SessionManager;
+import org.lamsfoundation.lams.web.util.AttributeNames;
 
 /**
  * 
@@ -373,8 +381,18 @@
 	//generateGroupsSessionData
 	List listAllGroupsDTO = buildGroupBasedSessionData(request, qaContent, qaService);
 	request.setAttribute(LIST_ALL_GROUPS_DTO, listAllGroupsDTO);
+	   
+    //set SubmissionDeadline, if any
+    if (qaContent.getSubmissionDeadline() != null) {
+    	Date submissionDeadline = qaContent.getSubmissionDeadline();
+    	HttpSession ss = SessionManager.getSession();
+    	UserDTO teacher = (UserDTO) ss.getAttribute(AttributeNames.USER);
+    	TimeZone teacherTimeZone = teacher.getTimeZone();
+    	Date tzSubmissionDeadline = DateUtil.convertToTimeZoneFromDefault(teacherTimeZone, submissionDeadline);
+    	request.setAttribute(QaAppConstants.ATTR_SUBMISSION_DEADLINE, tzSubmissionDeadline.getTime());
     }
-
+    }
+    
     public static List buildGroupBasedSessionData(HttpServletRequest request, QaContent qaContent, IQaService qaService) {
 	List listQuestions = qaService.getAllQuestionEntries(qaContent.getUid());
 
Index: lams_tool_laqa/src/java/org/lamsfoundation/lams/tool/qa/web/QaLearningStarterAction.java
===================================================================
diff -u -r501ddb69e1c739b90388262f41b4927356cb0449 -rcd0b7b82232971e95d54348b03049beb1dfe0ecb
--- lams_tool_laqa/src/java/org/lamsfoundation/lams/tool/qa/web/QaLearningStarterAction.java	(.../QaLearningStarterAction.java)	(revision 501ddb69e1c739b90388262f41b4927356cb0449)
+++ lams_tool_laqa/src/java/org/lamsfoundation/lams/tool/qa/web/QaLearningStarterAction.java	(.../QaLearningStarterAction.java)	(revision cd0b7b82232971e95d54348b03049beb1dfe0ecb)
@@ -25,9 +25,11 @@
 package org.lamsfoundation.lams.tool.qa.web;
 
 import java.io.IOException;
+import java.util.Date;
 import java.util.HashMap;
 import java.util.Iterator;
 import java.util.Map;
+import java.util.TimeZone;
 import java.util.TreeMap;
 
 import javax.servlet.ServletException;
@@ -60,6 +62,7 @@
 import org.lamsfoundation.lams.tool.qa.util.QaUtils;
 import org.lamsfoundation.lams.tool.qa.web.form.QaLearningForm;
 import org.lamsfoundation.lams.usermanagement.dto.UserDTO;
+import org.lamsfoundation.lams.util.DateUtil;
 import org.lamsfoundation.lams.util.WebUtil;
 import org.lamsfoundation.lams.web.session.SessionManager;
 import org.lamsfoundation.lams.web.util.AttributeNames;
@@ -303,6 +306,24 @@
 	    return (mapping.findForward(RUN_OFFLINE));
 	}
 
+	//check if there is submission deadline
+	Date submissionDeadline = qaContent.getSubmissionDeadline();
+	if (submissionDeadline != null) {
+		//store submission deadline to sessionMap
+		sessionMap.put(QaAppConstants.ATTR_SUBMISSION_DEADLINE, submissionDeadline);
+		
+		HttpSession ss = SessionManager.getSession();
+		UserDTO learnerDto = (UserDTO) ss.getAttribute(AttributeNames.USER);
+		TimeZone learnerTimeZone = learnerDto.getTimeZone();
+		Date tzSubmissionDeadline = DateUtil.convertToTimeZoneFromDefault(learnerTimeZone, submissionDeadline);
+		Date currentLearnerDate = DateUtil.convertToTimeZoneFromDefault(learnerTimeZone, new Date());
+		
+		//calculate whether submission deadline has passed, and if so forward to "runOffline"
+		if (currentLearnerDate.after(tzSubmissionDeadline)) {
+			return mapping.findForward("runOffline");
+		}
+	}
+	
 	/*
 	 * Verify that userId does not already exist in the db.
 	 * If it does exist and the passed tool session id exists in the db, that means the user already responded to the content and 
Index: lams_tool_laqa/src/java/org/lamsfoundation/lams/tool/qa/web/QaMonitoringAction.java
===================================================================
diff -u -r501ddb69e1c739b90388262f41b4927356cb0449 -rcd0b7b82232971e95d54348b03049beb1dfe0ecb
--- lams_tool_laqa/src/java/org/lamsfoundation/lams/tool/qa/web/QaMonitoringAction.java	(.../QaMonitoringAction.java)	(revision 501ddb69e1c739b90388262f41b4927356cb0449)
+++ lams_tool_laqa/src/java/org/lamsfoundation/lams/tool/qa/web/QaMonitoringAction.java	(.../QaMonitoringAction.java)	(revision cd0b7b82232971e95d54348b03049beb1dfe0ecb)
@@ -96,15 +96,18 @@
 
 import java.io.IOException;
 import java.util.ArrayList;
+import java.util.Date;
 import java.util.Iterator;
 import java.util.LinkedList;
 import java.util.List;
 import java.util.Map;
 import java.util.Set;
+import java.util.TimeZone;
 
 import javax.servlet.ServletException;
 import javax.servlet.http.HttpServletRequest;
 import javax.servlet.http.HttpServletResponse;
+import javax.servlet.http.HttpSession;
 
 import org.apache.log4j.Logger;
 import org.apache.struts.Globals;
@@ -134,8 +137,11 @@
 import org.lamsfoundation.lams.tool.qa.util.QaUtils;
 import org.lamsfoundation.lams.tool.qa.web.form.QaAuthoringForm;
 import org.lamsfoundation.lams.tool.qa.web.form.QaMonitoringForm;
+import org.lamsfoundation.lams.usermanagement.dto.UserDTO;
+import org.lamsfoundation.lams.util.DateUtil;
 import org.lamsfoundation.lams.util.WebUtil;
 import org.lamsfoundation.lams.web.action.LamsDispatchAction;
+import org.lamsfoundation.lams.web.session.SessionManager;
 import org.lamsfoundation.lams.web.util.AttributeNames;
 import org.lamsfoundation.lams.web.util.SessionMap;
 
@@ -3338,7 +3344,39 @@
 
 	return mapping.findForward(QaAppConstants.LOAD_MONITORING);
     }
+    
+    /**
+     * Set Submission Deadline
+     * 
+     * @param mapping
+     * @param form
+     * @param request
+     * @param response
+     * @return
+     */
+    public ActionForward setSubmissionDeadline(ActionMapping mapping, ActionForm form, HttpServletRequest request,
+	    HttpServletResponse response) {
+	IQaService qaService = getQAService();
+	
+	Long contentID = WebUtil.readLongParam(request, AttributeNames.PARAM_TOOL_CONTENT_ID);
+	QaContent content = qaService.getQa(contentID);
+	
+	Long dateParameter = WebUtil.readLongParam(request, QaAppConstants.ATTR_SUBMISSION_DEADLINE, true);
+	Date tzSubmissionDeadline = null;
+	if (dateParameter != null) {
+	    Date submissionDeadline = new Date(dateParameter);
+	    HttpSession ss = SessionManager.getSession();
+	    UserDTO teacher = (UserDTO) ss.getAttribute(AttributeNames.USER);
+	    TimeZone teacherTimeZone = teacher.getTimeZone();
+	    tzSubmissionDeadline = DateUtil.convertFromTimeZoneToDefault(teacherTimeZone, submissionDeadline);
+	}
+	content.setSubmissionDeadline(tzSubmissionDeadline);
+	qaService.saveOrUpdateQa(content);
 
+	return null;
+    }    
+    
+
     public void prepareReflectionData(HttpServletRequest request, QaContent qaContent, IQaService qaService,
 	    String userID, boolean exportMode, String currentSessionId) {
 	
@@ -3529,4 +3567,8 @@
 	return reflectionsContainerDTO;
     }
 
+    private IQaService getQAService() {
+    	return QaServiceProxy.getQaService(getServlet().getServletContext());
+    }
+    
 }
\ No newline at end of file
Index: lams_tool_laqa/web/common/header.jsp
===================================================================
diff -u -r00ae80d4791f903bcb3661537fc7e129c72ad195 -rcd0b7b82232971e95d54348b03049beb1dfe0ecb
--- lams_tool_laqa/web/common/header.jsp	(.../header.jsp)	(revision 00ae80d4791f903bcb3661537fc7e129c72ad195)
+++ lams_tool_laqa/web/common/header.jsp	(.../header.jsp)	(revision cd0b7b82232971e95d54348b03049beb1dfe0ecb)
@@ -19,7 +19,6 @@
 
 <!-- ********************  javascript ********************** -->
 <script type="text/javascript" src="${lams}includes/javascript/common.js"></script>
-<script type="text/javascript" src="${lams}includes/javascript/prototype.js"></script>
 <script type="text/javascript" src="${lams}includes/javascript/tabcontroller.js"></script>
 
 
Index: lams_tool_laqa/web/common/tabbedheader.jsp
===================================================================
diff -u -r00ae80d4791f903bcb3661537fc7e129c72ad195 -rcd0b7b82232971e95d54348b03049beb1dfe0ecb
--- lams_tool_laqa/web/common/tabbedheader.jsp	(.../tabbedheader.jsp)	(revision 00ae80d4791f903bcb3661537fc7e129c72ad195)
+++ lams_tool_laqa/web/common/tabbedheader.jsp	(.../tabbedheader.jsp)	(revision cd0b7b82232971e95d54348b03049beb1dfe0ecb)
@@ -19,7 +19,6 @@
 
 <!-- ********************  javascript ********************** -->
 <script type="text/javascript" src="${lams}includes/javascript/common.js"></script>
-<script type="text/javascript" src="${lams}includes/javascript/prototype.js"></script>
 <script type="text/javascript" src="${lams}includes/javascript/tabcontroller.js"></script>
 
 
Index: lams_tool_laqa/web/learning/AnswersContent.jsp
===================================================================
diff -u -r91f0740e75daa643981b757e49d1ed2ed7f0a528 -rcd0b7b82232971e95d54348b03049beb1dfe0ecb
--- lams_tool_laqa/web/learning/AnswersContent.jsp	(.../AnswersContent.jsp)	(revision 91f0740e75daa643981b757e49d1ed2ed7f0a528)
+++ lams_tool_laqa/web/learning/AnswersContent.jsp	(.../AnswersContent.jsp)	(revision cd0b7b82232971e95d54348b03049beb1dfe0ecb)
@@ -30,6 +30,7 @@
 <c:set var="tool">
 	<lams:WebAppURL />
 </c:set>
+<c:set var="sessionMap" value="${sessionScope[generalLearnerFlowDTO.httpSessionID]}" />
 
 <lams:html>
 <lams:head>
@@ -102,6 +103,14 @@
 				escapeXml="false" />
 		</h1>
 
+		<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>	
+
 		<html:form action="/learning?validate=false"
 			enctype="multipart/form-data" method="POST" target="_self" styleId="learningForm">
 			<c:choose>
Index: lams_tool_laqa/web/learning/IndividualLearnerResults.jsp
===================================================================
diff -u -r4c9365155a19f048af7f0465ced0b965141292d5 -rcd0b7b82232971e95d54348b03049beb1dfe0ecb
--- lams_tool_laqa/web/learning/IndividualLearnerResults.jsp	(.../IndividualLearnerResults.jsp)	(revision 4c9365155a19f048af7f0465ced0b965141292d5)
+++ lams_tool_laqa/web/learning/IndividualLearnerResults.jsp	(.../IndividualLearnerResults.jsp)	(revision cd0b7b82232971e95d54348b03049beb1dfe0ecb)
@@ -29,6 +29,7 @@
 <c:set var="tool">
 	<lams:WebAppURL />
 </c:set>
+<c:set var="sessionMap" value="${sessionScope[generalLearnerFlowDTO.httpSessionID]}" />
 
 <lams:html>
 <lams:head>
@@ -63,6 +64,14 @@
 			<c:out value="${generalLearnerFlowDTO.activityTitle}"
 				escapeXml="false" />
 		</h1>
+		
+		<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:if test="${(generalLearnerFlowDTO.lockWhenFinished == 'true')  && (generalLearnerFlowDTO.showOtherAnswers == 'true') }">
 				<div class="info space-bottom">
Index: lams_tool_laqa/web/learning/LearnerRep.jsp
===================================================================
diff -u -rb866c51b8fc29aa4e36e281ec30a8046a0797738 -rcd0b7b82232971e95d54348b03049beb1dfe0ecb
--- lams_tool_laqa/web/learning/LearnerRep.jsp	(.../LearnerRep.jsp)	(revision b866c51b8fc29aa4e36e281ec30a8046a0797738)
+++ lams_tool_laqa/web/learning/LearnerRep.jsp	(.../LearnerRep.jsp)	(revision cd0b7b82232971e95d54348b03049beb1dfe0ecb)
@@ -29,6 +29,7 @@
 <c:set var="tool">
 	<lams:WebAppURL />
 </c:set>
+<c:set var="sessionMap" value="${sessionScope[generalLearnerFlowDTO.httpSessionID]}" />
 
 <lams:html>
 <lams:head>
@@ -87,6 +88,13 @@
 			<c:out value="${generalLearnerFlowDTO.activityTitle}"
 				escapeXml="false" />
 		</h1>
+		<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:if
 			test="${generalLearnerFlowDTO.requestLearningReportProgress != 'true'}">
Index: lams_tool_laqa/web/learning/RevisitedLearnerRep.jsp
===================================================================
diff -u -r91f0740e75daa643981b757e49d1ed2ed7f0a528 -rcd0b7b82232971e95d54348b03049beb1dfe0ecb
--- lams_tool_laqa/web/learning/RevisitedLearnerRep.jsp	(.../RevisitedLearnerRep.jsp)	(revision 91f0740e75daa643981b757e49d1ed2ed7f0a528)
+++ lams_tool_laqa/web/learning/RevisitedLearnerRep.jsp	(.../RevisitedLearnerRep.jsp)	(revision cd0b7b82232971e95d54348b03049beb1dfe0ecb)
@@ -29,6 +29,7 @@
 <c:set var="tool">
 	<lams:WebAppURL />
 </c:set>
+<c:set var="sessionMap" value="${sessionScope[generalLearnerFlowDTO.httpSessionID]}" />
 
 <lams:html>
 <lams:head>
@@ -88,6 +89,14 @@
 			<c:out value="${generalLearnerFlowDTO.activityTitle}"
 				escapeXml="false" />
 		</h1>
+		
+		<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:if
 			test="${generalLearnerFlowDTO.requestLearningReportProgress != 'true'}">
Index: lams_tool_laqa/web/learning/RunOffline.jsp
===================================================================
diff -u -r80b7ea061db3811a79da84e1adbf688a26d6b43f -rcd0b7b82232971e95d54348b03049beb1dfe0ecb
--- lams_tool_laqa/web/learning/RunOffline.jsp	(.../RunOffline.jsp)	(revision 80b7ea061db3811a79da84e1adbf688a26d6b43f)
+++ lams_tool_laqa/web/learning/RunOffline.jsp	(.../RunOffline.jsp)	(revision cd0b7b82232971e95d54348b03049beb1dfe0ecb)
@@ -22,6 +22,7 @@
         "http://www.w3.org/TR/html4/strict.dtd">
 
 <%@ include file="/common/taglibs.jsp"%>
+<c:set var="sessionMap" value="${sessionScope[generalLearnerFlowDTO.httpSessionID]}" />
 
 <c:set var="lams">
 	<lams:LAMSURL />
@@ -72,6 +73,20 @@
 			<p>
 				<fmt:message key="label.learning.forceOfflineMessage" />
 			</p>
+			<c:choose>
+				<c:when test="${empty sessionMap.submissionDeadline}">
+					<p>
+						<fmt:message key="label.learning.forceOfflineMessage" />
+					</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>
 
 			<div class="space-bottom-top align-right">
 
Index: lams_tool_laqa/web/monitoring/MonitoringMaincontent.jsp
===================================================================
diff -u -r91f0740e75daa643981b757e49d1ed2ed7f0a528 -rcd0b7b82232971e95d54348b03049beb1dfe0ecb
--- lams_tool_laqa/web/monitoring/MonitoringMaincontent.jsp	(.../MonitoringMaincontent.jsp)	(revision 91f0740e75daa643981b757e49d1ed2ed7f0a528)
+++ lams_tool_laqa/web/monitoring/MonitoringMaincontent.jsp	(.../MonitoringMaincontent.jsp)	(revision cd0b7b82232971e95d54348b03049beb1dfe0ecb)
@@ -46,7 +46,7 @@
 		<lams:WebAppURL />
 	</c:set>
 	<c:set var="ctxPath" value="${pageContext.request.contextPath}" scope="request" />
-	
+		
 	<!-- ********************  CSS ********************** -->
 	<c:choose>
 		<c:when test="${not empty localLinkPath}">
@@ -56,21 +56,27 @@
 			<lams:css  style="tabbed"/>
 		</c:otherwise>
 	</c:choose>
+
+	<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">
+	<link rel="stylesheet" href="<html:rewrite page='/includes/css/jRating.jquery.css'/>"  type="text/css" />
+	<link rel="stylesheet" href="<html:rewrite page='/includes/css/ratingStars.css'/>"  type="text/css" />
 	
 	<!-- ********************  javascript ********************** -->
 	<script type="text/javascript" src="${lams}includes/javascript/common.js"></script>
 	<script type="text/javascript" src="${lams}includes/javascript/tabcontroller.js"></script>
-	
-	<link rel="stylesheet" href="<html:rewrite page='/includes/css/jRating.jquery.css'/>"  type="text/css" />
-	<link rel="stylesheet" href="<html:rewrite page='/includes/css/ratingStars.css'/>"  type="text/css" />
+	<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>
 	<style media="screen,projection" type="text/css">
 		.ratingStarsDiv {padding-right: 15px;}
 	</style>
 	
 	<script type="text/javascript"> 
 		var pathToImageFolder = "<html:rewrite page='/images/'/>"; 
 	</script>
-	<script type="text/javascript" src="<html:rewrite page='/includes/javascript/jquery.js'/>"></script>
+
 	<script type="text/javascript" src="<html:rewrite page='/includes/javascript/jRating.jquery.js'/>"></script>
 
  	<!-- ******************** FCK Editor related javascript & HTML ********************** -->
@@ -81,7 +87,70 @@
 		    	rateMax : 5,
 		    	isDisabled : true
 			});
+
+
+			$("#datetime").datetimepicker();
+			
+			var submissionDeadline = "${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.do"/>?dispatch=setSubmissionDeadline&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.do"/>?dispatch=setSubmissionDeadline&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("");
+				}
+			});
+		}
+		 
 
 		function submitMonitoringMethod(actionMethod) 
 		{
Index: lams_tool_laqa/web/monitoring/SummaryContent.jsp
===================================================================
diff -u -r6578a27494e05e43b274023060899ede28b17e59 -rcd0b7b82232971e95d54348b03049beb1dfe0ecb
--- lams_tool_laqa/web/monitoring/SummaryContent.jsp	(.../SummaryContent.jsp)	(revision 6578a27494e05e43b274023060899ede28b17e59)
+++ lams_tool_laqa/web/monitoring/SummaryContent.jsp	(.../SummaryContent.jsp)	(revision cd0b7b82232971e95d54348b03049beb1dfe0ecb)
@@ -21,7 +21,7 @@
 <%@ include file="/common/taglibs.jsp"%>
 <script type="text/javascript" src="<lams:LAMSURL />/includes/javascript/monitorToolSummaryAdvanced.js" ></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/>');" >
@@ -162,7 +162,9 @@
 	</tr>
 </table>
 </div>	
-	
+
+	<%@include file="dateRestriction.jsp"%>
+		
 	<html:hidden property="responseId"/>	 
 	<html:hidden property="sessionId"/>	 
 	
Index: lams_tool_laqa/web/monitoring/dateRestriction.jsp
===================================================================
diff -u
--- lams_tool_laqa/web/monitoring/dateRestriction.jsp	(revision 0)
+++ lams_tool_laqa/web/monitoring/dateRestriction.jsp	(revision cd0b7b82232971e95d54348b03049beb1dfe0ecb)
@@ -0,0 +1,43 @@
+<%@include file="/common/taglibs.jsp"%>
+
+<h1>
+	<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 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 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