Index: lams_tool_chat/src/java/org/lamsfoundation/lams/tool/chat/web/actions/MonitoringAction.java =================================================================== diff -u -r3399163940c61c9132223c758d274486e57ff9b7 -rc6ad8493ef2064430e8783b28258cc9f223a3844 --- lams_tool_chat/src/java/org/lamsfoundation/lams/tool/chat/web/actions/MonitoringAction.java (.../MonitoringAction.java) (revision 3399163940c61c9132223c758d274486e57ff9b7) +++ lams_tool_chat/src/java/org/lamsfoundation/lams/tool/chat/web/actions/MonitoringAction.java (.../MonitoringAction.java) (revision c6ad8493ef2064430e8783b28258cc9f223a3844) @@ -24,6 +24,7 @@ package org.lamsfoundation.lams.tool.chat.web.actions; +import java.io.IOException; import java.util.Date; import java.util.Iterator; import java.util.List; @@ -107,6 +108,8 @@ TimeZone learnerTimeZone = learnerDto.getTimeZone(); Date tzSubmissionDeadline = DateUtil.convertToTimeZoneFromDefault(learnerTimeZone, submissionDeadline); request.setAttribute("submissionDeadline", tzSubmissionDeadline.getTime()); + // use the unconverted time, as convertToStringForJSON() does the timezone conversion if needed + request.setAttribute("submissionDateString", DateUtil.convertToStringForJSON(submissionDeadline, request.getLocale())); } @@ -222,9 +225,10 @@ * @param request * @param response * @return + * @throws IOException */ public ActionForward setSubmissionDeadline(ActionMapping mapping, ActionForm form, HttpServletRequest request, - HttpServletResponse response) { + HttpServletResponse response) throws IOException { // set up chatService if (chatService == null) { @@ -236,19 +240,26 @@ Long dateParameter = WebUtil.readLongParam(request, ChatConstants.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()); } chat.setSubmissionDeadline(tzSubmissionDeadline); chatService.saveOrUpdateChat(chat); + response.setContentType("text/plain;charset=utf-8"); + response.getWriter().print(formattedDate); return null; } + + + /* Private Methods */ private ChatUser getCurrentUser(Long toolSessionId) { Index: lams_tool_chat/web/pages/monitoring/summary.jsp =================================================================== diff -u -r8955c559e118a75bcdec763ebae2e745a0421236 -rc6ad8493ef2064430e8783b28258cc9f223a3844 --- lams_tool_chat/web/pages/monitoring/summary.jsp (.../summary.jsp) (revision 8955c559e118a75bcdec763ebae2e745a0421236) +++ lams_tool_chat/web/pages/monitoring/summary.jsp (.../summary.jsp) (revision c6ad8493ef2064430e8783b28258cc9f223a3844) @@ -12,6 +12,7 @@ var submissionDeadlineSettings = { lams: '${lams}', submissionDeadline: '${submissionDeadline}', + submissionDateString: '${submissionDateString}', setSubmissionDeadlineUrl: '', toolContentID: '${param.toolContentID}', messageNotification: '', Index: lams_tool_forum/src/java/org/lamsfoundation/lams/tool/forum/util/ForumConstants.java =================================================================== diff -u -rb036e6dd6d2afe9c0e0b9143c9be3af1d53a1e0e -rc6ad8493ef2064430e8783b28258cc9f223a3844 --- lams_tool_forum/src/java/org/lamsfoundation/lams/tool/forum/util/ForumConstants.java (.../ForumConstants.java) (revision b036e6dd6d2afe9c0e0b9143c9be3af1d53a1e0e) +++ lams_tool_forum/src/java/org/lamsfoundation/lams/tool/forum/util/ForumConstants.java (.../ForumConstants.java) (revision c6ad8493ef2064430e8783b28258cc9f223a3844) @@ -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 =================================================================== diff -u -rc8739894a932a2bbf7cfa8687186c0ae3c63de8b -rc6ad8493ef2064430e8783b28258cc9f223a3844 --- lams_tool_forum/src/java/org/lamsfoundation/lams/tool/forum/web/actions/MonitoringAction.java (.../MonitoringAction.java) (revision c8739894a932a2bbf7cfa8687186c0ae3c63de8b) +++ lams_tool_forum/src/java/org/lamsfoundation/lams/tool/forum/web/actions/MonitoringAction.java (.../MonitoringAction.java) (revision c6ad8493ef2064430e8783b28258cc9f223a3844) @@ -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 =================================================================== diff -u -rbe49e45de128eb0d25eb224ff397590993eccc82 -rc6ad8493ef2064430e8783b28258cc9f223a3844 --- lams_tool_forum/web/jsps/monitoring/summary.jsp (.../summary.jsp) (revision be49e45de128eb0d25eb224ff397590993eccc82) +++ lams_tool_forum/web/jsps/monitoring/summary.jsp (.../summary.jsp) (revision c6ad8493ef2064430e8783b28258cc9f223a3844) @@ -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 =================================================================== diff -u -r2f725f8ef2aa09a2663b2335bf67213074426d11 -rc6ad8493ef2064430e8783b28258cc9f223a3844 --- lams_tool_kaltura/src/java/org/lamsfoundation/lams/tool/kaltura/util/KalturaConstants.java (.../KalturaConstants.java) (revision 2f725f8ef2aa09a2663b2335bf67213074426d11) +++ lams_tool_kaltura/src/java/org/lamsfoundation/lams/tool/kaltura/util/KalturaConstants.java (.../KalturaConstants.java) (revision c6ad8493ef2064430e8783b28258cc9f223a3844) @@ -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 =================================================================== diff -u -re535a51e19cbc72d07bda00b019c947847d869b0 -rc6ad8493ef2064430e8783b28258cc9f223a3844 --- lams_tool_kaltura/src/java/org/lamsfoundation/lams/tool/kaltura/web/actions/MonitoringAction.java (.../MonitoringAction.java) (revision e535a51e19cbc72d07bda00b019c947847d869b0) +++ lams_tool_kaltura/src/java/org/lamsfoundation/lams/tool/kaltura/web/actions/MonitoringAction.java (.../MonitoringAction.java) (revision c6ad8493ef2064430e8783b28258cc9f223a3844) @@ -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 =================================================================== diff -u -r22397baa76b549cb90d788ba1b472297a873ea82 -rc6ad8493ef2064430e8783b28258cc9f223a3844 --- lams_tool_kaltura/web/pages/monitoring/summary.jsp (.../summary.jsp) (revision 22397baa76b549cb90d788ba1b472297a873ea82) +++ lams_tool_kaltura/web/pages/monitoring/summary.jsp (.../summary.jsp) (revision c6ad8493ef2064430e8783b28258cc9f223a3844) @@ -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 =================================================================== diff -u -rd82560c4b917240cb90b5d3416f5199cba68fb85 -rc6ad8493ef2064430e8783b28258cc9f223a3844 --- lams_tool_lamc/src/java/org/lamsfoundation/lams/tool/mc/McAppConstants.java (.../McAppConstants.java) (revision d82560c4b917240cb90b5d3416f5199cba68fb85) +++ lams_tool_lamc/src/java/org/lamsfoundation/lams/tool/mc/McAppConstants.java (.../McAppConstants.java) (revision c6ad8493ef2064430e8783b28258cc9f223a3844) @@ -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 =================================================================== diff -u -r1d3ff83fba3454c6e0e4139dc15ad6cecdfa389c -rc6ad8493ef2064430e8783b28258cc9f223a3844 --- lams_tool_lamc/src/java/org/lamsfoundation/lams/tool/mc/web/McMonitoringAction.java (.../McMonitoringAction.java) (revision 1d3ff83fba3454c6e0e4139dc15ad6cecdfa389c) +++ lams_tool_lamc/src/java/org/lamsfoundation/lams/tool/mc/web/McMonitoringAction.java (.../McMonitoringAction.java) (revision c6ad8493ef2064430e8783b28258cc9f223a3844) @@ -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 =================================================================== diff -u -r1d3ff83fba3454c6e0e4139dc15ad6cecdfa389c -rc6ad8493ef2064430e8783b28258cc9f223a3844 --- lams_tool_lamc/src/java/org/lamsfoundation/lams/tool/mc/web/MonitoringUtil.java (.../MonitoringUtil.java) (revision 1d3ff83fba3454c6e0e4139dc15ad6cecdfa389c) +++ lams_tool_lamc/src/java/org/lamsfoundation/lams/tool/mc/web/MonitoringUtil.java (.../MonitoringUtil.java) (revision c6ad8493ef2064430e8783b28258cc9f223a3844) @@ -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 =================================================================== diff -u -r5c21f24dc619fd24806c5c8438ef59d5fd990ca2 -rc6ad8493ef2064430e8783b28258cc9f223a3844 --- lams_tool_lamc/web/monitoring/SummaryContent.jsp (.../SummaryContent.jsp) (revision 5c21f24dc619fd24806c5c8438ef59d5fd990ca2) +++ lams_tool_lamc/web/monitoring/SummaryContent.jsp (.../SummaryContent.jsp) (revision c6ad8493ef2064430e8783b28258cc9f223a3844) @@ -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 =================================================================== diff -u -r2f725f8ef2aa09a2663b2335bf67213074426d11 -rc6ad8493ef2064430e8783b28258cc9f223a3844 --- lams_tool_mindmap/src/java/org/lamsfoundation/lams/tool/mindmap/util/MindmapConstants.java (.../MindmapConstants.java) (revision 2f725f8ef2aa09a2663b2335bf67213074426d11) +++ lams_tool_mindmap/src/java/org/lamsfoundation/lams/tool/mindmap/util/MindmapConstants.java (.../MindmapConstants.java) (revision c6ad8493ef2064430e8783b28258cc9f223a3844) @@ -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 =================================================================== diff -u -r2f725f8ef2aa09a2663b2335bf67213074426d11 -rc6ad8493ef2064430e8783b28258cc9f223a3844 --- lams_tool_mindmap/src/java/org/lamsfoundation/lams/tool/mindmap/web/actions/MonitoringAction.java (.../MonitoringAction.java) (revision 2f725f8ef2aa09a2663b2335bf67213074426d11) +++ lams_tool_mindmap/src/java/org/lamsfoundation/lams/tool/mindmap/web/actions/MonitoringAction.java (.../MonitoringAction.java) (revision c6ad8493ef2064430e8783b28258cc9f223a3844) @@ -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 =================================================================== diff -u -r22397baa76b549cb90d788ba1b472297a873ea82 -rc6ad8493ef2064430e8783b28258cc9f223a3844 --- lams_tool_mindmap/web/pages/monitoring/summary.jsp (.../summary.jsp) (revision 22397baa76b549cb90d788ba1b472297a873ea82) +++ lams_tool_mindmap/web/pages/monitoring/summary.jsp (.../summary.jsp) (revision c6ad8493ef2064430e8783b28258cc9f223a3844) @@ -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 =================================================================== diff -u -rb036e6dd6d2afe9c0e0b9143c9be3af1d53a1e0e -rc6ad8493ef2064430e8783b28258cc9f223a3844 --- lams_tool_notebook/src/java/org/lamsfoundation/lams/tool/notebook/util/NotebookConstants.java (.../NotebookConstants.java) (revision b036e6dd6d2afe9c0e0b9143c9be3af1d53a1e0e) +++ lams_tool_notebook/src/java/org/lamsfoundation/lams/tool/notebook/util/NotebookConstants.java (.../NotebookConstants.java) (revision c6ad8493ef2064430e8783b28258cc9f223a3844) @@ -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 =================================================================== diff -u -rdba506c6b1663eba922793a44b6ad5726f2931d1 -rc6ad8493ef2064430e8783b28258cc9f223a3844 --- lams_tool_notebook/src/java/org/lamsfoundation/lams/tool/notebook/web/actions/LearningAction.java (.../LearningAction.java) (revision dba506c6b1663eba922793a44b6ad5726f2931d1) +++ lams_tool_notebook/src/java/org/lamsfoundation/lams/tool/notebook/web/actions/LearningAction.java (.../LearningAction.java) (revision c6ad8493ef2064430e8783b28258cc9f223a3844) @@ -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 =================================================================== diff -u -r0883d2881bdb1b40071f47d5de807c59a75f6c62 -rc6ad8493ef2064430e8783b28258cc9f223a3844 --- lams_tool_notebook/src/java/org/lamsfoundation/lams/tool/notebook/web/actions/MonitoringAction.java (.../MonitoringAction.java) (revision 0883d2881bdb1b40071f47d5de807c59a75f6c62) +++ lams_tool_notebook/src/java/org/lamsfoundation/lams/tool/notebook/web/actions/MonitoringAction.java (.../MonitoringAction.java) (revision c6ad8493ef2064430e8783b28258cc9f223a3844) @@ -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 =================================================================== diff -u -r0883d2881bdb1b40071f47d5de807c59a75f6c62 -rc6ad8493ef2064430e8783b28258cc9f223a3844 --- lams_tool_notebook/web/pages/monitoring/summary.jsp (.../summary.jsp) (revision 0883d2881bdb1b40071f47d5de807c59a75f6c62) +++ lams_tool_notebook/web/pages/monitoring/summary.jsp (.../summary.jsp) (revision c6ad8493ef2064430e8783b28258cc9f223a3844) @@ -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 =================================================================== diff -u -r0f06a3fe1469600b56093d09d01c0922ab1cb3db -rc6ad8493ef2064430e8783b28258cc9f223a3844 --- lams_tool_sbmt/src/java/org/lamsfoundation/lams/tool/sbmt/util/SbmtConstants.java (.../SbmtConstants.java) (revision 0f06a3fe1469600b56093d09d01c0922ab1cb3db) +++ lams_tool_sbmt/src/java/org/lamsfoundation/lams/tool/sbmt/util/SbmtConstants.java (.../SbmtConstants.java) (revision c6ad8493ef2064430e8783b28258cc9f223a3844) @@ -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 =================================================================== diff -u -r0f06a3fe1469600b56093d09d01c0922ab1cb3db -rc6ad8493ef2064430e8783b28258cc9f223a3844 --- lams_tool_sbmt/src/java/org/lamsfoundation/lams/tool/sbmt/web/MonitoringAction.java (.../MonitoringAction.java) (revision 0f06a3fe1469600b56093d09d01c0922ab1cb3db) +++ lams_tool_sbmt/src/java/org/lamsfoundation/lams/tool/sbmt/web/MonitoringAction.java (.../MonitoringAction.java) (revision c6ad8493ef2064430e8783b28258cc9f223a3844) @@ -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 =================================================================== diff -u -rf2c6fdd167bba44e7c7b4fa9c837a3d7d9e05f94 -rc6ad8493ef2064430e8783b28258cc9f223a3844 --- lams_tool_sbmt/web/monitoring/parts/summary.jsp (.../summary.jsp) (revision f2c6fdd167bba44e7c7b4fa9c837a3d7d9e05f94) +++ lams_tool_sbmt/web/monitoring/parts/summary.jsp (.../summary.jsp) (revision c6ad8493ef2064430e8783b28258cc9f223a3844) @@ -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 =================================================================== diff -u -r5e5c78e2345ed588a0fd341d4e7c53ed8402b958 -rc6ad8493ef2064430e8783b28258cc9f223a3844 --- lams_tool_scratchie/src/java/org/lamsfoundation/lams/tool/scratchie/ScratchieConstants.java (.../ScratchieConstants.java) (revision 5e5c78e2345ed588a0fd341d4e7c53ed8402b958) +++ lams_tool_scratchie/src/java/org/lamsfoundation/lams/tool/scratchie/ScratchieConstants.java (.../ScratchieConstants.java) (revision c6ad8493ef2064430e8783b28258cc9f223a3844) @@ -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 =================================================================== diff -u -r2f725f8ef2aa09a2663b2335bf67213074426d11 -rc6ad8493ef2064430e8783b28258cc9f223a3844 --- lams_tool_scratchie/src/java/org/lamsfoundation/lams/tool/scratchie/web/action/MonitoringAction.java (.../MonitoringAction.java) (revision 2f725f8ef2aa09a2663b2335bf67213074426d11) +++ lams_tool_scratchie/src/java/org/lamsfoundation/lams/tool/scratchie/web/action/MonitoringAction.java (.../MonitoringAction.java) (revision c6ad8493ef2064430e8783b28258cc9f223a3844) @@ -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 =================================================================== diff -u -rd28a91914e8858e0fbc045fc9313e3b50a309c45 -rc6ad8493ef2064430e8783b28258cc9f223a3844 --- lams_tool_scratchie/web/pages/monitoring/summary.jsp (.../summary.jsp) (revision d28a91914e8858e0fbc045fc9313e3b50a309c45) +++ lams_tool_scratchie/web/pages/monitoring/summary.jsp (.../summary.jsp) (revision c6ad8493ef2064430e8783b28258cc9f223a3844) @@ -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 =================================================================== diff -u -rb036e6dd6d2afe9c0e0b9143c9be3af1d53a1e0e -rc6ad8493ef2064430e8783b28258cc9f223a3844 --- lams_tool_survey/src/java/org/lamsfoundation/lams/tool/survey/SurveyConstants.java (.../SurveyConstants.java) (revision b036e6dd6d2afe9c0e0b9143c9be3af1d53a1e0e) +++ lams_tool_survey/src/java/org/lamsfoundation/lams/tool/survey/SurveyConstants.java (.../SurveyConstants.java) (revision c6ad8493ef2064430e8783b28258cc9f223a3844) @@ -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 =================================================================== diff -u -r2f725f8ef2aa09a2663b2335bf67213074426d11 -rc6ad8493ef2064430e8783b28258cc9f223a3844 --- lams_tool_survey/src/java/org/lamsfoundation/lams/tool/survey/web/action/MonitoringAction.java (.../MonitoringAction.java) (revision 2f725f8ef2aa09a2663b2335bf67213074426d11) +++ lams_tool_survey/src/java/org/lamsfoundation/lams/tool/survey/web/action/MonitoringAction.java (.../MonitoringAction.java) (revision c6ad8493ef2064430e8783b28258cc9f223a3844) @@ -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 =================================================================== diff -u -r230631757ce5657c02733128542f738928cc514e -rc6ad8493ef2064430e8783b28258cc9f223a3844 --- lams_tool_survey/web/pages/monitoring/monitoring.jsp (.../monitoring.jsp) (revision 230631757ce5657c02733128542f738928cc514e) +++ lams_tool_survey/web/pages/monitoring/monitoring.jsp (.../monitoring.jsp) (revision c6ad8493ef2064430e8783b28258cc9f223a3844) @@ -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 =================================================================== diff -u -r2f725f8ef2aa09a2663b2335bf67213074426d11 -rc6ad8493ef2064430e8783b28258cc9f223a3844 --- lams_tool_task/src/java/org/lamsfoundation/lams/tool/taskList/TaskListConstants.java (.../TaskListConstants.java) (revision 2f725f8ef2aa09a2663b2335bf67213074426d11) +++ lams_tool_task/src/java/org/lamsfoundation/lams/tool/taskList/TaskListConstants.java (.../TaskListConstants.java) (revision c6ad8493ef2064430e8783b28258cc9f223a3844) @@ -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 =================================================================== diff -u -rd6dcae53cbe27a85aedf62b8545ee3193ec55220 -rc6ad8493ef2064430e8783b28258cc9f223a3844 --- lams_tool_task/src/java/org/lamsfoundation/lams/tool/taskList/web/action/MonitoringAction.java (.../MonitoringAction.java) (revision d6dcae53cbe27a85aedf62b8545ee3193ec55220) +++ lams_tool_task/src/java/org/lamsfoundation/lams/tool/taskList/web/action/MonitoringAction.java (.../MonitoringAction.java) (revision c6ad8493ef2064430e8783b28258cc9f223a3844) @@ -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 =================================================================== diff -u -r0d14800c7ef0085f17e151c167408984eb55f1ff -rc6ad8493ef2064430e8783b28258cc9f223a3844 --- lams_tool_task/web/pages/monitoring/monitoring.jsp (.../monitoring.jsp) (revision 0d14800c7ef0085f17e151c167408984eb55f1ff) +++ lams_tool_task/web/pages/monitoring/monitoring.jsp (.../monitoring.jsp) (revision c6ad8493ef2064430e8783b28258cc9f223a3844) @@ -7,11 +7,20 @@ + <%-- param has higher level for request attribute --%> + + + + + + +