Index: lams_tool_chat/src/java/org/lamsfoundation/lams/tool/chat/web/actions/LearningAction.java
===================================================================
RCS file: /usr/local/cvsroot/lams_tool_chat/src/java/org/lamsfoundation/lams/tool/chat/web/actions/LearningAction.java,v
diff -u -r1.28.10.1 -r1.28.10.2
--- lams_tool_chat/src/java/org/lamsfoundation/lams/tool/chat/web/actions/LearningAction.java	16 Apr 2011 08:39:48 -0000	1.28.10.1
+++ lams_tool_chat/src/java/org/lamsfoundation/lams/tool/chat/web/actions/LearningAction.java	10 May 2011 06:25:55 -0000	1.28.10.2
@@ -123,29 +123,6 @@
 
 	ChatDTO chatDTO = new ChatDTO(chat);
 
-	/* Check if submission deadline is null */
-	
-	Date submissionDeadline = chatDTO.getSubmissionDeadline();
-	request.setAttribute("chatDTO", chatDTO);
-	
-	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());
-		request.setAttribute("submissionDeadline", submissionDeadline);
-		
-		//calculate whether submission deadline has passed, and if so forward to "runOffline"
-		if (currentLearnerDate.after(tzSubmissionDeadline)) {
-			return mapping.findForward("runOffline");
-			
-		}
-	
-	}
-
-
 	request.setAttribute("XMPPDOMAIN", Configuration.get(ConfigurationKeys.XMPP_DOMAIN));
 	request.setAttribute("CONFERENCEROOM", chatSession.getJabberRoom());
 
@@ -171,6 +148,30 @@
 	    return mapping.findForward("runOffline");
 	}
 
+	/* Check if submission deadline is null */
+	
+	Date submissionDeadline = chatDTO.getSubmissionDeadline();
+	request.setAttribute("chatDTO", chatDTO);
+	
+	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());
+		request.setAttribute("submissionDeadline", submissionDeadline);
+		
+		//calculate whether submission deadline has passed, and if so forward to "runOffline"
+		if (currentLearnerDate.after(tzSubmissionDeadline)) {
+			return mapping.findForward("runOffline");
+			
+		}
+	
+	}
+
+
+	
 	return mapping.findForward("learning");
 
     }
Index: lams_tool_notebook/src/java/org/lamsfoundation/lams/tool/notebook/web/actions/LearningAction.java
===================================================================
RCS file: /usr/local/cvsroot/lams_tool_notebook/src/java/org/lamsfoundation/lams/tool/notebook/web/actions/LearningAction.java,v
diff -u -r1.10.10.1 -r1.10.10.2
--- lams_tool_notebook/src/java/org/lamsfoundation/lams/tool/notebook/web/actions/LearningAction.java	10 May 2011 05:24:50 -0000	1.10.10.1
+++ lams_tool_notebook/src/java/org/lamsfoundation/lams/tool/notebook/web/actions/LearningAction.java	10 May 2011 06:25:54 -0000	1.10.10.2
@@ -135,22 +135,6 @@
 		if (notebook.isRunOffline()) {
 			return mapping.findForward("runOffline");
 		}
-
-		// date and time restriction LDEV-2657
-		Date submissionDeadline = notebook.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());
-			notebookDTO.submissionDeadline = tzSubmissionDeadline;
-
-			//calculate whether deadline has passed, and if so forward to "runOffline"
-			if (currentLearnerDate.after(tzSubmissionDeadline)) {
-				return mapping.findForward("runOffline");	
-			}
-		}
 		
 		NotebookUser notebookUser;
 		if (mode.equals(ToolAccessMode.TEACHER)) {
@@ -176,7 +160,24 @@
 			request.setAttribute("contentEditable", true);
 		}
 		request.setAttribute("finishedActivity", notebookUser.isFinishedActivity());
+		
+		// date and time restriction LDEV-2657
+		Date submissionDeadline = notebook.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());
+			notebookDTO.submissionDeadline = tzSubmissionDeadline;
 
+			//calculate whether deadline has passed, and if so forward to "runOffline"
+			if (currentLearnerDate.after(tzSubmissionDeadline)) {
+				return mapping.findForward("runOffline");	
+			}
+		}
+
+
 		return mapping.findForward("notebook");
 	}