<fmt:message key="label.learning.title" />

Progress Index: lams_tool_whiteboard/src/java/org/lamsfoundation/lams/tool/whiteboard/web/controller/LearningController.java =================================================================== diff -u -r1621b6daf8385b83e75f7ffde03c017b05c12487 -r5f169ec12c68516cfdbdfce8692bf37f4baecb65 --- lams_tool_whiteboard/src/java/org/lamsfoundation/lams/tool/whiteboard/web/controller/LearningController.java (.../LearningController.java) (revision 1621b6daf8385b83e75f7ffde03c017b05c12487) +++ lams_tool_whiteboard/src/java/org/lamsfoundation/lams/tool/whiteboard/web/controller/LearningController.java (.../LearningController.java) (revision 5f169ec12c68516cfdbdfce8692bf37f4baecb65) @@ -96,6 +96,7 @@ Whiteboard whiteboard = whiteboardService.getWhiteboardBySessionId(toolSessionId); WhiteboardSession session = whiteboardService.getWhiteboardSessionBySessionId(toolSessionId); sessionMap.put(WhiteboardConstants.ATTR_TOOL_CONTENT_ID, whiteboard.getContentId()); + sessionMap.put(AttributeNames.PARAM_TOOL_SESSION_ID, toolSessionId); // get back the whiteboard and item list and display them on page WhiteboardUser user = null; @@ -133,17 +134,17 @@ } request.setAttribute(WhiteboardConstants.ATTR_GROUP_USERS, groupUserDtos); request.setAttribute(WhiteboardConstants.ATTR_WHITEBOARD, whiteboard); + request.setAttribute(AttributeNames.PARAM_MODE, mode); return "pages/learning/waitforleader"; } boolean isUserLeader = user != null && leader != null && user.getUid().equals(leader.getUid()); boolean hasEditRight = !whiteboard.isUseSelectLeaderToolOuput() || isUserLeader; sessionMap.put(WhiteboardConstants.ATTR_HAS_EDIT_RIGHT, hasEditRight); - sessionMap.put(AttributeNames.PARAM_TOOL_SESSION_ID, toolSessionId); sessionMap.put(WhiteboardConstants.ATTR_REFLECTION_ON, whiteboard.isReflectOnActivity()); sessionMap.put(AttributeNames.ATTR_IS_LAST_ACTIVITY, whiteboardService.isLastActivity(toolSessionId)); sessionMap.put(WhiteboardConstants.ATTR_WHITEBOARD, whiteboard); - sessionMap.put(AttributeNames.ATTR_MODE, mode); + sessionMap.put(AttributeNames.PARAM_MODE, mode); // reflection information String entryText = new String(); @@ -209,6 +210,7 @@ // add define later support if (whiteboard.isDefineLater()) { + request.setAttribute(AttributeNames.PARAM_TOOL_SESSION_ID, toolSessionId); return "pages/learning/definelater"; } @@ -281,7 +283,8 @@ * Finish learning session. */ @RequestMapping("/finish") - private String finish(HttpServletRequest request) { + private void finish(HttpServletRequest request, HttpServletResponse response) + throws WhiteboardApplicationException, IOException { // get back SessionMap String sessionMapID = request.getParameter(WhiteboardConstants.ATTR_SESSION_MAP_ID); @@ -293,29 +296,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 = user.getUserID().longValue(); + HttpSession ss = SessionManager.getSession(); + UserDTO user = (UserDTO) ss.getAttribute(AttributeNames.USER); + Long userID = user.getUserID().longValue(); - nextActivityUrl = whiteboardService.finishToolSession(sessionId, userID); - request.setAttribute(WhiteboardConstants.ATTR_NEXT_ACTIVITY_URL, nextActivityUrl); - } catch (WhiteboardApplicationException e) { - LearningController.log.error("Failed get next activity url:" + e.getMessage()); - } - - return "pages/learning/finish"; + String nextActivityUrl = whiteboardService.finishToolSession(sessionId, userID); + response.sendRedirect(nextActivityUrl); } /** * Display empty reflection form. - * - * @param mapping - * @param form - * @param request - * @param response - * @return */ @SuppressWarnings("unchecked") @RequestMapping("/newReflection") @@ -346,16 +336,11 @@ /** * 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 WhiteboardApplicationException, IOException { Integer userId = reflectionForm.getUserID(); String sessionMapID = WebUtil.readStrParam(request, WhiteboardConstants.ATTR_SESSION_MAP_ID); @@ -378,7 +363,7 @@ whiteboardService.updateEntry(entry); } - return finish(request); + finish(request, response); } // ************************************************************************************* Index: lams_tool_whiteboard/web/WEB-INF/tags/PageLearner.tag =================================================================== diff -u -r955865d255f86a5447f729ec1ce573b2b6f94b27 -r5f169ec12c68516cfdbdfce8692bf37f4baecb65 --- lams_tool_whiteboard/web/WEB-INF/tags/PageLearner.tag (.../PageLearner.tag) (revision 955865d255f86a5447f729ec1ce573b2b6f94b27) +++ lams_tool_whiteboard/web/WEB-INF/tags/PageLearner.tag (.../PageLearner.tag) (revision 5f169ec12c68516cfdbdfce8692bf37f4baecb65) @@ -6,6 +6,7 @@ <%@ attribute name="toolSessionID" required="true" rtexprvalue="true"%> <%@ attribute name="title" required="false" rtexprvalue="true"%> <%@ attribute name="refresh" required="false" rtexprvalue="true"%> +<%@ attribute name="lessonID" required="false" rtexprvalue="true"%> @@ -55,7 +56,9 @@ decoderDiv = $('

'); $(document).ready(function (){ - initLearnerPage(${toolSessionID}); + const toolSessionID = ${empty lessonID ? toolSessionID : 'null'}, + lessonID = ${empty lessonID ? 'null' : lessonID}; + initLearnerPage(toolSessionID, lessonID); }); function preventLearnerAutosaveFromMultipleTabs(autosaveInterval) { @@ -75,56 +78,75 @@