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.4 -r1.5 --- lams_flash/src/central/flash/org/lamsfoundation/lams/learner/ls/LessonController.as 11 Jan 2008 07:32:13 -0000 1.4 +++ lams_flash/src/central/flash/org/lamsfoundation/lams/learner/ls/LessonController.as 22 Feb 2008 00:39:40 -0000 1.5 @@ -86,12 +86,12 @@ Debugger.log('activityDoubleClick CanvasActivity:'+ca.activity.activityID + ' status: ' + ca.activityStatus + 'type id: ' + ca.activity.activityTypeID,Debugger.GEN,'activityDoubleClick','LessonController'); - if(ca.activity.activityTypeID == Activity.TOOL_ACTIVITY_TYPE || ca.activity.activityTypeID == Activity.OPTIONAL_ACTIVITY_TYPE || ca.activity.activityTypeID == Activity.PARALLEL_ACTIVITY_TYPE || ca.activity.isGroupActivity() || ca.activity.isBranchingActivity() || ca.activity.isSequenceActivity()) { + if(ca.activity.activityTypeID == Activity.TOOL_ACTIVITY_TYPE || ca.activity.activityTypeID == Activity.OPTIONAL_ACTIVITY_TYPE || ca.activity.isOptionsWithSequencesActivity() || ca.activity.activityTypeID == Activity.PARALLEL_ACTIVITY_TYPE || ca.activity.isGroupActivity() || ca.activity.isBranchingActivity() || ca.activity.isSequenceActivity()) { 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){ + if(ca.activityStatus == 'completed_mc' && (ca.activity.activityTypeID != Activity.OPTIONAL_ACTIVITY_TYPE || !ca.activity.isOptionsWithSequencesActivity())){ _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_learning/web/lams_learner.swf =================================================================== RCS file: /usr/local/cvsroot/lams_learning/web/Attic/lams_learner.swf,v diff -u -r1.75 -r1.76 Binary files differ