Index: lams_tool_vote/build.properties
===================================================================
diff -u -r618abc7cca98f08ef288878ab371a3693492d835 -r57a242c8553eeec5781c2106493aa9f34efa5489
--- lams_tool_vote/build.properties	(.../build.properties)	(revision 618abc7cca98f08ef288878ab371a3693492d835)
+++ lams_tool_vote/build.properties	(.../build.properties)	(revision 57a242c8553eeec5781c2106493aa9f34efa5489)
@@ -4,7 +4,7 @@
 signature=lavote11
 
 #project version
-tool.version=20100309
+tool.version=20110509
 
 # hide tool option
 hideTool=false
Index: lams_tool_vote/conf/hibernate/mappings/org/lamsfoundation/lams/tool/vote/VoteContent.hbm.xml
===================================================================
diff -u -r618abc7cca98f08ef288878ab371a3693492d835 -r57a242c8553eeec5781c2106493aa9f34efa5489
--- lams_tool_vote/conf/hibernate/mappings/org/lamsfoundation/lams/tool/vote/VoteContent.hbm.xml	(.../VoteContent.hbm.xml)	(revision 618abc7cca98f08ef288878ab371a3693492d835)
+++ lams_tool_vote/conf/hibernate/mappings/org/lamsfoundation/lams/tool/vote/VoteContent.hbm.xml	(.../VoteContent.hbm.xml)	(revision 57a242c8553eeec5781c2106493aa9f34efa5489)
@@ -190,6 +190,14 @@
         column="external_inputs_added"
    />
 
+   <property
+        name="submissionDeadline"
+        type="java.util.Date"
+        access="property"
+        column="submission_deadline"
+        length="20"        
+   />   
+
     	 <set
             name="voteQueContents"
             order-by="display_order"
Index: lams_tool_vote/conf/language/lams/ApplicationResources.properties
===================================================================
diff -u -r618abc7cca98f08ef288878ab371a3693492d835 -r57a242c8553eeec5781c2106493aa9f34efa5489
--- lams_tool_vote/conf/language/lams/ApplicationResources.properties	(.../ApplicationResources.properties)	(revision 618abc7cca98f08ef288878ab371a3693492d835)
+++ lams_tool_vote/conf/language/lams/ApplicationResources.properties	(.../ApplicationResources.properties)	(revision 57a242c8553eeec5781c2106493aa9f34efa5489)
@@ -163,6 +163,19 @@
 label.total.students  =Total number of possible learners:
 label.learning.reportMessage  =Your vote(s):
 label.learner.nomination  =Your nomination is:
+error.minNominationCount.not.reached  =You haven't selected enough nominations. You should select at least
+label.minNomCount  =Min Votes
 
+monitor.summary.date.restriction  =Date restriction
+monitor.summary.when.date.restriction.is.set  =Learners will not be able to vote 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 155 labels for en AU =====
Index: lams_tool_vote/db/sql/create_lams_tool_vote.sql
===================================================================
diff -u -r618abc7cca98f08ef288878ab371a3693492d835 -r57a242c8553eeec5781c2106493aa9f34efa5489
--- lams_tool_vote/db/sql/create_lams_tool_vote.sql	(.../create_lams_tool_vote.sql)	(revision 618abc7cca98f08ef288878ab371a3693492d835)
+++ lams_tool_vote/db/sql/create_lams_tool_vote.sql	(.../create_lams_tool_vote.sql)	(revision 57a242c8553eeec5781c2106493aa9f34efa5489)
@@ -22,6 +22,7 @@
 	 , assigned_data_flow_object TINYINT(1)
      , external_inputs_added SMALLINT DEFAULT 0
 	 , max_external_inputs SMALLINT
+	 , submission_deadline datetime DEFAULT NULL
      , PRIMARY KEY (uid)
 )TYPE=InnoDB;
 
Index: lams_tool_vote/src/java/org/lamsfoundation/lams/tool/vote/VoteAppConstants.java
===================================================================
diff -u -r618abc7cca98f08ef288878ab371a3693492d835 -r57a242c8553eeec5781c2106493aa9f34efa5489
--- lams_tool_vote/src/java/org/lamsfoundation/lams/tool/vote/VoteAppConstants.java	(.../VoteAppConstants.java)	(revision 618abc7cca98f08ef288878ab371a3693492d835)
+++ lams_tool_vote/src/java/org/lamsfoundation/lams/tool/vote/VoteAppConstants.java	(.../VoteAppConstants.java)	(revision 57a242c8553eeec5781c2106493aa9f34efa5489)
@@ -143,6 +143,10 @@
     public static final String OPT_INDEX = "optIndex";
 
     public static final String RUN_OFFLINE = "runOffline";
+    
+    // 	for submission deadline LDEV-2657
+    public static final String ATTR_SUBMISSION_DEADLINE = "submissionDeadline";
+    public static final String ATTR_IS_SUBMISSION_DEADLINE_PASSED = "isSubmissionDeadlinePassed";
 
     /*
      * refers to number of questions presented initially, we have a single record for default content
Index: lams_tool_vote/src/java/org/lamsfoundation/lams/tool/vote/VoteGeneralLearnerFlowDTO.java
===================================================================
diff -u -r618abc7cca98f08ef288878ab371a3693492d835 -r57a242c8553eeec5781c2106493aa9f34efa5489
--- lams_tool_vote/src/java/org/lamsfoundation/lams/tool/vote/VoteGeneralLearnerFlowDTO.java	(.../VoteGeneralLearnerFlowDTO.java)	(revision 618abc7cca98f08ef288878ab371a3693492d835)
+++ lams_tool_vote/src/java/org/lamsfoundation/lams/tool/vote/VoteGeneralLearnerFlowDTO.java	(.../VoteGeneralLearnerFlowDTO.java)	(revision 57a242c8553eeec5781c2106493aa9f34efa5489)
@@ -22,6 +22,7 @@
 /* $$Id$$ */
 package org.lamsfoundation.lams.tool.vote;
 
+import java.util.Date;
 import java.util.List;
 import java.util.Map;
 
@@ -93,8 +94,10 @@
     
     protected String nominationsSubmited;
     
-    protected Map mapGeneralCheckedOptionsContent;
+    protected Date submissionDeadline;
     
+	protected Map mapGeneralCheckedOptionsContent;
+    
     protected Map mapStandardNominationsContent;
     
     protected Map mapStandardNominationsHTMLedContent;
@@ -308,6 +311,19 @@
     }    
     
     /**
+	 * @return the submissionDeadline
+	 */
+	public Date getSubmissionDeadline() {
+		return submissionDeadline;
+	}
+	/**
+	 * @param submissionDeadline the submissionDeadline to set
+	 */
+	public void setSubmissionDeadline(Date submissionDeadline) {
+		this.submissionDeadline = submissionDeadline;
+	}
+    
+    /**
      * @return Returns the previewOnly.
      */
     public String getPreviewOnly() {
Index: lams_tool_vote/src/java/org/lamsfoundation/lams/tool/vote/dbupdates/patch20110509_updateTo236.sql
===================================================================
diff -u
--- lams_tool_vote/src/java/org/lamsfoundation/lams/tool/vote/dbupdates/patch20110509_updateTo236.sql	(revision 0)
+++ lams_tool_vote/src/java/org/lamsfoundation/lams/tool/vote/dbupdates/patch20110509_updateTo236.sql	(revision 57a242c8553eeec5781c2106493aa9f34efa5489)
@@ -0,0 +1,9 @@
+SET AUTOCOMMIT = 0;
+
+-- LDEV-2657 date/time restrictions
+alter table tl_lavote11_content add column submission_deadline datetime default null;
+
+UPDATE lams_tool SET tool_version = "20110509" WHERE tool_signature = "lavote11";
+
+COMMIT;
+SET AUTOCOMMIT = 1;
Index: lams_tool_vote/src/java/org/lamsfoundation/lams/tool/vote/pojos/VoteContent.java
===================================================================
diff -u -r618abc7cca98f08ef288878ab371a3693492d835 -r57a242c8553eeec5781c2106493aa9f34efa5489
--- lams_tool_vote/src/java/org/lamsfoundation/lams/tool/vote/pojos/VoteContent.java	(.../VoteContent.java)	(revision 618abc7cca98f08ef288878ab371a3693492d835)
+++ lams_tool_vote/src/java/org/lamsfoundation/lams/tool/vote/pojos/VoteContent.java	(.../VoteContent.java)	(revision 57a242c8553eeec5781c2106493aa9f34efa5489)
@@ -107,6 +107,8 @@
 
     /** persistent field */
     private Set voteAttachments;
+    
+    private Date submissionDeadline;
 
     /**
      * persistent field This field can be calculated, but introducing it reduces number of DB calls.
@@ -538,4 +540,16 @@
     public void setExternalInputsAdded(Short externalInputsAdded) {
 	this.externalInputsAdded = externalInputsAdded;
     }
+    
+   	public void setSubmissionDeadline(Date submissionDeadline) {
+		this.submissionDeadline = submissionDeadline;
+	}
+	
+	/**
+	 * @hibernate.property column="submission_deadline"
+	 * @return date submissionDeadline
+	 */
+	public Date getSubmissionDeadline() {
+		return submissionDeadline;
+	}
 }
\ No newline at end of file
Index: lams_tool_vote/src/java/org/lamsfoundation/lams/tool/vote/web/VoteLearningStarterAction.java
===================================================================
diff -u -re7c872d97ed5a450f72cfa57325f7d37280efcde -r57a242c8553eeec5781c2106493aa9f34efa5489
--- lams_tool_vote/src/java/org/lamsfoundation/lams/tool/vote/web/VoteLearningStarterAction.java	(.../VoteLearningStarterAction.java)	(revision e7c872d97ed5a450f72cfa57325f7d37280efcde)
+++ lams_tool_vote/src/java/org/lamsfoundation/lams/tool/vote/web/VoteLearningStarterAction.java	(.../VoteLearningStarterAction.java)	(revision 57a242c8553eeec5781c2106493aa9f34efa5489)
@@ -159,6 +159,8 @@
 import java.util.Map;
 import java.util.Set;
 import java.util.TreeMap;
+import java.util.TimeZone;
+import java.util.Date;
 
 import javax.servlet.ServletException;
 import javax.servlet.http.HttpServletRequest;
@@ -189,6 +191,7 @@
 import org.lamsfoundation.lams.tool.vote.service.IVoteService;
 import org.lamsfoundation.lams.tool.vote.service.VoteServiceProxy;
 import org.lamsfoundation.lams.usermanagement.dto.UserDTO;
+import org.lamsfoundation.lams.util.DateUtil;
 import org.lamsfoundation.lams.util.MessageService;
 import org.lamsfoundation.lams.web.session.SessionManager;
 import org.lamsfoundation.lams.web.util.AttributeNames;
@@ -406,6 +409,28 @@
 	    return mapping.findForward(VoteAppConstants.DEFINE_LATER);
 	}
 
+    //	check if there is submission deadline
+    Date submissionDeadline = voteContent.getSubmissionDeadline();
+    
+    if (submissionDeadline != null) {
+    	
+    	request.setAttribute(VoteAppConstants.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());
+    	voteGeneralLearnerFlowDTO.setSubmissionDeadline(tzSubmissionDeadline);	 
+    	
+    	//calculate whether deadline has passed, and if so forward to "runOffline"
+    	if (currentLearnerDate.after(tzSubmissionDeadline)) {
+    		return mapping.findForward(RUN_OFFLINE);
+    		
+    	}
+    	
+    }
+  
+
 	/*
 	 * fetch question content from content
 	 */
Index: lams_tool_vote/src/java/org/lamsfoundation/lams/tool/vote/web/VoteMonitoringAction.java
===================================================================
diff -u -re7c872d97ed5a450f72cfa57325f7d37280efcde -r57a242c8553eeec5781c2106493aa9f34efa5489
--- lams_tool_vote/src/java/org/lamsfoundation/lams/tool/vote/web/VoteMonitoringAction.java	(.../VoteMonitoringAction.java)	(revision e7c872d97ed5a450f72cfa57325f7d37280efcde)
+++ lams_tool_vote/src/java/org/lamsfoundation/lams/tool/vote/web/VoteMonitoringAction.java	(.../VoteMonitoringAction.java)	(revision 57a242c8553eeec5781c2106493aa9f34efa5489)
@@ -30,10 +30,13 @@
 import java.util.Map;
 import java.util.Set;
 import java.util.TreeMap;
+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.ActionForm;
@@ -64,9 +67,12 @@
 import org.lamsfoundation.lams.tool.vote.pojos.VoteUsrAttempt;
 import org.lamsfoundation.lams.tool.vote.service.IVoteService;
 import org.lamsfoundation.lams.tool.vote.service.VoteServiceProxy;
+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.lamsfoundation.lams.web.util.SessionMap;
 
@@ -724,6 +730,16 @@
 
 	VoteContent voteContent = voteService.retrieveVote(new Long(toolContentID));
 	VoteMonitoringAction.logger.debug("existing voteContent:" + voteContent);
+	
+	if (voteContent.getSubmissionDeadline() != null) {
+		Date submissionDeadline = voteContent.getSubmissionDeadline();
+		HttpSession ss = SessionManager.getSession();
+		UserDTO teacher = (UserDTO) ss.getAttribute(AttributeNames.USER);
+		TimeZone teacherTimeZone = teacher.getTimeZone();
+		Date tzSubmissionDeadline = DateUtil.convertToTimeZoneFromDefault(teacherTimeZone, submissionDeadline);
+		request.setAttribute(VoteAppConstants.ATTR_SUBMISSION_DEADLINE, tzSubmissionDeadline.getTime());
+	}	
+	
 
 	/* this section is related to summary tab. Starts here. */
 	Map summaryToolSessions = MonitoringUtil.populateToolSessions(request, voteContent, voteService);
@@ -3437,6 +3453,38 @@
     }
 
     /**
+     * Set Submission Deadline
+     * 
+     * @param mapping
+     * @param form
+     * @param request
+     * @param response
+     * @return
+     */
+    public ActionForward setSubmissionDeadline(ActionMapping mapping, ActionForm form, HttpServletRequest request,
+	    HttpServletResponse response) {
+    	
+    	IVoteService voteService = VoteServiceProxy.getVoteService(getServlet().getServletContext());
+		
+    	Long contentID = WebUtil.readLongParam(request, AttributeNames.PARAM_TOOL_CONTENT_ID);
+    	VoteContent voteContent = voteService.retrieveVote(contentID);
+	
+    	Long dateParameter = WebUtil.readLongParam(request, VoteAppConstants.ATTR_SUBMISSION_DEADLINE, true);
+    	Date tzSubmissionDeadline = null;
+    	if (dateParameter != null) {
+    		Date submissionDeadline = new Date(dateParameter);
+		    HttpSession ss = SessionManager.getSession();
+		    org.lamsfoundation.lams.usermanagement.dto.UserDTO teacher = (org.lamsfoundation.lams.usermanagement.dto.UserDTO) ss.getAttribute(AttributeNames.USER);
+		    TimeZone teacherTimeZone = teacher.getTimeZone();
+		    tzSubmissionDeadline = DateUtil.convertFromTimeZoneToDefault(teacherTimeZone, submissionDeadline);
+    	}
+    	voteContent.setSubmissionDeadline(tzSubmissionDeadline);
+    	voteService.updateVote(voteContent);
+    	return null;
+    }
+
+
+    /**
      * Return ResourceService bean.
      */
     private MessageService getMessageService() {
Index: lams_tool_vote/web/common/tabbedheader.jsp
===================================================================
diff -u -r00ae80d4791f903bcb3661537fc7e129c72ad195 -r57a242c8553eeec5781c2106493aa9f34efa5489
--- lams_tool_vote/web/common/tabbedheader.jsp	(.../tabbedheader.jsp)	(revision 00ae80d4791f903bcb3661537fc7e129c72ad195)
+++ lams_tool_vote/web/common/tabbedheader.jsp	(.../tabbedheader.jsp)	(revision 57a242c8553eeec5781c2106493aa9f34efa5489)
@@ -19,5 +19,4 @@
 
 <!-- ********************  javascript ********************** -->
 <script type="text/javascript" src="${lams}includes/javascript/common.js"></script>
-<script type="text/javascript" src="${lams}includes/javascript/prototype.js"></script>
 <script type="text/javascript" src="${lams}includes/javascript/tabcontroller.js"></script>
Index: lams_tool_vote/web/learning/AnswersContent.jsp
===================================================================
diff -u -r618abc7cca98f08ef288878ab371a3693492d835 -r57a242c8553eeec5781c2106493aa9f34efa5489
--- lams_tool_vote/web/learning/AnswersContent.jsp	(.../AnswersContent.jsp)	(revision 618abc7cca98f08ef288878ab371a3693492d835)
+++ lams_tool_vote/web/learning/AnswersContent.jsp	(.../AnswersContent.jsp)	(revision 57a242c8553eeec5781c2106493aa9f34efa5489)
@@ -125,6 +125,15 @@
 			<html:hidden property="lockOnFinish" />
 			<html:hidden property="reportViewOnly" />
 			<html:hidden property="showResults" />
+			
+			
+			<c:if test="${not empty voteGeneralLearnerFlowDTO.submissionDeadline}">
+				<div class="info">
+					<fmt:message key="authoring.info.teacher.set.restriction" >
+						<fmt:param><lams:Date value="${voteGeneralLearnerFlowDTO.submissionDeadline}" /></fmt:param>
+					</fmt:message>	
+				</div>
+			</c:if>
 
 			<c:if test="${voteGeneralLearnerFlowDTO.activityRunOffline == 'true'}">
 				<div class="warning">
Index: lams_tool_vote/web/learning/RunOffline.jsp
===================================================================
diff -u -r8bf10f60ba533d85a9e1f88e3845cad66dfbeaeb -r57a242c8553eeec5781c2106493aa9f34efa5489
--- lams_tool_vote/web/learning/RunOffline.jsp	(.../RunOffline.jsp)	(revision 8bf10f60ba533d85a9e1f88e3845cad66dfbeaeb)
+++ lams_tool_vote/web/learning/RunOffline.jsp	(.../RunOffline.jsp)	(revision 57a242c8553eeec5781c2106493aa9f34efa5489)
@@ -60,10 +60,21 @@
 			<h1>
 				<fmt:message key="activity.title" />
 			</h1>
-			<p>
-				<fmt:message key="label.learning.forceOfflineMessage" />
-			</p>
-
+			<c:choose>
+				<c:when test="${empty 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="${submissionDeadline}" /></fmt:param>
+						</fmt:message>
+					</div>
+				</c:otherwise>														
+			</c:choose>
+			
 			<div class="space-bottom-top align-right">
 
 				<c:if test="${voteGeneralLearnerFlowDTO.reflection != 'true'}">
Index: lams_tool_vote/web/monitoring/MonitoringMaincontent.jsp
===================================================================
diff -u -r18e5e690d2e1a7c3d918759f7a2827c8205feaac -r57a242c8553eeec5781c2106493aa9f34efa5489
--- lams_tool_vote/web/monitoring/MonitoringMaincontent.jsp	(.../MonitoringMaincontent.jsp)	(revision 18e5e690d2e1a7c3d918759f7a2827c8205feaac)
+++ lams_tool_vote/web/monitoring/MonitoringMaincontent.jsp	(.../MonitoringMaincontent.jsp)	(revision 57a242c8553eeec5781c2106493aa9f34efa5489)
@@ -43,8 +43,6 @@
 	<title> <fmt:message key="label.monitoring"/> </title>
 
 	<%@ include file="/common/tabbedheader.jsp"%>
-	<script type="text/javascript" src="${lams}includes/javascript/prototype.js"></script>
-
 	<script type="text/javascript">
 	
 	   	var imgRoot="${lams}images/";
Index: lams_tool_vote/web/monitoring/SummaryContent.jsp
===================================================================
diff -u -r618abc7cca98f08ef288878ab371a3693492d835 -r57a242c8553eeec5781c2106493aa9f34efa5489
--- lams_tool_vote/web/monitoring/SummaryContent.jsp	(.../SummaryContent.jsp)	(revision 618abc7cca98f08ef288878ab371a3693492d835)
+++ lams_tool_vote/web/monitoring/SummaryContent.jsp	(.../SummaryContent.jsp)	(revision 57a242c8553eeec5781c2106493aa9f34efa5489)
@@ -24,9 +24,89 @@
 
 <c:set scope="request" var="lams"><lams:LAMSURL/></c:set>
 <c:set scope="request" var="tool"><lams:WebAppURL/></c:set>
-<script type="text/javascript" src="<lams:LAMSURL />/includes/javascript/monitorToolSummaryAdvanced.js" ></script>
 
-<h1>
+<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(){
+	$("#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("");
+		}
+	});
+}
+		
+
+-->
+</script>
+
+<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/>');" >
@@ -133,6 +213,11 @@
 	</c:choose>
 </table>
 </div>
+
+
+<%@include file="daterestriction.jsp"%>
+
+
 		<c:if test="${(voteGeneralMonitoringDTO.userExceptionNoToolSessions == 'true')}"> 	
 			<c:if test="${notebookEntriesExist != 'true' }"> 			
 				<table align="center">
Index: lams_tool_vote/web/monitoring/daterestriction.jsp
===================================================================
diff -u
--- lams_tool_vote/web/monitoring/daterestriction.jsp	(revision 0)
+++ lams_tool_vote/web/monitoring/daterestriction.jsp	(revision 57a242c8553eeec5781c2106493aa9f34efa5489)
@@ -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 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