Index: lams_tool_assessment/src/java/org/lamsfoundation/lams/tool/assessment/AssessmentConstants.java =================================================================== diff -u -r3949a1bbc3c7b576035600a88cda331703c12d9e -r5a2704204eda443d4fb54e97babed70b9d71ee60 --- lams_tool_assessment/src/java/org/lamsfoundation/lams/tool/assessment/AssessmentConstants.java (.../AssessmentConstants.java) (revision 3949a1bbc3c7b576035600a88cda331703c12d9e) +++ lams_tool_assessment/src/java/org/lamsfoundation/lams/tool/assessment/AssessmentConstants.java (.../AssessmentConstants.java) (revision 5a2704204eda443d4fb54e97babed70b9d71ee60) @@ -127,8 +127,6 @@ public static final String ATTR_QUESTION_UID = "questionUid"; - public static final String ATTR_NEXT_ACTIVITY_URL = "nextActivityUrl"; - public static final String ATTR_SUMMARY_LIST = "summaryList"; public static final String ATTR_USER_SUMMARY = "userSummary"; Index: lams_tool_assessment/src/java/org/lamsfoundation/lams/tool/assessment/web/controller/LearningController.java =================================================================== diff -u -r6866da235d682d74f883afdd01e00e92d16a13eb -r5a2704204eda443d4fb54e97babed70b9d71ee60 --- lams_tool_assessment/src/java/org/lamsfoundation/lams/tool/assessment/web/controller/LearningController.java (.../LearningController.java) (revision 6866da235d682d74f883afdd01e00e92d16a13eb) +++ lams_tool_assessment/src/java/org/lamsfoundation/lams/tool/assessment/web/controller/LearningController.java (.../LearningController.java) (revision 5a2704204eda443d4fb54e97babed70b9d71ee60) @@ -692,28 +692,19 @@ * Finish learning session. */ @RequestMapping("/finish") - public String finish(HttpServletRequest request) { + public void finish(HttpServletRequest request, HttpServletResponse response) throws IOException { SessionMap sessionMap = getSessionMap(request); - String nextActivityUrl = null; - try { - HttpSession ss = SessionManager.getSession(); - UserDTO user = (UserDTO) ss.getAttribute(AttributeNames.USER); - Long userID = user.getUserID().longValue(); - Long sessionId = (Long) sessionMap.get(AttributeNames.PARAM_TOOL_SESSION_ID); + HttpSession ss = SessionManager.getSession(); + UserDTO user = (UserDTO) ss.getAttribute(AttributeNames.USER); + Long userID = user.getUserID().longValue(); + Long sessionId = (Long) sessionMap.get(AttributeNames.PARAM_TOOL_SESSION_ID); - nextActivityUrl = service.finishToolSession(sessionId, userID); - request.setAttribute(AssessmentConstants.ATTR_NEXT_ACTIVITY_URL, nextActivityUrl); - } catch (AssessmentApplicationException e) { - log.error("Failed get next activity url:" + e.getMessage()); - } - - return "pages/learning/finish"; + String nextActivityUrl = service.finishToolSession(sessionId, userID); + response.sendRedirect(nextActivityUrl); } /** * auto saves responses - * - * @throws IOException */ @RequestMapping("/autoSaveAnswers") @ResponseStatus(HttpStatus.OK) @@ -799,8 +790,8 @@ * Submit reflection form input database. */ @RequestMapping("/submitReflection") - public String submitReflection(@ModelAttribute("reflectionForm") ReflectionForm refForm, - HttpServletRequest request) { + public void submitReflection(@ModelAttribute("reflectionForm") ReflectionForm refForm, + HttpServletRequest request, HttpServletResponse response) throws IOException { Integer userId = refForm.getUserID(); SessionMap sessionMap = getSessionMap(request); @@ -819,7 +810,7 @@ service.updateEntry(entry); } - return finish(request); + finish(request, response); } // ************************************************************************************* Index: lams_tool_daco/src/java/org/lamsfoundation/lams/tool/daco/DacoConstants.java =================================================================== diff -u -r62aaf160878735888d077bf28fac3c1989bb8fbd -r5a2704204eda443d4fb54e97babed70b9d71ee60 --- lams_tool_daco/src/java/org/lamsfoundation/lams/tool/daco/DacoConstants.java (.../DacoConstants.java) (revision 62aaf160878735888d077bf28fac3c1989bb8fbd) +++ lams_tool_daco/src/java/org/lamsfoundation/lams/tool/daco/DacoConstants.java (.../DacoConstants.java) (revision 5a2704204eda443d4fb54e97babed70b9d71ee60) @@ -160,8 +160,6 @@ public static final String ATTR_DACO = "daco"; - public static final String ATTR_NEXT_ACTIVITY_URL = "nextActivityUrl"; - public static final String ATTR_USER_LIST = "userList"; public static final String ATTR_FINISH_LOCK = "finishedLock"; Index: lams_tool_daco/src/java/org/lamsfoundation/lams/tool/daco/web/controller/LearningController.java =================================================================== diff -u -r587db89bd8343613879909637e377091b88e6cf2 -r5a2704204eda443d4fb54e97babed70b9d71ee60 --- lams_tool_daco/src/java/org/lamsfoundation/lams/tool/daco/web/controller/LearningController.java (.../LearningController.java) (revision 587db89bd8343613879909637e377091b88e6cf2) +++ lams_tool_daco/src/java/org/lamsfoundation/lams/tool/daco/web/controller/LearningController.java (.../LearningController.java) (revision 5a2704204eda443d4fb54e97babed70b9d71ee60) @@ -23,6 +23,7 @@ package org.lamsfoundation.lams.tool.daco.web.controller; +import java.io.IOException; import java.text.ParseException; import java.util.ArrayList; import java.util.Calendar; @@ -36,6 +37,7 @@ import java.util.TreeSet; import javax.servlet.http.HttpServletRequest; +import javax.servlet.http.HttpServletResponse; import javax.servlet.http.HttpSession; import org.apache.commons.lang.StringUtils; @@ -198,15 +200,10 @@ /** * Finish learning session. - * - * @param mapping - * @param form - * @param request - * @param response - * @return */ @RequestMapping("/finish") - protected String finish(@ModelAttribute("recordForm") RecordForm recordForm, HttpServletRequest request) { + protected String finish(HttpServletRequest request, HttpServletResponse response) + throws IOException, DacoApplicationException { // get back SessionMap String sessionMapID = request.getParameter(DacoConstants.ATTR_SESSION_MAP_ID); @@ -225,30 +222,17 @@ } // get sessionId from HttpServletRequest - String nextActivityUrl = null; - try { - HttpSession httpSession = SessionManager.getSession(); - UserDTO user = (UserDTO) httpSession.getAttribute(AttributeNames.USER); - Long userUid = new Long(user.getUserID().longValue()); + HttpSession httpSession = SessionManager.getSession(); + UserDTO user = (UserDTO) httpSession.getAttribute(AttributeNames.USER); + Long userUid = new Long(user.getUserID().longValue()); - nextActivityUrl = dacoService.finishToolSession(sessionId, userUid); - request.setAttribute(DacoConstants.ATTR_NEXT_ACTIVITY_URL, nextActivityUrl); - } catch (DacoApplicationException e) { - - LearningController.log.error("Failed get next activity url:" + e.getMessage()); - } - - return "pages/learning/finish"; + String nextActivityUrl = dacoService.finishToolSession(sessionId, userUid); + response.sendRedirect(nextActivityUrl); + return null; } /** * Save file or textfield daco question into database. - * - * @param mapping - * @param form - * @param request - * @param response - * @return */ @RequestMapping(value = "/saveOrUpdateRecord", method = RequestMethod.POST) protected String saveOrUpdateRecord(@ModelAttribute("recordForm") RecordForm recordForm, @@ -473,12 +457,6 @@ /** * Display empty reflection form. - * - * @param mapping - * @param form - * @param request - * @param response - * @return */ @RequestMapping("/startReflection") protected String startReflection(@ModelAttribute("messageForm") ReflectionForm messageForm, @@ -520,16 +498,10 @@ /** * Submit reflection form input database. - * - * @param mapping - * @param form - * @param request - * @param response - * @return */ @RequestMapping(path = "/submitReflection", method = RequestMethod.POST) protected String submitReflection(@ModelAttribute("messageForm") ReflectionForm messageForm, - @ModelAttribute("recordForm") RecordForm recordForm, HttpServletRequest request) { + HttpServletRequest request, HttpServletResponse response) throws IOException, DacoApplicationException { Integer userId = messageForm.getUserId(); Long sessionId = messageForm.getSessionId(); // check for existing notebook entry @@ -547,7 +519,7 @@ dacoService.updateEntry(entry); } - return finish(recordForm, request); + return finish(request, response); } // ************************************************************************************* Index: lams_tool_doku/src/java/org/lamsfoundation/lams/tool/dokumaran/DokumaranConstants.java =================================================================== diff -u -reccd6838790a4369b6788e48fb5ae5851622fe35 -r5a2704204eda443d4fb54e97babed70b9d71ee60 --- lams_tool_doku/src/java/org/lamsfoundation/lams/tool/dokumaran/DokumaranConstants.java (.../DokumaranConstants.java) (revision eccd6838790a4369b6788e48fb5ae5851622fe35) +++ lams_tool_doku/src/java/org/lamsfoundation/lams/tool/dokumaran/DokumaranConstants.java (.../DokumaranConstants.java) (revision 5a2704204eda443d4fb54e97babed70b9d71ee60) @@ -61,8 +61,6 @@ public static final String ATTR_IS_LEADER_RESPONSE_FINALIZED = "isLeaderResponseFinalized"; - public static final String ATTR_NEXT_ACTIVITY_URL = "nextActivityUrl"; - public static final String ATTR_SUMMARY_LIST = "summaryList"; public static final String ATTR_HAS_FAULTY_SESSION = "hasFaultySession"; Index: lams_tool_doku/src/java/org/lamsfoundation/lams/tool/dokumaran/web/controller/LearningController.java =================================================================== diff -u -ra21e768a73d42a3f0389aea1c5cd6a9d49387664 -r5a2704204eda443d4fb54e97babed70b9d71ee60 --- lams_tool_doku/src/java/org/lamsfoundation/lams/tool/dokumaran/web/controller/LearningController.java (.../LearningController.java) (revision a21e768a73d42a3f0389aea1c5cd6a9d49387664) +++ lams_tool_doku/src/java/org/lamsfoundation/lams/tool/dokumaran/web/controller/LearningController.java (.../LearningController.java) (revision 5a2704204eda443d4fb54e97babed70b9d71ee60) @@ -298,15 +298,9 @@ /** * Finish learning session. - * - * @param mapping - * @param form - * @param request - * @param response - * @return */ @RequestMapping("/finish") - private String finish(HttpServletRequest request) { + private void finish(HttpServletRequest request, HttpServletResponse response) throws IOException, DokumaranApplicationException { // get back SessionMap String sessionMapID = request.getParameter(DokumaranConstants.ATTR_SESSION_MAP_ID); @@ -318,29 +312,16 @@ Long sessionId = (Long) sessionMap.get(AttributeNames.PARAM_TOOL_SESSION_ID); // get sessionId from HttpServletRequest - String nextActivityUrl = null; - try { - HttpSession ss = SessionManager.getSession(); - UserDTO user = (UserDTO) ss.getAttribute(AttributeNames.USER); - Long userID = new Long(user.getUserID().longValue()); + HttpSession ss = SessionManager.getSession(); + UserDTO user = (UserDTO) ss.getAttribute(AttributeNames.USER); + Long userID = new Long(user.getUserID().longValue()); - nextActivityUrl = dokumaranService.finishToolSession(sessionId, userID); - request.setAttribute(DokumaranConstants.ATTR_NEXT_ACTIVITY_URL, nextActivityUrl); - } catch (DokumaranApplicationException e) { - LearningController.log.error("Failed get next activity url:" + e.getMessage()); - } - - return "pages/learning/finish"; + String nextActivityUrl = dokumaranService.finishToolSession(sessionId, userID); + response.sendRedirect(nextActivityUrl); } /** * Display empty reflection form. - * - * @param mapping - * @param form - * @param request - * @param response - * @return */ @SuppressWarnings("unchecked") @RequestMapping("/newReflection") @@ -371,16 +352,10 @@ /** * Submit reflection form input database. - * - * @param mapping - * @param form - * @param request - * @param response - * @return */ @RequestMapping("/submitReflection") - private String submitReflection(@ModelAttribute("reflectionForm") ReflectionForm reflectionForm, - HttpServletRequest request) { + private void submitReflection(@ModelAttribute("reflectionForm") ReflectionForm reflectionForm, + HttpServletRequest request, HttpServletResponse response) throws IOException, DokumaranApplicationException { Integer userId = reflectionForm.getUserID(); String sessionMapID = WebUtil.readStrParam(request, DokumaranConstants.ATTR_SESSION_MAP_ID); @@ -403,7 +378,7 @@ dokumaranService.updateEntry(entry); } - return finish(request); + finish(request, response); } // ************************************************************************************* Index: lams_tool_images/src/java/org/lamsfoundation/lams/tool/imageGallery/ImageGalleryConstants.java =================================================================== diff -u -rbc66c534c18e8e49ce8ed510418400cbc56fd605 -r5a2704204eda443d4fb54e97babed70b9d71ee60 --- lams_tool_images/src/java/org/lamsfoundation/lams/tool/imageGallery/ImageGalleryConstants.java (.../ImageGalleryConstants.java) (revision bc66c534c18e8e49ce8ed510418400cbc56fd605) +++ lams_tool_images/src/java/org/lamsfoundation/lams/tool/imageGallery/ImageGalleryConstants.java (.../ImageGalleryConstants.java) (revision 5a2704204eda443d4fb54e97babed70b9d71ee60) @@ -50,7 +50,6 @@ public static final String ATTR_DELETED_IMAGE_ATTACHMENT_LIST = "deletedItemAttachmmentList";; public static final String ATTR_IMAGE_GALLERY = "imageGallery"; public static final String ATTR_IMAGE = "image"; - public static final String ATTR_NEXT_ACTIVITY_URL = "nextActivityUrl"; public static final String ATTR_SUMMARY_LIST = "summaryList"; public static final String ATTR_IMAGE_SUMMARY = "imageSummary"; public static final String ATTR_FINISH_LOCK = "finishedLock"; Index: lams_tool_images/src/java/org/lamsfoundation/lams/tool/imageGallery/web/controller/LearningController.java =================================================================== diff -u -r2de8f805211b6433aff4efd6fa9275a1b9933033 -r5a2704204eda443d4fb54e97babed70b9d71ee60 --- lams_tool_images/src/java/org/lamsfoundation/lams/tool/imageGallery/web/controller/LearningController.java (.../LearningController.java) (revision 2de8f805211b6433aff4efd6fa9275a1b9933033) +++ lams_tool_images/src/java/org/lamsfoundation/lams/tool/imageGallery/web/controller/LearningController.java (.../LearningController.java) (revision 5a2704204eda443d4fb54e97babed70b9d71ee60) @@ -221,7 +221,7 @@ * Finish learning session. */ @RequestMapping("/finish") - public String finish(HttpServletRequest request) { + public void finish(HttpServletRequest request, HttpServletResponse response) throws IOException { // get back SessionMap String sessionMapID = request.getParameter(ImageGalleryConstants.ATTR_SESSION_MAP_ID); @@ -232,19 +232,12 @@ Long sessionId = (Long) sessionMap.get(AttributeNames.PARAM_TOOL_SESSION_ID); // get sessionId from HttpServletRequest - String nextActivityUrl = null; - try { - HttpSession ss = SessionManager.getSession(); - UserDTO userDTO = (UserDTO) ss.getAttribute(AttributeNames.USER); - Long userID = userDTO.getUserID().longValue(); + HttpSession ss = SessionManager.getSession(); + UserDTO userDTO = (UserDTO) ss.getAttribute(AttributeNames.USER); + Long userID = userDTO.getUserID().longValue(); - nextActivityUrl = igService.finishToolSession(sessionId, userID); - request.setAttribute(ImageGalleryConstants.ATTR_NEXT_ACTIVITY_URL, nextActivityUrl); - } catch (ImageGalleryException e) { - LearningController.log.error("Failed get next activity url:" + e.getMessage()); - } - - return "pages/learning/finish"; + String nextActivityUrl = igService.finishToolSession(sessionId, userID); + response.sendRedirect(nextActivityUrl); } /** @@ -283,7 +276,7 @@ * Save file or url imageGallery item into database. */ @RequestMapping("/deleteImage") - public String deleteImage(HttpServletRequest request, HttpServletResponse response) { + public String deleteImage(HttpServletRequest request) { Long imageUid = WebUtil.readLongParam(request, ImageGalleryConstants.PARAM_IMAGE_UID); String sessionMapID = request.getParameter(ImageGalleryConstants.ATTR_SESSION_MAP_ID); @@ -431,7 +424,8 @@ * Submit reflection form input database. */ @RequestMapping("/submitReflection") - public String submitReflection(@ModelAttribute ReflectionForm reflectionForm, HttpServletRequest request) { + public void submitReflection(@ModelAttribute ReflectionForm reflectionForm, HttpServletRequest request, + HttpServletResponse response) throws IOException { Integer userId = reflectionForm.getUserID(); @@ -455,7 +449,7 @@ igService.updateEntry(entry); } - return finish(request); + finish(request, response); } // ************************************************************************************* Index: lams_tool_imscc/src/java/org/lamsfoundation/lams/tool/commonCartridge/CommonCartridgeConstants.java =================================================================== diff -u -r8b5473449dff565aa7166137883b3edf46f8b3ee -r5a2704204eda443d4fb54e97babed70b9d71ee60 --- lams_tool_imscc/src/java/org/lamsfoundation/lams/tool/commonCartridge/CommonCartridgeConstants.java (.../CommonCartridgeConstants.java) (revision 8b5473449dff565aa7166137883b3edf46f8b3ee) +++ lams_tool_imscc/src/java/org/lamsfoundation/lams/tool/commonCartridge/CommonCartridgeConstants.java (.../CommonCartridgeConstants.java) (revision 5a2704204eda443d4fb54e97babed70b9d71ee60) @@ -78,8 +78,6 @@ public static final String ATTR_RESOURCE_ITEM_UID = "itemUid"; - public static final String ATTR_NEXT_ACTIVITY_URL = "nextActivityUrl"; - public static final String ATTR_SUMMARY_LIST = "summaryList"; public static final String ATTR_USER_LIST = "userList"; Index: lams_tool_imscc/src/java/org/lamsfoundation/lams/tool/commonCartridge/web/controller/LearningController.java =================================================================== diff -u -r1b54b6d33e0b878ab132c09a1f56ecde9fef5756 -r5a2704204eda443d4fb54e97babed70b9d71ee60 --- lams_tool_imscc/src/java/org/lamsfoundation/lams/tool/commonCartridge/web/controller/LearningController.java (.../LearningController.java) (revision 1b54b6d33e0b878ab132c09a1f56ecde9fef5756) +++ lams_tool_imscc/src/java/org/lamsfoundation/lams/tool/commonCartridge/web/controller/LearningController.java (.../LearningController.java) (revision 5a2704204eda443d4fb54e97babed70b9d71ee60) @@ -23,13 +23,15 @@ package org.lamsfoundation.lams.tool.commonCartridge.web.controller; +import java.io.IOException; import java.util.ArrayList; import java.util.Date; import java.util.List; import java.util.SortedSet; import java.util.TreeSet; import javax.servlet.http.HttpServletRequest; +import javax.servlet.http.HttpServletResponse; import javax.servlet.http.HttpSession; import org.apache.log4j.Logger; @@ -213,15 +215,10 @@ /** * Finish learning session. - * - * @param mapping - * @param form - * @param request - * @param response - * @return */ @RequestMapping("/finish") - private String finish(@ModelAttribute("reflectionForm") ReflectionForm reflectionForm, HttpServletRequest request) { + private String finish(HttpServletRequest request, HttpServletResponse response) + throws CommonCartridgeApplicationException, IOException { // get back SessionMap String sessionMapID = request.getParameter(CommonCartridgeConstants.ATTR_SESSION_MAP_ID); @@ -249,19 +246,13 @@ } // get sessionId from HttpServletRequest - String nextActivityUrl = null; - try { - HttpSession ss = SessionManager.getSession(); - UserDTO user = (UserDTO) ss.getAttribute(AttributeNames.USER); - Long userID = new Long(user.getUserID().longValue()); + HttpSession ss = SessionManager.getSession(); + UserDTO user = (UserDTO) ss.getAttribute(AttributeNames.USER); + Long userID = new Long(user.getUserID().longValue()); - nextActivityUrl = commonCartridgeService.finishToolSession(sessionId, userID); - request.setAttribute(CommonCartridgeConstants.ATTR_NEXT_ACTIVITY_URL, nextActivityUrl); - } catch (CommonCartridgeApplicationException e) { - LearningController.log.error("Failed get next activity url:" + e.getMessage()); - } - - return "pages/learning/finish"; + String nextActivityUrl = commonCartridgeService.finishToolSession(sessionId, userID); + response.sendRedirect(nextActivityUrl); + return null; } /** @@ -305,16 +296,10 @@ /** * Submit reflection form input database. - * - * @param mapping - * @param form - * @param request - * @param response - * @return */ @RequestMapping(path = "/submitReflection", method = RequestMethod.POST) private String submitReflection(@ModelAttribute("reflectionForm") ReflectionForm reflectionForm, - HttpServletRequest request) { + HttpServletRequest request, HttpServletResponse response) throws CommonCartridgeApplicationException, IOException { Integer userId = reflectionForm.getUserID(); String sessionMapID = WebUtil.readStrParam(request, CommonCartridgeConstants.ATTR_SESSION_MAP_ID); @@ -337,7 +322,7 @@ commonCartridgeService.updateEntry(entry); } - return finish(reflectionForm, request); + return finish(request, response); } // ************************************************************************************* Index: lams_tool_larsrc/src/java/org/lamsfoundation/lams/tool/rsrc/ResourceConstants.java =================================================================== diff -u -rf007d7e87e33de37ad35d279b1da1d59c9f42055 -r5a2704204eda443d4fb54e97babed70b9d71ee60 --- lams_tool_larsrc/src/java/org/lamsfoundation/lams/tool/rsrc/ResourceConstants.java (.../ResourceConstants.java) (revision f007d7e87e33de37ad35d279b1da1d59c9f42055) +++ lams_tool_larsrc/src/java/org/lamsfoundation/lams/tool/rsrc/ResourceConstants.java (.../ResourceConstants.java) (revision 5a2704204eda443d4fb54e97babed70b9d71ee60) @@ -96,8 +96,6 @@ public static final String ATTR_RESOURCE_ITEM_UID = "itemUid"; - public static final String ATTR_NEXT_ACTIVITY_URL = "nextActivityUrl"; - public static final String ATTR_SUMMARY_LIST = "summaryList"; public static final String ATTR_USER_LIST = "userList"; Index: lams_tool_larsrc/src/java/org/lamsfoundation/lams/tool/rsrc/web/controller/LearningController.java =================================================================== diff -u -rf007d7e87e33de37ad35d279b1da1d59c9f42055 -r5a2704204eda443d4fb54e97babed70b9d71ee60 --- lams_tool_larsrc/src/java/org/lamsfoundation/lams/tool/rsrc/web/controller/LearningController.java (.../LearningController.java) (revision f007d7e87e33de37ad35d279b1da1d59c9f42055) +++ lams_tool_larsrc/src/java/org/lamsfoundation/lams/tool/rsrc/web/controller/LearningController.java (.../LearningController.java) (revision 5a2704204eda443d4fb54e97babed70b9d71ee60) @@ -265,15 +265,9 @@ /** * Finish learning session. - * - * @param mapping - * @param form - * @param request - * @param response - * @return */ @RequestMapping("/finish") - private String finish(HttpServletRequest request) { + private String finish(HttpServletRequest request, HttpServletResponse response) throws IOException, ResourceApplicationException { // get back SessionMap String sessionMapID = request.getParameter(ResourceConstants.ATTR_SESSION_MAP_ID); @@ -288,30 +282,17 @@ } // get sessionId from HttpServletRequest - String nextActivityUrl = null; - try { - HttpSession ss = SessionManager.getSession(); - UserDTO user = (UserDTO) ss.getAttribute(AttributeNames.USER); - Long userID = user.getUserID().longValue(); + HttpSession ss = SessionManager.getSession(); + UserDTO user = (UserDTO) ss.getAttribute(AttributeNames.USER); + Long userID = user.getUserID().longValue(); - nextActivityUrl = resourceService.finishToolSession(sessionId, userID); - request.setAttribute(ResourceConstants.ATTR_NEXT_ACTIVITY_URL, nextActivityUrl); - } catch (ResourceApplicationException e) { - LearningController.log.error("Failed get next activity url:" + e.getMessage()); - } - - return "pages/learning/finish"; + String nextActivityUrl = resourceService.finishToolSession(sessionId, userID); + response.sendRedirect(nextActivityUrl); + return null; } /** * Save file or url resource item into database. - * - * @param mapping - * @param form - * @param request - * @param response - * @return - * @throws ServletException */ @RequestMapping(value = "/saveOrUpdateItem", method = RequestMethod.POST) private String saveOrUpdateItem(ResourceItemForm resourceItemForm, HttpServletRequest request) @@ -412,14 +393,7 @@ /** * Display empty reflection form. - * - * @param mapping - * @param form - * @param request - * @param response - * @return */ - @RequestMapping("/newReflection") private String newReflection(ReflectionForm reflectionForm, HttpServletRequest request) { @@ -450,16 +424,11 @@ } /** - * Submit reflection form input database. - * - * @param mapping - * @param form - * @param request - * @param response - * @return + * Submit reflection form input database */ @RequestMapping("/submitReflection") - private String submitReflection(@ModelAttribute ReflectionForm reflectionForm, HttpServletRequest request) { + private String submitReflection(@ModelAttribute ReflectionForm reflectionForm, HttpServletRequest request, + HttpServletResponse response) throws IOException, ResourceApplicationException { Integer userId = reflectionForm.getUserID(); String sessionMapID = WebUtil.readStrParam(request, ResourceConstants.ATTR_SESSION_MAP_ID); @@ -483,7 +452,7 @@ } request.setAttribute("reflectionForm", reflectionForm); - return finish(request); + return finish(request, response); } // ************************************************************************************* Index: lams_tool_preview/src/java/org/lamsfoundation/lams/tool/peerreview/PeerreviewConstants.java =================================================================== diff -u -r0d5ed4bdbfb191f7ffefc64a35c31cf48b55f0b0 -r5a2704204eda443d4fb54e97babed70b9d71ee60 --- lams_tool_preview/src/java/org/lamsfoundation/lams/tool/peerreview/PeerreviewConstants.java (.../PeerreviewConstants.java) (revision 0d5ed4bdbfb191f7ffefc64a35c31cf48b55f0b0) +++ lams_tool_preview/src/java/org/lamsfoundation/lams/tool/peerreview/PeerreviewConstants.java (.../PeerreviewConstants.java) (revision 5a2704204eda443d4fb54e97babed70b9d71ee60) @@ -94,8 +94,6 @@ public static final String ATTR_CRITERIAS = "criterias"; - public static final String ATTR_NEXT_ACTIVITY_URL = "nextActivityUrl"; - public static final String ATTR_SUMMARY_LIST = "summaryList"; public static final String ATTR_USER_LIST = "userList"; Index: lams_tool_preview/src/java/org/lamsfoundation/lams/tool/peerreview/web/controller/LearningController.java =================================================================== diff -u -r561bb65551f1a629adc974c1fb2d48e42e764115 -r5a2704204eda443d4fb54e97babed70b9d71ee60 --- lams_tool_preview/src/java/org/lamsfoundation/lams/tool/peerreview/web/controller/LearningController.java (.../LearningController.java) (revision 561bb65551f1a629adc974c1fb2d48e42e764115) +++ lams_tool_preview/src/java/org/lamsfoundation/lams/tool/peerreview/web/controller/LearningController.java (.../LearningController.java) (revision 5a2704204eda443d4fb54e97babed70b9d71ee60) @@ -71,7 +71,6 @@ private static final String DEFINE_LATER_PATH = "/pages/learning/definelater"; private static final String SHOW_RESULTS_REDIRECT = "redirect:/learning/showResults.do"; private static final String NEW_REFLECTION_REDIRECT = "redirect:/learning/newReflection.do"; - private static final String FINISH_PATH = "/pages/learning/finish"; private static final String SHOW_RESULTS_PAGE_PATH = "/pages/learning/results"; private static final String NOTEBOOK_PATH = "/pages/learning/notebook"; @@ -786,16 +785,9 @@ /** * Finish learning session. - * - * @param mapping - * @param form - * @param request - * @param response - * @return */ @RequestMapping("/finish") - @SuppressWarnings("unchecked") - public String finish(HttpServletRequest request, HttpSession session) { + public void finish(HttpServletRequest request, HttpSession session, HttpServletResponse response) throws PeerreviewApplicationException, IOException { // get back SessionMap String sessionMapID = request.getParameter(PeerreviewConstants.ATTR_SESSION_MAP_ID); @@ -804,33 +796,16 @@ // get mode and ToolSessionID from sessionMAP Long sessionId = (Long) sessionMap.get(PeerreviewConstants.PARAM_TOOL_SESSION_ID); - return doFinish(request, sessionId, session); - } - - private String doFinish(HttpServletRequest request, Long sessionId, HttpSession ss) { // get sessionId from HttpServletRequest - String nextActivityUrl = null; - try { - UserDTO user = (UserDTO) ss.getAttribute(AttributeNames.USER); - Long userID = new Long(user.getUserID().longValue()); + UserDTO user = (UserDTO) session.getAttribute(AttributeNames.USER); + Long userID = new Long(user.getUserID().longValue()); - nextActivityUrl = service.finishToolSession(sessionId, userID); - request.setAttribute(PeerreviewConstants.ATTR_NEXT_ACTIVITY_URL, nextActivityUrl); - } catch (PeerreviewApplicationException e) { - LearningController.log.error("Failed get next activity url:" + e.getMessage()); - } - - return FINISH_PATH; + String nextActivityUrl = service.finishToolSession(sessionId, userID); + response.sendRedirect(nextActivityUrl); } /** * Display empty reflection form. - * - * @param mapping - * @param form - * @param request - * @param response - * @return */ @RequestMapping("/newReflection") @SuppressWarnings("unchecked") @@ -860,17 +835,11 @@ /** * Submit reflection form input database. - * - * @param mapping - * @param form - * @param request - * @param response - * @return */ @RequestMapping("/submitReflection") @SuppressWarnings("unchecked") - public String submitReflection(@ModelAttribute ReflectionForm form, HttpServletRequest request, - HttpServletResponse response, HttpSession session) { + public void submitReflection(@ModelAttribute ReflectionForm form, HttpServletRequest request, + HttpServletResponse response, HttpSession session) throws PeerreviewApplicationException, IOException { ReflectionForm refForm = form; Integer userId = refForm.getUserID(); @@ -893,6 +862,6 @@ service.updateEntry(entry); } - return finish(request, session); + finish(request, session, response); } } \ No newline at end of file Index: lams_tool_scratchie/src/java/org/lamsfoundation/lams/tool/scratchie/ScratchieConstants.java =================================================================== diff -u -reccd6838790a4369b6788e48fb5ae5851622fe35 -r5a2704204eda443d4fb54e97babed70b9d71ee60 --- lams_tool_scratchie/src/java/org/lamsfoundation/lams/tool/scratchie/ScratchieConstants.java (.../ScratchieConstants.java) (revision eccd6838790a4369b6788e48fb5ae5851622fe35) +++ lams_tool_scratchie/src/java/org/lamsfoundation/lams/tool/scratchie/ScratchieConstants.java (.../ScratchieConstants.java) (revision 5a2704204eda443d4fb54e97babed70b9d71ee60) @@ -100,7 +100,7 @@ public static final String ATTR_IS_SCRATCHING_FINISHED = "isScratchingFinished"; public static final String ATTR_IS_WAITING_FOR_LEADER_TO_SUBMIT_NOTEBOOK = "isWaitingForLeaderToSubmitNotebook"; - + public static final String ATTR_IS_QUESTION_ETHERPAD_ENABLED = "isQuestionEtherpadEnabled"; public static final String ATTR_WAITING_MESSAGE_KEY = "waitingMessageKey"; @@ -111,8 +111,6 @@ public static final String ATTR_ITEM_UID = "itemUid"; - public static final String ATTR_NEXT_ACTIVITY_URL = "nextActivityUrl"; - public static final String ATTR_SUMMARY_LIST = "summaryList"; public static final String ATTR_ITEM_SUMMARY = "itemSummary"; @@ -191,11 +189,11 @@ public static final String ATTR_SHOW_RESULTS = "showResults"; public static final String ATTR_REFERENCES_SEQUENCE_IDS = "sequenceIds"; - + //flux management public static final String ANSWERS_UPDATED_SINK_NAME = "scratchie learner answers updated"; public static final String STUDENT_CHOICES_UPDATE_FLUX_NAME = "scratchie student choices updated"; - + public static final String BURNING_QUESTIONS_UPDATED_SINK_NAME = "scratchie burning questions updated"; public static final String BURNING_QUESTIONS_UPDATED_FLUX_NAME = "scratchie burning questions updated"; Index: lams_tool_scratchie/src/java/org/lamsfoundation/lams/tool/scratchie/web/controller/LearningController.java =================================================================== diff -u -r09dba58a4754f4962e8cfa1be27f702d47d4e3fa -r5a2704204eda443d4fb54e97babed70b9d71ee60 --- lams_tool_scratchie/src/java/org/lamsfoundation/lams/tool/scratchie/web/controller/LearningController.java (.../LearningController.java) (revision 09dba58a4754f4962e8cfa1be27f702d47d4e3fa) +++ lams_tool_scratchie/src/java/org/lamsfoundation/lams/tool/scratchie/web/controller/LearningController.java (.../LearningController.java) (revision 5a2704204eda443d4fb54e97babed70b9d71ee60) @@ -685,20 +685,15 @@ * Finish learning session. */ @RequestMapping("/finish") - public String finish(HttpServletRequest request) { + public void finish(HttpServletRequest request, HttpServletResponse response) throws IOException, ScratchieApplicationException { SessionMap sessionMap = getSessionMap(request); final Long toolSessionId = (Long) sessionMap.get(AttributeNames.PARAM_TOOL_SESSION_ID); HttpSession ss = SessionManager.getSession(); UserDTO user = (UserDTO) ss.getAttribute(AttributeNames.USER); final Long userId = user.getUserID().longValue(); - try { - String nextActivityUrl = scratchieService.finishToolSession(toolSessionId, userId); - request.setAttribute(ScratchieConstants.ATTR_NEXT_ACTIVITY_URL, nextActivityUrl); - } catch (ScratchieApplicationException e) { - log.error("Failed get next activity url:" + e.getMessage()); - } - return "pages/learning/finish"; + String nextActivityUrl = scratchieService.finishToolSession(toolSessionId, userId); + response.sendRedirect(nextActivityUrl); } /** Index: lams_tool_spreadsheet/src/java/org/lamsfoundation/lams/tool/spreadsheet/SpreadsheetConstants.java =================================================================== diff -u -r62aaf160878735888d077bf28fac3c1989bb8fbd -r5a2704204eda443d4fb54e97babed70b9d71ee60 --- lams_tool_spreadsheet/src/java/org/lamsfoundation/lams/tool/spreadsheet/SpreadsheetConstants.java (.../SpreadsheetConstants.java) (revision 62aaf160878735888d077bf28fac3c1989bb8fbd) +++ lams_tool_spreadsheet/src/java/org/lamsfoundation/lams/tool/spreadsheet/SpreadsheetConstants.java (.../SpreadsheetConstants.java) (revision 5a2704204eda443d4fb54e97babed70b9d71ee60) @@ -52,7 +52,6 @@ public static final String ATTR_DELETED_RESOURCE_ITEM_LIST = "deleteSpreadsheetList"; public static final String ATTR_RESOURCE = "spreadsheet"; public static final String ATTR_RESOURCE_ITEM_UID = "itemUid"; - public static final String ATTR_NEXT_ACTIVITY_URL = "nextActivityUrl"; public static final String ATTR_SUMMARY_LIST = "summaryList"; public static final String ATTR_STATISTIC_LIST = "statisticList"; public static final String ATTR_USER_LIST = "userList"; Index: lams_tool_spreadsheet/src/java/org/lamsfoundation/lams/tool/spreadsheet/web/controller/LearningController.java =================================================================== diff -u -r3ee06bc1b00b1673399c1871a73cfa1d8ec2c0db -r5a2704204eda443d4fb54e97babed70b9d71ee60 --- lams_tool_spreadsheet/src/java/org/lamsfoundation/lams/tool/spreadsheet/web/controller/LearningController.java (.../LearningController.java) (revision 3ee06bc1b00b1673399c1871a73cfa1d8ec2c0db) +++ lams_tool_spreadsheet/src/java/org/lamsfoundation/lams/tool/spreadsheet/web/controller/LearningController.java (.../LearningController.java) (revision 5a2704204eda443d4fb54e97babed70b9d71ee60) @@ -23,9 +23,11 @@ package org.lamsfoundation.lams.tool.spreadsheet.web.controller; +import java.io.IOException; import java.util.Date; import javax.servlet.http.HttpServletRequest; +import javax.servlet.http.HttpServletResponse; import javax.servlet.http.HttpSession; import org.apache.log4j.Logger; @@ -226,7 +228,7 @@ * Finish learning session. */ @RequestMapping("/finishSession") - public String finishSession(@ModelAttribute ReflectionForm reflectionForm, HttpServletRequest request) { + public void finishSession(HttpServletRequest request, HttpServletResponse response) throws IOException, SpreadsheetApplicationException { //get back SessionMap String sessionMapID = request.getParameter(SpreadsheetConstants.ATTR_SESSION_MAP_ID); @@ -237,19 +239,12 @@ Long sessionId = (Long) sessionMap.get(AttributeNames.PARAM_TOOL_SESSION_ID); // get sessionId from HttpServletRequest - String nextActivityUrl = null; - try { - HttpSession ss = SessionManager.getSession(); - UserDTO userDTO = (UserDTO) ss.getAttribute(AttributeNames.USER); - Long userID = new Long(userDTO.getUserID().longValue()); + HttpSession ss = SessionManager.getSession(); + UserDTO userDTO = (UserDTO) ss.getAttribute(AttributeNames.USER); + Long userID = new Long(userDTO.getUserID().longValue()); - nextActivityUrl = service.finishToolSession(sessionId, userID); - request.setAttribute(SpreadsheetConstants.ATTR_NEXT_ACTIVITY_URL, nextActivityUrl); - } catch (SpreadsheetApplicationException e) { - log.error("Failed get next activity url:" + e.getMessage()); - } - - return "pages/learning/finish"; + String nextActivityUrl = service.finishToolSession(sessionId, userID); + response.sendRedirect(nextActivityUrl); } /** @@ -284,7 +279,8 @@ * Submit reflection form input database. */ @RequestMapping(path = "/submitReflection", method = RequestMethod.POST) - public String submitReflection(@ModelAttribute ReflectionForm reflectionForm, HttpServletRequest request) { + public void submitReflection(@ModelAttribute ReflectionForm reflectionForm, HttpServletRequest request, + HttpServletResponse response) throws IOException, SpreadsheetApplicationException { Integer userId = reflectionForm.getUserID(); @@ -308,7 +304,7 @@ service.updateEntry(entry); } - return finishSession(reflectionForm, request); + finishSession(request, response); } //************************************************************************************* Index: lams_tool_survey/src/java/org/lamsfoundation/lams/tool/survey/SurveyConstants.java =================================================================== diff -u -r7475d08afc280b5e2e5ddf04e8bf35e3166aaf80 -r5a2704204eda443d4fb54e97babed70b9d71ee60 --- lams_tool_survey/src/java/org/lamsfoundation/lams/tool/survey/SurveyConstants.java (.../SurveyConstants.java) (revision 7475d08afc280b5e2e5ddf04e8bf35e3166aaf80) +++ lams_tool_survey/src/java/org/lamsfoundation/lams/tool/survey/SurveyConstants.java (.../SurveyConstants.java) (revision 5a2704204eda443d4fb54e97babed70b9d71ee60) @@ -133,8 +133,6 @@ public static final String ATTR_LOCK_ON_FINISH = "lockOnFinish"; - public static final String ATTR_NEXT_ACTIVITY_URL = "nextActivityUrl"; - public static final short SURVEY_TYPE_TEXT_ENTRY = 3; public static final short SURVEY_TYPE_MULTIPLE_CHOICES = 2; Index: lams_tool_survey/src/java/org/lamsfoundation/lams/tool/survey/web/controller/LearningController.java =================================================================== diff -u -r72d0843d3304959c18b3386b7e938835f795982b -r5a2704204eda443d4fb54e97babed70b9d71ee60 --- lams_tool_survey/src/java/org/lamsfoundation/lams/tool/survey/web/controller/LearningController.java (.../LearningController.java) (revision 72d0843d3304959c18b3386b7e938835f795982b) +++ lams_tool_survey/src/java/org/lamsfoundation/lams/tool/survey/web/controller/LearningController.java (.../LearningController.java) (revision 5a2704204eda443d4fb54e97babed70b9d71ee60) @@ -469,15 +469,9 @@ /** * Finish learning session. - * - * @param mapping - * @param form - * @param request - * @param response - * @return */ @RequestMapping(value = "/finish") - private String finish(HttpServletRequest request) { + private void finish(HttpServletRequest request, HttpServletResponse response) throws IOException, SurveyApplicationException { // get back SessionMap String sessionMapID = request.getParameter(SurveyConstants.ATTR_SESSION_MAP_ID); @@ -488,29 +482,16 @@ Long sessionId = (Long) sessionMap.get(AttributeNames.PARAM_TOOL_SESSION_ID); // get sessionId from HttpServletRequest - String nextActivityUrl = null; - try { - HttpSession ss = SessionManager.getSession(); - UserDTO user = (UserDTO) ss.getAttribute(AttributeNames.USER); - Long userID = new Long(user.getUserID().longValue()); + HttpSession ss = SessionManager.getSession(); + UserDTO user = (UserDTO) ss.getAttribute(AttributeNames.USER); + Long userID = new Long(user.getUserID().longValue()); - nextActivityUrl = surveyService.finishToolSession(sessionId, userID); - request.setAttribute(SurveyConstants.ATTR_NEXT_ACTIVITY_URL, nextActivityUrl); - } catch (SurveyApplicationException e) { - LearningController.log.error("Failed get next activity url:" + e.getMessage()); - } - - return "pages/learning/finish"; + String nextActivityUrl = surveyService.finishToolSession(sessionId, userID); + response.sendRedirect(nextActivityUrl); } /** * Display empty reflection form. - * - * @param mapping - * @param form - * @param request - * @param response - * @return */ @RequestMapping(value = "/newReflection") private String newReflection(@ModelAttribute("messageForm") ReflectionForm messageForm, @@ -542,16 +523,10 @@ /** * Submit reflection form input database. - * - * @param mapping - * @param form - * @param request - * @param response - * @return */ @RequestMapping(value = "/submitReflection", method = RequestMethod.POST) - private String submitReflection(@ModelAttribute("messageForm") ReflectionForm messageForm, - HttpServletRequest request) { + private void submitReflection(@ModelAttribute("messageForm") ReflectionForm messageForm, + HttpServletRequest request, HttpServletResponse response) throws IOException, SurveyApplicationException { Integer userId = messageForm.getUserID(); String sessionMapID = WebUtil.readStrParam(request, SurveyConstants.ATTR_SESSION_MAP_ID); @@ -574,7 +549,8 @@ surveyService.updateEntry(entry); } request.setAttribute("messageForm", messageForm); - return finish(request); + + finish(request, response); } // ************************************************************************************* @@ -593,7 +569,6 @@ SurveyAnswer answer = getAnswerFromPage(request, answerDto, sessionID); answerDto.setAnswer(answer); validateAnswers(request, answerDto, errorMap, answer); - } /** Index: lams_tool_task/src/java/org/lamsfoundation/lams/tool/taskList/TaskListConstants.java =================================================================== diff -u -raff1ef425c76fe6a2051694c0fdf833265459710 -r5a2704204eda443d4fb54e97babed70b9d71ee60 --- lams_tool_task/src/java/org/lamsfoundation/lams/tool/taskList/TaskListConstants.java (.../TaskListConstants.java) (revision aff1ef425c76fe6a2051694c0fdf833265459710) +++ lams_tool_task/src/java/org/lamsfoundation/lams/tool/taskList/TaskListConstants.java (.../TaskListConstants.java) (revision 5a2704204eda443d4fb54e97babed70b9d71ee60) @@ -51,7 +51,6 @@ public static final String ATTR_DELETED_CONDITION_LIST = "deleteConditionList"; public static final String ATTR_TASKLIST = "taskList"; public static final String ATTR_ITEM_UID = "itemUid"; - public static final String ATTR_NEXT_ACTIVITY_URL = "nextActivityUrl"; public static final String ATTR_MONITOR_VERIFICATION_REQUIRED = "monitorVerificationRequired"; public static final String ATTR_SESSION_DTOS = "sessionDtos"; public static final String ATTR_ITEM_SUMMARY = "itemSummary"; Index: lams_tool_task/src/java/org/lamsfoundation/lams/tool/taskList/web/controller/LearningController.java =================================================================== diff -u -r895289ecb3f8c3433306cd14b53ffb09bf788cca -r5a2704204eda443d4fb54e97babed70b9d71ee60 --- lams_tool_task/src/java/org/lamsfoundation/lams/tool/taskList/web/controller/LearningController.java (.../LearningController.java) (revision 895289ecb3f8c3433306cd14b53ffb09bf788cca) +++ lams_tool_task/src/java/org/lamsfoundation/lams/tool/taskList/web/controller/LearningController.java (.../LearningController.java) (revision 5a2704204eda443d4fb54e97babed70b9d71ee60) @@ -24,6 +24,7 @@ package org.lamsfoundation.lams.tool.taskList.web.controller; import java.io.File; +import java.io.IOException; import java.sql.Timestamp; import java.util.Comparator; import java.util.Date; @@ -340,7 +341,7 @@ */ @RequestMapping("/finish") public String finish(@ModelAttribute ReflectionForm reflectionForm, HttpServletRequest request, - HttpServletResponse response) { + HttpServletResponse response) throws IOException { // auto run mode, when use finish the only one taskList item, mark it as complete then finish this activity as well String taskListItemUid = request.getParameter(TaskListConstants.PARAM_ITEM_UID); if (taskListItemUid != null) { @@ -352,20 +353,15 @@ return "pages/learning/learning"; } - try { - HttpSession ss = SessionManager.getSession(); - UserDTO user = (UserDTO) ss.getAttribute(AttributeNames.USER); - Long userID = user.getUserID().longValue(); + HttpSession ss = SessionManager.getSession(); + UserDTO user = (UserDTO) ss.getAttribute(AttributeNames.USER); + Long userID = user.getUserID().longValue(); - SessionMap sessionMap = getSessionMap(request); - Long sessionId = (Long) sessionMap.get(AttributeNames.PARAM_TOOL_SESSION_ID); - String nextActivityUrl = taskListService.finishToolSession(sessionId, userID); - request.setAttribute(TaskListConstants.ATTR_NEXT_ACTIVITY_URL, nextActivityUrl); - } catch (TaskListException e) { - log.error("Failed get next activity url:" + e.getMessage()); - } - - return "pages/learning/finish"; + SessionMap sessionMap = getSessionMap(request); + Long sessionId = (Long) sessionMap.get(AttributeNames.PARAM_TOOL_SESSION_ID); + String nextActivityUrl = taskListService.finishToolSession(sessionId, userID); + response.sendRedirect(nextActivityUrl); + return null; } /** @@ -560,7 +556,7 @@ */ @RequestMapping(path = "/submitReflection", method = RequestMethod.POST) public String submitReflection(@ModelAttribute ReflectionForm reflectionForm, HttpServletRequest request, - HttpServletResponse response) { + HttpServletResponse response) throws IOException { Integer userId = reflectionForm.getUserID(); SessionMap sessionMap = getSessionMap(request);