Index: lams_central/src/java/org/lamsfoundation/lams/authoring/template/web/LdTemplateController.java =================================================================== diff -u -r62aaf160878735888d077bf28fac3c1989bb8fbd -r54007f98ca71e0073f19c5db78536437123287c6 --- lams_central/src/java/org/lamsfoundation/lams/authoring/template/web/LdTemplateController.java (.../LdTemplateController.java) (revision 62aaf160878735888d077bf28fac3c1989bb8fbd) +++ lams_central/src/java/org/lamsfoundation/lams/authoring/template/web/LdTemplateController.java (.../LdTemplateController.java) (revision 54007f98ca71e0073f19c5db78536437123287c6) @@ -33,6 +33,7 @@ import javax.servlet.http.HttpServletRequest; import javax.servlet.http.HttpServletResponse; +import javax.servlet.http.HttpSession; import org.apache.http.HttpException; import org.apache.http.client.HttpClient; @@ -76,7 +77,6 @@ * @author Marcin Cieslak, Fiona Malikoff */ @Controller -@RequestMapping("authoring/template/tbl") public abstract class LdTemplateController { @Autowired @@ -92,16 +92,16 @@ @Autowired @Qualifier("lamsCoreToolService") - protected static ILamsCoreToolService lamsCoreToolService; + protected ILamsCoreToolService lamsCoreToolService; @Autowired @Qualifier("workspaceManagementService") - protected static IWorkspaceManagementService workspaceManagementService; + protected IWorkspaceManagementService workspaceManagementService; @Autowired @Qualifier(AuthoringConstants.AUTHORING_SERVICE_BEAN_NAME) - protected static IAuthoringFullService authoringFullService; + protected IAuthoringFullService authoringFullService; @Autowired @Qualifier("toolDAO") - protected static IToolDAO toolDAO; + protected IToolDAO toolDAO; protected static final String CONTENT_TYPE_JSON = "application/json;charset=utf-8"; @@ -150,10 +150,10 @@ @RequestMapping("") @ResponseBody - public final String unspecified(HttpServletRequest request, HttpServletResponse response) throws Exception { + public final String unspecified(HttpServletRequest request, HttpServletResponse response, HttpSession httpSession) throws Exception { ObjectNode responseJSON = null; try { - responseJSON = createLearningDesign(request); + responseJSON = createLearningDesign(request, httpSession); if (!responseJSON.has("learningDesignID") && !responseJSON.has("errors")) { log.error( @@ -192,7 +192,7 @@ return "authoring/template/tbl/tbl"; } - protected abstract ObjectNode createLearningDesign(HttpServletRequest request) throws Exception; + protected abstract ObjectNode createLearningDesign(HttpServletRequest request, HttpSession httpSession) throws Exception; /** * Creates transitions between activities in the order they were created. @@ -1286,7 +1286,7 @@ /* ************************************** I18N related methods ************************************************* */ protected final Tool getTool(String toolSignature) { - return LdTemplateController.toolDAO.getToolBySignature(toolSignature); + return toolDAO.getToolBySignature(toolSignature); } class ToolDetails { Index: lams_central/src/java/org/lamsfoundation/lams/authoring/template/web/TBLTemplateController.java =================================================================== diff -u -r62aaf160878735888d077bf28fac3c1989bb8fbd -r54007f98ca71e0073f19c5db78536437123287c6 --- lams_central/src/java/org/lamsfoundation/lams/authoring/template/web/TBLTemplateController.java (.../TBLTemplateController.java) (revision 62aaf160878735888d077bf28fac3c1989bb8fbd) +++ lams_central/src/java/org/lamsfoundation/lams/authoring/template/web/TBLTemplateController.java (.../TBLTemplateController.java) (revision 54007f98ca71e0073f19c5db78536437123287c6) @@ -44,7 +44,6 @@ import org.lamsfoundation.lams.util.JsonUtil; import org.lamsfoundation.lams.util.ValidationUtil; import org.lamsfoundation.lams.util.WebUtil; -import org.lamsfoundation.lams.web.session.SessionManager; import org.lamsfoundation.lams.web.util.AttributeNames; import org.springframework.stereotype.Controller; import org.springframework.web.bind.annotation.RequestMapping; @@ -74,7 +73,7 @@ } @Override - protected ObjectNode createLearningDesign(HttpServletRequest request) throws Exception { + protected ObjectNode createLearningDesign(HttpServletRequest request, HttpSession httpSession) throws Exception { TBLData data = new TBLData(request); if (data.getErrorMessages() != null && data.getErrorMessages().size() > 0) { @@ -83,8 +82,7 @@ return restRequestJSON; } - HttpSession ss = SessionManager.getSession(); - UserDTO userDTO = (UserDTO) ss.getAttribute(AttributeNames.USER); + UserDTO userDTO = (UserDTO) httpSession.getAttribute(AttributeNames.USER); Integer workspaceFolderID = workspaceManagementService.getUserWorkspaceFolder(userDTO.getUserID()) .getResourceID().intValue(); AtomicInteger maxUIID = new AtomicInteger(); Index: lams_learning/src/java/org/lamsfoundation/lams/learning/web/controller/BranchingActivityController.java =================================================================== diff -u -r62aaf160878735888d077bf28fac3c1989bb8fbd -r54007f98ca71e0073f19c5db78536437123287c6 --- lams_learning/src/java/org/lamsfoundation/lams/learning/web/controller/BranchingActivityController.java (.../BranchingActivityController.java) (revision 62aaf160878735888d077bf28fac3c1989bb8fbd) +++ lams_learning/src/java/org/lamsfoundation/lams/learning/web/controller/BranchingActivityController.java (.../BranchingActivityController.java) (revision 54007f98ca71e0073f19c5db78536437123287c6) @@ -75,7 +75,7 @@ * Gets an options activity from the request (attribute) and forwards to the display JSP. */ @RequestMapping("/performBranching") - public String performBranching(@ModelAttribute("BranchingForm") BranchingForm branchForm, + public String performBranching(@ModelAttribute BranchingForm branchingForm, HttpServletRequest request, HttpServletResponse response) { ActivityMapping actionMappings = LearningWebUtil @@ -102,17 +102,17 @@ SequenceActivity branch = learnerService.determineBranch(learnerProgress.getLesson(), branchingActivity, learnerId); - branchForm.setActivityID(activity.getActivityId()); - branchForm.setProgressID(learnerProgress.getLearnerProgressId()); - branchForm.setShowFinishButton(Boolean.TRUE); - branchForm.setTitle(activity.getTitle()); + branchingForm.setActivityID(activity.getActivityId()); + branchingForm.setProgressID(learnerProgress.getLearnerProgressId()); + branchingForm.setShowFinishButton(Boolean.TRUE); + branchingForm.setTitle(activity.getTitle()); if (learnerProgress.getLesson().isPreviewLesson()) { // The preview version gives you a choice of branches // If a "normal" branch can be determined based on the group, tool marks, etc then it is marked as the default branch - branchForm.setPreviewLesson(Boolean.TRUE); + branchingForm.setPreviewLesson(Boolean.TRUE); forward = "branching/preview"; List activityURLs = new ArrayList<>(); @@ -127,21 +127,21 @@ } activityURLs.add(activityURL); } - branchForm.setActivityURLs(activityURLs); + branchingForm.setActivityURLs(activityURLs); } else if (branch == null) { // show the learner waiting page - branchForm.setPreviewLesson(Boolean.FALSE); + branchingForm.setPreviewLesson(Boolean.FALSE); forward = "branching/wait"; - branchForm.setShowNextButton(Boolean.TRUE); + branchingForm.setShowNextButton(Boolean.TRUE); if (branchingActivity.isChosenBranchingActivity()) { - branchForm.setType(BranchingActivity.CHOSEN_TYPE); + branchingForm.setType(BranchingActivity.CHOSEN_TYPE); } else if (branchingActivity.isGroupBranchingActivity()) { - branchForm.setType(BranchingActivity.GROUP_BASED_TYPE); + branchingForm.setType(BranchingActivity.GROUP_BASED_TYPE); } else if (branchingActivity.isToolBranchingActivity()) { - branchForm.setType(BranchingActivity.TOOL_BASED_TYPE); + branchingForm.setType(BranchingActivity.TOOL_BASED_TYPE); } // lessonId needed for the progress bar request.setAttribute(AttributeNames.PARAM_LESSON_ID, learnerProgress.getLesson().getLessonId()); @@ -165,7 +165,7 @@ * We are in the preview lesson and the author has selected a particular branch. Force it to take that branch. */ @RequestMapping("/forceBranching") - public String forceBranching(@ModelAttribute("BranchingForm") BranchingForm branchForm, + public String forceBranching(@ModelAttribute BranchingForm branchingForm, HttpServletRequest request) { ActivityMapping actionMappings = LearningWebUtil Index: lams_learning/src/java/org/lamsfoundation/lams/learning/web/controller/GateController.java =================================================================== diff -u -r62aaf160878735888d077bf28fac3c1989bb8fbd -r54007f98ca71e0073f19c5db78536437123287c6 --- lams_learning/src/java/org/lamsfoundation/lams/learning/web/controller/GateController.java (.../GateController.java) (revision 62aaf160878735888d077bf28fac3c1989bb8fbd) +++ lams_learning/src/java/org/lamsfoundation/lams/learning/web/controller/GateController.java (.../GateController.java) (revision 54007f98ca71e0073f19c5db78536437123287c6) @@ -115,7 +115,7 @@ * @throws IOException * @throws ServletException */ - @RequestMapping("") + @RequestMapping("knockGate") public String knockGate(@ModelAttribute GateForm gateForm, HttpServletRequest request, HttpServletResponse response) throws IOException, ServletException { boolean forceGate = WebUtil.readBooleanParam(request, GateController.PARAM_FORCE_GATE_OPEN, false); Index: lams_learning/src/java/org/lamsfoundation/lams/learning/web/controller/GroupingController.java =================================================================== diff -u -r62aaf160878735888d077bf28fac3c1989bb8fbd -r54007f98ca71e0073f19c5db78536437123287c6 --- lams_learning/src/java/org/lamsfoundation/lams/learning/web/controller/GroupingController.java (.../GroupingController.java) (revision 62aaf160878735888d077bf28fac3c1989bb8fbd) +++ lams_learning/src/java/org/lamsfoundation/lams/learning/web/controller/GroupingController.java (.../GroupingController.java) (revision 54007f98ca71e0073f19c5db78536437123287c6) @@ -98,14 +98,6 @@ public static final String VIEW_STUDENTS_BEFORE_SELECTION = "viewStudentsBeforeSelection"; // --------------------------------------------------------------------- - // Class level constants - Struts forward - // --------------------------------------------------------------------- - public static final String VIEW_GROUP = "viewGroup"; - public static final String WAIT_GROUP = "waitGroup"; - public static final String SHOW_GROUP = "showGroup"; - public static final String CHOOSE_GROUP = "chooseGroup"; - - // --------------------------------------------------------------------- // Struts Dispatch Method // --------------------------------------------------------------------- /** @@ -121,7 +113,7 @@ * @throws ServletException */ @RequestMapping("/performGrouping") - public String performGrouping(@ModelAttribute GroupingForm GroupingForm, HttpServletRequest request) + public String performGrouping(@ModelAttribute GroupingForm groupingForm, HttpServletRequest request) throws IOException, ServletException { boolean forceGroup = WebUtil.readBooleanParam(request, GroupingController.PARAM_FORCE_GROUPING, false); @@ -137,9 +129,9 @@ boolean groupingDone = learnerService.performGrouping(lessonId, activity.getActivityId(), LearningWebUtil.getUserId(), forceGroup); - GroupingForm.setPreviewLesson(learnerProgress.getLesson().isPreviewLesson()); - GroupingForm.setTitle(activity.getTitle()); - GroupingForm.setActivityID(activity.getActivityId()); + groupingForm.setPreviewLesson(learnerProgress.getLesson().isPreviewLesson()); + groupingForm.setTitle(activity.getTitle()); + groupingForm.setActivityID(activity.getActivityId()); request.setAttribute(AttributeNames.PARAM_LESSON_ID, lessonId); if (groupingDone) { @@ -263,7 +255,7 @@ * @throws ServletException */ @RequestMapping("/learnerChooseGroup") - public String learnerChooseGroup(@ModelAttribute GroupingForm GroupingForm, HttpServletRequest request) + public String learnerChooseGroup(@ModelAttribute GroupingForm groupingForm, HttpServletRequest request) throws IOException, ServletException { Activity activity = LearningWebUtil.getActivityFromRequest(request, learnerService); Long groupId = WebUtil.readLongParam(request, "groupId"); Index: lams_learning/src/java/org/lamsfoundation/lams/learning/web/util/ActivityMapping.java =================================================================== diff -u -r62aaf160878735888d077bf28fac3c1989bb8fbd -r54007f98ca71e0073f19c5db78536437123287c6 --- lams_learning/src/java/org/lamsfoundation/lams/learning/web/util/ActivityMapping.java (.../ActivityMapping.java) (revision 62aaf160878735888d077bf28fac3c1989bb8fbd) +++ lams_learning/src/java/org/lamsfoundation/lams/learning/web/util/ActivityMapping.java (.../ActivityMapping.java) (revision 54007f98ca71e0073f19c5db78536437123287c6) @@ -340,10 +340,10 @@ */ public String getDisplayActivityAction(Long lessonID) { if (lessonID != null) { - return WebUtil.appendParameterToURL("DisplayActivity.do", AttributeNames.PARAM_LESSON_ID, + return WebUtil.appendParameterToURL("/DisplayActivity.do", AttributeNames.PARAM_LESSON_ID, lessonID.toString()); } else { - return "DisplayActivity.do"; + return "/DisplayActivity.do"; } } Index: lams_learning/web/branching/preview.jsp =================================================================== diff -u -r0d0ccac606a59f73ed3209901b1d7d98371fb4be -r54007f98ca71e0073f19c5db78536437123287c6 --- lams_learning/web/branching/preview.jsp (.../preview.jsp) (revision 0d0ccac606a59f73ed3209901b1d7d98371fb4be) +++ lams_learning/web/branching/preview.jsp (.../preview.jsp) (revision 54007f98ca71e0073f19c5db78536437123287c6) @@ -29,8 +29,8 @@ <fmt:message key="label.branching.title"/> - /branching/performBranching.do?type=${BranchingForm.type}&activityID=${BranchingForm.activityID}&progressID=${BranchingForm.progressID} - + /branching/performBranching.do?type=${branchingForm.type}&activityID=${branchingForm.activityID}&progressID=${branchingForm.progressID} + &force=true @@ -65,7 +65,7 @@ } - +

@@ -75,11 +75,11 @@

+ action="forceBranching.do?type=${branchingForm.type}&activityID=${branchingForm.activityID}&progressID=${branchingForm.progressID}" + modelAttribute="branchingForm" target="_self" onsubmit="return validate();"> -
Index: lams_learning/web/branching/wait.jsp =================================================================== diff -u -r0e47126ed8d7024789b0e62c5c8e92d4f28510d2 -r54007f98ca71e0073f19c5db78536437123287c6 --- lams_learning/web/branching/wait.jsp (.../wait.jsp) (revision 0e47126ed8d7024789b0e62c5c8e92d4f28510d2) +++ lams_learning/web/branching/wait.jsp (.../wait.jsp) (revision 54007f98ca71e0073f19c5db78536437123287c6) @@ -29,20 +29,20 @@ <fmt:message key="label.branching.title"/> - /branching/performBranching.do?type=${BranchingForm.type}&activityID=${BranchingForm.activityID}&progressID=${BranchingForm.progressID} - + /branching/performBranching.do?type=${branchingForm.type}&activityID=${branchingForm.activityID}&progressID=${branchingForm.progressID} + &force=true - performBranching.do?type=${BranchingForm.type}&activityID=${BranchingForm.activityID}&progressID=${BranchingForm.progressID} + performBranching.do?type=${branchingForm.type}&activityID=${branchingForm.activityID}&progressID=${branchingForm.progressID} - + - +

Index: lams_learning/web/gate/conditionGateContent.jsp =================================================================== diff -u -rb546f3a46de916721f4d729ac1b0e64cc1eb9cb4 -r54007f98ca71e0073f19c5db78536437123287c6 --- lams_learning/web/gate/conditionGateContent.jsp (.../conditionGateContent.jsp) (revision b546f3a46de916721f4d729ac1b0e64cc1eb9cb4) +++ lams_learning/web/gate/conditionGateContent.jsp (.../conditionGateContent.jsp) (revision 54007f98ca71e0073f19c5db78536437123287c6) @@ -35,7 +35,7 @@ <c:out value="${title}" /> + CONTENT="60;URL=/gate/knockGate.do?activityID=${gateForm.activityID}&lessonID=${gateForm.lessonID }"> Index: lams_learning/web/gate/gateDescription.jsp =================================================================== diff -u -r7475d08afc280b5e2e5ddf04e8bf35e3166aaf80 -r54007f98ca71e0073f19c5db78536437123287c6 --- lams_learning/web/gate/gateDescription.jsp (.../gateDescription.jsp) (revision 7475d08afc280b5e2e5ddf04e8bf35e3166aaf80) +++ lams_learning/web/gate/gateDescription.jsp (.../gateDescription.jsp) (revision 54007f98ca71e0073f19c5db78536437123287c6) @@ -1,15 +1,15 @@ <%@ taglib uri="tags-core" prefix="c"%>
- +
- +
- +
- +
Index: lams_learning/web/gate/gateNext.jsp =================================================================== diff -u -r1f7150d6142f994d113ba543736a9f7c0e154337 -r54007f98ca71e0073f19c5db78536437123287c6 --- lams_learning/web/gate/gateNext.jsp (.../gateNext.jsp) (revision 1f7150d6142f994d113ba543736a9f7c0e154337) +++ lams_learning/web/gate/gateNext.jsp (.../gateNext.jsp) (revision 54007f98ca71e0073f19c5db78536437123287c6) @@ -1,20 +1,18 @@ - - + +
- +
- - &force=true +
- +