Index: lams_flash/src/central/flash/org/lamsfoundation/lams/learner/ls/LessonController.as =================================================================== RCS file: /usr/local/cvsroot/lams_flash/src/central/flash/org/lamsfoundation/lams/learner/ls/LessonController.as,v diff -u -r1.5 -r1.6 --- lams_flash/src/central/flash/org/lamsfoundation/lams/learner/ls/LessonController.as 22 Feb 2008 00:39:40 -0000 1.5 +++ lams_flash/src/central/flash/org/lamsfoundation/lams/learner/ls/LessonController.as 22 Feb 2008 03:35:24 -0000 1.6 @@ -91,7 +91,7 @@ if(ca.activityStatus != undefined){ var URLToSend:String = 'learning/learner.do?method=forwardToLearnerActivityURL&activityID='+ca.activity.activityID+'&userID='+_root.userID+'&lessonID='+_root.lessonID; - if(ca.activityStatus == 'completed_mc' && (ca.activity.activityTypeID != Activity.OPTIONAL_ACTIVITY_TYPE || !ca.activity.isOptionsWithSequencesActivity())){ + if(ca.activityStatus == 'completed_mc' && (ca.activity.activityTypeID != Activity.OPTIONAL_ACTIVITY_TYPE || ca.activity.activityTypeID != Activity.OPTIONS_WITH_SEQUENCES_TYPE)){ _lessonModel.getLesson().getActivityURL(URLToSend, true); } else if(ca.activityStatus == 'attempted_mc' && _root.mode == 'preview') { _lessonModel.getLesson().moveToActivity(_lessonModel.progressData.getCurrentActivityId(), ca.activity.activityID); Index: lams_flash/src/central/flash/org/lamsfoundation/lams/learner/ls/LessonModel.as =================================================================== RCS file: /usr/local/cvsroot/lams_flash/src/central/flash/org/lamsfoundation/lams/learner/ls/LessonModel.as,v diff -u -r1.7 -r1.8 --- lams_flash/src/central/flash/org/lamsfoundation/lams/learner/ls/LessonModel.as 30 Oct 2007 01:42:09 -0000 1.7 +++ lams_flash/src/central/flash/org/lamsfoundation/lams/learner/ls/LessonModel.as 22 Feb 2008 03:35:24 -0000 1.8 @@ -418,6 +418,24 @@ return orderedActivityArr; } + public function checkSequenceHasCurrentActivity(a:Activity, learner:Progress):Boolean { + var cChildren:Array = learningDesignModel.getComplexActivityChildren(a.activityUIID); + + if(cChildren.length > 0) { + for(var i=0; i