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.10.6.1.4.4 -r1.10.6.1.4.5
--- lams_tool_laqa/conf/hibernate/mappings/org/lamsfoundation/lams/tool/qa/QaContent.hbm.xml	22 Mar 2011 16:38:45 -0000	1.10.6.1.4.4
+++ lams_tool_laqa/conf/hibernate/mappings/org/lamsfoundation/lams/tool/qa/QaContent.hbm.xml	13 Apr 2011 16:57:51 -0000	1.10.6.1.4.5
@@ -87,13 +87,23 @@
     />
 
 
+    <property
+        name="submissionDeadline"
+        type="java.util.Date"
+        access="property"        
+        column="submission_deadline"
+        length="10"
+    />
+
+
    <property
         name="questionsSequenced"
         type="boolean"
         access="property"
         column="questions_sequenced"
    />
    
+   
    <property
         name="reflect"
         type="boolean"
Index: lams_tool_laqa/db/sql/create_lams_tool_qa.sql
===================================================================
RCS file: /usr/local/cvsroot/lams_tool_laqa/db/sql/create_lams_tool_qa.sql,v
diff -u -r1.52.6.2.4.3 -r1.52.6.2.4.4
--- lams_tool_laqa/db/sql/create_lams_tool_qa.sql	16 Mar 2011 20:01:47 -0000	1.52.6.2.4.3
+++ lams_tool_laqa/db/sql/create_lams_tool_qa.sql	13 Apr 2011 16:57:51 -0000	1.52.6.2.4.4
@@ -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
===================================================================
RCS file: /usr/local/cvsroot/lams_tool_laqa/src/java/org/lamsfoundation/lams/tool/qa/QaAppConstants.java,v
diff -u -r1.82.10.3 -r1.82.10.4
--- lams_tool_laqa/src/java/org/lamsfoundation/lams/tool/qa/QaAppConstants.java	18 Mar 2011 18:59:27 -0000	1.82.10.3
+++ lams_tool_laqa/src/java/org/lamsfoundation/lams/tool/qa/QaAppConstants.java	13 Apr 2011 16:57:51 -0000	1.82.10.4
@@ -253,6 +253,9 @@
     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
===================================================================
RCS file: /usr/local/cvsroot/lams_tool_laqa/src/java/org/lamsfoundation/lams/tool/qa/QaContent.java,v
diff -u -r1.22.4.1.4.3 -r1.22.4.1.4.4
--- lams_tool_laqa/src/java/org/lamsfoundation/lams/tool/qa/QaContent.java	22 Mar 2011 16:38:45 -0000	1.22.4.1.4.3
+++ lams_tool_laqa/src/java/org/lamsfoundation/lams/tool/qa/QaContent.java	13 Apr 2011 16:57:50 -0000	1.22.4.1.4.4
@@ -121,6 +121,8 @@
 
     /** nullable persistent field */
     private Date updateDate;
+    
+    private Date submissionDeadline;
 
     /** persistent field */
     private Set<QaQueContent> qaQueContents;
@@ -436,8 +438,23 @@
     public void setUpdateDate(Date updateDate) {
 	this.updateDate = updateDate;
     }
+    
+    /**
+     * @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
===================================================================
RCS file: /usr/local/cvsroot/lams_tool_laqa/src/java/org/lamsfoundation/lams/tool/qa/dbupdates/patch20110217_updateTo236.sql,v
diff -u -r1.1.2.2 -r1.1.2.3
--- lams_tool_laqa/src/java/org/lamsfoundation/lams/tool/qa/dbupdates/patch20110217_updateTo236.sql	16 Mar 2011 19:54:00 -0000	1.1.2.2
+++ lams_tool_laqa/src/java/org/lamsfoundation/lams/tool/qa/dbupdates/patch20110217_updateTo236.sql	13 Apr 2011 16:57:51 -0000	1.1.2.3
@@ -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
===================================================================
RCS file: /usr/local/cvsroot/lams_tool_laqa/src/java/org/lamsfoundation/lams/tool/qa/web/Attic/MonitoringUtil.java,v
diff -u -r1.42.8.5 -r1.42.8.6
--- lams_tool_laqa/src/java/org/lamsfoundation/lams/tool/qa/web/MonitoringUtil.java	22 Mar 2011 16:38:46 -0000	1.42.8.5
+++ lams_tool_laqa/src/java/org/lamsfoundation/lams/tool/qa/web/MonitoringUtil.java	13 Apr 2011 16:57:50 -0000	1.42.8.6
@@ -24,13 +24,16 @@
 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 +52,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;
 
 /**
  * 
@@ -370,6 +377,16 @@
 	//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) {
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.70.4.1.4.4 -r1.70.4.1.4.5
--- lams_tool_laqa/src/java/org/lamsfoundation/lams/tool/qa/web/QaLearningStarterAction.java	22 Mar 2011 16:38:46 -0000	1.70.4.1.4.4
+++ lams_tool_laqa/src/java/org/lamsfoundation/lams/tool/qa/web/QaLearningStarterAction.java	13 Apr 2011 16:57:50 -0000	1.70.4.1.4.5
@@ -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;
@@ -302,6 +305,24 @@
 	    QaUtils.cleanUpSessionAbsolute(request);
 	    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.
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.61.8.7 -r1.61.8.8
--- lams_tool_laqa/src/java/org/lamsfoundation/lams/tool/qa/web/QaMonitoringAction.java	22 Mar 2011 16:38:46 -0000	1.61.8.7
+++ lams_tool_laqa/src/java/org/lamsfoundation/lams/tool/qa/web/QaMonitoringAction.java	13 Apr 2011 16:57:50 -0000	1.61.8.8
@@ -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;
 
@@ -3343,7 +3349,38 @@
 
 	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) {
 	
@@ -3533,5 +3570,9 @@
 
 	return reflectionsContainerDTO;
     }
+    
+    private IQaService getQAService() {
+	return QaServiceProxy.getQaService(getServlet().getServletContext());
+    }
 
 }
\ No newline at end of file
Index: lams_tool_laqa/web/common/tabbedheader.jsp
===================================================================
RCS file: /usr/local/cvsroot/lams_tool_laqa/web/common/tabbedheader.jsp,v
diff -u -r1.2 -r1.2.10.1
--- lams_tool_laqa/web/common/tabbedheader.jsp	8 Jun 2007 01:38:44 -0000	1.2
+++ lams_tool_laqa/web/common/tabbedheader.jsp	13 Apr 2011 16:57:51 -0000	1.2.10.1
@@ -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>
 
 <%@ include file="/common/fckeditorheader.jsp"%>
Index: lams_tool_laqa/web/learning/AnswersContent.jsp
===================================================================
RCS file: /usr/local/cvsroot/lams_tool_laqa/web/learning/AnswersContent.jsp,v
diff -u -r1.28.10.3 -r1.28.10.4
--- lams_tool_laqa/web/learning/AnswersContent.jsp	16 Mar 2011 20:01:47 -0000	1.28.10.3
+++ lams_tool_laqa/web/learning/AnswersContent.jsp	13 Apr 2011 16:57:51 -0000	1.28.10.4
@@ -30,6 +30,7 @@
 <c:set var="tool">
 	<lams:WebAppURL />
 </c:set>
+<c:set var="sessionMap" value="${sessionScope[generalLearnerFlowDTO.httpSessionID]}" />
 
 <lams:html>
 <lams:head>
@@ -98,12 +99,18 @@
 
 	<div id="content">
 		<h1>
-			<c:out value="${generalLearnerFlowDTO.activityTitle}"
-				escapeXml="false" />
+			<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>
 
-		<html:form action="/learning?validate=false"
-			enctype="multipart/form-data" method="POST" target="_self" styleId="learningForm">
+		<html:form action="/learning?validate=false" enctype="multipart/form-data" method="POST" target="_self" styleId="learningForm">
 			<c:choose>
 				<c:when test="${generalLearnerFlowDTO.questionListingMode == 'questionListingModeSequential'}">
 					<html:hidden property="method" value="getNextQuestion"/>
Index: lams_tool_laqa/web/learning/IndividualLearnerResults.jsp
===================================================================
RCS file: /usr/local/cvsroot/lams_tool_laqa/web/learning/IndividualLearnerResults.jsp,v
diff -u -r1.33.8.3 -r1.33.8.4
--- lams_tool_laqa/web/learning/IndividualLearnerResults.jsp	1 Nov 2010 10:24:25 -0000	1.33.8.3
+++ lams_tool_laqa/web/learning/IndividualLearnerResults.jsp	13 Apr 2011 16:57:51 -0000	1.33.8.4
@@ -29,6 +29,7 @@
 <c:set var="tool">
 	<lams:WebAppURL />
 </c:set>
+<c:set var="sessionMap" value="${sessionScope[generalLearnerFlowDTO.httpSessionID]}" />
 
 <lams:html>
 <lams:head>
@@ -55,35 +56,35 @@
 
 <body class="stripes">
 
-
-
-
 	<div id="content">
 		<h1>
 			<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">
-					<fmt:message key="label.responses.locked" />								
-				</div>
+		<c:if test="${(generalLearnerFlowDTO.lockWhenFinished == 'true')  && (generalLearnerFlowDTO.showOtherAnswers == 'true') }">
+			<div class="info space-bottom">
+				<fmt:message key="label.responses.locked" />								
+			</div>
+		</c:if>
 
-			</c:if>
-
-
-		<html:form action="/learning?validate=false"
-			enctype="multipart/form-data" method="POST" target="_self">
+		<html:form action="/learning?validate=false" enctype="multipart/form-data" method="POST" target="_self">
 			<html:hidden property="method" value="storeAllResults"/>
 			<html:hidden property="toolSessionID" />
 			<html:hidden property="userID" />
 			<html:hidden property="httpSessionID" />
 			<html:hidden property="totalQuestionCount" />
 
+			<c:forEach var="questionEntry" items="${generalLearnerFlowDTO.mapQuestionContentLearner}">
 
-			<c:forEach var="questionEntry"
-				items="${generalLearnerFlowDTO.mapQuestionContentLearner}">
-
 				<div class="shading-bg">
 					<p>
 						<strong><fmt:message key="label.question" /> <c:out
@@ -92,41 +93,29 @@
 						<c:out value="${questionEntry.value.question}" escapeXml="false" />
 					</p>
 
-					<c:forEach var="answerEntry"
-						items="${generalLearnerFlowDTO.mapAnswersPresentable}">
+					<c:forEach var="answerEntry" items="${generalLearnerFlowDTO.mapAnswersPresentable}">
 						<c:if test="${answerEntry.key == questionEntry.key}">
-
-
-
 							<p>
 								<strong> <fmt:message key="label.learning.yourAnswer" />
 								</strong>
 
 								<br>
 								<c:out value="${answerEntry.value}" escapeXml="false" />
-
 							</p>
-
-
 						</c:if>
 					</c:forEach>
 
-
 					<c:if test="${(questionEntry.value.feedback != '') && (questionEntry.value.feedback != null) }">
 							<span class="field-name"> <fmt:message
 									key="label.feedback" />: </span>
 							<c:out value="${questionEntry.value.feedback}" escapeXml="false" />
 					</c:if>
 
 				</div>
-
 			</c:forEach>
 
-			<div class="last-item">
+			<div class="last-item"> </div>
 
-			</div>
-
-
 			<div class="space-bottom-top small-space-top">
 				<html:button property="redoQuestions" styleClass="button"
 					onclick="submitMethod('redoQuestions');">
@@ -161,8 +150,6 @@
 					</html:button>
 				</c:if>
 			</c:if>				
-			
-			
 			</div>
 
 		</html:form>
Index: lams_tool_laqa/web/learning/LearnerRep.jsp
===================================================================
RCS file: /usr/local/cvsroot/lams_tool_laqa/web/learning/LearnerRep.jsp,v
diff -u -r1.37.8.4 -r1.37.8.5
--- lams_tool_laqa/web/learning/LearnerRep.jsp	3 Mar 2011 20:34:50 -0000	1.37.8.4
+++ lams_tool_laqa/web/learning/LearnerRep.jsp	13 Apr 2011 16:57:51 -0000	1.37.8.5
@@ -29,6 +29,7 @@
 <c:set var="tool">
 	<lams:WebAppURL />
 </c:set>
+<c:set var="sessionMap" value="${sessionScope[generalLearnerFlowDTO.httpSessionID]}" />
 
 <lams:html>
 <lams:head>
@@ -84,16 +85,20 @@
 
 	<div id="content">
 		<h1>
-			<c:out value="${generalLearnerFlowDTO.activityTitle}"
-				escapeXml="false" />
+			<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'}">
+		<c:if test="${generalLearnerFlowDTO.requestLearningReportProgress != 'true'}">
 
-
-			<html:form action="/learning?validate=false"
-				enctype="multipart/form-data" method="POST" target="_self">
+			<html:form action="/learning?validate=false" enctype="multipart/form-data" method="POST" target="_self">
 				<c:choose>
 				<c:when test="${generalLearnerFlowDTO.reflection != 'true'}">
 					<html:hidden property="method" value="endLearning"/>
@@ -108,36 +113,32 @@
 				<html:hidden property="httpSessionID" />
 				<html:hidden property="totalQuestionCount"/>
 
-				<c:forEach var="currentDto"
-					items="${generalLearnerFlowDTO.listMonitoredAnswersContainerDTO}">
-					<c:set var="currentQuestionId" scope="request"
-						value="${currentDto.questionUid}" />
+				<c:forEach var="currentDto" items="${generalLearnerFlowDTO.listMonitoredAnswersContainerDTO}">
+					<c:set var="currentQuestionId" scope="request" value="${currentDto.questionUid}" />
 
 					<div class="shading-bg">
 						<p>
 							<strong> <fmt:message key="label.question" /> : </strong>
 							<c:out value="${currentDto.question}" escapeXml="false" />
 						</p>
 
-						<c:forEach var="questionAttemptData"
-							items="${currentDto.questionAttempts}">
+						<c:forEach var="questionAttemptData" items="${currentDto.questionAttempts}">
 							<c:forEach var="sData" items="${questionAttemptData.value}">
 								<c:set var="userData" scope="request" value="${sData.value}" />
 								<c:set var="responseUid" scope="request" value="${userData.uid}" />
 
 								<c:if test="${generalLearnerFlowDTO.userUid == userData.queUsrId}">
-		
-										<c:if test="${currentQuestionId == userData.questionUid}">
-											<p>
-												<span class="field-name"> <c:out
-														value="${userData.userName}" /> </span> -
-												<lams:Date value="${userData.attemptTime}" />
-											</p>
-											<p>
-												<c:out value="${userData.responsePresentable}" escapeXml="false" />
-											</p>
-											<jsp:include page="parts/ratingStarsDisabled.jsp" />
-										</c:if>
+									<c:if test="${currentQuestionId == userData.questionUid}">
+										<p>
+											<span class="field-name"> <c:out
+													value="${userData.userName}" /> </span> -
+											<lams:Date value="${userData.attemptTime}" />
+										</p>
+										<p>
+											<c:out value="${userData.responsePresentable}" escapeXml="false" />
+										</p>
+										<jsp:include page="parts/ratingStarsDisabled.jsp" />
+									</c:if>
 								</c:if>								
 							</c:forEach>
 						</c:forEach>
@@ -149,22 +150,17 @@
 					<h2> 
 						<fmt:message key="label.other.answers" />
 					</h2>
-					
 	
-					<c:forEach var="currentDto"
-								items="${generalLearnerFlowDTO.listMonitoredAnswersContainerDTO}">
-								<c:set var="currentQuestionId" scope="request"
-									value="${currentDto.questionUid}" />
+					<c:forEach var="currentDto" items="${generalLearnerFlowDTO.listMonitoredAnswersContainerDTO}">
+						<c:set var="currentQuestionId" scope="request" value="${currentDto.questionUid}" />
 			
-								<div class="shading-bg">
-						<p>
-							<strong> <fmt:message key="label.question" /> : </strong>
-							<c:out value="${currentDto.question}" escapeXml="false" />
-						</p>
-
+						<div class="shading-bg">
+							<p>
+								<strong> <fmt:message key="label.question" /> : </strong>
+								<c:out value="${currentDto.question}" escapeXml="false" />
+							</p>
 			
-									<c:forEach var="questionAttemptData"
-										items="${currentDto.questionAttempts}">
+									<c:forEach var="questionAttemptData" items="${currentDto.questionAttempts}">
 										<c:forEach var="sData" items="${questionAttemptData.value}">
 											<c:set var="userData" scope="request" value="${sData.value}" />
 											<c:set var="responseUid" scope="request" value="${userData.uid}" />
@@ -203,8 +199,7 @@
 
 						
 
-				<c:if
-					test="${generalLearnerFlowDTO.requestLearningReportViewOnly != 'true' }">
+				<c:if test="${generalLearnerFlowDTO.requestLearningReportViewOnly != 'true' }">
 					<c:if test="${generalLearnerFlowDTO.teacherViewOnly != 'true' }">
 
 						<html:button property="refreshAnswers" styleClass="button"
@@ -244,34 +239,29 @@
 
 
 
-		<c:if
-			test="${generalLearnerFlowDTO.requestLearningReportProgress == 'true'}">
+		<c:if test="${generalLearnerFlowDTO.requestLearningReportProgress == 'true'}">
 
 			<h2>
 				<fmt:message key="label.learnerReport" />
 			</h2>
 
-			<html:form action="/learning?validate=false"
-				enctype="multipart/form-data" method="POST" target="_self">
+			<html:form action="/learning?validate=false" enctype="multipart/form-data" method="POST" target="_self">
 				<html:hidden property="method" />
 				<html:hidden property="toolSessionID" styleId="toolSessionID"/>
 				<html:hidden property="userID" />
 				<html:hidden property="httpSessionID" />
 				<html:hidden property="totalQuestionCount" />
 
-				<c:forEach var="currentDto"
-					items="${generalLearnerFlowDTO.listMonitoredAnswersContainerDTO}">
-					<c:set var="currentQuestionId" scope="request"
-						value="${currentDto.questionUid}" />
+				<c:forEach var="currentDto" items="${generalLearnerFlowDTO.listMonitoredAnswersContainerDTO}">
+					<c:set var="currentQuestionId" scope="request" value="${currentDto.questionUid}" />
 
 					<div class="shading-bg">
 						<p>
 							<strong> <fmt:message key="label.question" /> : </strong>
 							<c:out value="${currentDto.question}" escapeXml="false" />
 						</p>
 
-						<c:forEach var="questionAttemptData"
-							items="${currentDto.questionAttempts}">
+						<c:forEach var="questionAttemptData" items="${currentDto.questionAttempts}">
 							<c:forEach var="sData" items="${questionAttemptData.value}">
 								<c:set var="userData" scope="request" value="${sData.value}" />
 								<c:set var="responseUid" scope="request" value="${userData.uid}" />
@@ -303,21 +293,17 @@
 						<fmt:message key="label.other.answers" />
 					</h2>
 					
-	
-						<c:forEach var="currentDto"
-								items="${generalLearnerFlowDTO.listMonitoredAnswersContainerDTO}">
-								<c:set var="currentQuestionId" scope="request"
-									value="${currentDto.questionUid}" />
+					<c:forEach var="currentDto" items="${generalLearnerFlowDTO.listMonitoredAnswersContainerDTO}">
+						<c:set var="currentQuestionId" scope="request" value="${currentDto.questionUid}" />
 			
-								<div class="shading-bg">
-						<p>
-							<strong> <fmt:message key="label.question" /> : </strong>
-							<c:out value="${currentDto.question}" escapeXml="false" />
-						</p>
+						<div class="shading-bg">
+							<p>
+								<strong> <fmt:message key="label.question" /> : </strong>
+								<c:out value="${currentDto.question}" escapeXml="false" />
+							</p>
 
 			
-									<c:forEach var="questionAttemptData"
-										items="${currentDto.questionAttempts}">
+									<c:forEach var="questionAttemptData" items="${currentDto.questionAttempts}">
 										<c:forEach var="sData" items="${questionAttemptData.value}">
 											<c:set var="userData" scope="request" value="${sData.value}" />
 											<c:set var="responseUid" scope="request" value="${userData.uid}" />
@@ -357,19 +343,16 @@
 
 					
 
-				<c:if
-					test="${generalLearnerFlowDTO.requestLearningReportViewOnly != 'true' }">
+				<c:if test="${generalLearnerFlowDTO.requestLearningReportViewOnly != 'true' }">
 					<c:if test="${generalLearnerFlowDTO.teacherViewOnly != 'true' }">
 
-						<html:button property="refreshAnswers" styleClass="button"
-							onclick="submitMethod('refreshAllResults');">
+						<html:button property="refreshAnswers" styleClass="button" onclick="submitMethod('refreshAllResults');">
 							<fmt:message key="label.refresh" />
 						</html:button>
 
 
 						<c:if test="${generalLearnerFlowDTO.lockWhenFinished != 'true'}">
-							<html:button property="redoQuestions" styleClass="button"
-								onclick="submitMethod('redoQuestions');">
+							<html:button property="redoQuestions" styleClass="button" onclick="submitMethod('redoQuestions');">
 								<fmt:message key="label.redo" />
 							</html:button>
 						</c:if>						
Index: lams_tool_laqa/web/learning/RevisitedLearnerRep.jsp
===================================================================
RCS file: /usr/local/cvsroot/lams_tool_laqa/web/learning/RevisitedLearnerRep.jsp,v
diff -u -r1.16.8.5 -r1.16.8.6
--- lams_tool_laqa/web/learning/RevisitedLearnerRep.jsp	16 Mar 2011 20:01:47 -0000	1.16.8.5
+++ lams_tool_laqa/web/learning/RevisitedLearnerRep.jsp	13 Apr 2011 16:57:51 -0000	1.16.8.6
@@ -29,6 +29,7 @@
 <c:set var="tool">
 	<lams:WebAppURL />
 </c:set>
+<c:set var="sessionMap" value="${sessionScope[generalLearnerFlowDTO.httpSessionID]}" />
 
 <lams:html>
 <lams:head>
@@ -85,9 +86,16 @@
 
 	<div id="content">
 		<h1>
-			<c:out value="${generalLearnerFlowDTO.activityTitle}"
-				escapeXml="false" />
+			<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
===================================================================
RCS file: /usr/local/cvsroot/lams_tool_laqa/web/learning/Attic/RunOffline.jsp,v
diff -u -r1.16.8.1 -r1.16.8.2
--- lams_tool_laqa/web/learning/RunOffline.jsp	16 Sep 2009 01:58:46 -0000	1.16.8.1
+++ lams_tool_laqa/web/learning/RunOffline.jsp	13 Apr 2011 16:57:51 -0000	1.16.8.2
@@ -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 />
@@ -69,9 +70,21 @@
 			<h1>
 				<fmt:message key="activity.title" />
 			</h1>
-			<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
===================================================================
RCS file: /usr/local/cvsroot/lams_tool_laqa/web/monitoring/MonitoringMaincontent.jsp,v
diff -u -r1.28.10.2 -r1.28.10.3
--- lams_tool_laqa/web/monitoring/MonitoringMaincontent.jsp	3 Mar 2011 20:34:50 -0000	1.28.10.2
+++ lams_tool_laqa/web/monitoring/MonitoringMaincontent.jsp	13 Apr 2011 16:57:50 -0000	1.28.10.3
@@ -41,6 +41,8 @@
 	<title><fmt:message key="activity.title" /></title>
 	<%@ include file="/common/tabbedheader.jsp"%>
 	
+	<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" />
 	<style media="screen,projection" type="text/css">
@@ -50,8 +52,11 @@
 	<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="${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="<html:rewrite page='/includes/javascript/jRating.jquery.js'/>"></script>
+	<script type="text/javascript" src="${lams}includes/javascript/jquery.blockUI.js"></script>
 
  	<!-- ******************** FCK Editor related javascript & HTML ********************** -->
 	<script language="JavaScript" type="text/JavaScript">
@@ -61,8 +66,69 @@
 		    	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) 
 		{
 			document.QaMonitoringForm.dispatch.value=actionMethod; 
Index: lams_tool_laqa/web/monitoring/SummaryContent.jsp
===================================================================
RCS file: /usr/local/cvsroot/lams_tool_laqa/web/monitoring/SummaryContent.jsp,v
diff -u -r1.39.10.2 -r1.39.10.3
--- lams_tool_laqa/web/monitoring/SummaryContent.jsp	18 Mar 2011 18:59:27 -0000	1.39.10.2
+++ lams_tool_laqa/web/monitoring/SummaryContent.jsp	13 Apr 2011 16:57:50 -0000	1.39.10.3
@@ -21,14 +21,13 @@
 <%@ 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/>');" >
 		<fmt:message key="monitor.summary.th.advancedSettings" />
 	</a>
 </h1>
-<br />
 
 <div class="monitoring-advanced" id="advancedDiv" style="display:none">
 <table class="alternative-color">
@@ -162,6 +161,8 @@
 	</tr>
 </table>
 </div>	
+
+<%@include file="dateRestriction.jsp"%>
 	
 	<html:hidden property="responseId"/>	 
 	<html:hidden property="sessionId"/>	 
Fisheye: Tag 1.1 refers to a dead (removed) revision in file `lams_tool_laqa/web/monitoring/dateRestriction.jsp'.
Fisheye: No comparison available.  Pass `N' to diff?