Index: lams_tool_sbmt/build.properties
===================================================================
diff -u -r84332e9d2e99a4c32b5d0d825a7256a2a1721faf -reab46de044a4c899fb8c8759c375402c6dba8783
--- lams_tool_sbmt/build.properties	(.../build.properties)	(revision 84332e9d2e99a4c32b5d0d825a7256a2a1721faf)
+++ lams_tool_sbmt/build.properties	(.../build.properties)	(revision eab46de044a4c899fb8c8759c375402c6dba8783)
@@ -8,7 +8,7 @@
 signature=lasbmt11
 
 #project version
-tool.version=20091028
+tool.version=20110325
 
 # Minimum compatible version
 min.server.version.number=2.0.3
Index: lams_tool_sbmt/build.xml
===================================================================
diff -u -r02696b4b5a761a0fcc9f72a677d3599656ffb725 -reab46de044a4c899fb8c8759c375402c6dba8783
--- lams_tool_sbmt/build.xml	(.../build.xml)	(revision 02696b4b5a761a0fcc9f72a677d3599656ffb725)
+++ lams_tool_sbmt/build.xml	(.../build.xml)	(revision eab46de044a4c899fb8c8759c375402c6dba8783)
@@ -494,7 +494,7 @@
 		</delete>
 	</target>
 	
-	<target name="explode-tool" depends="deploy-tool" description="explode tool jar and war package to a war folder">
+	<target name="explode-tool" depends="delete-exploded-tool-folder, deploy-tool" description="explode tool jar and war package to a war folder">
 		<!-- rename war file to avoid name conflict -->
 		<move tofile="${jboss.deploy}/temp-${product}.war" file="${jboss.deploy}/${product}.war"/>
 		<!-- explode the ear -->
Index: lams_tool_sbmt/conf/hibernate/mappings/org/lamsfoundation/lams/tool/sbmt/SubmitFilesContent.hbm.xml
===================================================================
diff -u -r05ab55ef4acdc0c374af7405c58fb0e0fe8eb6b7 -reab46de044a4c899fb8c8759c375402c6dba8783
--- lams_tool_sbmt/conf/hibernate/mappings/org/lamsfoundation/lams/tool/sbmt/SubmitFilesContent.hbm.xml	(.../SubmitFilesContent.hbm.xml)	(revision 05ab55ef4acdc0c374af7405c58fb0e0fe8eb6b7)
+++ lams_tool_sbmt/conf/hibernate/mappings/org/lamsfoundation/lams/tool/sbmt/SubmitFilesContent.hbm.xml	(.../SubmitFilesContent.hbm.xml)	(revision eab46de044a4c899fb8c8759c375402c6dba8783)
@@ -175,6 +175,14 @@
         />
 
         <property
+            name="submissionDeadline"
+            type="java.util.Date"
+            update="true"
+            insert="true"
+            column="submission_deadline"
+        />
+
+        <property
             name="notifyLearnersOnMarkRelease"
             type="boolean"
             update="true"
Index: lams_tool_sbmt/db/sql/create_lams_tool_sbmt.sql
===================================================================
diff -u -r84332e9d2e99a4c32b5d0d825a7256a2a1721faf -reab46de044a4c899fb8c8759c375402c6dba8783
--- lams_tool_sbmt/db/sql/create_lams_tool_sbmt.sql	(.../create_lams_tool_sbmt.sql)	(revision 84332e9d2e99a4c32b5d0d825a7256a2a1721faf)
+++ lams_tool_sbmt/db/sql/create_lams_tool_sbmt.sql	(.../create_lams_tool_sbmt.sql)	(revision eab46de044a4c899fb8c8759c375402c6dba8783)
@@ -24,6 +24,7 @@
    created datetime, 
    created_by bigint, 
    updated datetime,
+   submission_deadline datetime,
    mark_release_notify tinyint DEFAULT 0,
    file_submit_notify tinyint DEFAULT 0,
    primary key (content_id)
Index: lams_tool_sbmt/src/java/org/lamsfoundation/lams/tool/sbmt/SubmitFilesContent.hbm.xml
===================================================================
diff -u -r05ab55ef4acdc0c374af7405c58fb0e0fe8eb6b7 -reab46de044a4c899fb8c8759c375402c6dba8783
--- lams_tool_sbmt/src/java/org/lamsfoundation/lams/tool/sbmt/SubmitFilesContent.hbm.xml	(.../SubmitFilesContent.hbm.xml)	(revision 05ab55ef4acdc0c374af7405c58fb0e0fe8eb6b7)
+++ lams_tool_sbmt/src/java/org/lamsfoundation/lams/tool/sbmt/SubmitFilesContent.hbm.xml	(.../SubmitFilesContent.hbm.xml)	(revision eab46de044a4c899fb8c8759c375402c6dba8783)
@@ -175,6 +175,14 @@
         />
 
         <property
+            name="submissionDeadline"
+            type="java.util.Date"
+            update="true"
+            insert="true"
+            column="submission_deadline"
+        />
+
+        <property
             name="notifyLearnersOnMarkRelease"
             type="boolean"
             update="true"
Index: lams_tool_sbmt/src/java/org/lamsfoundation/lams/tool/sbmt/SubmitFilesContent.java
===================================================================
diff -u -r05ab55ef4acdc0c374af7405c58fb0e0fe8eb6b7 -reab46de044a4c899fb8c8759c375402c6dba8783
--- lams_tool_sbmt/src/java/org/lamsfoundation/lams/tool/sbmt/SubmitFilesContent.java	(.../SubmitFilesContent.java)	(revision 05ab55ef4acdc0c374af7405c58fb0e0fe8eb6b7)
+++ lams_tool_sbmt/src/java/org/lamsfoundation/lams/tool/sbmt/SubmitFilesContent.java	(.../SubmitFilesContent.java)	(revision eab46de044a4c899fb8c8759c375402c6dba8783)
@@ -87,6 +87,8 @@
 	private Date created;
 
 	private Date updated;
+	
+	private Date submissionDeadline;
 
 	private SubmitUser createdBy;
 
@@ -397,7 +399,19 @@
 	public void setUpdated(Date updated) {
 		this.updated = updated;
 	}
+	
+	/**
+	 * @hibernate.property column="submission_deadline"
+	 * @return
+	 */
+	public Date getSubmissionDeadline() {
+		return submissionDeadline;
+	}
 
+	public void setSubmissionDeadline(Date submissionDeadline) {
+		this.submissionDeadline = submissionDeadline;
+	}
+
 	/**
 	 * @hibernate.property column="mark_release_notify"
 	 * @return
Index: lams_tool_sbmt/src/java/org/lamsfoundation/lams/tool/sbmt/dbupdates/patch20110325_updateTo236.sql
===================================================================
diff -u
--- lams_tool_sbmt/src/java/org/lamsfoundation/lams/tool/sbmt/dbupdates/patch20110325_updateTo236.sql	(revision 0)
+++ lams_tool_sbmt/src/java/org/lamsfoundation/lams/tool/sbmt/dbupdates/patch20110325_updateTo236.sql	(revision eab46de044a4c899fb8c8759c375402c6dba8783)
@@ -0,0 +1,15 @@
+-- SQL statements to update to 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_lasbmt11_content add column submission_deadline datetime default null;
+
+----------------------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_sbmt/src/java/org/lamsfoundation/lams/tool/sbmt/util/SbmtConstants.java
===================================================================
diff -u -r6fb9beec407d0532645a9ff3331955bf7e5dd95b -reab46de044a4c899fb8c8759c375402c6dba8783
--- lams_tool_sbmt/src/java/org/lamsfoundation/lams/tool/sbmt/util/SbmtConstants.java	(.../SbmtConstants.java)	(revision 6fb9beec407d0532645a9ff3331955bf7e5dd95b)
+++ lams_tool_sbmt/src/java/org/lamsfoundation/lams/tool/sbmt/util/SbmtConstants.java	(.../SbmtConstants.java)	(revision eab46de044a4c899fb8c8759c375402c6dba8783)
@@ -79,6 +79,12 @@
     public static final String EVENT_NAME_NOTIFY_LEARNERS_ON_MARK_RELEASE = "notify_learners_on_mark_release";
 
     public static final String EVENT_NAME_NOTIFY_TEACHERS_ON_FILE_SUBMIT = "notify_teachers_on_file_submit";
+	
+    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 EVENT_NAME_NOTIFY_LEARNERS_ON_MARKED_FILE = "notify_learners_on_marked_file";
 
Index: lams_tool_sbmt/src/java/org/lamsfoundation/lams/tool/sbmt/web/LearnerAction.java
===================================================================
diff -u -ref2417616a93e7d6f1eaee601fd78455a90564d6 -reab46de044a4c899fb8c8759c375402c6dba8783
--- lams_tool_sbmt/src/java/org/lamsfoundation/lams/tool/sbmt/web/LearnerAction.java	(.../LearnerAction.java)	(revision ef2417616a93e7d6f1eaee601fd78455a90564d6)
+++ lams_tool_sbmt/src/java/org/lamsfoundation/lams/tool/sbmt/web/LearnerAction.java	(.../LearnerAction.java)	(revision eab46de044a4c899fb8c8759c375402c6dba8783)
@@ -26,9 +26,11 @@
 package org.lamsfoundation.lams.tool.sbmt.web;
 
 import java.io.IOException;
+import java.util.Date;
 import java.util.Iterator;
 import java.util.List;
 import java.util.Locale;
+import java.util.TimeZone;
 
 import javax.servlet.http.HttpServletRequest;
 import javax.servlet.http.HttpServletResponse;
@@ -63,6 +65,7 @@
 import org.lamsfoundation.lams.tool.sbmt.util.SbmtConstants;
 import org.lamsfoundation.lams.usermanagement.User;
 import org.lamsfoundation.lams.usermanagement.dto.UserDTO;
+import org.lamsfoundation.lams.util.DateUtil;
 import org.lamsfoundation.lams.util.FileUtil;
 import org.lamsfoundation.lams.util.FileValidatorUtil;
 import org.lamsfoundation.lams.util.WebUtil;
@@ -171,6 +174,23 @@
 	if (content.isRunOffline()) {
 	    return mapping.findForward("runOffline");
 	}
+	
+	//check if there is submission deadline
+	Date submissionDeadline = content.getSubmissionDeadline();
+	if (submissionDeadline != null) {
+	    //store submission deadline to sessionMap
+	    sessionMap.put(SbmtConstants.ATTR_SUBMISSION_DEADLINE, submissionDeadline);
+	   
+	    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");
+	    }
+	}
 
 	if (content.isNotifyLearnersOnMarkRelease()) {
 	    submitFilesService.getEventNotificationService().createEvent(SbmtConstants.TOOL_SIGNATURE,
Index: lams_tool_sbmt/src/java/org/lamsfoundation/lams/tool/sbmt/web/MonitoringAction.java
===================================================================
diff -u -r6fb9beec407d0532645a9ff3331955bf7e5dd95b -reab46de044a4c899fb8c8759c375402c6dba8783
--- lams_tool_sbmt/src/java/org/lamsfoundation/lams/tool/sbmt/web/MonitoringAction.java	(.../MonitoringAction.java)	(revision 6fb9beec407d0532645a9ff3331955bf7e5dd95b)
+++ lams_tool_sbmt/src/java/org/lamsfoundation/lams/tool/sbmt/web/MonitoringAction.java	(.../MonitoringAction.java)	(revision eab46de044a4c899fb8c8759c375402c6dba8783)
@@ -30,13 +30,16 @@
 import java.io.PrintWriter;
 import java.util.ArrayList;
 import java.util.Comparator;
+import java.util.Date;
 import java.util.Iterator;
 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.HttpServletResponse;
+import javax.servlet.http.HttpSession;
 
 import org.apache.poi.hssf.usermodel.HSSFCell;
 import org.apache.poi.hssf.usermodel.HSSFRow;
@@ -60,9 +63,12 @@
 import org.lamsfoundation.lams.tool.sbmt.service.ISubmitFilesService;
 import org.lamsfoundation.lams.tool.sbmt.service.SubmitFilesServiceProxy;
 import org.lamsfoundation.lams.tool.sbmt.util.SbmtConstants;
+import org.lamsfoundation.lams.usermanagement.dto.UserDTO;
+import org.lamsfoundation.lams.util.DateUtil;
 import org.lamsfoundation.lams.util.MessageService;
 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.springframework.web.context.WebApplicationContext;
 import org.springframework.web.context.support.WebApplicationContextUtils;
@@ -124,6 +130,16 @@
 	request.setAttribute(SbmtConstants.PAGE_EDITABLE, persistContent.isContentInUse());
 	request.setAttribute(SbmtConstants.ATTR_IS_GROUPED_ACTIVITY, submitFilesService.isGroupedActivity(contentID));
 
+	//set SubmissionDeadline, if any
+	if (persistContent.getSubmissionDeadline() != null) {
+	    Date submissionDeadline = persistContent.getSubmissionDeadline();
+	    HttpSession ss = SessionManager.getSession();
+	    UserDTO teacher = (UserDTO) ss.getAttribute(AttributeNames.USER);
+	    TimeZone teacherTimeZone = teacher.getTimeZone();
+	    Date tzSubmissionDeadline = DateUtil.convertToTimeZoneFromDefault(teacherTimeZone, submissionDeadline);
+	    request.setAttribute(SbmtConstants.ATTR_SUBMISSION_DEADLINE, tzSubmissionDeadline.getTime());
+	}
+
 	DynaActionForm smbtMonitoringForm = (DynaActionForm) form;
 	// smbtMonitoringForm.set("currentTab", WebUtil.readStrParam(request, AttributeNames.PARAM_CURRENT_TAB,true));
 
@@ -298,7 +314,38 @@
 
 	return null;
     }
+    
+    /**
+     * Set Submission Deadline
+     * 
+     * @param mapping
+     * @param form
+     * @param request
+     * @param response
+     * @return
+     */
+    public ActionForward setSubmissionDeadline(ActionMapping mapping, ActionForm form, HttpServletRequest request,
+	    HttpServletResponse response) {
+	submitFilesService = getSubmitFilesService();
+	
+	Long contentID = WebUtil.readLongParam(request, AttributeNames.PARAM_TOOL_CONTENT_ID);
+	SubmitFilesContent content = submitFilesService.getSubmitFilesContent(contentID);
+	
+	Long dateParameter = WebUtil.readLongParam(request, SbmtConstants.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);
+	submitFilesService.saveOrUpdateContent(content);
 
+	return null;
+    }
+
     // **********************************************************
     // Mark udpate/view methods
     // **********************************************************
Index: lams_tool_sbmt/web/learner/runoffline.jsp
===================================================================
diff -u -r037e42d7312890c7ac666f23a2ace665e7a51bc2 -reab46de044a4c899fb8c8759c375402c6dba8783
--- lams_tool_sbmt/web/learner/runoffline.jsp	(.../runoffline.jsp)	(revision 037e42d7312890c7ac666f23a2ace665e7a51bc2)
+++ lams_tool_sbmt/web/learner/runoffline.jsp	(.../runoffline.jsp)	(revision eab46de044a4c899fb8c8759c375402c6dba8783)
@@ -29,10 +29,22 @@
 			<fmt:message key="activity.title"></fmt:message>
 		</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">
 				<h2>
Index: lams_tool_sbmt/web/learner/sbmtlearner.jsp
===================================================================
diff -u -r037e42d7312890c7ac666f23a2ace665e7a51bc2 -reab46de044a4c899fb8c8759c375402c6dba8783
--- lams_tool_sbmt/web/learner/sbmtlearner.jsp	(.../sbmtlearner.jsp)	(revision 037e42d7312890c7ac666f23a2ace665e7a51bc2)
+++ lams_tool_sbmt/web/learner/sbmtlearner.jsp	(.../sbmtlearner.jsp)	(revision eab46de044a4c899fb8c8759c375402c6dba8783)
@@ -59,20 +59,28 @@
 		<p>
 			<c:out value="${sessionMap.instruction}" escapeXml="false" />
 		</p>
-    <c:if test="${sessionMap.mode == 'author' || sessionMap.mode == 'learner'}">
-		<c:if test="${sessionMap.lockOnFinish}">
-			<div class="info">
-				<c:choose>
-					<c:when test="${sessionMap.userFinished}">
-						<fmt:message key="message.activityLocked" />
-					</c:when>
-					<c:otherwise>
-						<fmt:message key="message.warnLockOnFinish" />
-					</c:otherwise>
-				</c:choose>
-			</div>
+	    <c:if test="${sessionMap.mode == 'author' || sessionMap.mode == 'learner'}">
+			<c:if test="${sessionMap.lockOnFinish}">
+				<div class="info">
+					<c:choose>
+						<c:when test="${sessionMap.userFinished}">
+							<fmt:message key="message.activityLocked" />
+						</c:when>
+						<c:otherwise>
+							<fmt:message key="message.warnLockOnFinish" />
+						</c:otherwise>
+					</c:choose>
+				</div>
+			</c:if>
+			
+			<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>
-	</c:if>
 
 		<%@include file="/common/messages.jsp"%>
 		<c:if test="${sessionMap.limitUpload}">
Index: lams_tool_sbmt/web/monitoring/monitoring.jsp
===================================================================
diff -u -r18e5e690d2e1a7c3d918759f7a2827c8205feaac -reab46de044a4c899fb8c8759c375402c6dba8783
--- lams_tool_sbmt/web/monitoring/monitoring.jsp	(.../monitoring.jsp)	(revision 18e5e690d2e1a7c3d918759f7a2827c8205feaac)
+++ lams_tool_sbmt/web/monitoring/monitoring.jsp	(.../monitoring.jsp)	(revision eab46de044a4c899fb8c8759c375402c6dba8783)
@@ -37,41 +37,20 @@
         }
         
         
-	var statisticTargetDiv = "statisticArea";
+	var statisticTargetDiv = "#statisticArea";
 	function doStatistic(){
 		var url = "<c:url value="/monitoring.do"/>";
 	    var reqIDVar = new Date();
-		var param = "method=doStatistic&toolContentID=" + ${param.toolContentID} +"&reqID="+reqIDVar.getTime();
-		messageLoading();
-	    var myAjax = new Ajax.Updater(
-		    	statisticTargetDiv,
-		    	url,
-		    	{
-		    		method:'get',
-		    		parameters:param,
-		    		onComplete:messageComplete,
-		    		evalScripts:true
-		    	}
-	    );
+		$(statisticTargetDiv).load(
+				url,
+				{
+					method: "doStatistic",
+					toolContentID: "${param.toolContentID}", 
+					reqID: reqIDVar.getTime()
+				}
+			);
 		
-	}
-	
-	function showBusy(targetDiv){
-		if($(targetDiv+"_Busy") != null){
-			Element.show(targetDiv+"_Busy");
-		}
-	}
-	function hideBusy(targetDiv){
-		if($(targetDiv+"_Busy") != null){
-			Element.hide(targetDiv+"_Busy");
-		}				
-	}
-	function messageLoading(){
-		showBusy(statisticTargetDiv);
-	}
-	function messageComplete(){
-		hideBusy(statisticTargetDiv);
-	}        
+	}       
 	</script>
 </lams:head>
 
Index: lams_tool_sbmt/web/monitoring/parts/daterestriction.jsp
===================================================================
diff -u
--- lams_tool_sbmt/web/monitoring/parts/daterestriction.jsp	(revision 0)
+++ lams_tool_sbmt/web/monitoring/parts/daterestriction.jsp	(revision eab46de044a4c899fb8c8759c375402c6dba8783)
@@ -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
Index: lams_tool_sbmt/web/monitoring/parts/summary.jsp
===================================================================
diff -u -r6fb9beec407d0532645a9ff3331955bf7e5dd95b -reab46de044a4c899fb8c8759c375402c6dba8783
--- lams_tool_sbmt/web/monitoring/parts/summary.jsp	(.../summary.jsp)	(revision 6fb9beec407d0532645a9ff3331955bf7e5dd95b)
+++ lams_tool_sbmt/web/monitoring/parts/summary.jsp	(.../summary.jsp)	(revision eab46de044a4c899fb8c8759c375402c6dba8783)
@@ -7,81 +7,140 @@
 	<lams:LAMSURL />
 </c:set>
 
-<script type="text/javascript" src="<lams:LAMSURL/>/includes/javascript/monitorToolSummaryAdvanced.js" ></script>
-<script type="text/javascript" src="${lams}includes/javascript/prototype.js"></script>
+<style media="screen,projection" type="text/css">
+	#restrictUsageDiv {font-size: 13px; padding-bottom: 10px; padding-left: 18px; padding-top: -5px;}
+	#restrictUsageDiv :first-child {padding-bottom: 10px; padding-top: -5px;}
+	#datetime {padding-left: 7px; margin-right: 20px;}
+	#dateInfo {padding-left: 7px;}
+	#dateInfoDiv a {margin-left:10px;}
+</style>
+
+<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 launchPopup(url,title) {
-		var wd = null;
-		if(wd && wd.open && !wd.closed){
-			wd.close();
+	$(function(){
+		$("#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}');
 		}
-		wd = window.open(url,title,'resizable,width=796,height=570,scrollbars');
-		wd.window.focus();
+	});
+	
+	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 showBusy(targetDiv){
-		if($(targetDiv+"_Busy") != null){
-			Element.show(targetDiv+"_Busy");
+	
+	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"/>?method=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 hideBusy(targetDiv){
-		if($(targetDiv+"_Busy") != null){
-			Element.hide(targetDiv+"_Busy");
-		}				
+	function removeSubmissionDeadline() {
+		var reqIDVar = new Date();
+		var url = "<c:url value="/monitoring.do"/>?method=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 viewMark(userId,sessionId){
+	function launchPopup(url, title) {
+		var wd = null;
+		if (wd && wd.open && !wd.closed) {
+			wd.close();
+		}
+		wd = window.open(url, title,
+				'resizable,width=796,height=570,scrollbars');
+		wd.window.focus();
+	}
+
+	function viewMark(userId, sessionId) {
 		var act = "<c:url value="/monitoring.do"/>";
-		launchPopup(act + "?method=listMark&userID="+userId+"&toolSessionID="+sessionId,"mark");
+		launchPopup(act + "?method=listMark&userID=" + userId
+				+ "&toolSessionID=" + sessionId, "mark");
 	}
-	function viewAllMarks(sessionId){
+	function viewAllMarks(sessionId) {
 		var act = "<c:url value="/monitoring.do"/>";
-		launchPopup(act + "?method=listAllMarks&toolSessionID="+sessionId,"mark");
+		launchPopup(act + "?method=listAllMarks&toolSessionID=" + sessionId,
+				"mark");
 	}
-	
-	var messageTargetDiv = "messageArea";
-	function releaseMarks(sessionId){
+
+	var messageTargetDiv = "#messageArea";
+	function releaseMarks(sessionId) {
 		var url = "<c:url value="/monitoring.do"/>";
-	    var reqIDVar = new Date();
-		var param = "method=releaseMarks&toolSessionID=" + sessionId +"&reqID="+reqIDVar.getTime();
-		messageLoading();
-	    var myAjax = new Ajax.Updater(
-		    	messageTargetDiv,
-		    	url,
-		    	{
-		    		method:'get',
-		    		parameters:param,
-		    		onComplete:messageComplete,
-		    		evalScripts:true
-		    	}
-	    );
-		
+		var reqIDVar = new Date();
+		$(messageTargetDiv).load(
+			url,
+			{
+				method: "releaseMarks",
+				toolSessionID: sessionId, 
+				reqID: reqIDVar.getTime()
+			}
+		);
 	}
-	
-	function downloadMarks(sessionId){
+
+	function downloadMarks(sessionId) {
 		var url = "<c:url value="/monitoring.do"/>";
-	    var reqIDVar = new Date();
-		var param = "?method=downloadMarks&toolSessionID=" + sessionId +"&reqID="+reqIDVar.getTime();
+		var reqIDVar = new Date();
+		var param = "?method=downloadMarks&toolSessionID=" + sessionId
+				+ "&reqID=" + reqIDVar.getTime();
 		url = url + param;
-		location.href=url;
+		location.href = url;
 	}
-	
-	function messageLoading(){
-		showBusy(messageTargetDiv);
-	}
-	function messageComplete(){
-		hideBusy(messageTargetDiv);
-	}
 </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">
@@ -184,9 +243,8 @@
 </table>
 </div>
 
+<%@include file="daterestriction.jsp"%>
 
-
-
 <table cellpadding="0">
 <tr><td>
 	<img src="${tool}/images/indicator.gif" style="display:none" id="messageArea_Busy" />