Index: lams_tool_assessment/src/java/org/lamsfoundation/lams/tool/assessment/AssessmentConstants.java
===================================================================
RCS file: /usr/local/cvsroot/lams_tool_assessment/src/java/org/lamsfoundation/lams/tool/assessment/AssessmentConstants.java,v
diff -u -r1.27.2.5 -r1.27.2.6
--- lams_tool_assessment/src/java/org/lamsfoundation/lams/tool/assessment/AssessmentConstants.java 2 Dec 2016 11:46:07 -0000 1.27.2.5
+++ lams_tool_assessment/src/java/org/lamsfoundation/lams/tool/assessment/AssessmentConstants.java 13 Dec 2016 22:40:24 -0000 1.27.2.6
@@ -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
===================================================================
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.7 -r1.25.2.8
--- lams_tool_assessment/src/java/org/lamsfoundation/lams/tool/assessment/web/action/MonitoringAction.java 11 May 2016 07:15:08 -0000 1.25.2.7
+++ 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
@@ -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
===================================================================
RCS file: /usr/local/cvsroot/lams_tool_assessment/web/pages/monitoring/monitoring.jsp,v
diff -u -r1.11.2.6 -r1.11.2.7
--- lams_tool_assessment/web/pages/monitoring/monitoring.jsp 4 Oct 2016 16:47:00 -0000 1.11.2.6
+++ lams_tool_assessment/web/pages/monitoring/monitoring.jsp 13 Dec 2016 22:40:24 -0000 1.11.2.7
@@ -23,6 +23,7 @@
var submissionDeadlineSettings = {
lams: '',
submissionDeadline: '${submissionDeadline}',
+ submissionDateString: '${submissionDateString}',
setSubmissionDeadlineUrl: '',
toolContentID: '${param.toolContentID}',
messageNotification: '',
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.4 -r1.23.2.5
--- lams_tool_chat/src/java/org/lamsfoundation/lams/tool/chat/web/actions/MonitoringAction.java 11 May 2016 07:14:21 -0000 1.23.2.4
+++ 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
@@ -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
===================================================================
RCS file: /usr/local/cvsroot/lams_tool_chat/web/pages/monitoring/summary.jsp,v
diff -u -r1.29.2.4 -r1.29.2.5
--- lams_tool_chat/web/pages/monitoring/summary.jsp 25 May 2016 12:46:57 -0000 1.29.2.4
+++ lams_tool_chat/web/pages/monitoring/summary.jsp 13 Dec 2016 22:50:21 -0000 1.29.2.5
@@ -12,6 +12,7 @@
var submissionDeadlineSettings = {
lams: '${lams}',
submissionDeadline: '${submissionDeadline}',
+ submissionDateString: '${submissionDateString}',
setSubmissionDeadlineUrl: '',
toolContentID: '${param.toolContentID}',
messageNotification: '',