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.10.1 -r1.3.10.2
--- lams_tool_lamc/src/java/org/lamsfoundation/lams/tool/mc/McGeneralMonitoringDTO.java	16 Apr 2011 04:32:25 -0000	1.3.10.1
+++ lams_tool_lamc/src/java/org/lamsfoundation/lams/tool/mc/McGeneralMonitoringDTO.java	1 Jun 2011 12:53:29 -0000	1.3.10.2
@@ -101,7 +101,6 @@
     protected List deletedAttachmentList;
     
     protected String contentFolderID;
-    protected Long submissionDeadline;
 
 
 	/**
@@ -656,16 +655,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)
@@ -710,7 +700,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
===================================================================
RCS file: /usr/local/cvsroot/lams_tool_lamc/src/java/org/lamsfoundation/lams/tool/mc/web/McMonitoringStarterAction.java,v
diff -u -r1.43.10.1 -r1.43.10.2
--- lams_tool_lamc/src/java/org/lamsfoundation/lams/tool/mc/web/McMonitoringStarterAction.java	16 Apr 2011 04:32:24 -0000	1.43.10.1
+++ lams_tool_lamc/src/java/org/lamsfoundation/lams/tool/mc/web/McMonitoringStarterAction.java	1 Jun 2011 12:53:29 -0000	1.43.10.2
@@ -185,30 +185,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());
@@ -268,17 +251,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());
-	    request.setAttribute("submissionDeadline", mcContent.getSubmissionDeadline());
 
 	    // 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
===================================================================
RCS file: /usr/local/cvsroot/lams_tool_lamc/src/java/org/lamsfoundation/lams/tool/mc/web/MonitoringUtil.java,v
diff -u -r1.34 -r1.34.10.1
--- lams_tool_lamc/src/java/org/lamsfoundation/lams/tool/mc/web/MonitoringUtil.java	28 Oct 2008 05:10:19 -0000	1.34
+++ lams_tool_lamc/src/java/org/lamsfoundation/lams/tool/mc/web/MonitoringUtil.java	1 Jun 2011 12:53:29 -0000	1.34.10.1
@@ -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,53 @@
 	}	
 
 	
-	/**
-	 * 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());
 	}
+    }
 }
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.10.1 -r1.29.10.2
--- lams_tool_lamc/web/monitoring/SummaryContent.jsp	16 Apr 2011 04:32:25 -0000	1.29.10.1
+++ lams_tool_lamc/web/monitoring/SummaryContent.jsp	1 Jun 2011 12:53:29 -0000	1.29.10.2
@@ -37,7 +37,7 @@
 	$(function(){
 		$("#datetime").datetimepicker();
 
-		var submissionDeadline = '${mcGeneralMonitoringDTO.submissionDeadline}';
+		var submissionDeadline = '${submissionDeadline}';
 		if (submissionDeadline != "") {
 			var date = new Date(eval(submissionDeadline));
 
Index: lams_tool_lamc/web/monitoring/daterestriction.jsp
===================================================================
RCS file: /usr/local/cvsroot/lams_tool_lamc/web/monitoring/Attic/daterestriction.jsp,v
diff -u -r1.1.2.1 -r1.1.2.2
--- lams_tool_lamc/web/monitoring/daterestriction.jsp	16 Apr 2011 04:32:25 -0000	1.1.2.1
+++ lams_tool_lamc/web/monitoring/daterestriction.jsp	1 Jun 2011 12:53:29 -0000	1.1.2.2
@@ -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>