Index: lams_tool_forum/src/java/org/lamsfoundation/lams/tool/forum/util/ForumConstants.java =================================================================== RCS file: /usr/local/cvsroot/lams_tool_forum/src/java/org/lamsfoundation/lams/tool/forum/util/ForumConstants.java,v diff -u -r1.61.2.8 -r1.61.2.9 --- lams_tool_forum/src/java/org/lamsfoundation/lams/tool/forum/util/ForumConstants.java 13 Dec 2016 14:33:25 -0000 1.61.2.8 +++ lams_tool_forum/src/java/org/lamsfoundation/lams/tool/forum/util/ForumConstants.java 13 Dec 2016 22:51:37 -0000 1.61.2.9 @@ -116,6 +116,8 @@ // for submission deadline public static final String ATTR_SUBMISSION_DEADLINE = "submissionDeadline"; + + public static final String ATTR_SUBMISSION_DEADLINE_DATESTRING = "submissionDateString"; public static final String ATTR_IS_SUBMISSION_DEADLINE_PASSED = "isSubmissionDeadlinePassed"; 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.9 -r1.46.2.10 --- lams_tool_forum/src/java/org/lamsfoundation/lams/tool/forum/web/actions/MonitoringAction.java 23 Nov 2016 07:44:38 -0000 1.46.2.9 +++ 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 @@ -220,6 +220,8 @@ TimeZone learnerTimeZone = learnerDto.getTimeZone(); Date tzSubmissionDeadline = DateUtil.convertToTimeZoneFromDefault(learnerTimeZone, submissionDeadline); sessionMap.put(ForumConstants.ATTR_SUBMISSION_DEADLINE, tzSubmissionDeadline.getTime()); + // use the unconverted time, as convertToStringForJSON() does the timezone conversion if needed + request.setAttribute(ForumConstants.ATTR_SUBMISSION_DEADLINE_DATESTRING, DateUtil.convertToStringForJSON(submissionDeadline, request.getLocale())); } boolean isGroupedActivity = forumService.isGroupedActivity(toolContentId); @@ -818,27 +820,32 @@ * @param request * @param response * @return + * @throws IOException */ public ActionForward setSubmissionDeadline(ActionMapping mapping, ActionForm form, HttpServletRequest request, - HttpServletResponse response) { + HttpServletResponse response) throws IOException { forumService = getForumService(); Long contentID = WebUtil.readLongParam(request, AttributeNames.PARAM_TOOL_CONTENT_ID); Forum forum = forumService.getForumByContentId(contentID); Long dateParameter = WebUtil.readLongParam(request, ForumConstants.ATTR_SUBMISSION_DEADLINE, true); Date tzSubmissionDeadline = null; + String formattedDate = ""; if (dateParameter != null) { Date submissionDeadline = new Date(dateParameter); HttpSession ss = SessionManager.getSession(); org.lamsfoundation.lams.usermanagement.dto.UserDTO teacher = (org.lamsfoundation.lams.usermanagement.dto.UserDTO) ss .getAttribute(AttributeNames.USER); TimeZone teacherTimeZone = teacher.getTimeZone(); tzSubmissionDeadline = DateUtil.convertFromTimeZoneToDefault(teacherTimeZone, submissionDeadline); + formattedDate = DateUtil.convertToStringForJSON(submissionDeadline, request.getLocale()); } forum.setSubmissionDeadline(tzSubmissionDeadline); forumService.updateForum(forum); + response.setContentType("text/plain;charset=utf-8"); + response.getWriter().print(formattedDate); return null; } Index: lams_tool_forum/web/jsps/monitoring/summary.jsp =================================================================== RCS file: /usr/local/cvsroot/lams_tool_forum/web/jsps/monitoring/summary.jsp,v diff -u -r1.31.2.13 -r1.31.2.14 --- lams_tool_forum/web/jsps/monitoring/summary.jsp 20 Oct 2016 22:17:29 -0000 1.31.2.13 +++ lams_tool_forum/web/jsps/monitoring/summary.jsp 13 Dec 2016 22:51:37 -0000 1.31.2.14 @@ -17,6 +17,7 @@ var submissionDeadlineSettings = { lams: '${lams}', submissionDeadline: '${sessionMap.submissionDeadline}', + submissionDateString: '${submissionDateString}', setSubmissionDeadlineUrl: '', toolContentID: '${param.toolContentID}', messageNotification: '', Index: lams_tool_kaltura/src/java/org/lamsfoundation/lams/tool/kaltura/util/KalturaConstants.java =================================================================== RCS file: /usr/local/cvsroot/lams_tool_kaltura/src/java/org/lamsfoundation/lams/tool/kaltura/util/KalturaConstants.java,v diff -u -r1.3.2.2 -r1.3.2.3 --- lams_tool_kaltura/src/java/org/lamsfoundation/lams/tool/kaltura/util/KalturaConstants.java 11 May 2016 07:37:16 -0000 1.3.2.2 +++ lams_tool_kaltura/src/java/org/lamsfoundation/lams/tool/kaltura/util/KalturaConstants.java 13 Dec 2016 22:52:14 -0000 1.3.2.3 @@ -34,6 +34,7 @@ public static final String ATTR_ITEMS = "items"; public static final String ATTR_SESSION_MAP_ID = "sessionMapID"; public static final String ATTR_SUBMISSION_DEADLINE = "submissionDeadline"; + public static final String ATTR_SUBMISSION_DEADLINE_DATESTRING = "submissionDateString"; public static final String ATTR_IS_SUBMISSION_DEADLINE_PASSED = "isSubmissionDeadlinePassed"; public static final String ATTR_ITEM_LIST = "itemList"; public static final String ATTR_DELETED_ITEM_LIST = "deletedItemList"; 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.4 -r1.4.2.5 --- lams_tool_kaltura/src/java/org/lamsfoundation/lams/tool/kaltura/web/actions/MonitoringAction.java 3 Jun 2016 08:58:43 -0000 1.4.2.4 +++ 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 @@ -24,6 +24,7 @@ package org.lamsfoundation.lams.tool.kaltura.web.actions; +import java.io.IOException; import java.util.Date; import java.util.List; import java.util.Set; @@ -100,6 +101,8 @@ TimeZone teacherTimeZone = teacher.getTimeZone(); Date tzSubmissionDeadline = DateUtil.convertToTimeZoneFromDefault(teacherTimeZone, submissionDeadline); request.setAttribute(KalturaConstants.ATTR_SUBMISSION_DEADLINE, tzSubmissionDeadline.getTime()); + // use the unconverted time, as convertToStringForJSON() does the timezone conversion if needed + request.setAttribute(KalturaConstants.ATTR_SUBMISSION_DEADLINE_DATESTRING, DateUtil.convertToStringForJSON(submissionDeadline, request.getLocale())); } return mapping.findForward("success"); @@ -175,9 +178,10 @@ * @param request * @param response * @return + * @throws IOException */ public ActionForward setSubmissionDeadline(ActionMapping mapping, ActionForm form, HttpServletRequest request, - HttpServletResponse response) { + HttpServletResponse response) throws IOException { setupService(); @@ -187,16 +191,21 @@ Long dateParameter = WebUtil.readLongParam(request, KalturaConstants.ATTR_SUBMISSION_DEADLINE, true); Date tzSubmissionDeadline = null; + String formattedDate = ""; if (dateParameter != null) { Date submissionDeadline = new Date(dateParameter); HttpSession ss = SessionManager.getSession(); org.lamsfoundation.lams.usermanagement.dto.UserDTO teacher = (org.lamsfoundation.lams.usermanagement.dto.UserDTO) ss .getAttribute(AttributeNames.USER); TimeZone teacherTimeZone = teacher.getTimeZone(); tzSubmissionDeadline = DateUtil.convertFromTimeZoneToDefault(teacherTimeZone, submissionDeadline); + formattedDate = DateUtil.convertToStringForJSON(submissionDeadline, request.getLocale()); } kaltura.setSubmissionDeadline(tzSubmissionDeadline); kalturaService.saveOrUpdateKaltura(kaltura); + + response.setContentType("text/plain;charset=utf-8"); + response.getWriter().print(formattedDate); return null; } Index: lams_tool_kaltura/web/pages/monitoring/summary.jsp =================================================================== RCS file: /usr/local/cvsroot/lams_tool_kaltura/web/pages/monitoring/summary.jsp,v diff -u -r1.4.2.6 -r1.4.2.7 --- lams_tool_kaltura/web/pages/monitoring/summary.jsp 3 Dec 2016 01:34:59 -0000 1.4.2.6 +++ lams_tool_kaltura/web/pages/monitoring/summary.jsp 13 Dec 2016 22:52:14 -0000 1.4.2.7 @@ -11,6 +11,7 @@ var submissionDeadlineSettings = { lams: '${lams}', submissionDeadline: '${submissionDeadline}', + submissionDateString: '${submissionDateString}', setSubmissionDeadlineUrl: '', toolContentID: '${param.toolContentID}', messageNotification: '', Index: lams_tool_lamc/src/java/org/lamsfoundation/lams/tool/mc/McAppConstants.java =================================================================== RCS file: /usr/local/cvsroot/lams_tool_lamc/src/java/org/lamsfoundation/lams/tool/mc/McAppConstants.java,v diff -u -r1.112.2.8 -r1.112.2.9 --- lams_tool_lamc/src/java/org/lamsfoundation/lams/tool/mc/McAppConstants.java 29 Sep 2016 13:26:21 -0000 1.112.2.8 +++ lams_tool_lamc/src/java/org/lamsfoundation/lams/tool/mc/McAppConstants.java 13 Dec 2016 22:52:31 -0000 1.112.2.9 @@ -171,6 +171,7 @@ /* Date time restriction */ public static final String ATTR_SUBMISSION_DEADLINE = "submissionDeadline"; + public static final String ATTR_SUBMISSION_DEADLINE_DATESTRING = "submissionDateString"; public static final String ATTR_IS_SUBMISSION_DEADLINE_PASSED = "isSubmissionDeadlinePassed"; public static final String ATTR_GROUP_USERS = "groupUsers"; public static final String ATTR_IS_USER_LEADER = "isUserLeader"; 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.5 -r1.58.2.6 --- lams_tool_lamc/src/java/org/lamsfoundation/lams/tool/mc/web/McMonitoringAction.java 15 Jun 2016 07:59:47 -0000 1.58.2.5 +++ lams_tool_lamc/src/java/org/lamsfoundation/lams/tool/mc/web/McMonitoringAction.java 13 Dec 2016 22:52:31 -0000 1.58.2.6 @@ -235,9 +235,10 @@ /** * Set Submission Deadline + * @throws IOException */ public ActionForward setSubmissionDeadline(ActionMapping mapping, ActionForm form, HttpServletRequest request, - HttpServletResponse response) { + HttpServletResponse response) throws IOException { IMcService service = McServiceProxy.getMcService(getServlet().getServletContext()); @@ -246,17 +247,20 @@ Long dateParameter = WebUtil.readLongParam(request, McAppConstants.ATTR_SUBMISSION_DEADLINE, true); Date tzSubmissionDeadline = null; + String formattedDate = ""; if (dateParameter != null) { Date submissionDeadline = new Date(dateParameter); HttpSession ss = SessionManager.getSession(); org.lamsfoundation.lams.usermanagement.dto.UserDTO teacher = (org.lamsfoundation.lams.usermanagement.dto.UserDTO) ss .getAttribute(AttributeNames.USER); TimeZone teacherTimeZone = teacher.getTimeZone(); tzSubmissionDeadline = DateUtil.convertFromTimeZoneToDefault(teacherTimeZone, submissionDeadline); + formattedDate = DateUtil.convertToStringForJSON(submissionDeadline, request.getLocale()); } mcContent.setSubmissionDeadline(tzSubmissionDeadline); service.updateMc(mcContent); - + response.setContentType("text/plain;charset=utf-8"); + response.getWriter().print(formattedDate); return null; } 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.43.2.4 -r1.43.2.5 --- lams_tool_lamc/src/java/org/lamsfoundation/lams/tool/mc/web/MonitoringUtil.java 15 Jun 2016 07:59:47 -0000 1.43.2.4 +++ lams_tool_lamc/src/java/org/lamsfoundation/lams/tool/mc/web/MonitoringUtil.java 13 Dec 2016 22:52:31 -0000 1.43.2.5 @@ -172,7 +172,10 @@ UserDTO learnerDto = (UserDTO) ss.getAttribute(AttributeNames.USER); TimeZone learnerTimeZone = learnerDto.getTimeZone(); Date tzSubmissionDeadline = DateUtil.convertToTimeZoneFromDefault(learnerTimeZone, submissionDeadline); - request.setAttribute("submissionDeadline", tzSubmissionDeadline.getTime()); + request.setAttribute(McAppConstants.ATTR_SUBMISSION_DEADLINE, tzSubmissionDeadline.getTime()); + // use the unconverted time, as convertToStringForJSON() does the timezone conversion if needed + request.setAttribute(McAppConstants.ATTR_SUBMISSION_DEADLINE_DATESTRING, DateUtil.convertToStringForJSON(submissionDeadline, request.getLocale())); + } //prepare toolOutputDefinitions and activityEvaluation Index: lams_tool_lamc/web/monitoring/SummaryContent.jsp =================================================================== RCS file: /usr/local/cvsroot/lams_tool_lamc/web/monitoring/SummaryContent.jsp,v diff -u -r1.39.2.8 -r1.39.2.9 --- lams_tool_lamc/web/monitoring/SummaryContent.jsp 3 Jun 2016 01:35:55 -0000 1.39.2.8 +++ lams_tool_lamc/web/monitoring/SummaryContent.jsp 13 Dec 2016 22:52:31 -0000 1.39.2.9 @@ -25,6 +25,7 @@ var submissionDeadlineSettings = { lams: '${lams}', submissionDeadline: '${submissionDeadline}', + submissionDateString: '${submissionDateString}', setSubmissionDeadlineUrl: '', toolContentID: '${toolContentID}', messageNotification: '', Index: lams_tool_mindmap/src/java/org/lamsfoundation/lams/tool/mindmap/util/MindmapConstants.java =================================================================== RCS file: /usr/local/cvsroot/lams_tool_mindmap/src/java/org/lamsfoundation/lams/tool/mindmap/util/MindmapConstants.java,v diff -u -r1.3.2.2 -r1.3.2.3 --- lams_tool_mindmap/src/java/org/lamsfoundation/lams/tool/mindmap/util/MindmapConstants.java 11 May 2016 07:37:44 -0000 1.3.2.2 +++ lams_tool_mindmap/src/java/org/lamsfoundation/lams/tool/mindmap/util/MindmapConstants.java 13 Dec 2016 22:53:27 -0000 1.3.2.3 @@ -60,5 +60,6 @@ //public static final String ERROR_MSG_NAME_DUPLICATED = "error.condition.duplicated.name"; public static final String ATTR_SUBMISSION_DEADLINE = "submissionDeadline"; + public static final String ATTR_SUBMISSION_DEADLINE_DATESTRING = "submissionDateString"; public static final String ATTR_IS_SUBMISSION_DEADLINE_PASSED = "isSubmissionDeadlinePassed"; } 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.5 -r1.9.2.6 --- lams_tool_mindmap/src/java/org/lamsfoundation/lams/tool/mindmap/web/actions/MonitoringAction.java 11 May 2016 07:37:44 -0000 1.9.2.5 +++ 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 @@ -113,6 +113,7 @@ TimeZone teacherTimeZone = teacher.getTimeZone(); Date tzSubmissionDeadline = DateUtil.convertToTimeZoneFromDefault(teacherTimeZone, submissionDeadline); request.setAttribute(MindmapConstants.ATTR_SUBMISSION_DEADLINE, tzSubmissionDeadline.getTime()); + request.setAttribute(MindmapConstants.ATTR_SUBMISSION_DEADLINE_DATESTRING, DateUtil.convertToStringForJSON(submissionDeadline, request.getLocale())); } return mapping.findForward("success"); @@ -335,26 +336,30 @@ * @param request * @param response * @return + * @throws IOException */ public ActionForward setSubmissionDeadline(ActionMapping mapping, ActionForm form, HttpServletRequest request, - HttpServletResponse response) { + HttpServletResponse response) throws IOException { setupService(); Long contentID = WebUtil.readLongParam(request, AttributeNames.PARAM_TOOL_CONTENT_ID); Mindmap mindmap = mindmapService.getMindmapByContentId(contentID); Long dateParameter = WebUtil.readLongParam(request, MindmapConstants.ATTR_SUBMISSION_DEADLINE, true); Date tzSubmissionDeadline = null; + String formattedDate = ""; if (dateParameter != null) { Date submissionDeadline = new Date(dateParameter); HttpSession ss = SessionManager.getSession(); UserDTO teacher = (UserDTO) ss.getAttribute(AttributeNames.USER); TimeZone teacherTimeZone = teacher.getTimeZone(); tzSubmissionDeadline = DateUtil.convertFromTimeZoneToDefault(teacherTimeZone, submissionDeadline); + formattedDate = DateUtil.convertToStringForJSON(submissionDeadline, request.getLocale()); } mindmap.setSubmissionDeadline(tzSubmissionDeadline); mindmapService.saveOrUpdateMindmap(mindmap); - + response.setContentType("text/plain;charset=utf-8"); + response.getWriter().print(formattedDate); return null; } Index: lams_tool_mindmap/web/pages/monitoring/summary.jsp =================================================================== RCS file: /usr/local/cvsroot/lams_tool_mindmap/web/pages/monitoring/summary.jsp,v diff -u -r1.11.2.4 -r1.11.2.5 --- lams_tool_mindmap/web/pages/monitoring/summary.jsp 3 Dec 2016 01:34:59 -0000 1.11.2.4 +++ lams_tool_mindmap/web/pages/monitoring/summary.jsp 13 Dec 2016 22:53:27 -0000 1.11.2.5 @@ -10,6 +10,7 @@ var submissionDeadlineSettings = { lams: '${lams}', submissionDeadline: '${submissionDeadline}', + submissionDateString: '${submissionDateString}', setSubmissionDeadlineUrl: '', toolContentID: '${param.toolContentID}', messageNotification: '', Index: lams_tool_notebook/src/java/org/lamsfoundation/lams/tool/notebook/util/NotebookConstants.java =================================================================== RCS file: /usr/local/cvsroot/lams_tool_notebook/src/java/org/lamsfoundation/lams/tool/notebook/util/NotebookConstants.java,v diff -u -r1.9.2.5 -r1.9.2.6 --- lams_tool_notebook/src/java/org/lamsfoundation/lams/tool/notebook/util/NotebookConstants.java 13 Dec 2016 14:33:30 -0000 1.9.2.5 +++ lams_tool_notebook/src/java/org/lamsfoundation/lams/tool/notebook/util/NotebookConstants.java 13 Dec 2016 22:54:19 -0000 1.9.2.6 @@ -68,6 +68,7 @@ // for submission deadline public static final String ATTR_SUBMISSION_DEADLINE = "submissionDeadline"; + public static final String ATTR_SUBMISSION_DEADLINE_DATESTRING = "submissionDateString"; public static final String ATTR_IS_SUBMISSION_DEADLINE_PASSED = "isSubmissionDeadlinePassed"; // monitor sorting 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.17.2.5 -r1.17.2.6 --- lams_tool_notebook/src/java/org/lamsfoundation/lams/tool/notebook/web/actions/LearningAction.java 23 Nov 2016 08:14:44 -0000 1.17.2.5 +++ lams_tool_notebook/src/java/org/lamsfoundation/lams/tool/notebook/web/actions/LearningAction.java 13 Dec 2016 22:54:19 -0000 1.17.2.6 @@ -204,7 +204,8 @@ LearningForm learningForm = (LearningForm) form; NotebookUser notebookUser = getCurrentUser(toolSessionID); - if (learningForm.getContentEditable()) { + // learningForm.getContentEditable() will be null if the deadline has passed + if (learningForm.getContentEditable() != null && learningForm.getContentEditable()) { // TODO fix idType to use real value not 999 if (notebookUser.getEntryUID() == null) { notebookUser.setEntryUID(notebookService.createNotebookEntry(toolSessionID, 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.7 -r1.13.2.8 --- lams_tool_notebook/src/java/org/lamsfoundation/lams/tool/notebook/web/actions/MonitoringAction.java 26 Jul 2016 01:30:00 -0000 1.13.2.7 +++ 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 @@ -102,6 +102,7 @@ TimeZone teacherTimeZone = teacher.getTimeZone(); Date tzSubmissionDeadline = DateUtil.convertToTimeZoneFromDefault(teacherTimeZone, submissionDeadline); request.setAttribute(NotebookConstants.ATTR_SUBMISSION_DEADLINE, tzSubmissionDeadline.getTime()); + request.setAttribute(NotebookConstants.ATTR_SUBMISSION_DEADLINE_DATESTRING, DateUtil.convertToStringForJSON(submissionDeadline, request.getLocale())); } return mapping.findForward("success"); @@ -223,9 +224,10 @@ * @param request * @param response * @return + * @throws IOException */ public ActionForward setSubmissionDeadline(ActionMapping mapping, ActionForm form, HttpServletRequest request, - HttpServletResponse response) { + HttpServletResponse response) throws IOException { setupService(); @@ -235,16 +237,20 @@ Long dateParameter = WebUtil.readLongParam(request, NotebookConstants.ATTR_SUBMISSION_DEADLINE, true); Date tzSubmissionDeadline = null; + String formattedDate = ""; if (dateParameter != null) { Date submissionDeadline = new Date(dateParameter); HttpSession ss = SessionManager.getSession(); org.lamsfoundation.lams.usermanagement.dto.UserDTO teacher = (org.lamsfoundation.lams.usermanagement.dto.UserDTO) ss .getAttribute(AttributeNames.USER); TimeZone teacherTimeZone = teacher.getTimeZone(); tzSubmissionDeadline = DateUtil.convertFromTimeZoneToDefault(teacherTimeZone, submissionDeadline); + formattedDate = DateUtil.convertToStringForJSON(submissionDeadline, request.getLocale()); } notebook.setSubmissionDeadline(tzSubmissionDeadline); notebookService.saveOrUpdateNotebook(notebook); + response.setContentType("text/plain;charset=utf-8"); + response.getWriter().print(formattedDate); return null; } Index: lams_tool_notebook/web/pages/monitoring/summary.jsp =================================================================== RCS file: /usr/local/cvsroot/lams_tool_notebook/web/pages/monitoring/summary.jsp,v diff -u -r1.15.2.10 -r1.15.2.11 --- lams_tool_notebook/web/pages/monitoring/summary.jsp 26 Jul 2016 01:29:59 -0000 1.15.2.10 +++ lams_tool_notebook/web/pages/monitoring/summary.jsp 13 Dec 2016 22:54:19 -0000 1.15.2.11 @@ -26,6 +26,7 @@ var submissionDeadlineSettings = { lams: '${lams}', submissionDeadline: '${submissionDeadline}', + submissionDateString: '${submissionDateString}', setSubmissionDeadlineUrl: '', toolContentID: '${param.toolContentID}', messageNotification: '', Index: lams_tool_sbmt/src/java/org/lamsfoundation/lams/tool/sbmt/util/SbmtConstants.java =================================================================== RCS file: /usr/local/cvsroot/lams_tool_sbmt/src/java/org/lamsfoundation/lams/tool/sbmt/util/SbmtConstants.java,v diff -u -r1.27.2.4 -r1.27.2.5 --- lams_tool_sbmt/src/java/org/lamsfoundation/lams/tool/sbmt/util/SbmtConstants.java 30 Aug 2016 02:15:10 -0000 1.27.2.4 +++ lams_tool_sbmt/src/java/org/lamsfoundation/lams/tool/sbmt/util/SbmtConstants.java 13 Dec 2016 22:54:36 -0000 1.27.2.5 @@ -84,7 +84,7 @@ public static final String EVENT_NAME_NOTIFY_TEACHERS_ON_FILE_SUBMIT = "notify_teachers_on_file_submit"; public static final String ATTR_SUBMISSION_DEADLINE = "submissionDeadline"; - + public static final String ATTR_SUBMISSION_DEADLINE_DATESTRING = "submissionDateString"; public static final String ATTR_IS_SUBMISSION_DEADLINE_PASSED = "isSubmissionDeadlinePassed"; public static final String EVENT_NAME_NOTIFY_LEARNERS_ON_MARKED_FILE = "notify_learners_on_marked_file"; 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.6 -r1.52.2.7 --- lams_tool_sbmt/src/java/org/lamsfoundation/lams/tool/sbmt/web/MonitoringAction.java 30 Aug 2016 02:15:09 -0000 1.52.2.6 +++ lams_tool_sbmt/src/java/org/lamsfoundation/lams/tool/sbmt/web/MonitoringAction.java 13 Dec 2016 22:54:36 -0000 1.52.2.7 @@ -146,6 +146,7 @@ TimeZone teacherTimeZone = teacher.getTimeZone(); Date tzSubmissionDeadline = DateUtil.convertToTimeZoneFromDefault(teacherTimeZone, submissionDeadline); request.setAttribute(SbmtConstants.ATTR_SUBMISSION_DEADLINE, tzSubmissionDeadline.getTime()); + request.setAttribute(SbmtConstants.ATTR_SUBMISSION_DEADLINE_DATESTRING, DateUtil.convertToStringForJSON(submissionDeadline, request.getLocale())); } DynaActionForm smbtMonitoringForm = (DynaActionForm) form; @@ -395,26 +396,31 @@ * @param request * @param response * @return + * @throws IOException */ public ActionForward setSubmissionDeadline(ActionMapping mapping, ActionForm form, HttpServletRequest request, - HttpServletResponse response) { + HttpServletResponse response) throws IOException { submitFilesService = getSubmitFilesService(); Long contentID = WebUtil.readLongParam(request, AttributeNames.PARAM_TOOL_CONTENT_ID); SubmitFilesContent content = submitFilesService.getSubmitFilesContent(contentID); Long dateParameter = WebUtil.readLongParam(request, SbmtConstants.ATTR_SUBMISSION_DEADLINE, true); Date tzSubmissionDeadline = null; + String formattedDate = ""; if (dateParameter != null) { Date submissionDeadline = new Date(dateParameter); HttpSession ss = SessionManager.getSession(); UserDTO teacher = (UserDTO) ss.getAttribute(AttributeNames.USER); TimeZone teacherTimeZone = teacher.getTimeZone(); tzSubmissionDeadline = DateUtil.convertFromTimeZoneToDefault(teacherTimeZone, submissionDeadline); + formattedDate = DateUtil.convertToStringForJSON(submissionDeadline, request.getLocale()); } content.setSubmissionDeadline(tzSubmissionDeadline); submitFilesService.saveOrUpdateContent(content); + response.setContentType("text/plain;charset=utf-8"); + response.getWriter().print(formattedDate); return null; } Index: lams_tool_sbmt/web/monitoring/parts/summary.jsp =================================================================== RCS file: /usr/local/cvsroot/lams_tool_sbmt/web/monitoring/parts/summary.jsp,v diff -u -r1.21.2.9 -r1.21.2.10 --- lams_tool_sbmt/web/monitoring/parts/summary.jsp 3 Dec 2016 00:58:50 -0000 1.21.2.9 +++ lams_tool_sbmt/web/monitoring/parts/summary.jsp 13 Dec 2016 22:54:36 -0000 1.21.2.10 @@ -13,6 +13,7 @@ var submissionDeadlineSettings = { lams: '${lams}', submissionDeadline: '${submissionDeadline}', + submissionDateString: '${submissionDateString}', setSubmissionDeadlineUrl: '', toolContentID: '${param.toolContentID}', messageNotification: '', Index: lams_tool_scratchie/src/java/org/lamsfoundation/lams/tool/scratchie/ScratchieConstants.java =================================================================== RCS file: /usr/local/cvsroot/lams_tool_scratchie/src/java/org/lamsfoundation/lams/tool/scratchie/ScratchieConstants.java,v diff -u -r1.21.2.8 -r1.21.2.9 --- lams_tool_scratchie/src/java/org/lamsfoundation/lams/tool/scratchie/ScratchieConstants.java 6 Dec 2016 16:52:34 -0000 1.21.2.8 +++ lams_tool_scratchie/src/java/org/lamsfoundation/lams/tool/scratchie/ScratchieConstants.java 13 Dec 2016 22:54:53 -0000 1.21.2.9 @@ -174,7 +174,7 @@ public static final String ATTR_SECONDS_LEFT = "secondsLeft"; public static final String ATTR_SUBMISSION_DEADLINE = "submissionDeadline"; - + public static final String ATTR_SUBMISSION_DEADLINE_DATESTRING = "submissionDateString"; public static final String ATTR_IS_SUBMISSION_DEADLINE_PASSED = "isSubmissionDeadlinePassed"; public static final String ATTR_ANSWER_UIDS = "answerUids"; 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.4 -r1.21.2.5 --- lams_tool_scratchie/src/java/org/lamsfoundation/lams/tool/scratchie/web/action/MonitoringAction.java 11 May 2016 07:38:01 -0000 1.21.2.4 +++ 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 @@ -119,6 +119,7 @@ TimeZone teacherTimeZone = teacher.getTimeZone(); Date tzSubmissionDeadline = DateUtil.convertToTimeZoneFromDefault(teacherTimeZone, submissionDeadline); request.setAttribute(ScratchieConstants.ATTR_SUBMISSION_DEADLINE, tzSubmissionDeadline.getTime()); + request.setAttribute(ScratchieConstants.ATTR_SUBMISSION_DEADLINE_DATESTRING, DateUtil.convertToStringForJSON(submissionDeadline, request.getLocale())); } // cache into sessionMap @@ -204,26 +205,31 @@ * @param request * @param response * @return + * @throws IOException */ private ActionForward setSubmissionDeadline(ActionMapping mapping, ActionForm form, HttpServletRequest request, - HttpServletResponse response) { + HttpServletResponse response) throws IOException { initializeScratchieService(); Long contentID = WebUtil.readLongParam(request, AttributeNames.PARAM_TOOL_CONTENT_ID); Scratchie scratchie = service.getScratchieByContentId(contentID); Long dateParameter = WebUtil.readLongParam(request, ScratchieConstants.ATTR_SUBMISSION_DEADLINE, true); Date tzSubmissionDeadline = null; + String formattedDate = ""; if (dateParameter != null) { Date submissionDeadline = new Date(dateParameter); HttpSession ss = SessionManager.getSession(); UserDTO teacher = (UserDTO) ss.getAttribute(AttributeNames.USER); TimeZone teacherTimeZone = teacher.getTimeZone(); tzSubmissionDeadline = DateUtil.convertFromTimeZoneToDefault(teacherTimeZone, submissionDeadline); + formattedDate = DateUtil.convertToStringForJSON(submissionDeadline, request.getLocale()); } scratchie.setSubmissionDeadline(tzSubmissionDeadline); service.saveOrUpdateScratchie(scratchie); + response.setContentType("text/plain;charset=utf-8"); + response.getWriter().print(formattedDate); return null; } Index: lams_tool_scratchie/web/pages/monitoring/summary.jsp =================================================================== RCS file: /usr/local/cvsroot/lams_tool_scratchie/web/pages/monitoring/summary.jsp,v diff -u -r1.14.2.9 -r1.14.2.10 --- lams_tool_scratchie/web/pages/monitoring/summary.jsp 11 Nov 2016 15:52:42 -0000 1.14.2.9 +++ lams_tool_scratchie/web/pages/monitoring/summary.jsp 13 Dec 2016 22:54:53 -0000 1.14.2.10 @@ -222,6 +222,7 @@ var submissionDeadlineSettings = { lams: '', submissionDeadline: '${submissionDeadline}', + submissionDateString: '${submissionDateString}', setSubmissionDeadlineUrl: '', toolContentID: '${param.toolContentID}', messageNotification: '', Index: lams_tool_survey/src/java/org/lamsfoundation/lams/tool/survey/SurveyConstants.java =================================================================== RCS file: /usr/local/cvsroot/lams_tool_survey/src/java/org/lamsfoundation/lams/tool/survey/SurveyConstants.java,v diff -u -r1.20.2.5 -r1.20.2.6 --- lams_tool_survey/src/java/org/lamsfoundation/lams/tool/survey/SurveyConstants.java 13 Dec 2016 14:33:32 -0000 1.20.2.5 +++ lams_tool_survey/src/java/org/lamsfoundation/lams/tool/survey/SurveyConstants.java 13 Dec 2016 22:55:30 -0000 1.20.2.6 @@ -49,7 +49,7 @@ // for submission deadline public static final String ATTR_SUBMISSION_DEADLINE = "submissionDeadline"; - + public static final String ATTR_SUBMISSION_DEADLINE_DATESTRING = "submissionDateString"; public static final String ATTR_IS_SUBMISSION_DEADLINE_PASSED = "isSubmissionDeadlinePassed"; // for parameters' name 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.6 -r1.23.2.7 --- lams_tool_survey/src/java/org/lamsfoundation/lams/tool/survey/web/action/MonitoringAction.java 11 May 2016 07:37:31 -0000 1.23.2.6 +++ 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 @@ -177,7 +177,7 @@ MonitoringAction.log.info("Time:" + tzSubmissionDeadline.getTime()); // store submission deadline to sessionMap sessionMap.put(SurveyConstants.ATTR_SUBMISSION_DEADLINE, tzSubmissionDeadline.getTime()); - + sessionMap.put(SurveyConstants.ATTR_SUBMISSION_DEADLINE_DATESTRING, DateUtil.convertToStringForJSON(submissionDeadline, request.getLocale())); } return mapping.findForward(SurveyConstants.SUCCESS); @@ -516,26 +516,31 @@ * @param request * @param response * @return + * @throws IOException */ public ActionForward setSubmissionDeadline(ActionMapping mapping, ActionForm form, HttpServletRequest request, - HttpServletResponse response) { + HttpServletResponse response) throws IOException { surveyService = getSurveyService(); Long contentID = WebUtil.readLongParam(request, AttributeNames.PARAM_TOOL_CONTENT_ID); Survey survey = surveyService.getSurveyByContentId(contentID); Long dateParameter = WebUtil.readLongParam(request, SurveyConstants.ATTR_SUBMISSION_DEADLINE, true); Date tzSubmissionDeadline = null; + String formattedDate = ""; if (dateParameter != null) { Date submissionDeadline = new Date(dateParameter); HttpSession ss = SessionManager.getSession(); UserDTO teacher = (UserDTO) ss.getAttribute(AttributeNames.USER); TimeZone teacherTimeZone = teacher.getTimeZone(); tzSubmissionDeadline = DateUtil.convertFromTimeZoneToDefault(teacherTimeZone, submissionDeadline); + formattedDate = DateUtil.convertToStringForJSON(submissionDeadline, request.getLocale()); } survey.setSubmissionDeadline(tzSubmissionDeadline); surveyService.saveOrUpdateSurvey(survey); + response.setContentType("text/plain;charset=utf-8"); + response.getWriter().print(formattedDate); return null; } Index: lams_tool_survey/web/pages/monitoring/monitoring.jsp =================================================================== RCS file: /usr/local/cvsroot/lams_tool_survey/web/pages/monitoring/monitoring.jsp,v diff -u -r1.11.2.2 -r1.11.2.3 --- lams_tool_survey/web/pages/monitoring/monitoring.jsp 4 Jun 2016 10:23:43 -0000 1.11.2.2 +++ lams_tool_survey/web/pages/monitoring/monitoring.jsp 13 Dec 2016 22:55:30 -0000 1.11.2.3 @@ -25,6 +25,7 @@ var submissionDeadlineSettings = { lams: '${lams}', submissionDeadline: '${sessionMap.submissionDeadline}', + submissionDateString: '${sessionMap.submissionDateString}', setSubmissionDeadlineUrl: '', toolContentID: '${param.toolContentID}', messageNotification: '', Index: lams_tool_task/src/java/org/lamsfoundation/lams/tool/taskList/TaskListConstants.java =================================================================== RCS file: /usr/local/cvsroot/lams_tool_task/src/java/org/lamsfoundation/lams/tool/taskList/TaskListConstants.java,v diff -u -r1.15.2.3 -r1.15.2.4 --- lams_tool_task/src/java/org/lamsfoundation/lams/tool/taskList/TaskListConstants.java 11 May 2016 07:35:22 -0000 1.15.2.3 +++ lams_tool_task/src/java/org/lamsfoundation/lams/tool/taskList/TaskListConstants.java 13 Dec 2016 22:59:00 -0000 1.15.2.4 @@ -78,6 +78,7 @@ // for submission deadline public static final String ATTR_SUBMISSION_DEADLINE = "submissionDeadline"; + public static final String ATTR_SUBMISSION_DEADLINE_DATESTRING = "submissionDateString"; public static final String ATTR_IS_SUBMISSION_DEADLINE_PASSED = "isSubmissionDeadlinePassed"; //error message keys 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.4 -r1.16.2.5 --- lams_tool_task/src/java/org/lamsfoundation/lams/tool/taskList/web/action/MonitoringAction.java 3 Jun 2016 00:18:11 -0000 1.16.2.4 +++ 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 @@ -137,6 +137,7 @@ TimeZone teacherTimeZone = teacher.getTimeZone(); Date tzSubmissionDeadline = DateUtil.convertToTimeZoneFromDefault(teacherTimeZone, submissionDeadline); sessionMap.put(TaskListConstants.ATTR_SUBMISSION_DEADLINE, tzSubmissionDeadline.getTime()); + sessionMap.put(TaskListConstants.ATTR_SUBMISSION_DEADLINE_DATESTRING, DateUtil.convertToStringForJSON(submissionDeadline, request.getLocale())); } // Create reflectList if reflection is enabled. @@ -439,24 +440,28 @@ * @return */ public ActionForward setSubmissionDeadline(ActionMapping mapping, ActionForm form, HttpServletRequest request, - HttpServletResponse response) { + HttpServletResponse response) throws IOException { ITaskListService service = getTaskListService(); Long contentID = WebUtil.readLongParam(request, AttributeNames.PARAM_TOOL_CONTENT_ID); TaskList taskList = service.getTaskListByContentId(contentID); Long dateParameter = WebUtil.readLongParam(request, TaskListConstants.ATTR_SUBMISSION_DEADLINE, true); Date tzSubmissionDeadline = null; + String formattedDate = ""; if (dateParameter != null) { Date submissionDeadline = new Date(dateParameter); HttpSession ss = SessionManager.getSession(); org.lamsfoundation.lams.usermanagement.dto.UserDTO teacher = (org.lamsfoundation.lams.usermanagement.dto.UserDTO) ss .getAttribute(AttributeNames.USER); TimeZone teacherTimeZone = teacher.getTimeZone(); tzSubmissionDeadline = DateUtil.convertFromTimeZoneToDefault(teacherTimeZone, submissionDeadline); + formattedDate = DateUtil.convertToStringForJSON(submissionDeadline, request.getLocale()); } taskList.setSubmissionDeadline(tzSubmissionDeadline); service.saveOrUpdateTaskList(taskList); + response.setContentType("text/plain;charset=utf-8"); + response.getWriter().print(formattedDate); return null; } Index: lams_tool_task/web/pages/monitoring/monitoring.jsp =================================================================== RCS file: /usr/local/cvsroot/lams_tool_task/web/pages/monitoring/monitoring.jsp,v diff -u -r1.5.2.3 -r1.5.2.4 --- lams_tool_task/web/pages/monitoring/monitoring.jsp 3 Jun 2016 01:32:10 -0000 1.5.2.3 +++ lams_tool_task/web/pages/monitoring/monitoring.jsp 13 Dec 2016 22:59:00 -0000 1.5.2.4 @@ -7,11 +7,20 @@ + <%-- param has higher level for request attribute --%> + + + + + + +