Index: lams_tool_laqa/src/java/org/lamsfoundation/lams/tool/qa/web/QaLearningAction.java =================================================================== diff -u -r4d139bddc3cdd41d32d9f3033f2100c711d8c0c5 -r655db12a5dc53946b3378f874511db4a3c15869a --- lams_tool_laqa/src/java/org/lamsfoundation/lams/tool/qa/web/QaLearningAction.java (.../QaLearningAction.java) (revision 4d139bddc3cdd41d32d9f3033f2100c711d8c0c5) +++ lams_tool_laqa/src/java/org/lamsfoundation/lams/tool/qa/web/QaLearningAction.java (.../QaLearningAction.java) (revision 655db12a5dc53946b3378f874511db4a3c15869a) @@ -24,13 +24,14 @@ package org.lamsfoundation.lams.tool.qa.web; import java.io.IOException; -import java.util.Collection; +import java.text.DateFormat; +import java.text.SimpleDateFormat; import java.util.Date; -import java.util.HashMap; import java.util.Iterator; import java.util.List; import java.util.Map; import java.util.Set; +import java.util.TimeZone; import java.util.TreeMap; import javax.servlet.ServletException; @@ -50,7 +51,6 @@ import org.apache.tomcat.util.json.JSONArray; import org.apache.tomcat.util.json.JSONException; import org.apache.tomcat.util.json.JSONObject; -import org.lamsfoundation.lams.learning.service.ICoreLearnerService; import org.lamsfoundation.lams.notebook.model.NotebookEntry; import org.lamsfoundation.lams.notebook.service.CoreNotebookConstants; import org.lamsfoundation.lams.tool.exception.ToolException; @@ -70,6 +70,7 @@ import org.lamsfoundation.lams.tool.qa.web.form.QaLearningForm; import org.lamsfoundation.lams.usermanagement.User; import org.lamsfoundation.lams.usermanagement.dto.UserDTO; +import org.lamsfoundation.lams.util.DateUtil; import org.lamsfoundation.lams.util.WebUtil; import org.lamsfoundation.lams.web.action.LamsDispatchAction; import org.lamsfoundation.lams.web.session.SessionManager; @@ -993,6 +994,11 @@ HttpServletResponse res) throws IOException, ServletException, JSONException { initializeQAService(); + // teacher timezone + HttpSession ss = SessionManager.getSession(); + UserDTO userDto = (UserDTO) ss.getAttribute(AttributeNames.USER); + TimeZone userTimeZone = userDto.getTimeZone(); + Long questionUid = WebUtil.readLongParam(request, "questionUid"); Long qaSessionId = WebUtil.readLongParam(request, "qaSessionId"); @@ -1035,8 +1041,13 @@ responseRow.put("answer", StringEscapeUtils.escapeCsv(response.getAnswer())); responseRow.put("userName", StringEscapeUtils.escapeCsv(user.getFullname())); responseRow.put("visible", new Boolean(response.isVisible()).toString()); - responseRow.put("attemptTime", response.getAttemptTime()); + // format attemptTime + Date attemptTime = response.getAttemptTime(); + attemptTime = DateUtil.convertToTimeZoneFromDefault(userTimeZone, attemptTime); + DateFormat dateFormatter = new SimpleDateFormat("d MMMM yyyy h:mm:ss a"); + responseRow.put("attemptTime", dateFormatter.format(attemptTime)); + AverageRatingDTO averageRatingDto = qaService.getAverageRatingDTOByResponse(response.getResponseId()); String averageRating = (averageRatingDto == null) ? "0" : averageRatingDto.getRating(); responseRow.put("averageRating", averageRating);