Index: lams_tool_assessment/src/java/org/lamsfoundation/lams/tool/assessment/web/action/MonitoringAction.java =================================================================== RCS file: /usr/local/cvsroot/lams_tool_assessment/src/java/org/lamsfoundation/lams/tool/assessment/web/action/MonitoringAction.java,v diff -u -r1.25.2.8 -r1.25.2.9 --- lams_tool_assessment/src/java/org/lamsfoundation/lams/tool/assessment/web/action/MonitoringAction.java 13 Dec 2016 22:40:24 -0000 1.25.2.8 +++ lams_tool_assessment/src/java/org/lamsfoundation/lams/tool/assessment/web/action/MonitoringAction.java 16 Dec 2016 09:26:37 -0000 1.25.2.9 @@ -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 =================================================================== RCS file: /usr/local/cvsroot/lams_tool_chat/src/java/org/lamsfoundation/lams/tool/chat/web/actions/MonitoringAction.java,v diff -u -r1.23.2.5 -r1.23.2.6 --- lams_tool_chat/src/java/org/lamsfoundation/lams/tool/chat/web/actions/MonitoringAction.java 13 Dec 2016 22:50:21 -0000 1.23.2.5 +++ lams_tool_chat/src/java/org/lamsfoundation/lams/tool/chat/web/actions/MonitoringAction.java 16 Dec 2016 09:26:42 -0000 1.23.2.6 @@ -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 =================================================================== RCS file: /usr/local/cvsroot/lams_tool_forum/src/java/org/lamsfoundation/lams/tool/forum/web/actions/MonitoringAction.java,v diff -u -r1.46.2.10 -r1.46.2.11 --- lams_tool_forum/src/java/org/lamsfoundation/lams/tool/forum/web/actions/MonitoringAction.java 13 Dec 2016 22:51:37 -0000 1.46.2.10 +++ lams_tool_forum/src/java/org/lamsfoundation/lams/tool/forum/web/actions/MonitoringAction.java 16 Dec 2016 09:26:44 -0000 1.46.2.11 @@ -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 =================================================================== RCS file: /usr/local/cvsroot/lams_tool_kaltura/src/java/org/lamsfoundation/lams/tool/kaltura/web/actions/MonitoringAction.java,v diff -u -r1.4.2.5 -r1.4.2.6 --- lams_tool_kaltura/src/java/org/lamsfoundation/lams/tool/kaltura/web/actions/MonitoringAction.java 13 Dec 2016 22:52:14 -0000 1.4.2.5 +++ lams_tool_kaltura/src/java/org/lamsfoundation/lams/tool/kaltura/web/actions/MonitoringAction.java 16 Dec 2016 09:26:38 -0000 1.4.2.6 @@ -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 =================================================================== RCS file: /usr/local/cvsroot/lams_tool_lamc/src/java/org/lamsfoundation/lams/tool/mc/web/McMonitoringAction.java,v diff -u -r1.58.2.6 -r1.58.2.7 --- lams_tool_lamc/src/java/org/lamsfoundation/lams/tool/mc/web/McMonitoringAction.java 13 Dec 2016 22:52:31 -0000 1.58.2.6 +++ lams_tool_lamc/src/java/org/lamsfoundation/lams/tool/mc/web/McMonitoringAction.java 16 Dec 2016 09:26:49 -0000 1.58.2.7 @@ -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 =================================================================== RCS file: /usr/local/cvsroot/lams_tool_laqa/src/java/org/lamsfoundation/lams/tool/qa/web/QaMonitoringAction.java,v diff -u -r1.80.2.5 -r1.80.2.6 --- lams_tool_laqa/src/java/org/lamsfoundation/lams/tool/qa/web/QaMonitoringAction.java 13 Dec 2016 05:55:03 -0000 1.80.2.5 +++ lams_tool_laqa/src/java/org/lamsfoundation/lams/tool/qa/web/QaMonitoringAction.java 16 Dec 2016 09:26:43 -0000 1.80.2.6 @@ -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 =================================================================== RCS file: /usr/local/cvsroot/lams_tool_mindmap/src/java/org/lamsfoundation/lams/tool/mindmap/web/actions/MonitoringAction.java,v diff -u -r1.9.2.6 -r1.9.2.7 --- lams_tool_mindmap/src/java/org/lamsfoundation/lams/tool/mindmap/web/actions/MonitoringAction.java 13 Dec 2016 22:53:27 -0000 1.9.2.6 +++ lams_tool_mindmap/src/java/org/lamsfoundation/lams/tool/mindmap/web/actions/MonitoringAction.java 16 Dec 2016 09:26:35 -0000 1.9.2.7 @@ -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 =================================================================== RCS file: /usr/local/cvsroot/lams_tool_notebook/src/java/org/lamsfoundation/lams/tool/notebook/web/actions/MonitoringAction.java,v diff -u -r1.13.2.8 -r1.13.2.9 --- lams_tool_notebook/src/java/org/lamsfoundation/lams/tool/notebook/web/actions/MonitoringAction.java 13 Dec 2016 22:54:19 -0000 1.13.2.8 +++ lams_tool_notebook/src/java/org/lamsfoundation/lams/tool/notebook/web/actions/MonitoringAction.java 16 Dec 2016 09:26:45 -0000 1.13.2.9 @@ -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 =================================================================== RCS file: /usr/local/cvsroot/lams_tool_sbmt/src/java/org/lamsfoundation/lams/tool/sbmt/web/MonitoringAction.java,v diff -u -r1.52.2.7 -r1.52.2.8 --- lams_tool_sbmt/src/java/org/lamsfoundation/lams/tool/sbmt/web/MonitoringAction.java 13 Dec 2016 22:54:36 -0000 1.52.2.7 +++ lams_tool_sbmt/src/java/org/lamsfoundation/lams/tool/sbmt/web/MonitoringAction.java 16 Dec 2016 09:26:41 -0000 1.52.2.8 @@ -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 =================================================================== RCS file: /usr/local/cvsroot/lams_tool_scratchie/src/java/org/lamsfoundation/lams/tool/scratchie/web/action/MonitoringAction.java,v diff -u -r1.21.2.5 -r1.21.2.6 --- lams_tool_scratchie/src/java/org/lamsfoundation/lams/tool/scratchie/web/action/MonitoringAction.java 13 Dec 2016 22:54:53 -0000 1.21.2.5 +++ lams_tool_scratchie/src/java/org/lamsfoundation/lams/tool/scratchie/web/action/MonitoringAction.java 16 Dec 2016 09:26:40 -0000 1.21.2.6 @@ -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 =================================================================== RCS file: /usr/local/cvsroot/lams_tool_survey/src/java/org/lamsfoundation/lams/tool/survey/web/action/MonitoringAction.java,v diff -u -r1.23.2.7 -r1.23.2.8 --- lams_tool_survey/src/java/org/lamsfoundation/lams/tool/survey/web/action/MonitoringAction.java 13 Dec 2016 22:55:30 -0000 1.23.2.7 +++ lams_tool_survey/src/java/org/lamsfoundation/lams/tool/survey/web/action/MonitoringAction.java 16 Dec 2016 09:26:48 -0000 1.23.2.8 @@ -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 =================================================================== RCS file: /usr/local/cvsroot/lams_tool_task/src/java/org/lamsfoundation/lams/tool/taskList/web/action/MonitoringAction.java,v diff -u -r1.16.2.5 -r1.16.2.6 --- lams_tool_task/src/java/org/lamsfoundation/lams/tool/taskList/web/action/MonitoringAction.java 13 Dec 2016 22:59:00 -0000 1.16.2.5 +++ lams_tool_task/src/java/org/lamsfoundation/lams/tool/taskList/web/action/MonitoringAction.java 16 Dec 2016 09:26:39 -0000 1.16.2.6 @@ -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 =================================================================== RCS file: /usr/local/cvsroot/lams_tool_vote/src/java/org/lamsfoundation/lams/tool/vote/web/Attic/MonitoringAction.java,v diff -u -r1.1.2.3 -r1.1.2.4 --- lams_tool_vote/src/java/org/lamsfoundation/lams/tool/vote/web/MonitoringAction.java 13 Dec 2016 22:59:14 -0000 1.1.2.3 +++ lams_tool_vote/src/java/org/lamsfoundation/lams/tool/vote/web/MonitoringAction.java 16 Dec 2016 09:26:47 -0000 1.1.2.4 @@ -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 =================================================================== RCS file: /usr/local/cvsroot/lams_tool_wiki/src/java/org/lamsfoundation/lams/tool/wiki/web/actions/MonitoringAction.java,v diff -u -r1.10.2.6 -r1.10.2.7 --- lams_tool_wiki/src/java/org/lamsfoundation/lams/tool/wiki/web/actions/MonitoringAction.java 13 Dec 2016 22:59:24 -0000 1.10.2.6 +++ lams_tool_wiki/src/java/org/lamsfoundation/lams/tool/wiki/web/actions/MonitoringAction.java 16 Dec 2016 09:26:36 -0000 1.10.2.7 @@ -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);