Index: lams_monitoring/src/java/org/lamsfoundation/lams/monitoring/web/SequenceAction.java =================================================================== diff -u -r95eba499e8c3bafed1173499dd0e0547ee0a40ef -r3a4c502dd96ac40fd96827f36bc450158b145113 --- lams_monitoring/src/java/org/lamsfoundation/lams/monitoring/web/SequenceAction.java (.../SequenceAction.java) (revision 95eba499e8c3bafed1173499dd0e0547ee0a40ef) +++ lams_monitoring/src/java/org/lamsfoundation/lams/monitoring/web/SequenceAction.java (.../SequenceAction.java) (revision 3a4c502dd96ac40fd96827f36bc450158b145113) @@ -25,12 +25,7 @@ package org.lamsfoundation.lams.monitoring.web; import java.io.IOException; -import java.util.HashSet; -import java.util.Iterator; import java.util.List; -import java.util.Set; -import java.util.SortedSet; -import java.util.TreeSet; import javax.servlet.ServletException; import javax.servlet.http.HttpServletRequest; @@ -39,13 +34,8 @@ import org.apache.struts.action.ActionForm; import org.apache.struts.action.ActionForward; import org.apache.struts.action.ActionMapping; -import org.lamsfoundation.lams.learningdesign.Activity; import org.lamsfoundation.lams.learningdesign.BranchingActivity; -import org.lamsfoundation.lams.learningdesign.Group; -import org.lamsfoundation.lams.learningdesign.BranchActivityEntry; import org.lamsfoundation.lams.learningdesign.SequenceActivity; -import org.lamsfoundation.lams.monitoring.BranchDTO; -import org.lamsfoundation.lams.monitoring.BranchingDTO; import org.lamsfoundation.lams.monitoring.service.IMonitoringService; import org.lamsfoundation.lams.monitoring.service.MonitoringServiceProxy; import org.lamsfoundation.lams.usermanagement.User; @@ -84,7 +74,7 @@ long activityId = WebUtil.readLongParam(request, AttributeNames.PARAM_ACTIVITY_ID); IMonitoringService monitoringService = MonitoringServiceProxy.getMonitoringService(getServlet().getServletContext()); - SequenceActivity activity = (SequenceActivity) monitoringService.getActivityById(activityId, BranchingActivity.class); + SequenceActivity activity = (SequenceActivity) monitoringService.getActivityById(activityId, SequenceActivity.class); return viewSequence(activity, lessonId, true, mapping, request, monitoringService); } @@ -101,7 +91,7 @@ long activityId = WebUtil.readLongParam(request, AttributeNames.PARAM_ACTIVITY_ID); IMonitoringService monitoringService = MonitoringServiceProxy.getMonitoringService(getServlet().getServletContext()); - SequenceActivity activity = (SequenceActivity) monitoringService.getActivityById(activityId, BranchingActivity.class); + SequenceActivity activity = (SequenceActivity) monitoringService.getActivityById(activityId, SequenceActivity.class); return viewSequence(activity, lessonId, false, mapping, request, monitoringService); } Index: lams_monitoring/web/WEB-INF/struts/struts-config.xml =================================================================== diff -u -reb02d23e4734503baf51538aefd7e345b0c45ec4 -r3a4c502dd96ac40fd96827f36bc450158b145113 --- lams_monitoring/web/WEB-INF/struts/struts-config.xml (.../struts-config.xml) (revision eb02d23e4734503baf51538aefd7e345b0c45ec4) +++ lams_monitoring/web/WEB-INF/struts/struts-config.xml (.../struts-config.xml) (revision 3a4c502dd96ac40fd96827f36bc450158b145113) @@ -61,6 +61,31 @@ /> + + + + + - - Index: lams_monitoring/web/WEB-INF/struts/tiles-defs.xml =================================================================== diff -u -rae679fd2cd995020670af485a110f19e84b117e9 -r3a4c502dd96ac40fd96827f36bc450158b145113 --- lams_monitoring/web/WEB-INF/struts/tiles-defs.xml (.../tiles-defs.xml) (revision ae679fd2cd995020670af485a110f19e84b117e9) +++ lams_monitoring/web/WEB-INF/struts/tiles-defs.xml (.../tiles-defs.xml) (revision 3a4c502dd96ac40fd96827f36bc450158b145113) @@ -49,4 +49,8 @@ + + + + \ No newline at end of file Index: lams_monitoring/web/WEB-INF/web.xml =================================================================== diff -u -rccf0c98665da622cc43ff39393de652596752cdf -r3a4c502dd96ac40fd96827f36bc450158b145113 --- lams_monitoring/web/WEB-INF/web.xml (.../web.xml) (revision ccf0c98665da622cc43ff39393de652596752cdf) +++ lams_monitoring/web/WEB-INF/web.xml (.../web.xml) (revision 3a4c502dd96ac40fd96827f36bc450158b145113) @@ -78,11 +78,6 @@ - createLessonClass - org.lamsfoundation.lams.monitoring.web.CreateLessonServlet - - - branchingExportPortfolio org.lamsfoundation.lams.monitoring.web.BranchingExportPortfolioServlet @@ -92,7 +87,17 @@ org.lamsfoundation.lams.monitoring.web.GateExportPortfolioServlet + + sequenceExportPortfolio + org.lamsfoundation.lams.monitoring.web.SequenceExportPortfolioServlet + + + createLessonClass + org.lamsfoundation.lams.monitoring.web.CreateLessonServlet + + + action org.apache.struts.action.ActionServlet @@ -129,17 +134,21 @@ /monitoring/performChosenGrouping - createLessonClass - /createLessonClass - - branchingExportPortfolio /branchingExportPortfolio gateExportPortfolio /gateExportPortfolio + + sequenceExportPortfolio + /sequenceExportPortfolio + + + createLessonClass + /createLessonClass + 120 Index: lams_monitoring/web/branching/viewBranches.jsp =================================================================== diff -u -rccf0c98665da622cc43ff39393de652596752cdf -r3a4c502dd96ac40fd96827f36bc450158b145113 --- lams_monitoring/web/branching/viewBranches.jsp (.../viewBranches.jsp) (revision ccf0c98665da622cc43ff39393de652596752cdf) +++ lams_monitoring/web/branching/viewBranches.jsp (.../viewBranches.jsp) (revision 3a4c502dd96ac40fd96827f36bc450158b145113) @@ -61,7 +61,7 @@ - + <%@ include file="../template/finishbutton.jsp" %> Index: lams_monitoring/web/viewSequence.jsp =================================================================== diff -u -r95eba499e8c3bafed1173499dd0e0547ee0a40ef -r3a4c502dd96ac40fd96827f36bc450158b145113 --- lams_monitoring/web/viewSequence.jsp (.../viewSequence.jsp) (revision 95eba499e8c3bafed1173499dd0e0547ee0a40ef) +++ lams_monitoring/web/viewSequence.jsp (.../viewSequence.jsp) (revision 3a4c502dd96ac40fd96827f36bc450158b145113) @@ -40,7 +40,7 @@ - + <%@ include file="../template/finishbutton.jsp" %>