Index: lams_central/src/flash/org/lamsfoundation/lams/learner/ls/LessonController.as
===================================================================
diff -u -r727b010ee9bb5c5fa8ab2e25fbbb8f49c0b62586 -r8a4feb3b869dc2b785a5eb0dd4be0b29f0f5bf06
--- lams_central/src/flash/org/lamsfoundation/lams/learner/ls/LessonController.as	(.../LessonController.as)	(revision 727b010ee9bb5c5fa8ab2e25fbbb8f49c0b62586)
+++ lams_central/src/flash/org/lamsfoundation/lams/learner/ls/LessonController.as	(.../LessonController.as)	(revision 8a4feb3b869dc2b785a5eb0dd4be0b29f0f5bf06)
@@ -21,12 +21,17 @@
  * ************************************************************************
  */
 
-import org.lamsfoundation.lams.learner.ls.*;
+import org.lamsfoundation.lams.learner.ls.*;
+import org.lamsfoundation.lams.common.LearnerComplexActivity;
 import org.lamsfoundation.lams.common.mvc.*
 import org.lamsfoundation.lams.common.util.*
 import org.lamsfoundation.lams.common.comms.Communication;
 import org.lamsfoundation.lams.learner.*
 import org.lamsfoundation.lams.authoring.Activity;
+
+import mx.managers.*;
+import mx.controls.*;
+import mx.events.*
 
 /*
 * Make changes to Lesson's model data based on user input
@@ -42,13 +47,18 @@
 	private var _app:Application;
 	private var _comms:Communication;
 	private var _isBusy:Boolean;
+	
+	//These are defined so that the compiler can 'see' the events that are added at runtime by EventDispatcher
+    private var dispatchEvent:Function;
 	
 	public function LessonController (cm:Observable) {
 		super (cm);
 		_app = Application.getInstance();
 		_comms = _app.getComms();
 		_lessonModel = LessonModel(model);
-		_isBusy = false;
+		_isBusy = false;
+		
+		EventDispatcher.initialize(this);     
 	}
 	
 	/**
@@ -94,14 +104,38 @@
 	}
    
     public function activityRelease(ca:Object):Void{
-	   Debugger.log('activityRelease CanvasActivity:'+ca.activity.activityID,Debugger.GEN,'activityRelease','LessonController');
+	   Debugger.log('activityRelease LearnerActivity:'+ca.activity.activityID,Debugger.GEN,'activityRelease','LessonController');
 	    
 	}
 	
     public function activityReleaseOutside(ca:Object):Void{
 	   Debugger.log('activityReleaseOutside CanvasActivity:'+ca.activity.activityID,Debugger.GEN,'activityReleaseOutside','LessonController');
     }
 	
+	public function complexActivityRelease(ca:Object):Void{
+		if(ca.locked){
+			_lessonModel.setCurrentActivityOpen(ca);
+		} else {
+			_lessonModel.setCurrentActivityOpen(null);
+		}
+	}
+	
+	public function checkForCurrentChildren(ca:Object, clickTarget:MovieClip):Void{
+		Debugger.log('checking activity:'+ca.activity.activityID,Debugger.GEN,'checkForCurrentChildren','LessonController');
+		for(var i=0; i<ca.activityChildren.length; i++){
+			Debugger.log('checking child activity:'+ca.activityChildren[i].activityID,Debugger.GEN,'checkForCurrentChildren','LessonController');
+			if(_lessonModel.progressData != null){
+				if(ca.activityChildren[i].activityID == _lessonModel.progressData.getCurrentActivityId()){
+					//LearnerComplexActivity(ca).expand();
+					//_lessonModel.setCurrentActivityOpen(ca);
+					Debugger.log('found match:'+ca.activityChildren[i].activityID,Debugger.GEN,'checkForCurrentChildren','LessonController');
+					//dispatchEvent({target:clickTarget, type: 'onRelease'});
+					ca.localOnRelease();
+				}
+			}
+		}
+	}
+	
 	public function setBusy(){
 		_isBusy = true;
 	}
Index: lams_central/src/flash/org/lamsfoundation/lams/learner/ls/LessonView.as
===================================================================
diff -u -r727b010ee9bb5c5fa8ab2e25fbbb8f49c0b62586 -r8a4feb3b869dc2b785a5eb0dd4be0b29f0f5bf06
--- lams_central/src/flash/org/lamsfoundation/lams/learner/ls/LessonView.as	(.../LessonView.as)	(revision 727b010ee9bb5c5fa8ab2e25fbbb8f49c0b62586)
+++ lams_central/src/flash/org/lamsfoundation/lams/learner/ls/LessonView.as	(.../LessonView.as)	(revision 8a4feb3b869dc2b785a5eb0dd4be0b29f0f5bf06)
@@ -148,6 +148,10 @@
 				Debugger.log('progress data receieved for user..' + lm.progressData.getUserName(),Debugger.CRITICAL,'update','org.lamsfoundation.lams.LessonView');
 				removeAll(lm);
 				lm.drawDesign();
+				break;
+			case 'CLOSE_COMPLEX_ACTIVITY' :
+				closeComplexActivity(infoObj.data, lm);
+				Debugger.log('closing complex activity' + infoObj.data.activity.activityUIID,Debugger.CRITICAL,'update','org.lamsfoundation.lams.LessonView');
 				break;
             default :
                 Debugger.log('unknown update type :' + infoObj.updateType,Debugger.CRITICAL,'update','org.lamsfoundation.lams.LessonView');
@@ -181,6 +185,17 @@
 		ACT_Y = 32.5;
 	}
 	
+	private function closeComplexActivity(ca:Object, lm:LessonModel):Void{
+		if(lm.activitiesDisplayed.containsKey(ca.activity.activityUIID)){
+			var a:LearnerComplexActivity = LearnerComplexActivity(lm.activitiesDisplayed.get(ca.activity.activityUIID));
+			if(a.locked && !a.doubleClicking){
+				a.collapse();
+			}
+		} else {
+			// no object found in table
+		}
+	}
+	
 	/**
 	 * Draws new activity to monitor tab view stage.
 	 * @usage   
@@ -204,6 +219,7 @@
 		if(a.activityTypeID==Activity.TOOL_ACTIVITY_TYPE || a.isGateActivity() || a.isGroupActivity() ){
 			newActivity_mc = _activityLayer_mc.attachMovie("LearnerActivity", "LearnerActivity" + a.activityID, _activityLayer_mc.getNextHighestDepth(),{_activity:a,_controller:lc,_view:lv, _x:ACT_X+25, _y:ACT_Y, actLabel:a.title, learner:lm.progressData});
 			ACT_Y = newActivity_mc._y + ACTIVITY_OFFSET;
+			_activityList.push(newActivity_mc);
 			Debugger.log('The activity:'+a.title+','+a.activityTypeID+' is tool/gate/group activity',Debugger.CRITICAL,'drawActivity','LessonView');
 		}else if(a.activityTypeID==Activity.PARALLEL_ACTIVITY_TYPE || a.activityTypeID==Activity.OPTIONAL_ACTIVITY_TYPE){
 			//get the children
@@ -212,7 +228,7 @@
 		
 			newActivity_mc = _activityLayer_mc.attachMovie("LearnerComplexActivity", "LearnerComplexActivity" + a.activityID, _activityLayer_mc.getNextHighestDepth(),{_activity:a,_children:children,_controller:lc,_view:lv, _x:ACT_X+25, _y:ACT_Y, learner:lm.progressData});
 			ACT_Y = newActivity_mc._y + ACTIVITY_OFFSET;
-			
+			_activityList.push(newActivity_mc);
 		}else{
 			Debugger.log('The activity:'+a.title+','+a.activityUIID+' is of unknown type, it cannot be drawn',Debugger.CRITICAL,'drawActivity','LessonView');
 		}
@@ -222,8 +238,6 @@
 			lm.activitiesDisplayed.put(a.activityUIID,newActivity_mc);
 		}
 		
-		_activityList.push(newActivity_mc);
-		
 		return true;
 	}