Index: lams_tool_assessment/src/java/org/lamsfoundation/lams/tool/assessment/AssessmentConstants.java =================================================================== diff -u -re10da332d88104fe61b1f646b8bcac22bbfd15f0 -rd170469167c907400448ffa1fb767e5ba0b43bee --- lams_tool_assessment/src/java/org/lamsfoundation/lams/tool/assessment/AssessmentConstants.java (.../AssessmentConstants.java) (revision e10da332d88104fe61b1f646b8bcac22bbfd15f0) +++ lams_tool_assessment/src/java/org/lamsfoundation/lams/tool/assessment/AssessmentConstants.java (.../AssessmentConstants.java) (revision d170469167c907400448ffa1fb767e5ba0b43bee) @@ -222,6 +222,8 @@ public static final String ATTR_QUESTION_NUMBERING_OFFSET = "questionNumberingOffset"; 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_assessment/src/java/org/lamsfoundation/lams/tool/assessment/web/action/MonitoringAction.java =================================================================== diff -u -r3399163940c61c9132223c758d274486e57ff9b7 -rd170469167c907400448ffa1fb767e5ba0b43bee --- lams_tool_assessment/src/java/org/lamsfoundation/lams/tool/assessment/web/action/MonitoringAction.java (.../MonitoringAction.java) (revision 3399163940c61c9132223c758d274486e57ff9b7) +++ lams_tool_assessment/src/java/org/lamsfoundation/lams/tool/assessment/web/action/MonitoringAction.java (.../MonitoringAction.java) (revision d170469167c907400448ffa1fb767e5ba0b43bee) @@ -143,6 +143,9 @@ TimeZone teacherTimeZone = teacher.getTimeZone(); Date tzSubmissionDeadline = DateUtil.convertToTimeZoneFromDefault(teacherTimeZone, submissionDeadline); request.setAttribute(AssessmentConstants.ATTR_SUBMISSION_DEADLINE, tzSubmissionDeadline.getTime()); + // use the unconverted time, as convertToStringForJSON() does the timezone conversion if needed + request.setAttribute(AssessmentConstants.ATTR_SUBMISSION_DEADLINE_DATESTRING, DateUtil.convertToStringForJSON(submissionDeadline, request.getLocale())); + } // Create reflectList if reflection is enabled. @@ -260,26 +263,32 @@ * @param request * @param response * @return + * @throws IOException */ private ActionForward setSubmissionDeadline(ActionMapping mapping, ActionForm form, HttpServletRequest request, - HttpServletResponse response) { + HttpServletResponse response) throws IOException { initAssessmentService(); Long contentID = WebUtil.readLongParam(request, AttributeNames.PARAM_TOOL_CONTENT_ID); Assessment assessment = service.getAssessmentByContentId(contentID); Long dateParameter = WebUtil.readLongParam(request, AssessmentConstants.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()); + } assessment.setSubmissionDeadline(tzSubmissionDeadline); service.saveOrUpdateAssessment(assessment); + response.setContentType("text/plain;charset=utf-8"); + response.getWriter().print(formattedDate); return null; } Index: lams_tool_assessment/web/pages/monitoring/monitoring.jsp =================================================================== diff -u -re0a2b2b60c19a5ea2e4fa4b4f1c18ae2dbe96844 -rd170469167c907400448ffa1fb767e5ba0b43bee --- lams_tool_assessment/web/pages/monitoring/monitoring.jsp (.../monitoring.jsp) (revision e0a2b2b60c19a5ea2e4fa4b4f1c18ae2dbe96844) +++ lams_tool_assessment/web/pages/monitoring/monitoring.jsp (.../monitoring.jsp) (revision d170469167c907400448ffa1fb767e5ba0b43bee) @@ -23,6 +23,7 @@ var submissionDeadlineSettings = { lams: '', submissionDeadline: '${submissionDeadline}', + submissionDateString: '${submissionDateString}', setSubmissionDeadlineUrl: '', toolContentID: '${param.toolContentID}', messageNotification: '',