Index: lams_learning/src/java/org/lamsfoundation/lams/learning/web/action/BranchingActivityAction.java =================================================================== RCS file: /usr/local/cvsroot/lams_learning/src/java/org/lamsfoundation/lams/learning/web/action/BranchingActivityAction.java,v diff -u -r1.8.10.4 -r1.8.10.5 --- lams_learning/src/java/org/lamsfoundation/lams/learning/web/action/BranchingActivityAction.java 11 May 2016 07:07:36 -0000 1.8.10.4 +++ lams_learning/src/java/org/lamsfoundation/lams/learning/web/action/BranchingActivityAction.java 29 Jul 2016 02:26:37 -0000 1.8.10.5 @@ -46,6 +46,7 @@ import org.lamsfoundation.lams.lesson.LearnerProgress; import org.lamsfoundation.lams.util.WebUtil; import org.lamsfoundation.lams.web.action.LamsDispatchAction; +import org.lamsfoundation.lams.web.util.AttributeNames; /** * Action class to display an OptionsActivity. @@ -148,6 +149,8 @@ } else if (branchingActivity.isToolBranchingActivity()) { branchForm.set("type", BranchingActivity.TOOL_BASED_TYPE); } + // lessonId needed for the progress bar + request.setAttribute(AttributeNames.PARAM_LESSON_ID, learnerProgress.getLesson().getLessonId()); } else { // forward to the sequence activity. if (LamsDispatchAction.log.isDebugEnabled()) { Index: lams_learning/src/java/org/lamsfoundation/lams/learning/web/action/DisplayOptionsActivityAction.java =================================================================== RCS file: /usr/local/cvsroot/lams_learning/src/java/org/lamsfoundation/lams/learning/web/action/DisplayOptionsActivityAction.java,v diff -u -r1.23.2.4 -r1.23.2.5 --- lams_learning/src/java/org/lamsfoundation/lams/learning/web/action/DisplayOptionsActivityAction.java 11 May 2016 07:07:36 -0000 1.23.2.4 +++ lams_learning/src/java/org/lamsfoundation/lams/learning/web/action/DisplayOptionsActivityAction.java 29 Jul 2016 02:26:37 -0000 1.23.2.5 @@ -44,6 +44,7 @@ import org.lamsfoundation.lams.learningdesign.OptionsActivity; import org.lamsfoundation.lams.lesson.LearnerProgress; import org.lamsfoundation.lams.web.action.LamsAction; +import org.lamsfoundation.lams.web.util.AttributeNames; /** * Action class to display an OptionsActivity. @@ -115,6 +116,9 @@ LearningWebUtil.putActivityPositionInRequest(form.getActivityID(), request, getServlet().getServletContext()); + // lessonId needed for the progress bar + request.setAttribute(AttributeNames.PARAM_LESSON_ID, learnerProgress.getLesson().getLessonId()); + String forward = "displayOptions"; return mapping.findForward(forward); } Index: lams_learning/src/java/org/lamsfoundation/lams/learning/web/action/GroupingAction.java =================================================================== RCS file: /usr/local/cvsroot/lams_learning/src/java/org/lamsfoundation/lams/learning/web/action/GroupingAction.java,v diff -u -r1.32.2.6 -r1.32.2.7 --- lams_learning/src/java/org/lamsfoundation/lams/learning/web/action/GroupingAction.java 28 Jul 2016 03:46:21 -0000 1.32.2.6 +++ lams_learning/src/java/org/lamsfoundation/lams/learning/web/action/GroupingAction.java 29 Jul 2016 02:26:37 -0000 1.32.2.7 @@ -183,6 +183,11 @@ */ public ActionForward viewGrouping(ActionMapping mapping, ActionForm form, HttpServletRequest request, HttpServletResponse response) throws IOException, ServletException { + return viewGrouping(mapping, form, request, response, null); + } + + public ActionForward viewGrouping(ActionMapping mapping, ActionForm form, HttpServletRequest request, + HttpServletResponse response, LearnerProgress learnerProgress) throws IOException, ServletException { prepareGroupData(request); request.setAttribute(GroupingAction.LOCAL_FILES, Boolean.FALSE); ToolAccessMode mode = WebUtil.readToolAccessModeParam(request, AttributeNames.PARAM_MODE, true); @@ -191,6 +196,14 @@ long activityId = WebUtil.readLongParam(request, AttributeNames.PARAM_ACTIVITY_ID); LearningWebUtil.putActivityPositionInRequest(activityId, request, getServlet().getServletContext()); + // make sure the lesson id is always in the request for the progress bar. + if ( request.getAttribute(AttributeNames.PARAM_LESSON_ID) == null ) { + if ( learnerProgress == null ) { + ICoreLearnerService learnerService = LearnerServiceProxy.getLearnerService(getServlet().getServletContext()); + learnerProgress = LearningWebUtil.getLearnerProgress(request, learnerService); + } + request.setAttribute(AttributeNames.PARAM_LESSON_ID, learnerProgress.getLesson().getLessonId()); + } return mapping.findForward(GroupingAction.SHOW_GROUP); } @@ -271,7 +284,7 @@ boolean learnerGroupped = learnerService.learnerChooseGroup(lessonId, activity.getActivityId(), groupId, LearningWebUtil.getUserId()); if (learnerGroupped) { - return viewGrouping(mapping, form, request, response); + return viewGrouping(mapping, form, request, response, learnerProgress); } Long groupingId = ((GroupingActivity) activity).getCreateGrouping().getGroupingId(); Index: lams_learning/web/WEB-INF/tags/Page.tag =================================================================== RCS file: /usr/local/cvsroot/lams_learning/web/WEB-INF/tags/Attic/Page.tag,v diff -u -r1.1.2.3 -r1.1.2.4 --- lams_learning/web/WEB-INF/tags/Page.tag 28 Jul 2016 23:57:46 -0000 1.1.2.3 +++ lams_learning/web/WEB-INF/tags/Page.tag 29 Jul 2016 02:26:37 -0000 1.1.2.4 @@ -66,7 +66,7 @@ - + @@ -204,7 +204,10 @@
  • Exit
  • Notebook
    • -
  • +
  • + +
    +
    • Index: lams_learning/web/grouping/show.jsp =================================================================== RCS file: /usr/local/cvsroot/lams_learning/web/grouping/show.jsp,v diff -u -r1.13.2.2 -r1.13.2.3 --- lams_learning/web/grouping/show.jsp 12 Mar 2016 23:48:18 -0000 1.13.2.2 +++ lams_learning/web/grouping/show.jsp 29 Jul 2016 02:26:37 -0000 1.13.2.3 @@ -37,7 +37,7 @@ Index: lams_learning/web/layout/branchingWaitLayout.jsp =================================================================== RCS file: /usr/local/cvsroot/lams_learning/web/layout/branchingWaitLayout.jsp,v diff -u -r1.6.12.2 -r1.6.12.3 --- lams_learning/web/layout/branchingWaitLayout.jsp 17 Mar 2016 11:20:59 -0000 1.6.12.2 +++ lams_learning/web/layout/branchingWaitLayout.jsp 29 Jul 2016 02:26:37 -0000 1.6.12.3 @@ -26,8 +26,9 @@ - <fmt:message key="${label.branching.title}"/> + <fmt:message key="label.branching.title"/> + /branching.do?method=performBranching&type=${BranchingForm.map.type}&activityID=${BranchingForm.map.activityID}&progressID=${BranchingForm.map.progressID} &force=true Index: lams_learning/web/layout/groupWaitLayout.jsp =================================================================== RCS file: /usr/local/cvsroot/lams_learning/web/layout/groupWaitLayout.jsp,v diff -u -r1.10.12.3 -r1.10.12.4 --- lams_learning/web/layout/groupWaitLayout.jsp 28 Jul 2016 03:47:50 -0000 1.10.12.3 +++ lams_learning/web/layout/groupWaitLayout.jsp 29 Jul 2016 02:26:37 -0000 1.10.12.4 @@ -25,7 +25,7 @@ - <fmt:message key="${label.view.groups.title}"/> + <fmt:message key="label.view.groups.title"/>