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.6 -r1.7
--- lams_flash/src/central/flash/org/lamsfoundation/lams/learner/ls/LessonController.as	22 Feb 2008 03:35:24 -0000	1.6
+++ lams_flash/src/central/flash/org/lamsfoundation/lams/learner/ls/LessonController.as	22 Feb 2008 04:18:12 -0000	1.7
@@ -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.isOptionsWithSequencesActivity() || 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.isOptionalActivity() || 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 || ca.activity.activityTypeID != Activity.OPTIONS_WITH_SEQUENCES_TYPE)){
+				if(ca.activityStatus == 'completed_mc' && !ca.activity.isOptionalActivity() && !ca.activity.isOptionsWithSequencesActivity() && !ca.activity.isBranchingActivity()){
 					_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/common/flash/org/lamsfoundation/lams/common/LearnerComplexActivity.as
===================================================================
RCS file: /usr/local/cvsroot/lams_flash/src/common/flash/org/lamsfoundation/lams/common/LearnerComplexActivity.as,v
diff -u -r1.9 -r1.10
--- lams_flash/src/common/flash/org/lamsfoundation/lams/common/LearnerComplexActivity.as	22 Feb 2008 00:18:15 -0000	1.9
+++ lams_flash/src/common/flash/org/lamsfoundation/lams/common/LearnerComplexActivity.as	22 Feb 2008 04:18:12 -0000	1.10
@@ -146,11 +146,10 @@
 		}
 		
 		drawChildren(childrenArray, children_mc);
-		checkIfSequenceActive();
 		
 		childHolder_mc._visible = false;
 		
-		MovieClipUtils.doLater(Proxy.create(this, draw));
+		MovieClipUtils.doLater(Proxy.create(this, draw, Proxy.create(this, checkIfSequenceActive)));
 	}
 	
 	private function drawChildren(children:Array, container:Array, _count:Number):Void {
@@ -230,22 +229,39 @@
 	
 	/** TODO: Use for Sequence in Optional */
 	private function checkIfSequenceActive():Void {
-		/**for(var i=0; i<_children.length; i++) {
-			if(_children[i] == activeSequence
-				&& Progress.compareProgressData(learner, _children[i].activityID) == 'completed_mc')
-				
-		}*/
+		for(var i=0; i<children_mc.length; i++) {
+			
+			var isChildCurrent:Boolean = (Progress.compareProgressData(learner, children_mc[i].activity.activityID) == 'current_mc');
+			var isChildAttempted:Boolean = (Progress.compareProgressData(learner, children_mc[i].activity.activityID) == 'attempted_mc');
+			
+			if(isChildCurrent && children_mc[i].activity.isSequenceActivity()) {
+				// set activesequence if is current
+				if(children_mc[i].activity != activeSequence)
+					removeAllChildrenAndInputSequence(children_mc[i].activity);
+			} else if(isChildAttempted && children_mc[i].activity.isSequenceActivity()) {
+				// check children of sequence (level 1) for current activity
+				if(model.checkSequenceHasCurrentActivity(children_mc[i].activity, learner))
+					removeAllChildrenAndInputSequence(children_mc[i].activity);
+			}
+		}
 		
 		Debugger.log("refreshing children: " + children_mc.length, Debugger.CRITICAL, "checkIfSequenceActive", "LearnerComplexActivity");
 		
+		var closeBox:Boolean = true;
 		for(var i=0; i<children_mc.length; i++) {
+			if(children_mc[i].activityStatus != "completed_mc") closeBox = false;
 			children_mc[i].refresh();
-	
+			
 			/**if(activity.isBranchingActivity() 
 				&& children_mc[i].activity.isSequenceActivity() 
 				&& (children_mc[i].isAttempted || children_mc[i].isCompleted)) 
 				removeAllChildrenAndInputSequence(SequenceActivity(children_mc[i].activity));*/
 		
+		}	
+		
+		if(closeBox && locked) {
+			collapse();
+			controller.complexActivityRelease(this, false);
 		}
 	}
 	
@@ -277,6 +293,11 @@
 	public function removeAllChildrenAndInputSequence(activity:SequenceActivity):Void {
 		activeSequence = activity;
 		redrawComplex();
+		
+		if(!locked) { 
+			expand();
+			controller.complexActivityRelease(this, false);
+		}
 	}
 	
 	private function redrawComplex():Void {
@@ -295,7 +316,7 @@
 		return false;
 	}
 	
-	private function draw (){
+	private function draw (callback:Function){
 		var toolTitle:String;
 		if (actStatus == null || actStatus == undefined){
 			actStatus = Progress.compareProgressData(learner, _activity.activityID);
@@ -336,8 +357,12 @@
 		
 		_visible = true;
 		
+		if(callback != null)
+			callback();
+		
 		if(_view instanceof LearnerTabView)
-			LearnerTabView(_view).drawNext();
+			LearnerTabView(_view).drawNext();
+			
 	}
 	
 	public function showToolTip(btnObj, btnTT:String):Void{
Index: lams_learning/web/lams_learner.swf
===================================================================
RCS file: /usr/local/cvsroot/lams_learning/web/Attic/lams_learner.swf,v
diff -u -r1.77 -r1.78
Binary files differ