Index: lams_central/web/includes/javascript/monitorToolSummaryAdvanced.js =================================================================== RCS file: /usr/local/cvsroot/lams_central/web/includes/javascript/monitorToolSummaryAdvanced.js,v diff -u -r1.3.2.1 -r1.3.2.2 --- lams_central/web/includes/javascript/monitorToolSummaryAdvanced.js 9 May 2016 12:06:08 -0000 1.3.2.1 +++ lams_central/web/includes/javascript/monitorToolSummaryAdvanced.js 13 Dec 2016 05:51:45 -0000 1.3.2.2 @@ -25,7 +25,12 @@ $("#datetime").datetimepicker(); if (submissionDeadlineSettings.submissionDeadline != "") { var date = new Date(eval(submissionDeadlineSettings.submissionDeadline)); - $("#dateInfo").html( formatDate(date) ); + + if ( typeof submissionDeadlineSettings.submissionDateString != 'undefined' ) { + $("#dateInfo").html( submissionDeadlineSettings.submissionDateString ); + } else { + $("#dateInfo").html( formatDate(date) ); + } if ( $("#restrictUsageDiv").hasClass("collapse") ) { // new version - using the according @@ -38,6 +43,7 @@ } }); + // fallback routine for when Java formatted dates are not available function formatDate(date) { var currHour = "" + date.getHours(); if (currHour.length == 1) { @@ -64,10 +70,15 @@ + date.getTime() + "&reqID=" + reqIDVar.getTime(); $.ajax({ url : url, - success : function() { + success : function(data) { + debugger; $.growlUI(submissionDeadlineSettings.messageNotification, submissionDeadlineSettings.messageRestrictionSet); $("#datetimeDiv").hide(); - $("#dateInfo").html(formatDate(date) ); + if ( data != '' ) { + $("#dateInfo").html( data ); + } else { + $("#dateInfo").html( formatDate(date) ); + } $("#dateInfoDiv").show(); } }); @@ -84,7 +95,6 @@ success : function() { $.growlUI(submissionDeadlineSettings.messageNotification, submissionDeadlineSettings.messageRestrictionRemoved); $("#dateInfoDiv").hide(); - $("#datetimeDiv").show(); $("#datetime").val(""); } Index: lams_tool_laqa/src/java/org/lamsfoundation/lams/tool/qa/QaAppConstants.java =================================================================== RCS file: /usr/local/cvsroot/lams_tool_laqa/src/java/org/lamsfoundation/lams/tool/qa/QaAppConstants.java,v diff -u -r1.95.2.9 -r1.95.2.10 --- lams_tool_laqa/src/java/org/lamsfoundation/lams/tool/qa/QaAppConstants.java 13 Oct 2016 14:00:23 -0000 1.95.2.9 +++ lams_tool_laqa/src/java/org/lamsfoundation/lams/tool/qa/QaAppConstants.java 13 Dec 2016 05:55:03 -0000 1.95.2.10 @@ -202,6 +202,7 @@ public static final String NO_TOOL_SESSIONS_AVAILABLE = "noToolSessionAvailable"; public static final String ATTR_CONTENT = "content"; public static final String ATTR_SUBMISSION_DEADLINE = "submissionDeadline"; + public static final String ATTR_SUBMISSION_DEADLINE_DATESTRING = "submissionDateString"; public static final String PARAM_SHOW_OTHER_ANSWERS_AFTER_DEADLINE = "showOtherAnswersAfterDeadline"; public static final String ATTR_IS_SUBMISSION_DEADLINE_PASSED = "isSubmissionDeadlinePassed"; public static final String ATTR_GROUP_USERS = "groupUsers"; 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.4 -r1.80.2.5 --- lams_tool_laqa/src/java/org/lamsfoundation/lams/tool/qa/web/QaMonitoringAction.java 11 May 2016 07:36:00 -0000 1.80.2.4 +++ lams_tool_laqa/src/java/org/lamsfoundation/lams/tool/qa/web/QaMonitoringAction.java 13 Dec 2016 05:55:03 -0000 1.80.2.5 @@ -107,30 +107,34 @@ * @param request * @param response * @return + * @throws IOException */ public ActionForward setSubmissionDeadline(ActionMapping mapping, ActionForm form, HttpServletRequest request, - HttpServletResponse response) { + HttpServletResponse response) throws IOException { IQaService qaService = getQAService(); Long contentID = WebUtil.readLongParam(request, AttributeNames.PARAM_TOOL_CONTENT_ID); QaContent content = qaService.getQaContent(contentID); Long dateParameter = WebUtil.readLongParam(request, QaAppConstants.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()); } else { //set showOtherAnswersAfterDeadline to false content.setShowOtherAnswersAfterDeadline(false); } content.setSubmissionDeadline(tzSubmissionDeadline); qaService.saveOrUpdateQaContent(content); + response.setContentType("text/plain;charset=utf-8"); + response.getWriter().print(formattedDate); return null; } Index: lams_tool_laqa/src/java/org/lamsfoundation/lams/tool/qa/web/QaMonitoringStarterAction.java =================================================================== RCS file: /usr/local/cvsroot/lams_tool_laqa/src/java/org/lamsfoundation/lams/tool/qa/web/QaMonitoringStarterAction.java,v diff -u -r1.68.2.6 -r1.68.2.7 --- lams_tool_laqa/src/java/org/lamsfoundation/lams/tool/qa/web/QaMonitoringStarterAction.java 11 Oct 2016 05:20:42 -0000 1.68.2.6 +++ lams_tool_laqa/src/java/org/lamsfoundation/lams/tool/qa/web/QaMonitoringStarterAction.java 13 Dec 2016 05:55:02 -0000 1.68.2.7 @@ -182,6 +182,8 @@ TimeZone teacherTimeZone = teacher.getTimeZone(); Date tzSubmissionDeadline = DateUtil.convertToTimeZoneFromDefault(teacherTimeZone, submissionDeadline); request.setAttribute(QaAppConstants.ATTR_SUBMISSION_DEADLINE, tzSubmissionDeadline.getTime()); + // use the unconverted time, as convertToStringForJSON() does the timezone conversion if needed + request.setAttribute(QaAppConstants.ATTR_SUBMISSION_DEADLINE_DATESTRING, DateUtil.convertToStringForJSON(submissionDeadline, request.getLocale())); } return (mapping.findForward(LOAD_MONITORING)); Index: lams_tool_laqa/web/monitoring/MonitoringMaincontent.jsp =================================================================== RCS file: /usr/local/cvsroot/lams_tool_laqa/web/monitoring/MonitoringMaincontent.jsp,v diff -u -r1.39.2.19 -r1.39.2.20 --- lams_tool_laqa/web/monitoring/MonitoringMaincontent.jsp 11 Dec 2016 01:34:11 -0000 1.39.2.19 +++ lams_tool_laqa/web/monitoring/MonitoringMaincontent.jsp 13 Dec 2016 05:55:03 -0000 1.39.2.20 @@ -56,6 +56,7 @@ var submissionDeadlineSettings = { lams: '${lams}', submissionDeadline: '${submissionDeadline}', + submissionDateString: '${submissionDateString}', setSubmissionDeadlineUrl: '', toolContentID: '${content.qaContentId}', messageNotification: '',