Index: lams_learning/lams_learning.eml =================================================================== diff -u -rf3144d7b1c275056481fd76050bad49b0ba6d06d -r966fe6dea3c644eaf336f305c960861b7e62fd73 --- lams_learning/lams_learning.eml (.../lams_learning.eml) (revision f3144d7b1c275056481fd76050bad49b0ba6d06d) +++ lams_learning/lams_learning.eml (.../lams_learning.eml) (revision 966fe6dea3c644eaf336f305c960861b7e62fd73) @@ -1,29 +1,40 @@ - - + + + + + + + + + + + + + Index: lams_learning/web/includes/javascript/learnerPage.js =================================================================== diff -u -r1f6e357f9932435e8c97e005196baa2f23909191 -r966fe6dea3c644eaf336f305c960861b7e62fd73 --- lams_learning/web/includes/javascript/learnerPage.js (.../learnerPage.js) (revision 1f6e357f9932435e8c97e005196baa2f23909191) +++ lams_learning/web/includes/javascript/learnerPage.js (.../learnerPage.js) (revision 966fe6dea3c644eaf336f305c960861b7e62fd73) @@ -34,12 +34,4 @@ } } }); -} - -function nextActivity(){ - let contentFrame = $('#learner-page-content-frame'); - contentFrame.on('load', function (){ - location.href = contentFrame[0].contentDocument.URL; - }); - contentFrame[0].contentWindow.submitForm('finish'); } \ No newline at end of file Index: lams_tool_nb/src/java/org/lamsfoundation/lams/tool/noticeboard/web/controller/LearningController.java =================================================================== diff -u -r72bf0041a18e7e902404c65e55e167bf6ff84269 -r966fe6dea3c644eaf336f305c960861b7e62fd73 --- lams_tool_nb/src/java/org/lamsfoundation/lams/tool/noticeboard/web/controller/LearningController.java (.../LearningController.java) (revision 72bf0041a18e7e902404c65e55e167bf6ff84269) +++ lams_tool_nb/src/java/org/lamsfoundation/lams/tool/noticeboard/web/controller/LearningController.java (.../LearningController.java) (revision 966fe6dea3c644eaf336f305c960861b7e62fd73) @@ -59,7 +59,6 @@ import org.springframework.web.bind.annotation.ModelAttribute; import org.springframework.web.bind.annotation.RequestMapping; import org.springframework.web.bind.annotation.RequestMethod; -import org.springframework.web.bind.annotation.RequestParam; /** * Creation Date: 27-06-05 @@ -109,32 +108,16 @@ return WebUtil.readLongParam(request, AttributeNames.PARAM_USER_ID, false); } - public String unspecified(@ModelAttribute NbLearnerForm NbLearnerForm, HttpServletRequest request, - HttpServletResponse response, Model model) { - - return learner5(request, model); - } - @RequestMapping("/learner") - public String learner5(HttpServletRequest request, Model model) { - String url = request.getRequestURL().toString().replace("learner.do", "learnerInner.do") + "?" - + request.getQueryString(); - model.addAttribute("contentUrl", url); - Long toolSessionId = WebUtil.readLongParam(request, AttributeNames.PARAM_TOOL_SESSION_ID); - model.addAttribute(AttributeNames.PARAM_TOOL_SESSION_ID, toolSessionId); - return "learner5"; - } - - @RequestMapping("/learnerInner") - public String learner(@ModelAttribute NbLearnerForm NbLearnerForm, HttpServletRequest request, + public String learner(@ModelAttribute NbLearnerForm nbLearnerForm, HttpServletRequest request, HttpServletResponse response) { NoticeboardContent nbContent = null; NoticeboardUser nbUser = null; MultiValueMap errorMap = new LinkedMultiValueMap<>(); - Long toolSessionID = Long.valueOf(NbLearnerForm.getToolSessionID()); + Long toolSessionID = Long.valueOf(nbLearnerForm.getToolSessionID()); if (toolSessionID == null) { String error = "Unable to continue. The parameters tool session id is missing"; @@ -156,10 +139,10 @@ } boolean readOnly = false; - if (NbLearnerForm.getMode() == null) { - NbLearnerForm.setMode(ToolAccessMode.LEARNER.toString()); + if (nbLearnerForm.getMode() == null) { + nbLearnerForm.setMode(ToolAccessMode.LEARNER.toString()); } - ToolAccessMode mode = WebUtil.getToolAccessMode(NbLearnerForm.getMode()); + ToolAccessMode mode = WebUtil.getToolAccessMode(nbLearnerForm.getMode()); Long userID = null; if (mode == ToolAccessMode.LEARNER || mode == ToolAccessMode.AUTHOR) { userID = getUserID(request); @@ -186,7 +169,7 @@ readOnly = true; } - NbLearnerForm.copyValuesIntoForm(nbContent, readOnly, mode.toString()); + nbLearnerForm.copyValuesIntoForm(nbContent, readOnly, mode.toString()); NotebookEntry notebookEntry = nbService.getEntry(toolSessionID, CoreNotebookConstants.NOTEBOOK_TOOL, NoticeboardConstants.TOOL_SIGNATURE, userID.intValue()); Index: lams_tool_nb/web/WEB-INF/tags/PageLearner.tag =================================================================== diff -u -r1f6e357f9932435e8c97e005196baa2f23909191 -r966fe6dea3c644eaf336f305c960861b7e62fd73 --- lams_tool_nb/web/WEB-INF/tags/PageLearner.tag (.../PageLearner.tag) (revision 1f6e357f9932435e8c97e005196baa2f23909191) +++ lams_tool_nb/web/WEB-INF/tags/PageLearner.tag (.../PageLearner.tag) (revision 966fe6dea3c644eaf336f305c960861b7e62fd73) @@ -29,10 +29,6 @@ }); }); - - <%-- --%> - <%-- --%> - <%-- --%> @@ -45,15 +41,14 @@

- -

+<%--

--%> +<%-- --%> +<%--

--%> @@ -68,268 +63,6 @@ - <%-- -

- -

Progress

20%

- -

- - -

- - - -

- -

- - - -

Progress bar

- -

- - - - Introduction -
- - - - Team Setup -
- - - - Individual Readiness -
- - - - Leader Selection -
- - - - Introduction -
- - - - Team Setup -
- - - - Leader Selection -

- -

- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -

- - Name - -	- - Score - - -
- - Krystal Johnson -	- 20 -
- - Joel Bryant -	- 18 -
- - Alex Burns -	- 16 -
- - Caroline Scott -	- 15 -
- - Derek Lewis -	- 14 -
- - Frank Hart -	- 12 -

Lorem ipsum dolor sit amet, consetetur sadipscing elitr, sed diam - nonumy - eirmod tempor invidunt ut labore et dolore magna aliquyam erat, sed - diam - voluptua. At vero eos et accusam et justo duo dolores et ea rebum. - Stet - clita kasd gubergren, no sea takimata sanctus est Lorem ipsum dolor - sit - amet.

- -

- - - - - --%> Fisheye: Tag 966fe6dea3c644eaf336f305c960861b7e62fd73 refers to a dead (removed) revision in file `lams_tool_nb/web/learner5.jsp'. Fisheye: No comparison available. Pass `N' to diff?

Progress bar

Name

Score