Index: lams_tool_task/build.properties
===================================================================
diff -u -r3636757b4afafb785ae0c6c8295a969c605f8e28 -rc142236c124ecebfa9f29ea91c71759c579e1c61
--- lams_tool_task/build.properties	(.../build.properties)	(revision 3636757b4afafb785ae0c6c8295a969c605f8e28)
+++ lams_tool_task/build.properties	(.../build.properties)	(revision c142236c124ecebfa9f29ea91c71759c579e1c61)
@@ -13,7 +13,7 @@
 weblib=lib
 
 #project version
-tool.version=20090113
+tool.version=20110510
 
 # hide tool option
 hideTool=false
Index: lams_tool_task/conf/language/lams/ApplicationResources.properties
===================================================================
diff -u -r69e1708bf3ef4936c2d3f3962340f2b11488a4fa -rc142236c124ecebfa9f29ea91c71759c579e1c61
--- lams_tool_task/conf/language/lams/ApplicationResources.properties	(.../ApplicationResources.properties)	(revision 69e1708bf3ef4936c2d3f3962340f2b11488a4fa)
+++ lams_tool_task/conf/language/lams/ApplicationResources.properties	(.../ApplicationResources.properties)	(revision c142236c124ecebfa9f29ea91c71759c579e1c61)
@@ -2,7 +2,7 @@
 #language code: en 
 #locale code: AU 
 
- # CVS ID: $Id$ Exported from the LAMS Community by Ernie Ghiglione on Sun Jul 05 07:15:08 CST 2009 
+ # CVS ID: $Id$ Exported from the LAMS Community by Ernie Ghiglione on Fri Apr 16 00:07:23 CST 2010 
  
 #=================== labels for Task List =================# 
 
@@ -24,16 +24,14 @@
 label.authoring.heading.advance  =Advanced
 label.authoring.heading.advance.desc  =Please input advance options for task list
 label.authoring.basic.title  =Title
-label.authoring.basic.task.isCommentsFilesAllowed  =Allow learners to add comments/files for this task
-label.monitoring.tasksummary.comments.allowed  =Learners are allowed to add comments
-label.monitoring.tasksummary.files.allowed  =Learners are allowed to add files
 label.authoring.basic.description  =Description
 label.authoring.basic.add.task  =Add Task
 label.authoring.basic.task.isRequired  =Required task
 label.authoring.basic.task.isCommentsAllowed  =Allow Learners to add comment(s)
 label.authoring.basic.task.isCommentsRequired  =Comment required to complete task
 label.authoring.basic.task.isFilesAllowed  =Allow Learners to add file(s)
 label.authoring.basic.task.isFilesRequired  =File required to complete task
+label.authoring.basic.task.isCommentsFilesAllowed  =Allow learners to add comments/files for this task
 label.authoring.basic.task.show.only.to.monitoring  =Show only to monitoring
 label.authoring.basic.task.show.to.all.learners  =Show to all learners
 label.authoring.basic.task.isChildTask  =Don't display until parent task has been completed
@@ -64,6 +62,7 @@
 label.authoring.down  =Move down
 label.authoring.conditions.add.condition  =Add Condition
 label.authoring.conditions.list.title  =Conditions
+label.authoring.conditions.condition.name  =Condition Name
 label.authoring.conditions.order  =Order
 label.authoring.conditions.empty.condition.list  =There are no conditions
 authoring.exception  =There is a problem in task list authoring page, the reason is {0}
@@ -73,6 +72,7 @@
 error.condition.name.blank  =Condition name can not be blank.
 error.condition.name.contains.wrong.symbol  =Condition name can not contain # symbol. Please choose the name without this symbol.
 error.condition.duplicated.name  =Duplicated name. Please choose unique one.
+error.condition.no.tasklistitems.selected  =There are no tasks selected. Please select at least one.
 error.upload.failed  =Upload file failed: {0}
 error.msg.upload.file.not.found  =Could not find upload file {0}.
 error.msg.file.not.found  =File not found exception occurs when uploading file.
@@ -114,16 +114,21 @@
 label.monitoring.heading.access  =Learners list
 label.monitoring.edit.activity.edit  =Edit
 label.monitoring.summary.overall.summary  =Overall Summary
+label.monitoring.summary.user  =Learner
 label.monitoring.summary.confirm.completion  =Confirm Completion
 label.monitoring.summary.title.reflection  =Notebook Entry
 label.monitoring.summary.reflection  =Notebook Entry
 label.monitoring.tasksummary.task.summary  =Task Summary
 label.monitoring.tasksummary.task.required.to.finish  =this task is required to finish this activity
+label.monitoring.tasksummary.parent.activity  =Parent task
 label.monitoring.tasksummary.comments.files.enabled  =Comments/files enabled
+label.monitoring.tasksummary.user  =Learner
 label.monitoring.tasksummary.completed  =Completed
 label.monitoring.tasksummary.time.and.date  =Time and Date
 label.monitoring.tasksummary.comments.files  =Comments/Files
+label.monitoring.tasksummary.comments.allowed  =Learners are allowed to add comments
 label.monitoring.tasksummary.comments.required  =Comments are required to complete the task
+label.monitoring.tasksummary.files.allowed  =Learners are allowed to add files
 label.monitoring.tasksummary.files.required  =Files are required to complete the task
 label.monitoring.instructions.attachments  =Attachments
 message.monitoring.edit.activity.not.editable  =This Activity is no longer editable
@@ -145,16 +150,12 @@
 label.continue  =Continue
 page.title.monitoring.view.reflection  =View Notebook Entry
 button.close  =Close
+message.alertContentEdit  =Warning: One of more learners have accessed this activity. Changing this content will result in learners getting different information.
 label.finished  =Next Activity
 label.finish  =Next Activity
 label.default.user.name  =Instructor
 output.desc.learner.number.of.tasks.completed  =Number of Tasks Completed
-error.condition.no.tasklistitems.selected  =There are no tasks selected. Please select at least one.
-label.monitoring.tasksummary.user  =Learner
 output.desc.tool.condition  =Learner Entered Conditions
-label.authoring.conditions.condition.name  =Condition Name
-label.monitoring.summary.user  =Learner
-label.monitoring.tasksummary.parent.activity  =Parent task
 label.on  =On
 label.off  =Off
 label.monitoring.summary.lock.when.finished  =Lock when finished: {0}
@@ -163,9 +164,19 @@
 label.monitoring.summary.allowed.contribute.tasks  =Participants are allowed to contribute tasks: {0}
 label.monitoring.summary.monitor.verification  =Monitor verification: {0}
 label.monitoring.summary.notebook.reflection  =Notebook Reflection: {0}
-message.alertContentEdit  =Warning: One of more learners have accessed this activity. Changing this content will result in learners getting different information.
 planner.item.title  =Items' titles
 monitor.summary.th.advancedSettings  =Advanced Settings
+monitor.summary.date.restriction  =Date restriction
+monitor.summary.when.date.restriction.is.set  =Learners will not be able to view/complete tasks after the set date and time. 
+monitor.summary.after.date  =Date/time:
 
+monitor.summary.set.restriction  =Set restriction
+monitor.summary.unset.restriction  =Remove restriction
+authoring.info.teacher.set.restriction  =The instructor has set a restriction to this activity from {0} onwards.
+monitor.summary.notification  =Notification
+monitor.summary.date.restriction.set  =Date restriction has been set
+monitor.summary.date.restriction.removed  =Date restriction has been removed
 
+
+
 #======= End labels: Exported 160 labels for en AU =====
Index: lams_tool_task/conf/xdoclet/struts-actions.xml
===================================================================
diff -u -r3636757b4afafb785ae0c6c8295a969c605f8e28 -rc142236c124ecebfa9f29ea91c71759c579e1c61
--- lams_tool_task/conf/xdoclet/struts-actions.xml	(.../struts-actions.xml)	(revision 3636757b4afafb785ae0c6c8295a969c605f8e28)
+++ lams_tool_task/conf/xdoclet/struts-actions.xml	(.../struts-actions.xml)	(revision c142236c124ecebfa9f29ea91c71759c579e1c61)
@@ -38,7 +38,7 @@
 			<forward name="monitor" path="/pages/authoring/definelater.jsp" />
 		</action>
 		
-		<!-- ==========  Authroing Definitions: Instrcutions Files ========== -->
+		<!-- ==========  Authoring Definitions: Instructions Files ========== -->
 		
 		<action path="/authoring/uploadOnlineFile"
 			type="org.lamsfoundation.lams.tool.taskList.web.action.AuthoringAction"
@@ -73,7 +73,7 @@
 			<forward name="success" path="/pages/authoring/parts/instructionfilelist.jsp" />
 		</action>
 		
-		<!-- ==========  Authroing Definitions: Add taskListItem methods ========== -->
+		<!-- ==========  Authoring Definitions: Add taskListItem methods ========== -->
 		
 		<action path="/authoring/newItemInit"
 			type="org.lamsfoundation.lams.tool.taskList.web.action.AuthoringAction"
@@ -142,7 +142,7 @@
 			<forward name="success" path="/pages/authoring/pedagogicalPlannerForm.jsp" />
 		</action>
 		
-		<!-- ==========  Authroing Definitions: Add taskListCondition methods ========== -->
+		<!-- ==========  Authoring Definitions: Add taskListCondition methods ========== -->
 		
 		<action path="/authoring/showConditions"
 			type="org.lamsfoundation.lams.tool.taskList.web.action.AuthoringTaskListConditionAction"
@@ -301,6 +301,11 @@
 			<forward name="success" path="/pages/monitoring/parts/notebook.jsp" />
 		</action>
 		
+		<action path="/monitoring/setSubmissionDeadline"
+			type="org.lamsfoundation.lams.tool.taskList.web.action.MonitoringAction"
+			parameter="setSubmissionDeadline" >
+		</action> 
+		
 		<!-- ========== Common Definitions============================== -->
 		
 		<action path="/clearsession"
Index: lams_tool_task/db/sql/create_lams_tool_taskList.sql
===================================================================
diff -u -rac170eba5ee70135e473b3a5525d1743d0098bc8 -rc142236c124ecebfa9f29ea91c71759c579e1c61
--- lams_tool_task/db/sql/create_lams_tool_taskList.sql	(.../create_lams_tool_taskList.sql)	(revision ac170eba5ee70135e473b3a5525d1743d0098bc8)
+++ lams_tool_task/db/sql/create_lams_tool_taskList.sql	(.../create_lams_tool_taskList.sql)	(revision c142236c124ecebfa9f29ea91c71759c579e1c61)
@@ -51,6 +51,7 @@
    is_monitor_verification_required tinyint,
    reflect_instructions varchar(255), 
    reflect_on_activity smallint, 
+   submission_deadline datetime DEFAULT NULL,
    primary key (uid)
 )TYPE=InnoDB;
 create table tl_latask10_taskList_item (
Index: lams_tool_task/src/java/org/lamsfoundation/lams/tool/taskList/TaskListConstants.java
===================================================================
diff -u -r0d23815a0217cc440544b56c2a964cef24d7de50 -rc142236c124ecebfa9f29ea91c71759c579e1c61
--- lams_tool_task/src/java/org/lamsfoundation/lams/tool/taskList/TaskListConstants.java	(.../TaskListConstants.java)	(revision 0d23815a0217cc440544b56c2a964cef24d7de50)
+++ lams_tool_task/src/java/org/lamsfoundation/lams/tool/taskList/TaskListConstants.java	(.../TaskListConstants.java)	(revision c142236c124ecebfa9f29ea91c71759c579e1c61)
@@ -87,6 +87,10 @@
 	public static final String ATTR_TASK_LIST_ITEM_DTOS = "itemDTOs";
 	public static final String ATTR_IS_GROUPED_ACTIVITY = "isGroupedActivity";
 	
+	//  for submission deadline LDEV-2657
+	public static final String ATTR_SUBMISSION_DEADLINE = "submissionDeadline";
+	public static final String ATTR_IS_SUBMISSION_DEADLINE_PASSED = "isSubmissionDeadlinePassed";
+	
 	//error message keys
 	public static final String ERROR_MSG_TITLE_BLANK = "error.resource.item.title.blank";
 	public static final String ERROR_MSG_NAME_BLANK = "error.condition.name.blank";
Index: lams_tool_task/src/java/org/lamsfoundation/lams/tool/taskList/dbupdates/patch20110510_updateTo236.sql
===================================================================
diff -u
--- lams_tool_task/src/java/org/lamsfoundation/lams/tool/taskList/dbupdates/patch20110510_updateTo236.sql	(revision 0)
+++ lams_tool_task/src/java/org/lamsfoundation/lams/tool/taskList/dbupdates/patch20110510_updateTo236.sql	(revision c142236c124ecebfa9f29ea91c71759c579e1c61)
@@ -0,0 +1,16 @@
+-- SQL statements to update from LAMS 2.3.6
+
+-- Turn off autocommit, so nothing is committed if there is an error
+SET AUTOCOMMIT = 0;
+
+----------------------Put all sql statements below here-------------------------
+-- LDEV-2657
+alter table tl_latask10_taskList add column submission_deadline datetime default null;
+
+UPDATE lams_tool SET tool_version = "20110510" WHERE tool_signature = "latask10";
+
+----------------------Put all sql statements above here-------------------------
+
+-- If there were no errors, commit and restore autocommit to on
+COMMIT;
+SET AUTOCOMMIT = 1;
\ No newline at end of file
Index: lams_tool_task/src/java/org/lamsfoundation/lams/tool/taskList/model/TaskList.java
===================================================================
diff -u -rac170eba5ee70135e473b3a5525d1743d0098bc8 -rc142236c124ecebfa9f29ea91c71759c579e1c61
--- lams_tool_task/src/java/org/lamsfoundation/lams/tool/taskList/model/TaskList.java	(.../TaskList.java)	(revision ac170eba5ee70135e473b3a5525d1743d0098bc8)
+++ lams_tool_task/src/java/org/lamsfoundation/lams/tool/taskList/model/TaskList.java	(.../TaskList.java)	(revision c142236c124ecebfa9f29ea91c71759c579e1c61)
@@ -68,6 +68,10 @@
 	private boolean runOffline;
 	private boolean defineLater;
 	private boolean contentInUse;
+	
+	// LDEV-2657
+	private Date submissionDeadline;
+	
 	//instructions
 	private String onlineInstructions;
 	private String offlineInstructions;
@@ -692,7 +696,19 @@
 	public void setReflectOnActivity(boolean reflectOnActivity) {
 		this.reflectOnActivity = reflectOnActivity;
 	}
+
+	/**
+	 * @hibernate.property column="submission_deadline"
+	 * @return date submissionDeadline
+	 */
+	public Date getSubmissionDeadline() {
+		return submissionDeadline;
+	}
 	
+	public void setSubmissionDeadline(Date submissionDeadline) {
+		this.submissionDeadline = submissionDeadline;
+	}
+
 	/**
 	 * For display use
 	 * @return
Index: lams_tool_task/src/java/org/lamsfoundation/lams/tool/taskList/web/action/LearningAction.java
===================================================================
diff -u -rf385194bf2584414427c60c9f0fe6c7ca5993bc6 -rc142236c124ecebfa9f29ea91c71759c579e1c61
--- lams_tool_task/src/java/org/lamsfoundation/lams/tool/taskList/web/action/LearningAction.java	(.../LearningAction.java)	(revision f385194bf2584414427c60c9f0fe6c7ca5993bc6)
+++ lams_tool_task/src/java/org/lamsfoundation/lams/tool/taskList/web/action/LearningAction.java	(.../LearningAction.java)	(revision c142236c124ecebfa9f29ea91c71759c579e1c61)
@@ -33,6 +33,7 @@
 import java.util.List;
 import java.util.Set;
 import java.util.TreeSet;
+import java.util.TimeZone;
 
 import javax.servlet.ServletException;
 import javax.servlet.http.HttpServletRequest;
@@ -72,6 +73,7 @@
 import org.lamsfoundation.lams.tool.taskList.web.form.ReflectionForm;
 import org.lamsfoundation.lams.tool.taskList.web.form.TaskListItemForm;
 import org.lamsfoundation.lams.usermanagement.dto.UserDTO;
+import org.lamsfoundation.lams.util.DateUtil;
 import org.lamsfoundation.lams.util.FileValidatorUtil;
 import org.lamsfoundation.lams.util.WebUtil;
 import org.lamsfoundation.lams.web.session.SessionManager;
@@ -327,6 +329,23 @@
 			return mapping.findForward("runOffline");
 		}else
 			sessionMap.put(TaskListConstants.PARAM_RUN_OFFLINE, false);
+		
+		//  check if there is submission deadline LDEV-2657
+		Date submissionDeadline = taskList.getSubmissionDeadline();
+		if (submissionDeadline != null) {
+			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());
+			sessionMap.put(TaskListConstants.ATTR_SUBMISSION_DEADLINE, tzSubmissionDeadline);
+			
+			//calculate whether deadline has passed, and if so forward to "runOffline"
+			if (currentLearnerDate.after(tzSubmissionDeadline)) {
+				return mapping.findForward("runOffline");
+			}
+			
+		}
 				
 		sessionMap.put(TaskListConstants.ATTR_RESOURCE,taskList);
 		
Index: lams_tool_task/src/java/org/lamsfoundation/lams/tool/taskList/web/action/MonitoringAction.java
===================================================================
diff -u -r0d23815a0217cc440544b56c2a964cef24d7de50 -rc142236c124ecebfa9f29ea91c71759c579e1c61
--- lams_tool_task/src/java/org/lamsfoundation/lams/tool/taskList/web/action/MonitoringAction.java	(.../MonitoringAction.java)	(revision 0d23815a0217cc440544b56c2a964cef24d7de50)
+++ lams_tool_task/src/java/org/lamsfoundation/lams/tool/taskList/web/action/MonitoringAction.java	(.../MonitoringAction.java)	(revision c142236c124ecebfa9f29ea91c71759c579e1c61)
@@ -26,10 +26,13 @@
 
 import java.io.IOException;
 import java.util.List;
+import java.util.Date;
+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.action.Action;
@@ -49,9 +52,12 @@
 import org.lamsfoundation.lams.tool.taskList.model.TaskListSession;
 import org.lamsfoundation.lams.tool.taskList.model.TaskListUser;
 import org.lamsfoundation.lams.tool.taskList.service.ITaskListService;
+import org.lamsfoundation.lams.usermanagement.dto.UserDTO;
 import org.lamsfoundation.lams.util.WebUtil;
+import org.lamsfoundation.lams.util.DateUtil;
 import org.lamsfoundation.lams.web.util.AttributeNames;
 import org.lamsfoundation.lams.web.util.SessionMap;
+import org.lamsfoundation.lams.web.session.SessionManager;
 import org.springframework.web.context.WebApplicationContext;
 import org.springframework.web.context.support.WebApplicationContextUtils;
 
@@ -76,7 +82,11 @@
 		if (param.equals("viewReflection")) {
 			return viewReflection(mapping, form, request, response);
 		}
-		
+
+		if (param.equals("setSubmissionDeadline")) {
+			return setSubmissionDeadline(mapping, form, request, response);
+		}
+
 		return mapping.findForward(TaskListConstants.ERROR);
 	}
 
@@ -103,7 +113,16 @@
 		sessionMap.put(TaskListConstants.ATTR_RESOURCE, taskList);
 		sessionMap.put(TaskListConstants.ATTR_TOOL_CONTENT_ID, contentId);
 		sessionMap.put(AttributeNames.PARAM_CONTENT_FOLDER_ID,WebUtil.readStrParam(request,AttributeNames.PARAM_CONTENT_FOLDER_ID));
-		sessionMap.put(TaskListConstants.ATTR_IS_GROUPED_ACTIVITY, service.isGroupedActivity(contentId));
+
+		 if (taskList.getSubmissionDeadline() != null) {
+			 Date submissionDeadline = taskList.getSubmissionDeadline();
+			 HttpSession ss = SessionManager.getSession();
+			 UserDTO teacher = (UserDTO) ss.getAttribute(AttributeNames.USER);
+			 TimeZone teacherTimeZone = teacher.getTimeZone();
+			 Date tzSubmissionDeadline = DateUtil.convertToTimeZoneFromDefault(teacherTimeZone, submissionDeadline);
+			 sessionMap.put(TaskListConstants.ATTR_SUBMISSION_DEADLINE, tzSubmissionDeadline.getTime());
+			 
+		 }
 		
 		return mapping.findForward(TaskListConstants.SUCCESS);
 	}
Index: lams_tool_task/web/common/header.jsp
===================================================================
diff -u -r875f56cb6917d1a52bed0545f2933c3b55497a02 -rc142236c124ecebfa9f29ea91c71759c579e1c61
--- lams_tool_task/web/common/header.jsp	(.../header.jsp)	(revision 875f56cb6917d1a52bed0545f2933c3b55497a02)
+++ lams_tool_task/web/common/header.jsp	(.../header.jsp)	(revision c142236c124ecebfa9f29ea91c71759c579e1c61)
@@ -10,7 +10,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="<html:rewrite page='/includes/javascript/taskListcommon.js'/>"></script>
 	<script type="text/javascript" src="${lams}includes/javascript/tabcontroller.js"></script>    
 
Index: lams_tool_task/web/common/tabbedheader.jsp
===================================================================
diff -u -r875f56cb6917d1a52bed0545f2933c3b55497a02 -rc142236c124ecebfa9f29ea91c71759c579e1c61
--- lams_tool_task/web/common/tabbedheader.jsp	(.../tabbedheader.jsp)	(revision 875f56cb6917d1a52bed0545f2933c3b55497a02)
+++ lams_tool_task/web/common/tabbedheader.jsp	(.../tabbedheader.jsp)	(revision c142236c124ecebfa9f29ea91c71759c579e1c61)
@@ -10,7 +10,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="<html:rewrite page='/includes/javascript/taskListcommon.js'/>"></script>
 	<script type="text/javascript" src="${lams}includes/javascript/tabcontroller.js"></script>    
 
Index: lams_tool_task/web/pages/learning/learning.jsp
===================================================================
diff -u -rfe81577970db4c878d1c2b9617b37abb5d431fc5 -rc142236c124ecebfa9f29ea91c71759c579e1c61
--- lams_tool_task/web/pages/learning/learning.jsp	(.../learning.jsp)	(revision fe81577970db4c878d1c2b9617b37abb5d431fc5)
+++ lams_tool_task/web/pages/learning/learning.jsp	(.../learning.jsp)	(revision c142236c124ecebfa9f29ea91c71759c579e1c61)
@@ -86,6 +86,15 @@
 		
  	   	<%@ include file="/common/messages.jsp"%>
 
+		<c:if test="${not empty taskList.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>
+		
+
 		<p>
 			${taskList.instructions}
 		</p>
Index: lams_tool_task/web/pages/learning/runoffline.jsp
===================================================================
diff -u -r5f36e6af9e3babbf42238635f4865f76282dedeb -rc142236c124ecebfa9f29ea91c71759c579e1c61
--- lams_tool_task/web/pages/learning/runoffline.jsp	(.../runoffline.jsp)	(revision 5f36e6af9e3babbf42238635f4865f76282dedeb)
+++ lams_tool_task/web/pages/learning/runoffline.jsp	(.../runoffline.jsp)	(revision c142236c124ecebfa9f29ea91c71759c579e1c61)
@@ -28,9 +28,22 @@
 			${sessionMap.title}
 		</h1>
 
-		<p>
-			<fmt:message key="run.offline.message" />
-		</p>
+
+		<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>									
+			
 		
 		<c:if test="${sessionMap.userFinished and sessionMap.reflectOn}">
 			<div class="small-space-top">
Index: lams_tool_task/web/pages/monitoring/daterestriction.jsp
===================================================================
diff -u
--- lams_tool_task/web/pages/monitoring/daterestriction.jsp	(revision 0)
+++ lams_tool_task/web/pages/monitoring/daterestriction.jsp	(revision c142236c124ecebfa9f29ea91c71759c579e1c61)
@@ -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_task/web/pages/monitoring/summary.jsp
===================================================================
diff -u -r0d23815a0217cc440544b56c2a964cef24d7de50 -rc142236c124ecebfa9f29ea91c71759c579e1c61
--- lams_tool_task/web/pages/monitoring/summary.jsp	(.../summary.jsp)	(revision 0d23815a0217cc440544b56c2a964cef24d7de50)
+++ lams_tool_task/web/pages/monitoring/summary.jsp	(.../summary.jsp)	(revision c142236c124ecebfa9f29ea91c71759c579e1c61)
@@ -2,9 +2,20 @@
 <c:set var="sessionMap" value="${sessionScope[sessionMapID]}"/>
 <c:set var="summaryList" value="${sessionMap.summaryList}"/>
 <c:set var="taskList" value="${sessionMap.taskList}"/>
-<script type="text/javascript" src="<lams:LAMSURL/>/includes/javascript/monitorToolSummaryAdvanced.js" > </script>
-<script type="text/javascript">
 
+<c:set scope="request" var="lams"><lams:LAMSURL/></c:set>
+<c:set scope="request" var="tool"><lams:WebAppURL/></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 summaryTask(taskUid){
 		var myUrl = "<c:url value="/monitoring/itemSummary.do"/>?toolContentID=${toolContentID}&taskListItemUid=" + taskUid;
 		launchPopup(myUrl,"LearnerView");
@@ -14,11 +25,80 @@
 		document.location.href = "<c:url value="/monitoring/setVerifiedByMonitor.do"/>?toolContentID=${toolContentID}&contentFolderID=${sessionMap.contentFolderID}&userUid=" + userUid;
 		return false;
 	}
+
+
+	$(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>
 
 <%-- Overall TaskList information  --%>
-<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/>');" >
@@ -128,6 +208,8 @@
 </table>
 </div>
 
+<%@include file="daterestriction.jsp"%>
+
 <%-- Summary list  --%>
 
 <c:if test="${empty summaryList}">
@@ -138,17 +220,10 @@
 
 <c:forEach var="summary" items="${summaryList}">
 
-	<c:if test="${sessionMap.isGroupedActivity}">
-		<h1>
-			<fmt:message key="monitoring.label.group" /> ${summary.sessionName}	
-		</h1>
-	</c:if>
-	
-	<h2 style="color:black; margin-left: 20px;">
-		<fmt:message key="label.monitoring.summary.overall.summary" />
-	</h2>
-	
+	<h1><fmt:message key="monitoring.label.group" /> ${summary.sessionName}	</h1>
+	<h2 style="color:black; margin-left: 20px;"><fmt:message key="label.monitoring.summary.overall.summary" />	</h2>
 	<table cellpadding="0" class="alternative-color" >
+		
 		<tr>
 			<th width="30%" style="background-repeat: repeat">
 				<fmt:message key="label.monitoring.summary.user" />