Index: lams_tool_assessment/src/java/org/lamsfoundation/lams/tool/assessment/web/action/MonitoringAction.java
===================================================================
diff -u -rd170469167c907400448ffa1fb767e5ba0b43bee -r7e8d2e658c8363cb1878c6f9270b5e1f64c3afac
--- lams_tool_assessment/src/java/org/lamsfoundation/lams/tool/assessment/web/action/MonitoringAction.java	(.../MonitoringAction.java)	(revision d170469167c907400448ffa1fb767e5ba0b43bee)
+++ lams_tool_assessment/src/java/org/lamsfoundation/lams/tool/assessment/web/action/MonitoringAction.java	(.../MonitoringAction.java)	(revision 7e8d2e658c8363cb1878c6f9270b5e1f64c3afac)
@@ -281,7 +281,7 @@
 	    UserDTO teacher = (UserDTO) ss.getAttribute(AttributeNames.USER);
 	    TimeZone teacherTimeZone = teacher.getTimeZone();
 	    tzSubmissionDeadline = DateUtil.convertFromTimeZoneToDefault(teacherTimeZone, submissionDeadline);
-	    formattedDate = DateUtil.convertToStringForJSON(submissionDeadline, request.getLocale());
+	    formattedDate = DateUtil.convertToStringForJSON(tzSubmissionDeadline, request.getLocale());
 
 	}
 	assessment.setSubmissionDeadline(tzSubmissionDeadline);
Index: lams_tool_chat/src/java/org/lamsfoundation/lams/tool/chat/web/actions/MonitoringAction.java
===================================================================
diff -u -rc6ad8493ef2064430e8783b28258cc9f223a3844 -r7e8d2e658c8363cb1878c6f9270b5e1f64c3afac
--- lams_tool_chat/src/java/org/lamsfoundation/lams/tool/chat/web/actions/MonitoringAction.java	(.../MonitoringAction.java)	(revision c6ad8493ef2064430e8783b28258cc9f223a3844)
+++ lams_tool_chat/src/java/org/lamsfoundation/lams/tool/chat/web/actions/MonitoringAction.java	(.../MonitoringAction.java)	(revision 7e8d2e658c8363cb1878c6f9270b5e1f64c3afac)
@@ -247,7 +247,7 @@
 	    UserDTO teacher = (UserDTO) ss.getAttribute(AttributeNames.USER);
 	    TimeZone teacherTimeZone = teacher.getTimeZone();
 	    tzSubmissionDeadline = DateUtil.convertFromTimeZoneToDefault(teacherTimeZone, submissionDeadline);
-	    formattedDate = DateUtil.convertToStringForJSON(submissionDeadline, request.getLocale());
+	    formattedDate = DateUtil.convertToStringForJSON(tzSubmissionDeadline, request.getLocale());
 	}
 	chat.setSubmissionDeadline(tzSubmissionDeadline);
 	chatService.saveOrUpdateChat(chat);
Index: lams_tool_forum/src/java/org/lamsfoundation/lams/tool/forum/web/actions/MonitoringAction.java
===================================================================
diff -u -rc6ad8493ef2064430e8783b28258cc9f223a3844 -r7e8d2e658c8363cb1878c6f9270b5e1f64c3afac
--- lams_tool_forum/src/java/org/lamsfoundation/lams/tool/forum/web/actions/MonitoringAction.java	(.../MonitoringAction.java)	(revision c6ad8493ef2064430e8783b28258cc9f223a3844)
+++ lams_tool_forum/src/java/org/lamsfoundation/lams/tool/forum/web/actions/MonitoringAction.java	(.../MonitoringAction.java)	(revision 7e8d2e658c8363cb1878c6f9270b5e1f64c3afac)
@@ -839,7 +839,7 @@
 		    .getAttribute(AttributeNames.USER);
 	    TimeZone teacherTimeZone = teacher.getTimeZone();
 	    tzSubmissionDeadline = DateUtil.convertFromTimeZoneToDefault(teacherTimeZone, submissionDeadline);
-	    formattedDate = DateUtil.convertToStringForJSON(submissionDeadline, request.getLocale());
+	    formattedDate = DateUtil.convertToStringForJSON(tzSubmissionDeadline, request.getLocale());
 	}
 	forum.setSubmissionDeadline(tzSubmissionDeadline);
 	forumService.updateForum(forum);
Index: lams_tool_kaltura/src/java/org/lamsfoundation/lams/tool/kaltura/web/actions/MonitoringAction.java
===================================================================
diff -u -rc6ad8493ef2064430e8783b28258cc9f223a3844 -r7e8d2e658c8363cb1878c6f9270b5e1f64c3afac
--- lams_tool_kaltura/src/java/org/lamsfoundation/lams/tool/kaltura/web/actions/MonitoringAction.java	(.../MonitoringAction.java)	(revision c6ad8493ef2064430e8783b28258cc9f223a3844)
+++ lams_tool_kaltura/src/java/org/lamsfoundation/lams/tool/kaltura/web/actions/MonitoringAction.java	(.../MonitoringAction.java)	(revision 7e8d2e658c8363cb1878c6f9270b5e1f64c3afac)
@@ -199,7 +199,7 @@
 		    .getAttribute(AttributeNames.USER);
 	    TimeZone teacherTimeZone = teacher.getTimeZone();
 	    tzSubmissionDeadline = DateUtil.convertFromTimeZoneToDefault(teacherTimeZone, submissionDeadline);
-	    formattedDate = DateUtil.convertToStringForJSON(submissionDeadline, request.getLocale());
+	    formattedDate = DateUtil.convertToStringForJSON(tzSubmissionDeadline, request.getLocale());
 	}
 	kaltura.setSubmissionDeadline(tzSubmissionDeadline);
 	kalturaService.saveOrUpdateKaltura(kaltura);
Index: lams_tool_lamc/src/java/org/lamsfoundation/lams/tool/mc/web/McMonitoringAction.java
===================================================================
diff -u -rc6ad8493ef2064430e8783b28258cc9f223a3844 -r7e8d2e658c8363cb1878c6f9270b5e1f64c3afac
--- lams_tool_lamc/src/java/org/lamsfoundation/lams/tool/mc/web/McMonitoringAction.java	(.../McMonitoringAction.java)	(revision c6ad8493ef2064430e8783b28258cc9f223a3844)
+++ lams_tool_lamc/src/java/org/lamsfoundation/lams/tool/mc/web/McMonitoringAction.java	(.../McMonitoringAction.java)	(revision 7e8d2e658c8363cb1878c6f9270b5e1f64c3afac)
@@ -255,7 +255,7 @@
 		    .getAttribute(AttributeNames.USER);
 	    TimeZone teacherTimeZone = teacher.getTimeZone();
 	    tzSubmissionDeadline = DateUtil.convertFromTimeZoneToDefault(teacherTimeZone, submissionDeadline);
-	    formattedDate = DateUtil.convertToStringForJSON(submissionDeadline, request.getLocale());
+	    formattedDate = DateUtil.convertToStringForJSON(tzSubmissionDeadline, request.getLocale());
 	}
 	mcContent.setSubmissionDeadline(tzSubmissionDeadline);
 	service.updateMc(mcContent);
Index: lams_tool_laqa/src/java/org/lamsfoundation/lams/tool/qa/web/QaMonitoringAction.java
===================================================================
diff -u -r31e6bbeab2ea68cd74d596bfc0ba41b58d6e49de -r7e8d2e658c8363cb1878c6f9270b5e1f64c3afac
--- lams_tool_laqa/src/java/org/lamsfoundation/lams/tool/qa/web/QaMonitoringAction.java	(.../QaMonitoringAction.java)	(revision 31e6bbeab2ea68cd74d596bfc0ba41b58d6e49de)
+++ lams_tool_laqa/src/java/org/lamsfoundation/lams/tool/qa/web/QaMonitoringAction.java	(.../QaMonitoringAction.java)	(revision 7e8d2e658c8363cb1878c6f9270b5e1f64c3afac)
@@ -125,7 +125,7 @@
 	    UserDTO teacher = (UserDTO) ss.getAttribute(AttributeNames.USER);
 	    TimeZone teacherTimeZone = teacher.getTimeZone();
 	    tzSubmissionDeadline = DateUtil.convertFromTimeZoneToDefault(teacherTimeZone, submissionDeadline);
-	    formattedDate = DateUtil.convertToStringForJSON(submissionDeadline, request.getLocale());
+	    formattedDate = DateUtil.convertToStringForJSON(tzSubmissionDeadline, request.getLocale());
 	} else {
 	    //set showOtherAnswersAfterDeadline to false
 	    content.setShowOtherAnswersAfterDeadline(false);
Index: lams_tool_mindmap/src/java/org/lamsfoundation/lams/tool/mindmap/web/actions/MonitoringAction.java
===================================================================
diff -u -rc6ad8493ef2064430e8783b28258cc9f223a3844 -r7e8d2e658c8363cb1878c6f9270b5e1f64c3afac
--- lams_tool_mindmap/src/java/org/lamsfoundation/lams/tool/mindmap/web/actions/MonitoringAction.java	(.../MonitoringAction.java)	(revision c6ad8493ef2064430e8783b28258cc9f223a3844)
+++ lams_tool_mindmap/src/java/org/lamsfoundation/lams/tool/mindmap/web/actions/MonitoringAction.java	(.../MonitoringAction.java)	(revision 7e8d2e658c8363cb1878c6f9270b5e1f64c3afac)
@@ -354,7 +354,7 @@
 	    UserDTO teacher = (UserDTO) ss.getAttribute(AttributeNames.USER);
 	    TimeZone teacherTimeZone = teacher.getTimeZone();
 	    tzSubmissionDeadline = DateUtil.convertFromTimeZoneToDefault(teacherTimeZone, submissionDeadline);
-	    formattedDate = DateUtil.convertToStringForJSON(submissionDeadline, request.getLocale());
+	    formattedDate = DateUtil.convertToStringForJSON(tzSubmissionDeadline, request.getLocale());
 	}
 	mindmap.setSubmissionDeadline(tzSubmissionDeadline);
 	mindmapService.saveOrUpdateMindmap(mindmap);
Index: lams_tool_notebook/src/java/org/lamsfoundation/lams/tool/notebook/web/actions/MonitoringAction.java
===================================================================
diff -u -rc6ad8493ef2064430e8783b28258cc9f223a3844 -r7e8d2e658c8363cb1878c6f9270b5e1f64c3afac
--- lams_tool_notebook/src/java/org/lamsfoundation/lams/tool/notebook/web/actions/MonitoringAction.java	(.../MonitoringAction.java)	(revision c6ad8493ef2064430e8783b28258cc9f223a3844)
+++ lams_tool_notebook/src/java/org/lamsfoundation/lams/tool/notebook/web/actions/MonitoringAction.java	(.../MonitoringAction.java)	(revision 7e8d2e658c8363cb1878c6f9270b5e1f64c3afac)
@@ -245,7 +245,7 @@
 		    .getAttribute(AttributeNames.USER);
 	    TimeZone teacherTimeZone = teacher.getTimeZone();
 	    tzSubmissionDeadline = DateUtil.convertFromTimeZoneToDefault(teacherTimeZone, submissionDeadline);
-	    formattedDate = DateUtil.convertToStringForJSON(submissionDeadline, request.getLocale());
+	    formattedDate = DateUtil.convertToStringForJSON(tzSubmissionDeadline, request.getLocale());
 	}
 	notebook.setSubmissionDeadline(tzSubmissionDeadline);
 	notebookService.saveOrUpdateNotebook(notebook);
Index: lams_tool_sbmt/src/java/org/lamsfoundation/lams/tool/sbmt/web/MonitoringAction.java
===================================================================
diff -u -rc6ad8493ef2064430e8783b28258cc9f223a3844 -r7e8d2e658c8363cb1878c6f9270b5e1f64c3afac
--- lams_tool_sbmt/src/java/org/lamsfoundation/lams/tool/sbmt/web/MonitoringAction.java	(.../MonitoringAction.java)	(revision c6ad8493ef2064430e8783b28258cc9f223a3844)
+++ lams_tool_sbmt/src/java/org/lamsfoundation/lams/tool/sbmt/web/MonitoringAction.java	(.../MonitoringAction.java)	(revision 7e8d2e658c8363cb1878c6f9270b5e1f64c3afac)
@@ -414,7 +414,7 @@
 	    UserDTO teacher = (UserDTO) ss.getAttribute(AttributeNames.USER);
 	    TimeZone teacherTimeZone = teacher.getTimeZone();
 	    tzSubmissionDeadline = DateUtil.convertFromTimeZoneToDefault(teacherTimeZone, submissionDeadline);
-	    formattedDate = DateUtil.convertToStringForJSON(submissionDeadline, request.getLocale());
+	    formattedDate = DateUtil.convertToStringForJSON(tzSubmissionDeadline, request.getLocale());
 	}
 	content.setSubmissionDeadline(tzSubmissionDeadline);
 	submitFilesService.saveOrUpdateContent(content);
Index: lams_tool_scratchie/src/java/org/lamsfoundation/lams/tool/scratchie/web/action/MonitoringAction.java
===================================================================
diff -u -rc6ad8493ef2064430e8783b28258cc9f223a3844 -r7e8d2e658c8363cb1878c6f9270b5e1f64c3afac
--- lams_tool_scratchie/src/java/org/lamsfoundation/lams/tool/scratchie/web/action/MonitoringAction.java	(.../MonitoringAction.java)	(revision c6ad8493ef2064430e8783b28258cc9f223a3844)
+++ lams_tool_scratchie/src/java/org/lamsfoundation/lams/tool/scratchie/web/action/MonitoringAction.java	(.../MonitoringAction.java)	(revision 7e8d2e658c8363cb1878c6f9270b5e1f64c3afac)
@@ -223,7 +223,7 @@
 	    UserDTO teacher = (UserDTO) ss.getAttribute(AttributeNames.USER);
 	    TimeZone teacherTimeZone = teacher.getTimeZone();
 	    tzSubmissionDeadline = DateUtil.convertFromTimeZoneToDefault(teacherTimeZone, submissionDeadline);
-	    formattedDate = DateUtil.convertToStringForJSON(submissionDeadline, request.getLocale());
+	    formattedDate = DateUtil.convertToStringForJSON(tzSubmissionDeadline, request.getLocale());
 	}
 	scratchie.setSubmissionDeadline(tzSubmissionDeadline);
 	service.saveOrUpdateScratchie(scratchie);
Index: lams_tool_survey/src/java/org/lamsfoundation/lams/tool/survey/web/action/MonitoringAction.java
===================================================================
diff -u -rc6ad8493ef2064430e8783b28258cc9f223a3844 -r7e8d2e658c8363cb1878c6f9270b5e1f64c3afac
--- lams_tool_survey/src/java/org/lamsfoundation/lams/tool/survey/web/action/MonitoringAction.java	(.../MonitoringAction.java)	(revision c6ad8493ef2064430e8783b28258cc9f223a3844)
+++ lams_tool_survey/src/java/org/lamsfoundation/lams/tool/survey/web/action/MonitoringAction.java	(.../MonitoringAction.java)	(revision 7e8d2e658c8363cb1878c6f9270b5e1f64c3afac)
@@ -534,7 +534,7 @@
 	    UserDTO teacher = (UserDTO) ss.getAttribute(AttributeNames.USER);
 	    TimeZone teacherTimeZone = teacher.getTimeZone();
 	    tzSubmissionDeadline = DateUtil.convertFromTimeZoneToDefault(teacherTimeZone, submissionDeadline);
-	    formattedDate = DateUtil.convertToStringForJSON(submissionDeadline, request.getLocale());
+	    formattedDate = DateUtil.convertToStringForJSON(tzSubmissionDeadline, request.getLocale());
 	}
 	survey.setSubmissionDeadline(tzSubmissionDeadline);
 	surveyService.saveOrUpdateSurvey(survey);
Index: lams_tool_task/src/java/org/lamsfoundation/lams/tool/taskList/web/action/MonitoringAction.java
===================================================================
diff -u -rc6ad8493ef2064430e8783b28258cc9f223a3844 -r7e8d2e658c8363cb1878c6f9270b5e1f64c3afac
--- lams_tool_task/src/java/org/lamsfoundation/lams/tool/taskList/web/action/MonitoringAction.java	(.../MonitoringAction.java)	(revision c6ad8493ef2064430e8783b28258cc9f223a3844)
+++ lams_tool_task/src/java/org/lamsfoundation/lams/tool/taskList/web/action/MonitoringAction.java	(.../MonitoringAction.java)	(revision 7e8d2e658c8363cb1878c6f9270b5e1f64c3afac)
@@ -456,7 +456,7 @@
 		    .getAttribute(AttributeNames.USER);
 	    TimeZone teacherTimeZone = teacher.getTimeZone();
 	    tzSubmissionDeadline = DateUtil.convertFromTimeZoneToDefault(teacherTimeZone, submissionDeadline);
-	    formattedDate = DateUtil.convertToStringForJSON(submissionDeadline, request.getLocale());
+	    formattedDate = DateUtil.convertToStringForJSON(tzSubmissionDeadline, request.getLocale());
 	}
 	taskList.setSubmissionDeadline(tzSubmissionDeadline);
 	service.saveOrUpdateTaskList(taskList);
Index: lams_tool_vote/src/java/org/lamsfoundation/lams/tool/vote/web/MonitoringAction.java
===================================================================
diff -u -rc6ad8493ef2064430e8783b28258cc9f223a3844 -r7e8d2e658c8363cb1878c6f9270b5e1f64c3afac
--- lams_tool_vote/src/java/org/lamsfoundation/lams/tool/vote/web/MonitoringAction.java	(.../MonitoringAction.java)	(revision c6ad8493ef2064430e8783b28258cc9f223a3844)
+++ lams_tool_vote/src/java/org/lamsfoundation/lams/tool/vote/web/MonitoringAction.java	(.../MonitoringAction.java)	(revision 7e8d2e658c8363cb1878c6f9270b5e1f64c3afac)
@@ -372,7 +372,7 @@
 		    .getAttribute(AttributeNames.USER);
 	    TimeZone teacherTimeZone = teacher.getTimeZone();
 	    tzSubmissionDeadline = DateUtil.convertFromTimeZoneToDefault(teacherTimeZone, submissionDeadline);
-	    formattedDate = DateUtil.convertToStringForJSON(submissionDeadline, request.getLocale());
+	    formattedDate = DateUtil.convertToStringForJSON(tzSubmissionDeadline, request.getLocale());
 	}
 	voteContent.setSubmissionDeadline(tzSubmissionDeadline);
 	voteService.updateVote(voteContent);
Index: lams_tool_wiki/src/java/org/lamsfoundation/lams/tool/wiki/web/actions/MonitoringAction.java
===================================================================
diff -u -rc6ad8493ef2064430e8783b28258cc9f223a3844 -r7e8d2e658c8363cb1878c6f9270b5e1f64c3afac
--- lams_tool_wiki/src/java/org/lamsfoundation/lams/tool/wiki/web/actions/MonitoringAction.java	(.../MonitoringAction.java)	(revision c6ad8493ef2064430e8783b28258cc9f223a3844)
+++ lams_tool_wiki/src/java/org/lamsfoundation/lams/tool/wiki/web/actions/MonitoringAction.java	(.../MonitoringAction.java)	(revision 7e8d2e658c8363cb1878c6f9270b5e1f64c3afac)
@@ -201,7 +201,7 @@
 	    UserDTO teacher = (UserDTO) ss.getAttribute(AttributeNames.USER);
 	    TimeZone teacherTimeZone = teacher.getTimeZone();
 	    tzSubmissionDeadline = DateUtil.convertFromTimeZoneToDefault(teacherTimeZone, submissionDeadline);
-	    formattedDate = DateUtil.convertToStringForJSON(submissionDeadline, request.getLocale());
+	    formattedDate = DateUtil.convertToStringForJSON(tzSubmissionDeadline, request.getLocale());
 	}
 	wiki.setSubmissionDeadline(tzSubmissionDeadline);
 	wikiService.saveOrUpdateWiki(wiki);