Index: lams_build/lib/lams/lams-monitoring.jar
===================================================================
RCS file: /usr/local/cvsroot/lams_build/lib/lams/lams-monitoring.jar,v
diff -u -r1.21 -r1.22
Binary files differ
Index: lams_monitoring/src/java/org/lamsfoundation/lams/monitoring/web/DummyMonitoringAction.java
===================================================================
RCS file: /usr/local/cvsroot/lams_monitoring/src/java/org/lamsfoundation/lams/monitoring/web/Attic/DummyMonitoringAction.java,v
diff -u -r1.9 -r1.10
--- lams_monitoring/src/java/org/lamsfoundation/lams/monitoring/web/DummyMonitoringAction.java	22 Dec 2005 01:25:33 -0000	1.9
+++ lams_monitoring/src/java/org/lamsfoundation/lams/monitoring/web/DummyMonitoringAction.java	20 Jan 2006 00:42:50 -0000	1.10
@@ -242,6 +242,37 @@
     }
 
     /**
+     * The Struts dispatch method to remove a lesson (marking the lesson by the given lesson ID
+     * as <code>Lesson.DISABLED_STATE</code> status).  Forwards to the control
+     * list jsp.
+     * 
+     * @param mapping An ActionMapping class that will be used by the Action class to tell
+     * the ActionServlet where to send the end-user.
+     *
+     * @param form The ActionForm class that will contain any data submitted
+     * by the end-user via a form.
+     * @param request A standard Servlet HttpServletRequest class.
+     * @param response A standard Servlet HttpServletResponse class.
+     * @return An ActionForward class that will be returned to the ActionServlet indicating where
+     *         the user is to go next.
+     * @throws IOException
+     * @throws ServletException
+     */
+    public ActionForward removeLesson(ActionMapping mapping,
+                                     ActionForm form,
+                                     HttpServletRequest request,
+                                     HttpServletResponse response) throws IOException,
+                                                                          ServletException
+    {
+        this.monitoringService = MonitoringServiceProxy.getMonitoringService(getServlet().getServletContext());
+
+        long lessonId = WebUtil.readLongParam(request,AttributeNames.PARAM_LESSON_ID);
+		monitoringService.removeLesson(lessonId);
+
+        return unspecified(mapping, form, request, response);
+    }
+
+    /**
      * The Struts dispatch method that lists a lesson's details. Forwards to the detail screen
      * 
      * @param mapping An ActionMapping class that will be used by the Action class to tell
Index: lams_monitoring/web/dummyControlFrame.jsp
===================================================================
RCS file: /usr/local/cvsroot/lams_monitoring/web/Attic/dummyControlFrame.jsp,v
diff -u -r1.3 -r1.4
--- lams_monitoring/web/dummyControlFrame.jsp	18 Jan 2006 01:03:20 -0000	1.3
+++ lams_monitoring/web/dummyControlFrame.jsp	20 Jan 2006 00:42:50 -0000	1.4
@@ -24,6 +24,7 @@
 		<tr><td><A HREF="<lams:WebAppURL/>dummy.do?method=initStartScreen" target="contentFrame">Start new lesson</a></td></tr>	
 		<tr><td><A HREF="<lams:WebAppURL/>dummy.do">Refresh List</a></td></tr>	
 		<TR><TD><HR></TD></TR>
+		<TR><TD>Current Lessons</TD></TR>
 		<c:forEach var="lesson" items="${lessons}">
 			<c:if test="${lesson.lessonStateId<6}">
 				<TR><TD><STRONG><c:out value="${lesson.lessonName}"/></STRONG>
@@ -41,6 +42,19 @@
 			<TR><TD><HR></TD></TR>
 			</c:if>
 		</c:forEach>
+		<TR><TD><HR></TD></TR>
+		<TR><TD>Archived Lessons</TD></TR>
+		<c:forEach var="lesson" items="${lessons}">
+			<c:if test="${lesson.lessonStateId==6}">
+				<TR><TD><STRONG><c:out value="${lesson.lessonName}"/></STRONG>
+				<BR><c:out value="${lesson.lessonDescription}"/>
+				<BR><A HREF="<lams:WebAppURL/>/dummy.do?method=getLesson&lessonID=<c:out value="${lesson.lessonId}"/>" target="contentFrame">Monitor Lesson</A>
+				<BR><A HREF="<lams:WebAppURL/>/dummy.do?method=removeLesson&lessonID=<c:out value="${lesson.lessonId}"/>">Remove Lesson</A>
+				</TD></TR>
+			<TR><TD><HR></TD></TR>
+			</c:if>
+		</c:forEach>
+		<!-- Don't display the removed lessons ie lessonStateId=7 -->
 	</table>
 	
 	</body>