Exit the current lesson that is running in the leaner window. It + * expects lesson id passed as parameter from flash component. + * + * @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 exitLesson(ActionMapping mapping, + ActionForm form, + HttpServletRequest request, + HttpServletResponse response) throws IOException, + ServletException + { + + return null; + } + + /** + *
The struts dispatch action to retrieve the progress data from the + * server and tailor it into the object struture that expected by flash. + * A wddx packet with object data struture is sent back in the end of this + * call. It is used to construct or restore the flash learner progress + * bar
+ * + *As this process is expensive, the server is only expecting this call + * whenever is necessary. For example, starting, resuming and restoring + * a new lesson. And it should not happen every time that learner is + * progressing to next activity.
+ * + * @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 getFlashProgressData(ActionMapping mapping, + ActionForm form, + HttpServletRequest request, + HttpServletResponse response) throws IOException, + ServletException + { + + return null; + } + + + + /** * Helper method to retrieve the user data. We always load up from http * session first to optimize the performance. If no session cache available, * we load it from data source. Index: lams_learning/src/java/org/lamsfoundation/lams/learning/web/action/LoadToolActivityAction.java =================================================================== diff -u -r4e049aced5079eff1ff599aa4572624cc0314e59 -red8afe78a454a4b3b9d2ae039ac12d7ad9dc809a --- lams_learning/src/java/org/lamsfoundation/lams/learning/web/action/LoadToolActivityAction.java (.../LoadToolActivityAction.java) (revision 4e049aced5079eff1ff599aa4572624cc0314e59) +++ lams_learning/src/java/org/lamsfoundation/lams/learning/web/action/LoadToolActivityAction.java (.../LoadToolActivityAction.java) (revision ed8afe78a454a4b3b9d2ae039ac12d7ad9dc809a) @@ -52,11 +52,11 @@ * Gets an activity from the request (attribute) and forwards onto a * loading page. */ - public ActionForward execute( - ActionMapping mapping, - ActionForm actionForm, - HttpServletRequest request, - HttpServletResponse response) { + public ActionForward execute(ActionMapping mapping, + ActionForm actionForm, + HttpServletRequest request, + HttpServletResponse response) + { ActivityForm form = (ActivityForm)actionForm; ActivityMapping actionMappings = getActivityMapping(); @@ -78,8 +78,7 @@ activityURLs.add(activityURL); form.setActivityURLs(activityURLs); - String forward = "displayTool"; - return mapping.findForward(forward); + return mapping.findForward("displayTool"); } } \ No newline at end of file Index: lams_learning/test/java/org/lamsfoundation/lams/learning/service/TestLearnerService.java =================================================================== diff -u -ra1c82d1d104334920095e4e9132ac6d2c52bbce9 -red8afe78a454a4b3b9d2ae039ac12d7ad9dc809a --- lams_learning/test/java/org/lamsfoundation/lams/learning/service/TestLearnerService.java (.../TestLearnerService.java) (revision a1c82d1d104334920095e4e9132ac6d2c52bbce9) +++ lams_learning/test/java/org/lamsfoundation/lams/learning/service/TestLearnerService.java (.../TestLearnerService.java) (revision ed8afe78a454a4b3b9d2ae039ac12d7ad9dc809a) @@ -253,6 +253,15 @@ assertEquals("verify temp completed activities",1,testProgress.getCurrentCompletedActivitiesList().size()); } + public void testExitLesson() + { + learnerService.exitLesson(testProgress); + + LearnerProgress progress = learnerProgressDao.getLearnerProgressByLearner(testUser,testLesson); + + assertTrue("verify it should be restarting",progress.isRestarting()); + + } /** * @param numberOfAttemptedAct * @param testCompletedActivity Index: lams_learning/test/java/org/lamsfoundation/lams/learning/web/action/TestDisplayActivityAction.java =================================================================== diff -u -r47a0b22c0f3ff85ed2d419ad50912025d55c9cfa -red8afe78a454a4b3b9d2ae039ac12d7ad9dc809a --- lams_learning/test/java/org/lamsfoundation/lams/learning/web/action/TestDisplayActivityAction.java (.../TestDisplayActivityAction.java) (revision 47a0b22c0f3ff85ed2d419ad50912025d55c9cfa) +++ lams_learning/test/java/org/lamsfoundation/lams/learning/web/action/TestDisplayActivityAction.java (.../TestDisplayActivityAction.java) (revision ed8afe78a454a4b3b9d2ae039ac12d7ad9dc809a) @@ -23,6 +23,10 @@ package org.lamsfoundation.lams.learning.web.action; import org.lamsfoundation.lams.AbstractLamsStrutsTestCase; +import org.lamsfoundation.lams.learning.web.bean.SessionBean; +import org.lamsfoundation.lams.learningdesign.OptionsActivity; +import org.lamsfoundation.lams.learningdesign.ParallelActivity; +import org.lamsfoundation.lams.lesson.LearnerProgress; /** @@ -36,7 +40,7 @@ { private static final String TEST_USER_ID = "2"; private static final String TEST_LESSON_ID = "2"; - + private static SessionBean testBean = null; /** * Constructor for TestDisplayActivityAction. * @param arg0 @@ -87,10 +91,87 @@ addRequestParameter("lessonId", TEST_LESSON_ID); actionPerform(); + testBean = (SessionBean)httpSession.getAttribute(SessionBean.NAME); + //test page loading. setRequestPathInfo("/DisplayActivity.do"); actionPerform(); verifyForward("loadToolActivity"); } + + public void testDisplayToolActivityFollowingParallelActivity() + { + //setup the session bean to display option page. + LearnerProgress progress = testBean.getLearnerProgress(); + ParallelActivity parallelActivity= new ParallelActivity(); + progress.setPreviousActivity(parallelActivity); + testBean.setLearnerProgress(progress); + httpSession.setAttribute(SessionBean.NAME,testBean); + + setRequestPathInfo("/DisplayActivity.do"); + actionPerform(); + verifyForwardPath("/requestDisplay.do?url=http://localhost:8080/lams_learning//LoadToolActivity.do?activityId=26"); + + //restore the progress + progress = testBean.getLearnerProgress(); + progress.setPreviousActivity(null); + testBean.setLearnerProgress(progress); + } + + public void testDisplayOptionsActivity() + { + //setup the session bean to display option page. + LearnerProgress progress = testBean.getLearnerProgress(); + OptionsActivity optionActivity= new OptionsActivity(); + progress.setNextActivity(optionActivity); + testBean.setLearnerProgress(progress); + httpSession.setAttribute(SessionBean.NAME,testBean); + + setRequestPathInfo("/DisplayActivity.do"); + actionPerform(); + verifyForward("displayOptionsActivity"); + } + public void testDisplayParallelActivity() + { + //setup the session bean to display option page. + LearnerProgress progress = testBean.getLearnerProgress(); + ParallelActivity parallelActivity= new ParallelActivity(); + progress.setNextActivity(parallelActivity); + testBean.setLearnerProgress(progress); + httpSession.setAttribute(SessionBean.NAME,testBean); + + setRequestPathInfo("/DisplayActivity.do"); + actionPerform(); + verifyForward("displayParallelActivity"); + } + + + + public void testDisplayWaitingParallelActivity() + { + //setup the session bean to display parallel waiting. + LearnerProgress progress = testBean.getLearnerProgress(); + progress.setParallelWaiting(true); + testBean.setLearnerProgress(progress); + httpSession.setAttribute(SessionBean.NAME,testBean); + + setRequestPathInfo("/DisplayActivity.do"); + actionPerform(); + verifyForward("parallelWait"); + } + + public void testDisplayCompletionPage() + { + //setup the session bean to display completion page. + LearnerProgress progress = testBean.getLearnerProgress(); + progress.setLessonComplete(true); + testBean.setLearnerProgress(progress); + httpSession.setAttribute(SessionBean.NAME,testBean); + + setRequestPathInfo("/DisplayActivity.do"); + actionPerform(); + verifyForward("lessonComplete"); + + } } Index: lams_learning/test/java/org/lamsfoundation/lams/learning/web/action/TestLearnerAction.java =================================================================== diff -u -r47a0b22c0f3ff85ed2d419ad50912025d55c9cfa -red8afe78a454a4b3b9d2ae039ac12d7ad9dc809a --- lams_learning/test/java/org/lamsfoundation/lams/learning/web/action/TestLearnerAction.java (.../TestLearnerAction.java) (revision 47a0b22c0f3ff85ed2d419ad50912025d55c9cfa) +++ lams_learning/test/java/org/lamsfoundation/lams/learning/web/action/TestLearnerAction.java (.../TestLearnerAction.java) (revision ed8afe78a454a4b3b9d2ae039ac12d7ad9dc809a) @@ -94,7 +94,6 @@ actionPerform(); - verifyForward("displayActivity"); verifyNoActionErrors(); SessionBean bean = (SessionBean)httpSession.getAttribute(SessionBean.NAME); Index: lams_learning/test/web/WEB-INF/spring/learningApplicationContext.xml =================================================================== diff -u -r47a0b22c0f3ff85ed2d419ad50912025d55c9cfa -red8afe78a454a4b3b9d2ae039ac12d7ad9dc809a --- lams_learning/test/web/WEB-INF/spring/learningApplicationContext.xml (.../learningApplicationContext.xml) (revision 47a0b22c0f3ff85ed2d419ad50912025d55c9cfa) +++ lams_learning/test/web/WEB-INF/spring/learningApplicationContext.xml (.../learningApplicationContext.xml) (revision ed8afe78a454a4b3b9d2ae039ac12d7ad9dc809a) @@ -30,6 +30,7 @@|
+
+
+ Select an Activity Sequence from the panel on the left to begin. +You may start a new sequence, resume an existing sequence or view a completed sequence. + |
+