Index: lams_tool_lamc/src/java/org/lamsfoundation/lams/tool/mc/McGeneralMonitoringDTO.java
===================================================================
diff -u -r3e5b36454b17cee648f9d02e0656e8e99c46e00e -rfc9683793d78bf103e13bc18fe56006c92e7901d
--- lams_tool_lamc/src/java/org/lamsfoundation/lams/tool/mc/McGeneralMonitoringDTO.java	(.../McGeneralMonitoringDTO.java)	(revision 3e5b36454b17cee648f9d02e0656e8e99c46e00e)
+++ lams_tool_lamc/src/java/org/lamsfoundation/lams/tool/mc/McGeneralMonitoringDTO.java	(.../McGeneralMonitoringDTO.java)	(revision fc9683793d78bf103e13bc18fe56006c92e7901d)
@@ -99,11 +99,7 @@
     protected String offlineInstructions;
     protected List attachmentList;
     protected List deletedAttachmentList;
-    
     protected String contentFolderID;
-    protected Long submissionDeadline;
-
-
     
     /**
      * @return Returns the listOfflineFilesMetadata.
@@ -657,16 +653,7 @@
         this.sessionUserCount = sessionUserCount;
     }
     
-    
-    public Long getSubmissionDeadline() {
-		return submissionDeadline;
-	}
-	public void setSubmissionDeadline(Long submissionDeadline) {
-		this.submissionDeadline = submissionDeadline;
-	}
-
-    
-	public String toString() {
+ 	public String toString() {
         return new ToStringBuilder(this)
         	.append("toolContentID: ", toolContentID)
         	.append("activeModule: ", activeModule)
@@ -711,7 +698,6 @@
 			.append("sessionUserCount: ", sessionUserCount)
 			.append("completedSessionUserCount: ", completedSessionUserCount)
 			.append("completedSessionUserPercent: ", completedSessionUserPercent)
-			.append("submissionDeadline", submissionDeadline)
             .toString();
     }
 
Index: lams_tool_lamc/src/java/org/lamsfoundation/lams/tool/mc/web/McMonitoringStarterAction.java
===================================================================
diff -u -r3e5b36454b17cee648f9d02e0656e8e99c46e00e -rfc9683793d78bf103e13bc18fe56006c92e7901d
--- lams_tool_lamc/src/java/org/lamsfoundation/lams/tool/mc/web/McMonitoringStarterAction.java	(.../McMonitoringStarterAction.java)	(revision 3e5b36454b17cee648f9d02e0656e8e99c46e00e)
+++ lams_tool_lamc/src/java/org/lamsfoundation/lams/tool/mc/web/McMonitoringStarterAction.java	(.../McMonitoringStarterAction.java)	(revision fc9683793d78bf103e13bc18fe56006c92e7901d)
@@ -184,30 +184,13 @@
 	public void initialiseMonitoringData(ActionMapping mapping, ActionForm form, HttpServletRequest request, HttpServletResponse response,
 	        IMcService mcService, McGeneralMonitoringDTO mcGeneralMonitoringDTO)
 	{
-	    logger.debug("start initializing  monitoring data...mcService: " + mcService);
-		McMonitoringForm mcMonitoringForm = (McMonitoringForm) form;
-
-	    String toolContentID=mcMonitoringForm.getToolContentID();
-	    logger.debug("toolContentID: " + toolContentID);
+    	McMonitoringForm mcMonitoringForm = (McMonitoringForm) form;
+    	String toolContentID = mcMonitoringForm.getToolContentID();
 	    
 	    McContent mcContent=mcService.retrieveMc(new Long(toolContentID));
+	    	mcGeneralMonitoringDTO.setToolContentID(toolContentID.toString());
 		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());
 		mcGeneralMonitoringDTO.setDefineLaterInEditMode(new Boolean(false).toString());
@@ -267,19 +250,6 @@
 	    mcGeneralMonitoringDTO.setCurrentMonitoredToolSession("All");
 	    mcGeneralMonitoringDTO.setListMonitoredAnswersContainerDto(new LinkedList());
 	    mcGeneralMonitoringDTO.setExistsOpenMcs(new Boolean(false).toString());
-	    
-	    // setting up the advanced summary for LDEV-1662
-	    request.setAttribute("questionsSequenced",	mcContent.isQuestionsSequenced());
-	    request.setAttribute("showMarks", mcContent.isShowMarks());
-	    request.setAttribute("randomize", mcContent.isRandomize());
-	    request.setAttribute("displayAnswers", mcContent.isDisplayAnswers());
-	    request.setAttribute("retries", mcContent.isRetries());
-	    request.setAttribute("reflect", mcContent.isReflect());
-	    request.setAttribute("reflectionSubject", mcContent.getReflectionSubject());
-	    request.setAttribute("passMark", mcContent.getPassMark());
-	    
-	    boolean isGroupedActivity = mcService.isGroupedActivity(new Long(toolContentID));
-	    request.setAttribute("isGroupedActivity", isGroupedActivity);
 
 	    // The edit activity code needs a session map
 	    SessionMap sessionMap = new SessionMap();
Index: lams_tool_lamc/src/java/org/lamsfoundation/lams/tool/mc/web/MonitoringUtil.java
===================================================================
diff -u -r13b3303dd460ab8ee1f9ab0841972620e4b29943 -rfc9683793d78bf103e13bc18fe56006c92e7901d
--- lams_tool_lamc/src/java/org/lamsfoundation/lams/tool/mc/web/MonitoringUtil.java	(.../MonitoringUtil.java)	(revision 13b3303dd460ab8ee1f9ab0841972620e4b29943)
+++ lams_tool_lamc/src/java/org/lamsfoundation/lams/tool/mc/web/MonitoringUtil.java	(.../MonitoringUtil.java)	(revision fc9683793d78bf103e13bc18fe56006c92e7901d)
@@ -28,9 +28,11 @@
 import java.util.List;
 import java.util.Map;
 import java.util.Set;
+import java.util.TimeZone;
 import java.util.TreeMap;
 
 import javax.servlet.http.HttpServletRequest;
+import javax.servlet.http.HttpSession;
 
 import org.apache.log4j.Logger;
 import org.lamsfoundation.lams.notebook.model.NotebookEntry;
@@ -49,6 +51,10 @@
 import org.lamsfoundation.lams.tool.mc.pojos.McSession;
 import org.lamsfoundation.lams.tool.mc.pojos.McUsrAttempt;
 import org.lamsfoundation.lams.tool.mc.service.IMcService;
+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;
 
 /**
  * 
@@ -573,46 +579,56 @@
 	}	
 
 	
-	/**
-	 * void setupAllSessionsData(HttpServletRequest request, McContent mcContent, IMcService mcService)
-	 * 
-	 * @param request
-	 * @param mcContent
-	 * @param mcService
-	 */
-	protected static void setupAllSessionsData(HttpServletRequest request, McContent mcContent, IMcService mcService)
-	{
-	    logger.debug("starting setupAllSessionsData, mcContent: " + mcContent);
-	    logger.debug("CURRENT_MONITORED_TOOL_SESSION: " + request.getAttribute(CURRENT_MONITORED_TOOL_SESSION));
+    /**
+     * Sets up auxiliary parameters. Used by all monitoring action methods. 
+     * 
+     * @param request
+     * @param mcContent
+     * @param mcService
+     */
+    protected static void setupAllSessionsData(HttpServletRequest request, McContent mcContent, IMcService mcService) {
+	List listMonitoredAnswersContainerDTO = MonitoringUtil.buildGroupsQuestionData(request, mcContent, mcService);
+	request.setAttribute(LIST_MONITORED_ANSWERS_CONTAINER_DTO, listMonitoredAnswersContainerDTO);
 
-	    List listMonitoredAnswersContainerDTO=MonitoringUtil.buildGroupsQuestionData(request, mcContent, mcService);
-	    request.setAttribute(LIST_MONITORED_ANSWERS_CONTAINER_DTO, listMonitoredAnswersContainerDTO);
-	    logger.debug("LIST_MONITORED_ANSWERS_CONTAINER_DTO: " + request.getAttribute(LIST_MONITORED_ANSWERS_CONTAINER_DTO));
-	    
-	    List listMonitoredMarksContainerDTO=MonitoringUtil.buildGroupsMarkData(request, mcContent, mcService);
-	    request.setAttribute(LIST_MONITORED_MARKS_CONTAINER_DTO, listMonitoredMarksContainerDTO);
-	    logger.debug("LIST_MONITORED_MARKS_CONTAINER_DTO: " + request.getAttribute(LIST_MONITORED_MARKS_CONTAINER_DTO));
-	    logger.debug("ending setupAllSessionsData, mcContent: ");
-	    
-	    request.setAttribute(HR_COLUMN_COUNT, new Integer(mcContent.getMcQueContents().size()+2).toString());
-	    
-	    String strPassMark="";
-	    Integer passMark=mcContent.getPassMark();
-	    logger.debug("passMark: " + passMark);
-	    
-    	if (passMark == null)
-    	    strPassMark=" ";
-    	else if ((passMark != null) && (passMark.equals("0")))
-    	    strPassMark=" ";
-    	else
-    	    strPassMark=passMark.toString();
-    	
-    	logger.debug("strPassMark: " + strPassMark);
-    	 
-    	if (strPassMark.trim().equals("0"))
-    		strPassMark=" ";
-    	
-    	logger.debug("strPassMark: " + strPassMark);
-    	request.setAttribute(PASSMARK, strPassMark);
+	List listMonitoredMarksContainerDTO = MonitoringUtil.buildGroupsMarkData(request, mcContent, mcService);
+	request.setAttribute(LIST_MONITORED_MARKS_CONTAINER_DTO, listMonitoredMarksContainerDTO);
+
+	request.setAttribute(HR_COLUMN_COUNT, new Integer(mcContent.getMcQueContents().size() + 2).toString());
+
+	String strPassMark = "";
+	Integer passMark = mcContent.getPassMark();
+	if (passMark == null)
+	    strPassMark = " ";
+	else if ((passMark != null) && (passMark.equals("0")))
+	    strPassMark = " ";
+	else
+	    strPassMark = passMark.toString();
+	if (strPassMark.trim().equals("0"))
+	    strPassMark = " ";
+	request.setAttribute(PASSMARK, strPassMark);
+
+	// setting up the advanced summary for LDEV-1662
+	request.setAttribute("questionsSequenced", mcContent.isQuestionsSequenced());
+	request.setAttribute("showMarks", mcContent.isShowMarks());
+	request.setAttribute("randomize", mcContent.isRandomize());
+	request.setAttribute("displayAnswers", mcContent.isDisplayAnswers());
+	request.setAttribute("retries", mcContent.isRetries());
+	request.setAttribute("reflect", mcContent.isReflect());
+	request.setAttribute("reflectionSubject", mcContent.getReflectionSubject());
+	request.setAttribute("passMark", mcContent.getPassMark());
+	request.setAttribute("toolContentID", mcContent.getMcContentId());
+	
+	// setting up Date and time restriction in activities
+	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);
+	    request.setAttribute("submissionDeadline", tzSubmissionDeadline.getTime());
 	}
+
+	boolean isGroupedActivity = mcService.isGroupedActivity(new Long(mcContent.getMcContentId()));
+	request.setAttribute("isGroupedActivity", isGroupedActivity);
+    }
 }
Index: lams_tool_lamc/web/monitoring/SummaryContent.jsp
===================================================================
diff -u -r3e5b36454b17cee648f9d02e0656e8e99c46e00e -rfc9683793d78bf103e13bc18fe56006c92e7901d
--- lams_tool_lamc/web/monitoring/SummaryContent.jsp	(.../SummaryContent.jsp)	(revision 3e5b36454b17cee648f9d02e0656e8e99c46e00e)
+++ lams_tool_lamc/web/monitoring/SummaryContent.jsp	(.../SummaryContent.jsp)	(revision fc9683793d78bf103e13bc18fe56006c92e7901d)
@@ -25,85 +25,25 @@
 
 <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"> 
+	//pass settings to monitorToolSummaryAdvanced.js
+	var submissionDeadlineSettings = {
+		lams: '${lams}',
+		submissionDeadline: '${submissionDeadline}',
+		setSubmissionDeadlineUrl: '<c:url value="/monitoring.do?dispatch=setSubmissionDeadline"/>',
+		toolContentID: '${toolContentID}',
+		messageNotification: '<fmt:message key="monitor.summary.notification" />',
+		messageRestrictionSet: '<fmt:message key="monitor.summary.date.restriction.set" />',
+		messageRestrictionRemoved: '<fmt:message key="monitor.summary.date.restriction.removed" />'
+	};	
+</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" src="${lams}includes/javascript/jquery.blockUI.js"></script>
+<script type="text/javascript" src="${lams}/includes/javascript/monitorToolSummaryAdvanced.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/>');" />
 
Index: lams_tool_lamc/web/monitoring/daterestriction.jsp
===================================================================
diff -u -r3e5b36454b17cee648f9d02e0656e8e99c46e00e -rfc9683793d78bf103e13bc18fe56006c92e7901d
--- lams_tool_lamc/web/monitoring/daterestriction.jsp	(.../daterestriction.jsp)	(revision 3e5b36454b17cee648f9d02e0656e8e99c46e00e)
+++ lams_tool_lamc/web/monitoring/daterestriction.jsp	(.../daterestriction.jsp)	(revision fc9683793d78bf103e13bc18fe56006c92e7901d)
@@ -15,7 +15,7 @@
 		<fmt:message key="monitor.summary.when.date.restriction.is.set" />
 	</p	>
 		
-	<div id="datetimeDiv" <c:if test='${not empty mcGeneralMonitoringDTO.submissionDeadline}'> style="display: none;" </c:if>>
+	<div id="datetimeDiv" <c:if test='${not empty submissionDeadline}'> style="display: none;" </c:if>>
 		<span>
 			<fmt:message key="monitor.summary.after.date" />
 		</span>
@@ -27,7 +27,7 @@
 		</html:link>
 	</div>
 
-	<div id="dateInfoDiv" <c:if test='${empty mcGeneralMonitoringDTO.submissionDeadline}'> style="display: none;" </c:if>>
+	<div id="dateInfoDiv" <c:if test='${empty submissionDeadline}'> style="display: none;" </c:if>>
 		<span>
 			<fmt:message key="monitor.summary.after.date" />
 		</span>