Index: lams_tool_daco/src/java/org/lamsfoundation/lams/tool/daco/web/controller/LearningController.java =================================================================== diff -u -r23b73e96556d74828d16d651138657e2c4a0e635 -re24d6ed72c977828fd089bf2bc718ca4a8328f26 --- lams_tool_daco/src/java/org/lamsfoundation/lams/tool/daco/web/controller/LearningController.java (.../LearningController.java) (revision 23b73e96556d74828d16d651138657e2c4a0e635) +++ lams_tool_daco/src/java/org/lamsfoundation/lams/tool/daco/web/controller/LearningController.java (.../LearningController.java) (revision e24d6ed72c977828fd089bf2bc718ca4a8328f26) @@ -215,7 +215,7 @@ * @return */ @RequestMapping("/finish") - protected String finish(HttpServletRequest request) { + protected String finish(@ModelAttribute("recordForm") RecordForm recordForm, HttpServletRequest request) { // get back SessionMap String sessionMapID = request.getParameter(DacoConstants.ATTR_SESSION_MAP_ID); @@ -534,7 +534,7 @@ * @return */ @RequestMapping("/submitReflection") - protected String submitReflection(@ModelAttribute("messageForm") ReflectionForm messageForm, + protected String submitReflection(@ModelAttribute("messageForm") ReflectionForm messageForm, @ModelAttribute("recordForm") RecordForm recordForm, HttpServletRequest request) { Integer userId = messageForm.getUserId(); Long sessionId = messageForm.getSessionId(); @@ -553,7 +553,7 @@ dacoService.updateEntry(entry); } - return finish(request); + return finish(recordForm, request); } // ************************************************************************************* Index: lams_tool_daco/src/java/org/lamsfoundation/lams/tool/daco/web/controller/MonitoringController.java =================================================================== diff -u -r23b73e96556d74828d16d651138657e2c4a0e635 -re24d6ed72c977828fd089bf2bc718ca4a8328f26 --- lams_tool_daco/src/java/org/lamsfoundation/lams/tool/daco/web/controller/MonitoringController.java (.../MonitoringController.java) (revision 23b73e96556d74828d16d651138657e2c4a0e635) +++ lams_tool_daco/src/java/org/lamsfoundation/lams/tool/daco/web/controller/MonitoringController.java (.../MonitoringController.java) (revision e24d6ed72c977828fd089bf2bc718ca4a8328f26) @@ -123,7 +123,7 @@ } @RequestMapping("/summary") - protected String summary(HttpServletRequest request) { + protected String summary(HttpServletRequest request, HttpServletResponse response) { // initial Session Map String sessionMapID = WebUtil.readStrParam(request, DacoConstants.ATTR_SESSION_MAP_ID, true); @@ -173,9 +173,9 @@ return "pages/monitoring/monitoring"; } - @RequestMapping(path = "/getUsers", produces = MediaType.APPLICATION_JSON_UTF8_VALUE) + @RequestMapping(path = "/getUsers") @ResponseBody - protected String getUsers(HttpServletRequest request, HttpServletResponse res) + protected String getUsers(HttpServletRequest request, HttpServletResponse response) throws IOException, ServletException { String sessionMapID = WebUtil.readStrParam(request, DacoConstants.ATTR_SESSION_MAP_ID, true); @@ -242,6 +242,7 @@ rows.add(responseRow); } responsedata.set("rows", rows); + response.setContentType("application/json;charset=UTF-8"); return responsedata.toString(); } Index: lams_tool_laqa/src/java/org/lamsfoundation/lams/tool/qa/web/controller/QaLearningController.java =================================================================== diff -u -r60b108064c4a844e3f153a849ab51a14bc3a8488 -re24d6ed72c977828fd089bf2bc718ca4a8328f26 --- lams_tool_laqa/src/java/org/lamsfoundation/lams/tool/qa/web/controller/QaLearningController.java (.../QaLearningController.java) (revision 60b108064c4a844e3f153a849ab51a14bc3a8488) +++ lams_tool_laqa/src/java/org/lamsfoundation/lams/tool/qa/web/controller/QaLearningController.java (.../QaLearningController.java) (revision e24d6ed72c977828fd089bf2bc718ca4a8328f26) @@ -571,7 +571,7 @@ return forwardName; } - @RequestMapping(value="/checkLeaderProgress", produces = MediaType.APPLICATION_JSON_UTF8_VALUE) + @RequestMapping(value="/checkLeaderProgress") @ResponseBody public String checkLeaderProgress(HttpServletRequest request, HttpServletResponse response) throws IOException { @@ -584,6 +584,7 @@ ObjectNode ObjectNode = JsonNodeFactory.instance.objectNode(); ObjectNode.put("isLeaderResponseFinalized", isLeaderResponseFinalized); + response.setContentType("application/json;charset=UTF-8"); return ObjectNode.toString(); } Index: lams_tool_laqa/src/java/org/lamsfoundation/lams/tool/qa/web/controller/QaMonitoringController.java =================================================================== diff -u -re0dcf97659b72435ef0f29c69a4999847ae11d5b -re24d6ed72c977828fd089bf2bc718ca4a8328f26 --- lams_tool_laqa/src/java/org/lamsfoundation/lams/tool/qa/web/controller/QaMonitoringController.java (.../QaMonitoringController.java) (revision e0dcf97659b72435ef0f29c69a4999847ae11d5b) +++ lams_tool_laqa/src/java/org/lamsfoundation/lams/tool/qa/web/controller/QaMonitoringController.java (.../QaMonitoringController.java) (revision e24d6ed72c977828fd089bf2bc718ca4a8328f26) @@ -346,9 +346,9 @@ * @param request * @return */ - @RequestMapping(path = "/getReflectionsJSON", produces = MediaType.APPLICATION_JSON_UTF8_VALUE) + @RequestMapping(path = "/getReflectionsJSON") @ResponseBody - public String getReflectionsJSON(HttpServletRequest request) throws IOException, ServletException, ToolException { + public String getReflectionsJSON(HttpServletRequest request, HttpServletResponse response ) throws IOException, ServletException, ToolException { Long toolSessionId = WebUtil.readLongParam(request, QaAppConstants.TOOL_SESSION_ID); @@ -382,6 +382,7 @@ rows.add(responseRow); } responsedata.set("rows", rows); + response.setContentType("application/json;charset=UTF-8"); return responsedata.toString(); } Index: lams_tool_leader/src/java/org/lamsfoundation/lams/tool/leaderselection/web/controller/TblMonitoringController.java =================================================================== diff -u -r7475d08afc280b5e2e5ddf04e8bf35e3166aaf80 -re24d6ed72c977828fd089bf2bc718ca4a8328f26 --- lams_tool_leader/src/java/org/lamsfoundation/lams/tool/leaderselection/web/controller/TblMonitoringController.java (.../TblMonitoringController.java) (revision 7475d08afc280b5e2e5ddf04e8bf35e3166aaf80) +++ lams_tool_leader/src/java/org/lamsfoundation/lams/tool/leaderselection/web/controller/TblMonitoringController.java (.../TblMonitoringController.java) (revision e24d6ed72c977828fd089bf2bc718ca4a8328f26) @@ -3,6 +3,7 @@ import java.io.IOException; import javax.servlet.http.HttpServletRequest; +import javax.servlet.http.HttpServletResponse; import org.apache.log4j.Logger; import org.lamsfoundation.lams.tool.leaderselection.model.LeaderselectionUser; @@ -35,9 +36,9 @@ * @throws IOException * @throws JSONException */ - @RequestMapping(path = "/changeLeader", produces = MediaType.APPLICATION_JSON_UTF8_VALUE) + @RequestMapping(path = "/changeLeader") @ResponseBody - public String changeLeader(HttpServletRequest request) throws IOException { + public String changeLeader(HttpServletRequest request, HttpServletResponse response) throws IOException { Long leaderUserId = WebUtil.readLongParam(request, AttributeNames.PARAM_USER_ID); Long toolContentId = WebUtil.readLongParam(request, AttributeNames.PARAM_TOOL_CONTENT_ID); @@ -55,6 +56,7 @@ // build JSON ObjectNode responseJSON = JsonNodeFactory.instance.objectNode(); responseJSON.put("isSuccessful", isSuccessful); + response.setContentType("application/json;charset=UTF-8"); return responseJSON.toString(); } Index: lams_tool_scratchie/src/java/org/lamsfoundation/lams/tool/scratchie/web/controller/TblMonitorController.java =================================================================== diff -u -rb18aa49cea9cab29bda065b37ee720bfa0a4ef6f -re24d6ed72c977828fd089bf2bc718ca4a8328f26 --- lams_tool_scratchie/src/java/org/lamsfoundation/lams/tool/scratchie/web/controller/TblMonitorController.java (.../TblMonitorController.java) (revision b18aa49cea9cab29bda065b37ee720bfa0a4ef6f) +++ lams_tool_scratchie/src/java/org/lamsfoundation/lams/tool/scratchie/web/controller/TblMonitorController.java (.../TblMonitorController.java) (revision e24d6ed72c977828fd089bf2bc718ca4a8328f26) @@ -188,7 +188,7 @@ * * @throws JSONException */ - @RequestMapping(value = "/isBurningQuestionsEnabled", produces = MediaType.APPLICATION_JSON_UTF8_VALUE) + @RequestMapping(value = "/isBurningQuestionsEnabled") @ResponseBody public String isBurningQuestionsEnabled(HttpServletRequest request, HttpServletResponse response) throws IOException, ServletException { @@ -199,6 +199,7 @@ // build JSON ObjectNode responseJSON = JsonNodeFactory.instance.objectNode(); responseJSON.put("isBurningQuestionsEnabled", scratchie.isBurningQuestionsEnabled()); + response.setContentType("application/json;charset=UTF-8"); return responseJSON.toString(); } Index: lams_tool_vote/src/java/org/lamsfoundation/lams/tool/vote/web/controller/LearningController.java =================================================================== diff -u -r8bc11142a6db14da1d00d3fd8adfe7d4938ead15 -re24d6ed72c977828fd089bf2bc718ca4a8328f26 --- lams_tool_vote/src/java/org/lamsfoundation/lams/tool/vote/web/controller/LearningController.java (.../LearningController.java) (revision 8bc11142a6db14da1d00d3fd8adfe7d4938ead15) +++ lams_tool_vote/src/java/org/lamsfoundation/lams/tool/vote/web/controller/LearningController.java (.../LearningController.java) (revision e24d6ed72c977828fd089bf2bc718ca4a8328f26) @@ -34,6 +34,7 @@ import java.util.TreeSet; import javax.servlet.http.HttpServletRequest; +import javax.servlet.http.HttpServletResponse; import javax.servlet.http.HttpSession; import org.apache.log4j.Logger; @@ -497,9 +498,9 @@ return "/learning/AnswersContent"; } - @RequestMapping(path = "/checkLeaderProgress", produces = MediaType.APPLICATION_JSON_UTF8_VALUE) + @RequestMapping(path = "/checkLeaderProgress") @ResponseBody - public String checkLeaderProgress(HttpServletRequest request) throws IOException { + public String checkLeaderProgress(HttpServletRequest request, HttpServletResponse response) throws IOException { Long toolSessionId = WebUtil.readLongParam(request, AttributeNames.PARAM_TOOL_SESSION_ID); @@ -511,6 +512,7 @@ ObjectNode objectNode = JsonNodeFactory.instance.objectNode(); objectNode.put("isLeaderResponseFinalized", isLeaderResponseFinalized); + response.setContentType("application/json;charset=UTF-8"); return objectNode.toString(); } Index: lams_tool_vote/src/java/org/lamsfoundation/lams/tool/vote/web/controller/MonitoringController.java =================================================================== diff -u -r8bc11142a6db14da1d00d3fd8adfe7d4938ead15 -re24d6ed72c977828fd089bf2bc718ca4a8328f26 --- lams_tool_vote/src/java/org/lamsfoundation/lams/tool/vote/web/controller/MonitoringController.java (.../MonitoringController.java) (revision 8bc11142a6db14da1d00d3fd8adfe7d4938ead15) +++ lams_tool_vote/src/java/org/lamsfoundation/lams/tool/vote/web/controller/MonitoringController.java (.../MonitoringController.java) (revision e24d6ed72c977828fd089bf2bc718ca4a8328f26) @@ -32,6 +32,7 @@ import java.util.TreeMap; import javax.servlet.http.HttpServletRequest; +import javax.servlet.http.HttpServletResponse; import javax.servlet.http.HttpSession; import org.apache.log4j.Logger; @@ -78,19 +79,19 @@ @Qualifier("voteService") private IVoteService voteService; - @RequestMapping(path = "/hideOpenVote", produces = MediaType.APPLICATION_JSON_UTF8_VALUE) + @RequestMapping(path = "/hideOpenVote") @ResponseBody - public String hideOpenVote(HttpServletRequest request) { - return toggleHideShow(request, false); + public String hideOpenVote(HttpServletRequest request, HttpServletResponse response) { + return toggleHideShow(request, response, false); } - @RequestMapping(path = "/showOpenVote", produces = MediaType.APPLICATION_JSON_UTF8_VALUE) + @RequestMapping(path = "/showOpenVote") @ResponseBody - public String showOpenVote(HttpServletRequest request) { - return toggleHideShow(request, true); + public String showOpenVote(HttpServletRequest request, HttpServletResponse response) { + return toggleHideShow(request, response, true); } - private String toggleHideShow(HttpServletRequest request, boolean show) { + private String toggleHideShow(HttpServletRequest request, HttpServletResponse response, boolean show) { Long currentUid = WebUtil.readLongParam(request, "currentUid"); logger.info("Current Uid" + currentUid); @@ -110,6 +111,7 @@ ObjectNode responseJSON = JsonNodeFactory.instance.objectNode(); responseJSON.put("currentUid", currentUid); responseJSON.put("nextActionMethod", nextActionMethod); + response.setContentType("application/json;charset=UTF-8"); return responseJSON.toString(); } @@ -135,9 +137,9 @@ return "/monitoring/VoteNominationViewer"; } - @RequestMapping(path = "/getVoteNominationsJSON", produces = MediaType.APPLICATION_JSON_UTF8_VALUE) + @RequestMapping(path = "/getVoteNominationsJSON") @ResponseBody - public String getVoteNominationsJSON(HttpServletRequest request) { + public String getVoteNominationsJSON(HttpServletRequest request, HttpServletResponse response) { Long sessionUid = WebUtil.readLongParam(request, VoteAppConstants.ATTR_SESSION_UID, true); if (sessionUid == 0L) { @@ -182,12 +184,13 @@ rows.add(responseRow); } responseJSON.set("rows", rows); + response.setContentType("application/json;charset=UTF-8"); return responseJSON.toString(); } - @RequestMapping(path = "/getReflectionsJSON", produces = MediaType.APPLICATION_JSON_UTF8_VALUE) + @RequestMapping(path = "/getReflectionsJSON") @ResponseBody - public String getReflectionsJSON(HttpServletRequest request) { + public String getReflectionsJSON(HttpServletRequest request, HttpServletResponse response) { Long sessionUid = WebUtil.readLongParam(request, VoteAppConstants.ATTR_SESSION_UID, true); @@ -224,6 +227,7 @@ rows.add(responseRow); } responseJSON.set("rows", rows); + response.setContentType("application/json;charset=UTF-8"); return responseJSON.toString(); } @@ -236,9 +240,9 @@ return "/monitoring/Stats"; } - @RequestMapping(path = "/getOpenTextNominationsJSON", produces = MediaType.APPLICATION_JSON_UTF8_VALUE) + @RequestMapping(path = "/getOpenTextNominationsJSON") @ResponseBody - public String getOpenTextNominationsJSON(HttpServletRequest request) { + public String getOpenTextNominationsJSON(HttpServletRequest request, HttpServletResponse response) { Long sessionUid = WebUtil.readLongParam(request, VoteAppConstants.ATTR_SESSION_UID, true); if (sessionUid == 0L) { @@ -298,6 +302,7 @@ rows.add(responseRow); } responseJSON.set("rows", rows); + response.setContentType("application/json;charset=UTF-8"); return responseJSON.toString(); } Index: lams_tool_vote/src/java/org/lamsfoundation/lams/tool/vote/web/controller/VoteChartGeneratorController.java =================================================================== diff -u -r8bc11142a6db14da1d00d3fd8adfe7d4938ead15 -re24d6ed72c977828fd089bf2bc718ca4a8328f26 --- lams_tool_vote/src/java/org/lamsfoundation/lams/tool/vote/web/controller/VoteChartGeneratorController.java (.../VoteChartGeneratorController.java) (revision 8bc11142a6db14da1d00d3fd8adfe7d4938ead15) +++ lams_tool_vote/src/java/org/lamsfoundation/lams/tool/vote/web/controller/VoteChartGeneratorController.java (.../VoteChartGeneratorController.java) (revision e24d6ed72c977828fd089bf2bc718ca4a8328f26) @@ -27,6 +27,7 @@ import java.util.Map; import javax.servlet.http.HttpServletRequest; +import javax.servlet.http.HttpServletResponse; import org.apache.commons.lang.StringUtils; import org.lamsfoundation.lams.tool.vote.dto.SessionDTO; @@ -58,9 +59,9 @@ @Qualifier("voteService") private IVoteService voteService; - @RequestMapping(path = "/chartGenerator", produces = MediaType.APPLICATION_JSON_UTF8_VALUE) + @RequestMapping(path = "/chartGenerator") @ResponseBody - public String start(HttpServletRequest request) { + public String start(HttpServletRequest request, HttpServletResponse response) { String currentSessionId = request.getParameter("currentSessionId"); Map nominationNames = new HashMap<>(); @@ -106,6 +107,7 @@ responseJSON.withArray("data").add(nomination); } + response.setContentType("application/json;charset=UTF-8"); return responseJSON.toString(); } } \ No newline at end of file