Index: lams_monitoring/src/java/org/lamsfoundation/lams/monitoring/web/SequenceAction.java =================================================================== RCS file: /usr/local/cvsroot/lams_monitoring/src/java/org/lamsfoundation/lams/monitoring/web/SequenceAction.java,v diff -u -r1.1 -r1.2 --- lams_monitoring/src/java/org/lamsfoundation/lams/monitoring/web/SequenceAction.java 18 Oct 2007 07:36:53 -0000 1.1 +++ lams_monitoring/src/java/org/lamsfoundation/lams/monitoring/web/SequenceAction.java 19 Oct 2007 01:03:00 -0000 1.2 @@ -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/viewSequence.jsp =================================================================== RCS file: /usr/local/cvsroot/lams_monitoring/web/viewSequence.jsp,v diff -u -r1.1 -r1.2 --- lams_monitoring/web/viewSequence.jsp 18 Oct 2007 07:37:00 -0000 1.1 +++ lams_monitoring/web/viewSequence.jsp 19 Oct 2007 01:03:00 -0000 1.2 @@ -40,7 +40,7 @@ - + <%@ include file="../template/finishbutton.jsp" %> Index: lams_monitoring/web/WEB-INF/web.xml =================================================================== RCS file: /usr/local/cvsroot/lams_monitoring/web/WEB-INF/Attic/web.xml,v diff -u -r1.28 -r1.29 --- lams_monitoring/web/WEB-INF/web.xml 17 Jul 2007 01:27:37 -0000 1.28 +++ lams_monitoring/web/WEB-INF/web.xml 19 Oct 2007 01:03:00 -0000 1.29 @@ -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/WEB-INF/struts/struts-config.xml =================================================================== RCS file: /usr/local/cvsroot/lams_monitoring/web/WEB-INF/struts/Attic/struts-config.xml,v diff -u -r1.19 -r1.20 --- lams_monitoring/web/WEB-INF/struts/struts-config.xml 10 Oct 2007 07:12:40 -0000 1.19 +++ lams_monitoring/web/WEB-INF/struts/struts-config.xml 19 Oct 2007 01:03:00 -0000 1.20 @@ -61,6 +61,31 @@ /> + + + + + - - Index: lams_monitoring/web/WEB-INF/struts/tiles-defs.xml =================================================================== RCS file: /usr/local/cvsroot/lams_monitoring/web/WEB-INF/struts/Attic/tiles-defs.xml,v diff -u -r1.8 -r1.9 --- lams_monitoring/web/WEB-INF/struts/tiles-defs.xml 9 Jul 2007 05:41:34 -0000 1.8 +++ lams_monitoring/web/WEB-INF/struts/tiles-defs.xml 19 Oct 2007 01:03:00 -0000 1.9 @@ -49,4 +49,8 @@ + + + + \ No newline at end of file Index: lams_monitoring/web/branching/viewBranches.jsp =================================================================== RCS file: /usr/local/cvsroot/lams_monitoring/web/branching/viewBranches.jsp,v diff -u -r1.3 -r1.4 --- lams_monitoring/web/branching/viewBranches.jsp 17 Jul 2007 01:27:37 -0000 1.3 +++ lams_monitoring/web/branching/viewBranches.jsp 19 Oct 2007 01:03:00 -0000 1.4 @@ -61,7 +61,7 @@ - + <%@ include file="../template/finishbutton.jsp" %>