Index: lams_learning/src/java/org/lamsfoundation/lams/learning/export/service/ExportPortfolioService.java =================================================================== diff -u -r2bfd4245ec82b86c782db4a9be15f24c3e9a6ccc -r6c93a29e621c20da5662066e4be018eab3f5d17d --- lams_learning/src/java/org/lamsfoundation/lams/learning/export/service/ExportPortfolioService.java (.../ExportPortfolioService.java) (revision 2bfd4245ec82b86c782db4a9be15f24c3e9a6ccc) +++ lams_learning/src/java/org/lamsfoundation/lams/learning/export/service/ExportPortfolioService.java (.../ExportPortfolioService.java) (revision 6c93a29e621c20da5662066e4be018eab3f5d17d) @@ -199,7 +199,7 @@ if (learner != null && lesson != null) { - LearnerProgress learnerProgress = learnerService.getProgress(learner.getUserId(), lesson); + LearnerProgress learnerProgress = learnerService.getProgress(learner.getUserId(), lesson.getLessonId()); if (learnerProgress != null) { Index: lams_learning/src/java/org/lamsfoundation/lams/learning/progress/ProgressEngine.java =================================================================== diff -u -r2b6827b06455b7269c88062bd218427529ee0a4c -r6c93a29e621c20da5662066e4be018eab3f5d17d --- lams_learning/src/java/org/lamsfoundation/lams/learning/progress/ProgressEngine.java (.../ProgressEngine.java) (revision 2b6827b06455b7269c88062bd218427529ee0a4c) +++ lams_learning/src/java/org/lamsfoundation/lams/learning/progress/ProgressEngine.java (.../ProgressEngine.java) (revision 6c93a29e621c20da5662066e4be018eab3f5d17d) @@ -27,9 +27,15 @@ import java.util.LinkedList; import java.util.List; -import org.lamsfoundation.lams.learningdesign.*; +import org.lamsfoundation.lams.learningdesign.Activity; +import org.lamsfoundation.lams.learningdesign.ComplexActivity; +import org.lamsfoundation.lams.learningdesign.LearningDesign; +import org.lamsfoundation.lams.learningdesign.SequenceActivity; +import org.lamsfoundation.lams.learningdesign.Transition; import org.lamsfoundation.lams.learningdesign.dao.IActivityDAO; -import org.lamsfoundation.lams.lesson.*; +import org.lamsfoundation.lams.lesson.LearnerProgress; +import org.lamsfoundation.lams.lesson.Lesson; +import org.lamsfoundation.lams.lesson.ParallelWaitActivity; import org.lamsfoundation.lams.usermanagement.User; /** @@ -63,7 +69,6 @@ * @throws ProgressException if progress cannot be calculated successfully. */ public LearnerProgress calculateProgress(User learner, - Lesson lesson, Activity completedActivity, LearnerProgress learnerProgress) throws ProgressException { @@ -78,7 +83,6 @@ transition); else return progressParentActivity(learner, - lesson, completedActivity, learnerProgress); } @@ -165,7 +169,6 @@ * @throws ProgressException */ private LearnerProgress progressParentActivity(User learner, - Lesson lesson, Activity completedActivity, LearnerProgress learnerProgress) throws ProgressException { @@ -211,7 +214,7 @@ //recurvisely call back to calculateProgress to calculate completed //parent activity. else - calculateProgress(learner, lesson, parent, learnerProgress); + calculateProgress(learner, parent, learnerProgress); } //lesson is meant to be completed if there is no transition and no parent. else Index: lams_learning/src/java/org/lamsfoundation/lams/learning/service/ILearnerService.java =================================================================== diff -u -r2bfd4245ec82b86c782db4a9be15f24c3e9a6ccc -r6c93a29e621c20da5662066e4be018eab3f5d17d --- lams_learning/src/java/org/lamsfoundation/lams/learning/service/ILearnerService.java (.../ILearnerService.java) (revision 2bfd4245ec82b86c782db4a9be15f24c3e9a6ccc) +++ lams_learning/src/java/org/lamsfoundation/lams/learning/service/ILearnerService.java (.../ILearnerService.java) (revision 6c93a29e621c20da5662066e4be018eab3f5d17d) @@ -69,11 +69,11 @@ /** * Returns the current progress data of the User. * @param learnerId the Learner's userID - * @param lesson the Lesson to get progress from. + * @param lessonId the Lesson to get progress from. * @return LearnerProgess contains the learner's progress for the lesson. * @throws LearnerServiceException in case of problems. */ - public LearnerProgress getProgress(Integer learnerId, Lesson lesson); + public LearnerProgress getProgress(Integer learnerId, Long lessonId); /** * Return the current progress data against progress id. @@ -93,22 +93,22 @@ /** * Marks an activity as attempted. Called when a user selects an OptionsActivity. * @param learnerId the Learner's userID - * @param lesson the Lesson to get progress from. + * @param lessonId the Lesson to get progress from. * @param activity the activity being attempted. * @return LearnerProgress */ - public LearnerProgress chooseActivity(Integer learnerId, Lesson lesson, Activity activity); + public LearnerProgress chooseActivity(Integer learnerId, Long lessonId, Activity activity); /** * Calculates learner progress and returns the data required to be displayed to the learner (including URL(s)). * @param completedActivityID identifies the activity just completed * @param learner the Learner - * @param lesson the Lesson in progress. + * @param lessonId the Lesson in progress. * @return the bean containing the display data for the Learner * @throws LearnerServiceException in case of problems. */ - public LearnerProgress calculateProgress(Activity completedActivity, Integer learnerId, Lesson lesson); + public LearnerProgress calculateProgress(Activity completedActivity, Integer learnerId, Long lessonId); /** @@ -148,10 +148,10 @@ * * @param learnerId the learner who are running this activity in the design. * @param activity the activity is being run. - * @param lesson the lesson this learner is currently in. + * @param lessonId the lesson this learner is currently in. * @return the url for next activity. */ - public String completeActivity(Integer learnerId,Activity activity,Lesson lesson); + public String completeActivity(Integer learnerId,Activity activity,Long lessonId); /** * Retrieve all lessons that has been started, suspended or finished. All Index: lams_learning/src/java/org/lamsfoundation/lams/learning/service/LearnerService.java =================================================================== diff -u -r2b6827b06455b7269c88062bd218427529ee0a4c -r6c93a29e621c20da5662066e4be018eab3f5d17d --- lams_learning/src/java/org/lamsfoundation/lams/learning/service/LearnerService.java (.../LearnerService.java) (revision 2b6827b06455b7269c88062bd218427529ee0a4c) +++ lams_learning/src/java/org/lamsfoundation/lams/learning/service/LearnerService.java (.../LearnerService.java) (revision 6c93a29e621c20da5662066e4be018eab3f5d17d) @@ -224,7 +224,7 @@ User learner = userManagementService.getUserById(learnerId); Lesson lesson = getLesson(lessonID); - LearnerProgress learnerProgress = learnerProgressDAO.getLearnerProgressByLearner(learner.getUserId(),lesson); + LearnerProgress learnerProgress = learnerProgressDAO.getLearnerProgressByLearner(learner.getUserId(),lessonID); if(learnerProgress==null) { @@ -262,13 +262,13 @@ /** * Returns the current progress data of the User. * @param learnerId the Learner's userID - * @param lesson the Lesson to get progress from. + * @param lessonId the Lesson to get progress from. * @return LearnerProgess contains the learner's progress for the lesson. * @throws LearnerServiceException in case of problems. */ - public LearnerProgress getProgress(Integer learnerId, Lesson lesson) + public LearnerProgress getProgress(Integer learnerId, Long lessonId) { - return learnerProgressDAO.getLearnerProgressByLearner(learnerId, lesson); + return learnerProgressDAO.getLearnerProgressByLearner(learnerId, lessonId); } /** @@ -288,11 +288,11 @@ } /** - * @see org.lamsfoundation.lams.learning.service.ILearnerService#chooseActivity(org.lamsfoundation.lams.usermanagement.User, org.lamsfoundation.lams.lesson.Lesson, org.lamsfoundation.lams.learningdesign.Activity) + * @see org.lamsfoundation.lams.learning.service.ILearnerService#chooseActivity(org.lamsfoundation.lams.usermanagement.User, java.lang.Long, org.lamsfoundation.lams.learningdesign.Activity) */ - public LearnerProgress chooseActivity(Integer learnerId, Lesson lesson, Activity activity) + public LearnerProgress chooseActivity(Integer learnerId, Long lessonId, Activity activity) { - LearnerProgress progress = learnerProgressDAO.getLearnerProgressByLearner(learnerId, lesson); + LearnerProgress progress = learnerProgressDAO.getLearnerProgressByLearner(learnerId, lessonId); progress.setProgressState(activity, LearnerProgress.ACTIVITY_ATTEMPTED); progress.setCurrentActivity(activity); progress.setNextActivity(activity); @@ -304,23 +304,22 @@ /** * Calculates learner progress and returns the data required to be displayed * to the learner. - * TODO need to initialize tool session for next activity if necessary. * @param completedActivityID identifies the activity just completed * @param learner the Learner - * @param lesson the Lesson in progress. + * @param lessonId the Lesson in progress. * @return the bean containing the display data for the Learner * @throws LamsToolServiceException * @throws LearnerServiceException in case of problems. */ public LearnerProgress calculateProgress(Activity completedActivity, Integer learnerId, - Lesson lesson) + Long lessonId) { - LearnerProgress learnerProgress = learnerProgressDAO.getLearnerProgressByLearner(learnerId,lesson); + LearnerProgress learnerProgress = learnerProgressDAO.getLearnerProgressByLearner(learnerId,lessonId); try { - learnerProgress = progressEngine.calculateProgress(learnerProgress.getUser(), lesson, completedActivity,learnerProgress); + learnerProgress = progressEngine.calculateProgress(learnerProgress.getUser(), completedActivity,learnerProgress); learnerProgressDAO.updateLearnerProgress(learnerProgress); createToolSessionsIfNecessary(learnerProgress); @@ -329,11 +328,6 @@ { throw new LearnerServiceException(e.getMessage()); } -/* catch (LamsToolServiceException e) - { - throw new LearnerServiceException(e.getMessage()); - } -*/ return learnerProgress; } @@ -350,22 +344,21 @@ lamsCoreToolService.updateToolSession(toolSession); - return completeActivity(new Integer(learnerId.intValue()), toolSession.getToolActivity(), toolSession.getLesson()); + return completeActivity(new Integer(learnerId.intValue()), toolSession.getToolActivity(), toolSession.getLesson().getLessonId()); } /** * @see org.lamsfoundation.lams.learning.service.ILearnerService#completeActivity(java.lang.Integer, java.lang.Long, java.lang.Long) */ public String completeActivity(Integer learnerId,Long activityId,Long lessonId) { Activity activity = getActivity(activityId); - Lesson lesson = getLesson(lessonId); - return completeActivity(learnerId, activity,lesson); + return completeActivity(learnerId, activity,lessonId); } /** - * @see org.lamsfoundation.lams.learning.service.ILearnerService#completeActivity(java.lang.Integer, org.lamsfoundation.lams.learningdesign.Activity,org.lamsfoundation.lams.lesson.Lesson ) + * @see org.lamsfoundation.lams.learning.service.ILearnerService#completeActivity(java.lang.Integer, org.lamsfoundation.lams.learningdesign.Activity, java.lang.Long ) */ - public String completeActivity(Integer learnerId,Activity activity,Lesson lesson) + public String completeActivity(Integer learnerId,Activity activity,Long lessonId) { //build up the url for next activity. @@ -375,7 +368,7 @@ // is triggered from a tool calling completeToolSession, its a bit hard to avoid. try { - LearnerProgress nextLearnerProgress = calculateProgress(activity, learnerId, lesson); + LearnerProgress nextLearnerProgress = calculateProgress(activity, learnerId, lessonId); LearningWebUtil.setLearnerProgress(nextLearnerProgress); return activityMapping.getProgressURL(nextLearnerProgress); } Index: lams_learning/src/java/org/lamsfoundation/lams/learning/web/action/ChooseActivityAction.java =================================================================== diff -u -r2bfd4245ec82b86c782db4a9be15f24c3e9a6ccc -r6c93a29e621c20da5662066e4be018eab3f5d17d --- lams_learning/src/java/org/lamsfoundation/lams/learning/web/action/ChooseActivityAction.java (.../ChooseActivityAction.java) (revision 2bfd4245ec82b86c782db4a9be15f24c3e9a6ccc) +++ lams_learning/src/java/org/lamsfoundation/lams/learning/web/action/ChooseActivityAction.java (.../ChooseActivityAction.java) (revision 6c93a29e621c20da5662066e4be018eab3f5d17d) @@ -69,7 +69,7 @@ } // Get learner and lesson details. - Integer learner = LearningWebUtil.getUserId(getServlet().getServletContext()); + Integer learner = LearningWebUtil.getUserId(); LearnerProgress progress = getLearnerProgress(request); Lesson lesson = progress.getLesson(); @@ -81,7 +81,7 @@ } ILearnerService learnerService = getLearnerService(); - learnerService.chooseActivity(learner, lesson, activity); + learnerService.chooseActivity(learner, lesson.getLessonId(), activity); ActionForward forward = actionMappings.getActivityForward(activity, progress, true); return forward; Index: lams_learning/src/java/org/lamsfoundation/lams/learning/web/action/CompleteActivityAction.java =================================================================== diff -u -r2b6827b06455b7269c88062bd218427529ee0a4c -r6c93a29e621c20da5662066e4be018eab3f5d17d --- lams_learning/src/java/org/lamsfoundation/lams/learning/web/action/CompleteActivityAction.java (.../CompleteActivityAction.java) (revision 2b6827b06455b7269c88062bd218427529ee0a4c) +++ lams_learning/src/java/org/lamsfoundation/lams/learning/web/action/CompleteActivityAction.java (.../CompleteActivityAction.java) (revision 6c93a29e621c20da5662066e4be018eab3f5d17d) @@ -72,7 +72,7 @@ return mapping.findForward(ActivityMapping.DOUBLE_SUBMIT_ERROR); } - Integer learnerId = LearningWebUtil.getUserId(getServlet().getServletContext()); + Integer learnerId = LearningWebUtil.getUserId(); LearnerProgress progress = getLearnerProgress(request); Lesson lesson = progress.getLesson(); Activity activity = LearningWebUtil.getActivityFromRequest(request, getLearnerService()); @@ -86,7 +86,7 @@ // Set activity as complete try { - progress = learnerService.calculateProgress(activity, learnerId, lesson); + progress = learnerService.calculateProgress(activity, learnerId, lesson.getLessonId()); } catch (LearnerServiceException e) { return mapping.findForward("error"); Index: lams_learning/src/java/org/lamsfoundation/lams/learning/web/action/DummyLearnerAction.java =================================================================== diff -u -r2bfd4245ec82b86c782db4a9be15f24c3e9a6ccc -r6c93a29e621c20da5662066e4be018eab3f5d17d --- lams_learning/src/java/org/lamsfoundation/lams/learning/web/action/DummyLearnerAction.java (.../DummyLearnerAction.java) (revision 2bfd4245ec82b86c782db4a9be15f24c3e9a6ccc) +++ lams_learning/src/java/org/lamsfoundation/lams/learning/web/action/DummyLearnerAction.java (.../DummyLearnerAction.java) (revision 6c93a29e621c20da5662066e4be018eab3f5d17d) @@ -105,7 +105,7 @@ ILearnerService learnerService = LearnerServiceProxy.getLearnerService(getServlet().getServletContext()); //get learner. - Integer learner = LearningWebUtil.getUserId(getServlet().getServletContext()); + Integer learner = LearningWebUtil.getUserId(); if(log.isDebugEnabled()) log.debug("Getting active lessons for leaner:["+learner+"]"); @@ -143,7 +143,7 @@ ILearnerService learnerService = LearnerServiceProxy.getLearnerService(getServlet().getServletContext()); //get user and lesson based on request. - Integer learner = LearningWebUtil.getUserId(getServlet().getServletContext()); + Integer learner = LearningWebUtil.getUserId(); long lessonID = WebUtil.readLongParam(request,LearningWebUtil.PARAM_LESSON_ID); Index: lams_learning/src/java/org/lamsfoundation/lams/learning/web/action/GroupingAction.java =================================================================== diff -u -r2bfd4245ec82b86c782db4a9be15f24c3e9a6ccc -r6c93a29e621c20da5662066e4be018eab3f5d17d --- lams_learning/src/java/org/lamsfoundation/lams/learning/web/action/GroupingAction.java (.../GroupingAction.java) (revision 2bfd4245ec82b86c782db4a9be15f24c3e9a6ccc) +++ lams_learning/src/java/org/lamsfoundation/lams/learning/web/action/GroupingAction.java (.../GroupingAction.java) (revision 6c93a29e621c20da5662066e4be018eab3f5d17d) @@ -123,7 +123,7 @@ learnerProgress.getNextActivity().getActivityId()); LearningWebUtil.putActivityInRequest(request, learnerProgress.getNextActivity(), learnerService); - LearningWebUtil.setLessonData(learnerProgress.getLesson()); + LearningWebUtil.setLessonId(learnerProgress.getLesson().getLessonId()); return mapping.findForward(VIEW_GROUPING); } @@ -184,7 +184,7 @@ String nextActivityUrl = learnerService.completeActivity(learnerProgress.getUser().getUserId(), groupingActivity, - learnerProgress.getLesson()); + learnerProgress.getLesson().getLessonId()); response.sendRedirect(nextActivityUrl); Index: lams_learning/src/java/org/lamsfoundation/lams/learning/web/action/LearnerAction.java =================================================================== diff -u -r2b6827b06455b7269c88062bd218427529ee0a4c -r6c93a29e621c20da5662066e4be018eab3f5d17d --- lams_learning/src/java/org/lamsfoundation/lams/learning/web/action/LearnerAction.java (.../LearnerAction.java) (revision 2b6827b06455b7269c88062bd218427529ee0a4c) +++ lams_learning/src/java/org/lamsfoundation/lams/learning/web/action/LearnerAction.java (.../LearnerAction.java) (revision 6c93a29e621c20da5662066e4be018eab3f5d17d) @@ -145,7 +145,7 @@ try { //get user and lesson based on request. - Integer learner = LearningWebUtil.getUserId(getServlet().getServletContext()); + Integer learner = LearningWebUtil.getUserId(); long lessonID = WebUtil.readLongParam(request,LearningWebUtil.PARAM_LESSON_ID); @@ -368,7 +368,7 @@ ILearnerService learnerService = LearnerServiceProxy.getLearnerService(getServlet().getServletContext()); //getting requested object according to coming parameters - Integer learnerId = LearningWebUtil.getUserId(getServlet().getServletContext()); + Integer learnerId = LearningWebUtil.getUserId(); User learner = LearnerServiceProxy.getUserManagementService(getServlet().getServletContext()).getUserById(learnerId); Activity requestedActivity = learnerService.getActivity(new Long(activityId)); Index: lams_learning/src/java/org/lamsfoundation/lams/learning/web/util/LearningWebUtil.java =================================================================== diff -u -r2bfd4245ec82b86c782db4a9be15f24c3e9a6ccc -r6c93a29e621c20da5662066e4be018eab3f5d17d --- lams_learning/src/java/org/lamsfoundation/lams/learning/web/util/LearningWebUtil.java (.../LearningWebUtil.java) (revision 2bfd4245ec82b86c782db4a9be15f24c3e9a6ccc) +++ lams_learning/src/java/org/lamsfoundation/lams/learning/web/util/LearningWebUtil.java (.../LearningWebUtil.java) (revision 6c93a29e621c20da5662066e4be018eab3f5d17d) @@ -33,7 +33,6 @@ import org.lamsfoundation.lams.learning.web.action.ActivityAction; import org.lamsfoundation.lams.learningdesign.Activity; import org.lamsfoundation.lams.lesson.LearnerProgress; -import org.lamsfoundation.lams.lesson.Lesson; import org.lamsfoundation.lams.usermanagement.dto.UserDTO; import org.lamsfoundation.lams.util.WebUtil; import org.lamsfoundation.lams.web.session.SessionManager; @@ -54,7 +53,6 @@ //--------------------------------------------------------------------- // Class level constants - session attributes //--------------------------------------------------------------------- - public static final String ATTR_LESSON_DATA = "lesson"; public static final String PARAM_LESSON_ID = "lessonId"; public static final String PARAM_ACTIVITY_ID = "activityId"; public static final String PARAM_PROGRESS_ID = "progressId"; @@ -68,54 +66,51 @@ * @param surveyService the service facade of survey tool * @return the user data value object */ - public static Integer getUserId(ServletContext servletContext) + public static Integer getUserId() { HttpSession ss = SessionManager.getSession(); UserDTO learner = (UserDTO) ss.getAttribute(AttributeNames.USER); return learner != null ? learner.getUserID() : null; } /** - * Helper method to get lesson. + * Helper method to get lesson id. * * @param request A standard Servlet HttpServletRequest class. * @param learnerService leaner service facade. * @param servletContext the servlet container that has all resources * @return The requested lesson. */ - public static Lesson getLessonData(HttpServletRequest request, ServletContext servletContext) + public static Long getLessonId(HttpServletRequest request) { HttpSession ss = SessionManager.getSession(); - Lesson lesson = (Lesson)ss.getAttribute(ATTR_LESSON_DATA); + Long lessonId = (Long)ss.getAttribute(PARAM_LESSON_ID); - if(lesson ==null) + if(lessonId ==null) { - //initialize service object - ILearnerService learnerService = LearnerServiceProxy.getLearnerService(servletContext); - long lessonId = WebUtil.readLongParam(request,PARAM_LESSON_ID); - lesson = learnerService.getLesson(new Long(lessonId)); - setLessonData(lesson); + // not in the session - is it in the request? + lessonId = WebUtil.readLongParam(request,PARAM_LESSON_ID,true); } - return lesson; + return lessonId; } /** - * Put the lesson data in the user's special session object, so that - * it can be retrieved by getLessonData() + * Put the lesson id in the user's special session object, so that + * it can be retrieved by getLessonId() * * @param request A standard Servlet HttpServletRequest class. * @param learnerService leaner service facade. * @param servletContext the servlet container that has all resources * @return The requested lesson. */ - public static void setLessonData(Lesson lesson) + public static void setLessonId(Long lessonId) { HttpSession ss = SessionManager.getSession(); - if ( lesson != null ) { - ss.setAttribute(ATTR_LESSON_DATA, lesson); + if ( lessonId != null ) { + ss.setAttribute(PARAM_LESSON_ID, lessonId); } else { - ss.removeAttribute(ATTR_LESSON_DATA); + ss.removeAttribute(PARAM_LESSON_ID); } } @@ -166,9 +161,9 @@ { //initialize service object ILearnerService learnerService = LearnerServiceProxy.getLearnerService(servletContext); - Integer currentLearner = getUserId(servletContext); - Lesson lesson = getLessonData(request,servletContext); - learnerProgress = learnerService.getProgress(currentLearner,lesson); + Integer currentLearner = getUserId(); + Long lessonId = getLessonId(request); + learnerProgress = learnerService.getProgress(currentLearner,lessonId); setLearnerProgress(learnerProgress); } return learnerProgress; Index: lams_learning/test/java/org/lamsfoundation/lams/learning/export/service/TestExportPortfolioService.java =================================================================== diff -u -r2bfd4245ec82b86c782db4a9be15f24c3e9a6ccc -r6c93a29e621c20da5662066e4be018eab3f5d17d --- lams_learning/test/java/org/lamsfoundation/lams/learning/export/service/TestExportPortfolioService.java (.../TestExportPortfolioService.java) (revision 2bfd4245ec82b86c782db4a9be15f24c3e9a6ccc) +++ lams_learning/test/java/org/lamsfoundation/lams/learning/export/service/TestExportPortfolioService.java (.../TestExportPortfolioService.java) (revision 6c93a29e621c20da5662066e4be018eab3f5d17d) @@ -176,7 +176,7 @@ */ public void testGetOrderedListByLearnerProgressId() { - testProgress=learnerProgressDao.getLearnerProgressByLearner(testUser.getUserId(),testLesson); + testProgress=learnerProgressDao.getLearnerProgressByLearner(testUser.getUserId(),testLesson.getLessonId()); Vector sortedActivityList = exportService.getOrderedActivityList(testProgress); Vector testActivityIdList = getTestOrderedCompletedActivityIdList(); Index: lams_learning/test/java/org/lamsfoundation/lams/learning/service/TestLearnerService.java =================================================================== diff -u -redb9aafe18f76e1d6f1315bee1c54726b2c9538e -r6c93a29e621c20da5662066e4be018eab3f5d17d --- lams_learning/test/java/org/lamsfoundation/lams/learning/service/TestLearnerService.java (.../TestLearnerService.java) (revision edb9aafe18f76e1d6f1315bee1c54726b2c9538e) +++ lams_learning/test/java/org/lamsfoundation/lams/learning/service/TestLearnerService.java (.../TestLearnerService.java) (revision 6c93a29e621c20da5662066e4be018eab3f5d17d) @@ -155,7 +155,7 @@ { learnerService.joinLesson(testUser.getUserId(),Test_Lesson_ID); - testProgress=learnerProgressDao.getLearnerProgressByLearner(testUser.getUserId(),testLesson); + testProgress=learnerProgressDao.getLearnerProgressByLearner(testUser.getUserId(),testLesson.getLessonId()); assertNotNull(testProgress); // get the next activity, and get it by its proper class so we can analyse it! @@ -200,7 +200,7 @@ testRootPreviousActivity = testCompletedActivity; testProgress = learnerService.calculateProgress(testCompletedActivity, testUser.getUserId(), - testLesson); + testLesson.getLessonId()); assertLearnerProgress(testRootPreviousActivity,TEST_SYNCHGATE_ACTIVITY_UIID,TEST_SYNCHGATE_ACTIVITY_UIID,1,1,"sycn-gate","sycn-gate"); assertEquals("verify temp completed activities",1,testProgress.getCurrentCompletedActivitiesList().size()); @@ -209,7 +209,7 @@ testRootPreviousActivity = testCompletedActivity; testProgress = learnerService.calculateProgress(testCompletedActivity, testUser.getUserId(), - testLesson); + testLesson.getLessonId()); assertLearnerProgress(testRootPreviousActivity,TEST_NOTEBOOK_ACTIVITY_UIID,TEST_NOTEBOOK_ACTIVITY_UIID,2,1,"random grouping","random grouping"); assertEquals("verify temp completed activities",1,testProgress.getCurrentCompletedActivitiesList().size()); @@ -219,7 +219,7 @@ testRootPreviousActivity = testCompletedActivity; testProgress = learnerService.calculateProgress(testCompletedActivity, testUser.getUserId(), - testLesson); + testLesson.getLessonId()); assertLearnerProgress(testRootPreviousActivity,TEST_RGRP_ACTIVITY_UIID,TEST_RGRP_ACTIVITY_UIID,3,1,"random grouping","random grouping"); assertEquals("verify temp completed activities",1,testProgress.getCurrentCompletedActivitiesList().size()); @@ -228,7 +228,7 @@ testRootPreviousActivity = testCompletedActivity; testProgress = learnerService.calculateProgress(testCompletedActivity, testUser.getUserId(), - testLesson); + testLesson.getLessonId()); assertLearnerProgress(testRootPreviousActivity,TEST_SCHEDULE_GATE_ACTIVITY_UIID,TEST_SCHEDULE_GATE_ACTIVITY_UIID,4,1,"schedule gate","schedule gate"); assertEquals("verify temp completed activities",1,testProgress.getCurrentCompletedActivitiesList().size()); @@ -238,7 +238,7 @@ testRootPreviousActivity = testCompletedActivity; testProgress = learnerService.calculateProgress(testCompletedActivity, testUser.getUserId(), - testLesson); + testLesson.getLessonId()); assertLearnerProgress(testRootPreviousActivity,TEST_CHAT_ACTIVITY_UIID,TEST_CHAT_ACTIVITY_UIID,5,1,"chat","chat"); assertEquals("verify temp completed activities",1,testProgress.getCurrentCompletedActivitiesList().size()); @@ -247,7 +247,7 @@ testRootPreviousActivity = testCompletedActivity; testProgress = learnerService.calculateProgress(testCompletedActivity, testUser.getUserId(), - testLesson); + testLesson.getLessonId()); assertLearnerProgress(testRootPreviousActivity,TEST_QNA_ACTIVITY_UIID,TEST_QNA_ACTIVITY_UIID,6,1,"QNA","QNA"); assertEquals("verify temp completed activities",1,testProgress.getCurrentCompletedActivitiesList().size()); @@ -257,7 +257,7 @@ testRootPreviousActivity = testCompletedActivity; testProgress = learnerService.calculateProgress(testCompletedActivity, testUser.getUserId(), - testLesson); + testLesson.getLessonId()); assertLearnerProgress(testRootPreviousActivity,TEST_PERMISSION_GATE_ACTIVITY_UIID,TEST_PERMISSION_GATE_ACTIVITY_UIID,7,1,"permission gate","permission gate"); assertEquals("verify temp completed activities",1,testProgress.getCurrentCompletedActivitiesList().size()); @@ -266,7 +266,7 @@ testRootPreviousActivity = testCompletedActivity; testProgress = learnerService.calculateProgress(testCompletedActivity, testUser.getUserId(), - testLesson); + testLesson.getLessonId()); assertLearnerProgress(testRootPreviousActivity,TEST_OPTIONS_ACTIVITY_UIID,TEST_OPTIONS_ACTIVITY_UIID,8,1,"OPTIONS","OPTIONS"); assertEquals("verify temp completed activities",1,testProgress.getCurrentCompletedActivitiesList().size()); @@ -275,7 +275,7 @@ testRootPreviousActivity = testCompletedActivity.getParentActivity(); testProgress = learnerService.calculateProgress(testCompletedActivity, testUser.getUserId(), - testLesson); + testLesson.getLessonId()); assertLearnerProgress(testRootPreviousActivity,TEST_PARALLEL_ACTIVITY_UIID,TEST_PARALLEL_ACTIVITY_UIID,10,1,"PARALLEL","PARALLEL"); assertEquals("verify temp completed activities",2,testProgress.getCurrentCompletedActivitiesList().size()); @@ -285,7 +285,7 @@ testRootPreviousActivity = testProgress.getPreviousActivity(); testProgress = learnerService.calculateProgress(testCompletedActivity, testUser.getUserId(), - testLesson); + testLesson.getLessonId()); assertLearnerProgress(testRootPreviousActivity,TEST_PARALLEL_ACTIVITY_UIID,TEST_WAITING_ACTIVITY_UIID,11,1,"PARALLEL","WAITING"); assertTrue("verify waiting flag-should be waiting.",testProgress.isParallelWaiting()); assertTrue("verify next activity",testProgress.getNextActivity()==null); @@ -296,7 +296,7 @@ testRootPreviousActivity = testCompletedActivity.getParentActivity(); testProgress = learnerService.calculateProgress(testCompletedActivity, testUser.getUserId(), - testLesson); + testLesson.getLessonId()); assertLearnerProgress(testRootPreviousActivity,TEST_SEQUENCE_ACTIVITY_UIID,TEST_SR_ACTIVITY_UIID,13,1,"SEQUENCE","SHARE RESOURCE"); assertTrue("verify waiting flag-should not be waiting",!testProgress.isParallelWaiting()); assertEquals("verify temp completed activities",2,testProgress.getCurrentCompletedActivitiesList().size()); @@ -306,15 +306,15 @@ testRootPreviousActivity = testProgress.getPreviousActivity(); testProgress = learnerService.calculateProgress(testCompletedActivity, testUser.getUserId(), - testLesson); + testLesson.getLessonId()); assertLearnerProgress(testRootPreviousActivity,TEST_SEQUENCE_ACTIVITY_UIID,TEST_SQNA_ACTIVITY_UIID,14,2,"SEQUENCE","QNA"); assertEquals("verify temp completed activities",1,testProgress.getCurrentCompletedActivitiesList().size()); //progress sub sequence(QNA) to complete lesson testCompletedActivity = testProgress.getNextActivity(); testProgress = learnerService.calculateProgress(testCompletedActivity, testUser.getUserId(), - testLesson); + testLesson.getLessonId()); assertTrue("verify lesson complete",testProgress.isLessonComplete()); assertEquals("verify temp completed activities",1,testProgress.getCurrentCompletedActivitiesList().size()); } @@ -323,7 +323,7 @@ { learnerService.exitLesson(testProgress.getLearnerProgressId()); - LearnerProgress progress = learnerProgressDao.getLearnerProgressByLearner(testUser.getUserId(),testLesson); + LearnerProgress progress = learnerProgressDao.getLearnerProgressByLearner(testUser.getUserId(),testLesson.getLessonId()); assertTrue("verify it should be restarting",progress.isRestarting());