Index: lams_tool_lamc/build.properties
===================================================================
RCS file: /usr/local/cvsroot/lams_tool_lamc/build.properties,v
diff -u -r1.15 -r1.15.8.1
--- lams_tool_lamc/build.properties	9 Dec 2008 05:38:09 -0000	1.15
+++ lams_tool_lamc/build.properties	16 Apr 2011 04:32:25 -0000	1.15.8.1
@@ -4,7 +4,7 @@
 signature=lamc11
 
 #version of this project
-tool.version=20081127
+tool.version=20110416
 
 # hide tool option
 hideTool=false
Index: lams_tool_lamc/conf/hibernate/mappings/org/lamsfoundation/lams/tool/mc/McContent.hbm.xml
===================================================================
RCS file: /usr/local/cvsroot/lams_tool_lamc/conf/hibernate/mappings/org/lamsfoundation/lams/tool/mc/Attic/McContent.hbm.xml,v
diff -u -r1.21 -r1.21.10.1
--- lams_tool_lamc/conf/hibernate/mappings/org/lamsfoundation/lams/tool/mc/McContent.hbm.xml	11 Oct 2007 06:27:31 -0000	1.21
+++ lams_tool_lamc/conf/hibernate/mappings/org/lamsfoundation/lams/tool/mc/McContent.hbm.xml	16 Apr 2011 04:32:25 -0000	1.21.10.1
@@ -86,6 +86,13 @@
         length="20"
     />
 
+   <property
+        name="submissionDeadline"
+        type="java.util.Date"
+        access="property"        
+        column="submission_deadline"
+        length="20"
+    />
 
    <property
         name="questionsSequenced"
Index: lams_tool_lamc/conf/language/lams/ApplicationResources.properties
===================================================================
RCS file: /usr/local/cvsroot/lams_tool_lamc/conf/language/lams/ApplicationResources.properties,v
diff -u -r1.27.8.3 -r1.27.8.4
--- lams_tool_lamc/conf/language/lams/ApplicationResources.properties	16 Apr 2010 06:46:55 -0000	1.27.8.3
+++ lams_tool_lamc/conf/language/lams/ApplicationResources.properties	16 Apr 2011 04:32:25 -0000	1.27.8.4
@@ -262,5 +262,17 @@
 monitor.summary.td.notebookInstructions  =Notebook Instructions
 error.pedagogical.planner.empty.answer.selected  =In question {0} correct answer cannot be blank.
 
+monitor.summary.date.restriction  =Date restriction
+monitor.summary.when.date.restriction.is.set  =Students will not be able to take this multiple choice 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 teacher has set a restriction for this activity from {0}.
+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 255 labels for en AU =====
Index: lams_tool_lamc/conf/language/lams/ApplicationResources_en_AU.properties
===================================================================
RCS file: /usr/local/cvsroot/lams_tool_lamc/conf/language/lams/ApplicationResources_en_AU.properties,v
diff -u -r1.27.8.3 -r1.27.8.4
--- lams_tool_lamc/conf/language/lams/ApplicationResources_en_AU.properties	16 Apr 2010 06:46:55 -0000	1.27.8.3
+++ lams_tool_lamc/conf/language/lams/ApplicationResources_en_AU.properties	16 Apr 2011 04:32:25 -0000	1.27.8.4
@@ -262,5 +262,17 @@
 monitor.summary.td.notebookInstructions  =Notebook Instructions
 error.pedagogical.planner.empty.answer.selected  =In question {0} correct answer cannot be blank.
 
+monitor.summary.date.restriction  =Date restriction
+monitor.summary.when.date.restriction.is.set  =Students will not be able to take this multiple choice 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 teacher has set a restriction for this activity from {0}.
+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 255 labels for en AU =====
Index: lams_tool_lamc/db/sql/create_lams_tool_mc.sql
===================================================================
RCS file: /usr/local/cvsroot/lams_tool_lamc/db/sql/create_lams_tool_mc.sql,v
diff -u -r1.25 -r1.25.10.1
--- lams_tool_lamc/db/sql/create_lams_tool_mc.sql	13 Feb 2008 06:13:15 -0000	1.25
+++ lams_tool_lamc/db/sql/create_lams_tool_mc.sql	16 Apr 2011 04:33:23 -0000	1.25.10.1
@@ -20,6 +20,7 @@
      , showMarks TINYINT(1) NOT NULL DEFAULT 0
      , randomize TINYINT(1) NOT NULL DEFAULT 0
      , displayAnswers TINYINT(1) NOT NULL DEFAULT 1
+     , submission_deadline datetime DEFAULT NULL
      , UNIQUE UQ_tl_lamc11_content_1 (content_id)
      , PRIMARY KEY (uid)
 )TYPE=InnoDB;
Index: lams_tool_lamc/src/java/org/lamsfoundation/lams/tool/mc/McAppConstants.java
===================================================================
RCS file: /usr/local/cvsroot/lams_tool_lamc/src/java/org/lamsfoundation/lams/tool/mc/McAppConstants.java,v
diff -u -r1.103 -r1.103.8.1
--- lams_tool_lamc/src/java/org/lamsfoundation/lams/tool/mc/McAppConstants.java	9 Dec 2008 05:38:09 -0000	1.103
+++ lams_tool_lamc/src/java/org/lamsfoundation/lams/tool/mc/McAppConstants.java	16 Apr 2011 04:32:24 -0000	1.103.8.1
@@ -224,6 +224,10 @@
     public static final String TOP_MARK = "topMark";
     public static final String LOWEST_MARK = "lowestMark";
     public static final String AVERAGE_MARK = "averageMark";
+    
+    /* Date time restriction LDEV-2657 */
+    public static final String ATTR_SUBMISSION_DEADLINE = "submissionDeadline";
+    public static final String ATTR_IS_SUBMISSION_DEADLINE_PASSED = "isSubmissionDeadlinePassed";
 
     /*
      * the learner or monitoring environment provides toolSessionId
Index: lams_tool_lamc/src/java/org/lamsfoundation/lams/tool/mc/McGeneralMonitoringDTO.java
===================================================================
RCS file: /usr/local/cvsroot/lams_tool_lamc/src/java/org/lamsfoundation/lams/tool/mc/McGeneralMonitoringDTO.java,v
diff -u -r1.3 -r1.3.10.1
--- lams_tool_lamc/src/java/org/lamsfoundation/lams/tool/mc/McGeneralMonitoringDTO.java	15 Oct 2007 05:01:48 -0000	1.3
+++ lams_tool_lamc/src/java/org/lamsfoundation/lams/tool/mc/McGeneralMonitoringDTO.java	16 Apr 2011 04:32:25 -0000	1.3.10.1
@@ -23,6 +23,7 @@
 package org.lamsfoundation.lams.tool.mc;
 
 
+import java.util.Date;
 import java.util.List;
 import java.util.Map;
 
@@ -100,10 +101,10 @@
     protected List deletedAttachmentList;
     
     protected String contentFolderID;
+    protected Long submissionDeadline;
 
 
-    
-    /**
+	/**
      * @return Returns the listOfflineFilesMetadata.
      */
     public List getListOfflineFilesMetadata() {
@@ -655,6 +656,15 @@
         this.sessionUserCount = sessionUserCount;
     }
     
+    
+    public Long getSubmissionDeadline() {
+		return submissionDeadline;
+	}
+	public void setSubmissionDeadline(Long submissionDeadline) {
+		this.submissionDeadline = submissionDeadline;
+	}
+
+    
 	public String toString() {
         return new ToStringBuilder(this)
         	.append("toolContentID: ", toolContentID)
@@ -700,6 +710,7 @@
 			.append("sessionUserCount: ", sessionUserCount)
 			.append("completedSessionUserCount: ", completedSessionUserCount)
 			.append("completedSessionUserPercent: ", completedSessionUserPercent)
+			.append("submissionDeadline", submissionDeadline)
             .toString();
     }
 
Index: lams_tool_lamc/src/java/org/lamsfoundation/lams/tool/mc/McLearnerStarterDTO.java
===================================================================
RCS file: /usr/local/cvsroot/lams_tool_lamc/src/java/org/lamsfoundation/lams/tool/mc/Attic/McLearnerStarterDTO.java,v
diff -u -r1.2 -r1.2.16.1
--- lams_tool_lamc/src/java/org/lamsfoundation/lams/tool/mc/McLearnerStarterDTO.java	17 Sep 2006 06:23:44 -0000	1.2
+++ lams_tool_lamc/src/java/org/lamsfoundation/lams/tool/mc/McLearnerStarterDTO.java	16 Apr 2011 04:32:25 -0000	1.2.16.1
@@ -22,8 +22,10 @@
 /* $$Id$$ */
 package org.lamsfoundation.lams.tool.mc;
 
+import java.util.Date;
 
 
+
 /**
  * <p> DTO that holds properties for initial screen presentation
  * </p>
@@ -39,6 +41,8 @@
     
     protected String toolActivityOffline;
     
+    protected Date submissionDeadline;
+    
     /**
      * @return Returns the toolActivityOffline.
      */
@@ -75,6 +79,19 @@
     public void setQuestionListingMode(String questionListingMode) {
         this.questionListingMode = questionListingMode;
     }
+	/**
+	 * @return the submissionDeadline
+	 */
+	public Date getSubmissionDeadline() {
+		return submissionDeadline;
+	}
+	
+	/**
+	 * @param submissionDeadline the submissionDeadline to set
+	 */
+	public void setSubmissionDeadline(Date submissionDeadline) {
+		this.submissionDeadline = submissionDeadline;
+	}
 	public int compareTo(Object o)
     {
 	    McLearnerStarterDTO mcLearnerStarterDTO = (McLearnerStarterDTO) o;
Index: lams_tool_lamc/src/java/org/lamsfoundation/lams/tool/mc/dbupdates/patch20110416_updateFrom235.sql
===================================================================
RCS file: /usr/local/cvsroot/lams_tool_lamc/src/java/org/lamsfoundation/lams/tool/mc/dbupdates/patch20110416_updateFrom235.sql,v
diff -u -r1.1 -r1.1.2.1
Binary files differ
Index: lams_tool_lamc/src/java/org/lamsfoundation/lams/tool/mc/pojos/McContent.java
===================================================================
RCS file: /usr/local/cvsroot/lams_tool_lamc/src/java/org/lamsfoundation/lams/tool/mc/pojos/McContent.java,v
diff -u -r1.17 -r1.17.10.1
--- lams_tool_lamc/src/java/org/lamsfoundation/lams/tool/mc/pojos/McContent.java	11 Oct 2007 06:27:31 -0000	1.17
+++ lams_tool_lamc/src/java/org/lamsfoundation/lams/tool/mc/pojos/McContent.java	16 Apr 2011 04:32:25 -0000	1.17.10.1
@@ -103,6 +103,9 @@
 
     private boolean showMarks;
     
+    /* LDEV-2657 */
+    private Date submissionDeadline;
+    
     /** nullable persistent field */
     private Integer passMark;
 
@@ -522,6 +525,19 @@
     	this.displayAnswers = displayAnswers;
     }
     
+    
+	/**
+	 * @return date submissionDeadline
+	 */
+	public Date getSubmissionDeadline() {
+		return submissionDeadline;
+	}
+	
+	public void setSubmissionDeadline(Date submissionDeadline) {
+		this.submissionDeadline = submissionDeadline;
+	}
+
+    
     /**
      * Get total possible marks for this content. Iterates over the McQueContents set 
      */
Index: lams_tool_lamc/src/java/org/lamsfoundation/lams/tool/mc/web/McLearningStarterAction.java
===================================================================
RCS file: /usr/local/cvsroot/lams_tool_lamc/src/java/org/lamsfoundation/lams/tool/mc/web/McLearningStarterAction.java,v
diff -u -r1.76 -r1.76.10.1
--- lams_tool_lamc/src/java/org/lamsfoundation/lams/tool/mc/web/McLearningStarterAction.java	12 Oct 2007 09:23:19 -0000	1.76
+++ lams_tool_lamc/src/java/org/lamsfoundation/lams/tool/mc/web/McLearningStarterAction.java	16 Apr 2011 04:32:24 -0000	1.76.10.1
@@ -23,9 +23,11 @@
 package org.lamsfoundation.lams.tool.mc.web;
 
 import java.io.IOException;
+import java.util.Date;
 import java.util.LinkedList;
 import java.util.List;
 import java.util.Map;
+import java.util.TimeZone;
 import java.util.TreeMap;
 
 import javax.servlet.ServletException;
@@ -56,6 +58,7 @@
 import org.lamsfoundation.lams.tool.mc.service.IMcService;
 import org.lamsfoundation.lams.tool.mc.service.McServiceProxy;
 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;
 import org.lamsfoundation.lams.web.util.SessionMap;
@@ -258,7 +261,28 @@
 	    	mcLearningForm.setQuestionListingMode(QUESTION_LISTING_MODE_COMBINED);
 	    }
 	    
+	    /*  
+	     * Is there a deadline set?
+	     */
 	    
+	    Date submissionDeadline = mcContent.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());
+			mcLearnerStarterDTO.setSubmissionDeadline(submissionDeadline);
+		
+			//calculate whether submission deadline has passed, and if so forward to "runOffline"
+			if (currentLearnerDate.after(tzSubmissionDeadline)) {
+				request.setAttribute(MC_LEARNER_STARTER_DTO, mcLearnerStarterDTO);
+				return mapping.findForward(RUN_OFFLINE);
+			}
+		}
+		
 	    /*
 	     * Is the tool activity been checked as Run Offline in the property inspector?
 	     */
Index: lams_tool_lamc/src/java/org/lamsfoundation/lams/tool/mc/web/McMonitoringAction.java
===================================================================
RCS file: /usr/local/cvsroot/lams_tool_lamc/src/java/org/lamsfoundation/lams/tool/mc/web/McMonitoringAction.java,v
diff -u -r1.44 -r1.44.10.1
--- lams_tool_lamc/src/java/org/lamsfoundation/lams/tool/mc/web/McMonitoringAction.java	4 Jun 2008 04:19:29 -0000	1.44
+++ lams_tool_lamc/src/java/org/lamsfoundation/lams/tool/mc/web/McMonitoringAction.java	16 Apr 2011 04:32:24 -0000	1.44.10.1
@@ -26,15 +26,18 @@
 import java.io.IOException;
 import java.io.OutputStream;
 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.ServletException;
 import javax.servlet.http.HttpServletRequest;
 import javax.servlet.http.HttpServletResponse;
+import javax.servlet.http.HttpSession;
 
 import org.apache.log4j.Logger;
 import org.apache.poi.hssf.usermodel.HSSFCell;
@@ -71,9 +74,11 @@
 import org.lamsfoundation.lams.tool.mc.pojos.McUploadedFile;
 import org.lamsfoundation.lams.tool.mc.service.IMcService;
 import org.lamsfoundation.lams.tool.mc.service.McServiceProxy;
+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;
 
@@ -4830,7 +4835,39 @@
     	
 		return data;
 	}
+    
+    /**
+     * Set Submission Deadline
+     * 
+     * @param mapping
+     * @param form
+     * @param request
+     * @param response
+     * @return
+     */
+    public ActionForward setSubmissionDeadline(ActionMapping mapping, ActionForm form, HttpServletRequest request,
+	    HttpServletResponse response) {
+    	
+    	IMcService mcService = McServiceProxy.getMcService(getServlet().getServletContext());
+		
+    	Long contentID = WebUtil.readLongParam(request, AttributeNames.PARAM_TOOL_CONTENT_ID);
+    	McContent mcContent = mcService.retrieveMc(contentID);
+	
+	Long dateParameter = WebUtil.readLongParam(request, McAppConstants.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);
+	}
+	mcContent.setSubmissionDeadline(tzSubmissionDeadline);
+	mcService.updateMc(mcContent);
 
+	return null;
+    }
+
     /**
 	 * Return ResourceService bean.
 	 */
Index: lams_tool_lamc/src/java/org/lamsfoundation/lams/tool/mc/web/McMonitoringStarterAction.java
===================================================================
RCS file: /usr/local/cvsroot/lams_tool_lamc/src/java/org/lamsfoundation/lams/tool/mc/web/McMonitoringStarterAction.java,v
diff -u -r1.43 -r1.43.10.1
--- lams_tool_lamc/src/java/org/lamsfoundation/lams/tool/mc/web/McMonitoringStarterAction.java	21 Jul 2008 06:05:27 -0000	1.43
+++ lams_tool_lamc/src/java/org/lamsfoundation/lams/tool/mc/web/McMonitoringStarterAction.java	16 Apr 2011 04:32:24 -0000	1.43.10.1
@@ -29,8 +29,11 @@
 import java.util.List;
 import java.util.Map;
 import java.util.TreeMap;
+import java.util.Date;
+import java.util.TimeZone;
 
 import javax.servlet.ServletException;
+import javax.servlet.http.HttpSession;
 import javax.servlet.http.HttpServletRequest;
 import javax.servlet.http.HttpServletResponse;
 
@@ -54,9 +57,12 @@
 import org.lamsfoundation.lams.tool.mc.pojos.McQueContent;
 import org.lamsfoundation.lams.tool.mc.service.IMcService;
 import org.lamsfoundation.lams.tool.mc.service.McServiceProxy;
+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;
 
 
 /**
@@ -188,6 +194,20 @@
 	    McContent mcContent=mcService.retrieveMc(new Long(toolContentID));
 		mcGeneralMonitoringDTO.setActivityTitle(mcContent.getTitle());
 		mcGeneralMonitoringDTO.setActivityInstructions(mcContent.getInstructions());
+		
+		// get session from shared session.
+		HttpSession ss = SessionManager.getSession();
+		
+		Date submissionDeadline = mcContent.getSubmissionDeadline();
+		
+		if (submissionDeadline != null) {
+		
+			UserDTO learnerDto = (UserDTO) ss.getAttribute(AttributeNames.USER);
+			TimeZone learnerTimeZone = learnerDto.getTimeZone();
+			Date tzSubmissionDeadline = DateUtil.convertToTimeZoneFromDefault(learnerTimeZone, submissionDeadline);
+			mcGeneralMonitoringDTO.setSubmissionDeadline(tzSubmissionDeadline.getTime());
+			
+		}
 
 		mcGeneralMonitoringDTO.setCurrentMonitoringTab("summary");
 		mcGeneralMonitoringDTO.setSbmtSuccess(new Boolean(false).toString());
@@ -234,7 +254,7 @@
 		
 		logger.debug("end initializing  monitoring data...");
 	    mcGeneralMonitoringDTO.setExistsOpenMcs(new Boolean(false).toString());
-	    logger.debug("post refreshes, mcGeneralMonitoringDTO: " + mcGeneralMonitoringDTO);
+	    logger.debug("post refreshes, mcGeneralMonitoringDTO: " + mcGeneralMonitoringDTO.toString());
 
 	    /* SELECTION_CASE == 2 indicates start up */
 	    request.setAttribute(SELECTION_CASE, new Long(2));
@@ -258,6 +278,7 @@
 	    request.setAttribute("reflect", mcContent.isReflect());
 	    request.setAttribute("reflectionSubject", mcContent.getReflectionSubject());
 	    request.setAttribute("passMark", mcContent.getPassMark());
+	    request.setAttribute("submissionDeadline", mcContent.getSubmissionDeadline());
 
 	    // The edit activity code needs a session map
 	    SessionMap sessionMap = new SessionMap();
@@ -278,4 +299,8 @@
 		logger.debug("add " + message +"  to ActionMessages:");
 		saveErrors(request,errors);	    	    
 	}
+	
+
+
+	
 }  
Index: lams_tool_lamc/web/common/header.jsp
===================================================================
RCS file: /usr/local/cvsroot/lams_tool_lamc/web/common/header.jsp,v
diff -u -r1.6 -r1.6.12.1
--- lams_tool_lamc/web/common/header.jsp	8 Jun 2007 01:38:22 -0000	1.6
+++ lams_tool_lamc/web/common/header.jsp	16 Apr 2011 04:32:25 -0000	1.6.12.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_lamc/web/learning/RunOffline.jsp
===================================================================
RCS file: /usr/local/cvsroot/lams_tool_lamc/web/learning/Attic/RunOffline.jsp,v
diff -u -r1.14.8.1 -r1.14.8.2
--- lams_tool_lamc/web/learning/RunOffline.jsp	14 Sep 2009 07:07:45 -0000	1.14.8.1
+++ lams_tool_lamc/web/learning/RunOffline.jsp	16 Apr 2011 04:32:25 -0000	1.14.8.2
@@ -67,11 +67,20 @@
 			<h1>
 				<fmt:message key="activity.title" />
 			</h1>
-			<p>
-				<fmt:message key="label.learning.forceOfflineMessage" />
-			</p>
-
-
+			<c:choose>
+				<c:when test="${empty mcLearnerStarterDTO.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="${mcLearnerStarterDTO.submissionDeadline}" /></fmt:param>
+						</fmt:message>							
+					</div>
+				</c:otherwise>
+			</c:choose>								
 			<div class="space-bottom-top align-right">
 
 				<c:if test="${mcGeneralLearnerFlowDTO.reflection != 'true'}">
Index: lams_tool_lamc/web/monitoring/MonitoringMaincontent.jsp
===================================================================
RCS file: /usr/local/cvsroot/lams_tool_lamc/web/monitoring/MonitoringMaincontent.jsp,v
diff -u -r1.43 -r1.43.10.1
--- lams_tool_lamc/web/monitoring/MonitoringMaincontent.jsp	15 Oct 2007 05:01:48 -0000	1.43
+++ lams_tool_lamc/web/monitoring/MonitoringMaincontent.jsp	16 Apr 2011 04:32:25 -0000	1.43.10.1
@@ -43,7 +43,6 @@
 	<title> <fmt:message key="label.monitoring"/> </title>
 
 	<%@ include file="/common/header.jsp"%>
-	<script type="text/javascript" src="${lams}includes/javascript/prototype.js"></script>
 	<script type="text/javascript" src="${lams}includes/javascript/common.js"></script>
 
 	<script type="text/javascript">
Index: lams_tool_lamc/web/monitoring/SummaryContent.jsp
===================================================================
RCS file: /usr/local/cvsroot/lams_tool_lamc/web/monitoring/SummaryContent.jsp,v
diff -u -r1.29 -r1.29.10.1
--- lams_tool_lamc/web/monitoring/SummaryContent.jsp	25 Jul 2008 05:18:21 -0000	1.29
+++ lams_tool_lamc/web/monitoring/SummaryContent.jsp	16 Apr 2011 04:32:25 -0000	1.29.10.1
@@ -19,9 +19,92 @@
   http://www.gnu.org/licenses/gpl.txt
 --%>
 <%@ include file="/common/taglibs.jsp"%>
-<script type="text/javascript" src="<lams:LAMSURL />/includes/javascript/monitorToolSummaryAdvanced.js" ></script>
+<c:set var="lams">
+ 		<lams:LAMSURL />
+</c:set>
 
-<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 = '${mcGeneralMonitoringDTO.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/>');" >
@@ -155,6 +238,8 @@
 </table>
 </div>
 
+<%@include file="daterestriction.jsp"%>
+
 		<c:if test="${(mcGeneralMonitoringDTO.userExceptionNoToolSessions == 'true')}"> 	
 			<c:if test="${notebookEntriesExist != 'true' }"> 			
 				<table align="center">
Fisheye: Tag 1.1 refers to a dead (removed) revision in file `lams_tool_lamc/web/monitoring/daterestriction.jsp'.
Fisheye: No comparison available.  Pass `N' to diff?