Index: lams_flash/src/central/flash/org/lamsfoundation/lams/authoring/br/CanvasBranchView.as
===================================================================
RCS file: /usr/local/cvsroot/lams_flash/src/central/flash/org/lamsfoundation/lams/authoring/br/CanvasBranchView.as,v
diff -u -r1.93 -r1.94
--- lams_flash/src/central/flash/org/lamsfoundation/lams/authoring/br/CanvasBranchView.as	3 Nov 2008 02:07:28 -0000	1.93
+++ lams_flash/src/central/flash/org/lamsfoundation/lams/authoring/br/CanvasBranchView.as	20 Jan 2009 07:27:27 -0000	1.94
@@ -340,13 +340,19 @@
 		var endX:Number = (this.activity.endXCoord != null) ? this.activity.endXCoord : hubEndDir_x;
 		var endY:Number = (this.activity.endYCoord != null) ? this.activity.endYCoord : _endy;
 		
+		var _module = null;
+		
+		if(model instanceof MonitorModel) {
+			_module = "monitoring";
+		}
+		
 		// start-point connector hub
-		cHubStart_mc = (model instanceof CanvasModel) ? activityLayer.createChildAtDepth("CanvasBranchingConnectorStart",DepthManager.kTop,{_activity: activity, _canvasController:getController(), _canvasBranchView:_canvasBranchView, _x: startX , _y: startY, branchConnector:true})
-												  : activityLayer.createChildAtDepth("CanvasBranchingConnectorStart",DepthManager.kTop,{_activity: activity, _monitorController:getController(), _canvasBranchView:_canvasBranchView, _x: activity.startXCoord , _y: activity.startYCoord, branchConnector:true});
+		cHubStart_mc = (model instanceof CanvasModel) ? activityLayer.createChildAtDepth("CanvasBranchingConnectorStart",DepthManager.kTop,{_activity: activity, _canvasController:getController(), _canvasBranchView:_canvasBranchView, _x: startX , _y: startY, branchConnector:true, _module:_module})
+												  : activityLayer.createChildAtDepth("CanvasBranchingConnectorStart",DepthManager.kTop,{_activity: activity, _monitorController:getController(), _canvasBranchView:_canvasBranchView, _x: activity.startXCoord , _y: activity.startYCoord, branchConnector:true, _module:_module});
 		// end-point connector hub
-		cHubEnd_mc = (model instanceof CanvasModel) ? activityLayer.createChildAtDepth("CanvasBranchingConnectorEnd",DepthManager.kTop,{_activity: activity, _canvasController:CanvasController(getController()), _canvasBranchView:_canvasBranchView, _x: endX , _y: endY, branchConnector:true})
-												: activityLayer.createChildAtDepth("CanvasBranchingConnectorEnd",DepthManager.kTop,{_activity: activity, _monitorController:MonitorController(getController()), _canvasBranchView:_canvasBranchView, _x: activity.endXCoord , _y: activity.endYCoord, branchConnector:true});
-												
+		cHubEnd_mc = (model instanceof CanvasModel) ? activityLayer.createChildAtDepth("CanvasBranchingConnectorEnd",DepthManager.kTop,{_activity: activity, _canvasController:CanvasController(getController()), _canvasBranchView:_canvasBranchView, _x: endX , _y: endY, branchConnector:true, _module:_module})
+												: activityLayer.createChildAtDepth("CanvasBranchingConnectorEnd",DepthManager.kTop,{_activity: activity, _monitorController:MonitorController(getController()), _canvasBranchView:_canvasBranchView, _x: activity.endXCoord , _y: activity.endYCoord, branchConnector:true, _module:_module});
+											
 		this.onEnterFrame = hitConnectorHubs;
 		
 	}
Index: lams_flash/src/central/flash/org/lamsfoundation/lams/authoring/cv/CanvasActivity.as
===================================================================
RCS file: /usr/local/cvsroot/lams_flash/src/central/flash/org/lamsfoundation/lams/authoring/cv/CanvasActivity.as,v
diff -u -r1.53 -r1.54
--- lams_flash/src/central/flash/org/lamsfoundation/lams/authoring/cv/CanvasActivity.as	3 Nov 2008 02:07:28 -0000	1.53
+++ lams_flash/src/central/flash/org/lamsfoundation/lams/authoring/cv/CanvasActivity.as	20 Jan 2009 07:27:27 -0000	1.54
@@ -29,6 +29,7 @@
 import org.lamsfoundation.lams.authoring.br.*;
 import org.lamsfoundation.lams.monitoring.mv.*;
 import org.lamsfoundation.lams.monitoring.mv.tabviews.LearnerTabView;
+import org.lamsfoundation.lams.monitoring.mv.tabviews.MonitorTabView;
 import org.lamsfoundation.lams.common.style.*
 
 import mx.controls.*
@@ -337,7 +338,7 @@
 		icon_mc._y -= (!_sequenceChild) ? 6 : 0;
 	}
 	
-	private function drawLearners():Void {
+	public function drawLearners():Void {
 		mm = MonitorModel(_monitorController.getModel());
 		
 		var learner_X = _activity.xCoord + learnerOffset_X;
@@ -382,10 +383,11 @@
 		}
 		
 		// get the length of learners from the Monitor Model and run a for loop.
-		for (var j=0; j<mm.allLearnersProgress.length; j++){
+		var learnersProgress:Array = mm.allLearnersProgress;
+		for (var j=0; j<learnersProgress.length; j++){
 				
 			var learner:Object = new Object();
-			learner = mm.allLearnersProgress[j]
+			learner = learnersProgress[j]
 					
 			//Gets a true if learner's currect activityID matches this activityID else false.
 			var isLearnerCurrentAct:Boolean = Progress.isLearnerCurrentActivity(learner, _activity.activityID);
@@ -418,10 +420,20 @@
 	 * @return  
 	 */
 	private function draw(){
-		
+		Debugger.log("module: " + _module, Debugger.CRITICAL, "draw", "CanvasActivity");
 		// Drawing learner on the activty. 
-		if(_module == "monitoring")
-			drawLearners();
+		if(_module == "monitoring") {
+			var view = (activity.parentUIID == null) ? _monitorView : null;
+			
+			Debugger.log("view: " + view, Debugger.CRITICAL, "draw", "CanvasActivity");
+			if(view != null) {
+				view.addEvt("DRAW_LEARNERS", this);
+				view.drawNext();
+			} else if(_canvasBranchView != null) {
+				MovieClipUtils.doLater(Proxy.create(this, drawLearners));
+			}
+				
+		}
 		
 		Debugger.log(_activity.title+',_activity.isGateActivity():'+_activity.isGateActivity(),4,'draw','CanvasActivity');
 		
Index: lams_flash/src/central/flash/org/lamsfoundation/lams/authoring/cv/CanvasOptionalActivity.as
===================================================================
RCS file: /usr/local/cvsroot/lams_flash/src/central/flash/org/lamsfoundation/lams/authoring/cv/CanvasOptionalActivity.as,v
diff -u -r1.29 -r1.30
--- lams_flash/src/central/flash/org/lamsfoundation/lams/authoring/cv/CanvasOptionalActivity.as	21 Oct 2008 03:09:00 -0000	1.29
+++ lams_flash/src/central/flash/org/lamsfoundation/lams/authoring/cv/CanvasOptionalActivity.as	20 Jan 2009 07:27:27 -0000	1.30
@@ -320,7 +320,7 @@
 		_activity = a;
 	}
 	
-	private function drawLearners():Void {
+	public function drawLearners():Void {
 		var mm:MonitorModel = MonitorModel(_monitorController.getModel());
 		
 		var learner_X = (mm.activeView instanceof CanvasComplexView) ? this._x + learnerOffset_X : _activity.xCoord + learnerOffset_X;
@@ -392,8 +392,18 @@
 		//dimentions of container (this)
 		setLocking();
 			
-		if(fromModuleTab == "monitorMonitorTab")
-			drawLearners();
+		if(fromModuleTab == "monitorMonitorTab") {
+			var view = (activity.parentUIID == null) ? _monitorTabView : null;
+			
+			Debugger.log("view: " + view, Debugger.CRITICAL, "draw", "CanvasOptionalActivity");
+			if(view != null) {
+				view.addEvt("DRAW_LEARNERS", this);
+				view.drawNext();
+			} else if(_canvasBranchView != null) {
+				MovieClipUtils.doLater(Proxy.create(this, drawLearners));
+			}
+				
+		}
 		
 		Debugger.log ("I am in Draw :" + _activity.title + 'uiID:' + _activity.activityUIID + ' children:' + _children.length, Debugger.GEN, 'Draw', 'CanvasOptionalActivity');
 		
Index: lams_flash/src/central/flash/org/lamsfoundation/lams/authoring/cv/CanvasParallelActivity.as
===================================================================
RCS file: /usr/local/cvsroot/lams_flash/src/central/flash/org/lamsfoundation/lams/authoring/cv/CanvasParallelActivity.as,v
diff -u -r1.19 -r1.20
--- lams_flash/src/central/flash/org/lamsfoundation/lams/authoring/cv/CanvasParallelActivity.as	21 Oct 2008 03:09:00 -0000	1.19
+++ lams_flash/src/central/flash/org/lamsfoundation/lams/authoring/cv/CanvasParallelActivity.as	20 Jan 2009 07:27:27 -0000	1.20
@@ -246,7 +246,7 @@
 		return styleObj;
 	}
 	
-	private function drawLearners():Void {
+	public function drawLearners():Void {
 		var mm:MonitorModel = MonitorModel(_monitorController.getModel());
 		
 		var learner_X = (mm.activeView instanceof CanvasComplexView) ? this._x + learnerOffset_X : _activity.xCoord + learnerOffset_X;
@@ -283,9 +283,18 @@
 			
 		//write text
 		title_lbl.text = _activity.title;
+		
+		if(fromModuleTab == "monitorMonitorTab") {
+			var view = (activity.parentUIID == null) ? _monitorTabView : null;
+			Debugger.log("view: " + view, Debugger.CRITICAL, "draw", "CanvasParallelActivity");
 			
-		if(fromModuleTab == "monitorMonitorTab")
-			drawLearners()
+			if(view != null) {
+				view.addEvt("DRAW_LEARNERS", this);
+				view.drawNext();
+			} else if(_canvasBranchView != null) {
+				MovieClipUtils.doLater(Proxy.create(this, drawLearners));
+			}
+		}
 			
 		//position the container (this)
 		if(!_canvasComplexView) {
Index: lams_flash/src/central/flash/org/lamsfoundation/lams/monitoring/mv/MonitorModel.as
===================================================================
RCS file: /usr/local/cvsroot/lams_flash/src/central/flash/org/lamsfoundation/lams/monitoring/mv/MonitorModel.as,v
diff -u -r1.40 -r1.41
--- lams_flash/src/central/flash/org/lamsfoundation/lams/monitoring/mv/MonitorModel.as	13 Nov 2008 05:19:32 -0000	1.40
+++ lams_flash/src/central/flash/org/lamsfoundation/lams/monitoring/mv/MonitorModel.as	20 Jan 2009 07:27:27 -0000	1.41
@@ -24,6 +24,7 @@
 import org.lamsfoundation.lams.monitoring.*;
 import org.lamsfoundation.lams.monitoring.mv.*;
 import org.lamsfoundation.lams.monitoring.mv.tabviews.LearnerTabView;
+import org.lamsfoundation.lams.monitoring.mv.tabviews.MonitorTabView;
 import org.lamsfoundation.lams.authoring.Activity;
 import org.lamsfoundation.lams.authoring.Branch;
 import org.lamsfoundation.lams.authoring.BranchingActivity;
@@ -840,7 +841,7 @@
 			}
 			
 			if(ddm_activity.activityTypeID == Activity.SEQUENCE_ACTIVITY_TYPE && selectedTab != LearnerTabView._tabID){
-				eventArr.push(createViewUpdate("ADD_SEQUENCE", ddm_activity));
+				eventArr.push(createViewUpdate("ADD_SEQUENCE", ddm_activity, tabID));
 			} else if(ddm_activity.parentActivityID > 0 || ddm_activity.parentUIID > 0){
 				var parentAct;
 				if((parentAct = _activeSeq.getLearningDesignModel().activities.get(ddm_activity.parentUIID)) != null)
@@ -892,11 +893,11 @@
 	}
 	
 	private function callDesignEvents(tabID, eventArr):Void {
-		if(tabID != LearnerTabView._tabID)
+		if(tabID != LearnerTabView._tabID && tabID != MonitorTabView._tabID)
 			for(var i=0; i<eventArr.length; i++)
 				broadcastViewUpdate(eventArr[i].updateType, eventArr[i].data, eventArr[i].tabID, eventArr[i].learner);
-			else
-				broadcastViewUpdate("DRAW_ALL", eventArr, tabID);
+		else
+			broadcastViewUpdate("DRAW_ALL", eventArr, tabID);
 		
 	}
 	
Index: lams_flash/src/central/flash/org/lamsfoundation/lams/monitoring/mv/tabviews/LearnerTabView.as
===================================================================
RCS file: /usr/local/cvsroot/lams_flash/src/central/flash/org/lamsfoundation/lams/monitoring/mv/tabviews/LearnerTabView.as,v
diff -u -r1.17 -r1.18
--- lams_flash/src/central/flash/org/lamsfoundation/lams/monitoring/mv/tabviews/LearnerTabView.as	21 Oct 2008 03:08:59 -0000	1.17
+++ lams_flash/src/central/flash/org/lamsfoundation/lams/monitoring/mv/tabviews/LearnerTabView.as	20 Jan 2009 07:27:27 -0000	1.18
@@ -211,17 +211,17 @@
 					break;
 				case 'DRAW_DESIGN' :
 					Debugger.log("DRAW_DESIGN received",Debugger.CRITICAL,"update","LearnerTabView");
-					adjustLearnerPanel(mm);
 					if (infoObj.tabID == _tabID && !mm.locked){
+						adjustLearnerPanel(mm);
 						if (mm.isDesignDrawn) {
 							clearCanvas(mm);
 						}
 						drawAllLearnersDesign(mm, infoObj.tabID);
 					}
 					break;
 				case 'DRAW_ALL' :
-					adjustLearnerPanel(mm);
 					if (infoObj.tabID == _tabID && !mm.locked){
+						adjustLearnerPanel(mm);
 						evtArr = infoObj.data;
 						drawAll();
 					}
@@ -353,7 +353,7 @@
 		
 		if (learnerListArr == null || learnerListArr == undefined){ 
 			learnerListArr = new Array();
-		}
+		}
 		this._activityLayer_mc.removeMovieClip();
 		this._nameLayer_mc.removeMovieClip();
 			
Index: lams_flash/src/central/flash/org/lamsfoundation/lams/monitoring/mv/tabviews/MonitorTabView.as
===================================================================
RCS file: /usr/local/cvsroot/lams_flash/src/central/flash/org/lamsfoundation/lams/monitoring/mv/tabviews/MonitorTabView.as,v
diff -u -r1.36 -r1.37
--- lams_flash/src/central/flash/org/lamsfoundation/lams/monitoring/mv/tabviews/MonitorTabView.as	21 Oct 2008 03:08:59 -0000	1.36
+++ lams_flash/src/central/flash/org/lamsfoundation/lams/monitoring/mv/tabviews/MonitorTabView.as	20 Jan 2009 07:27:27 -0000	1.37
@@ -79,6 +79,10 @@
 	private var orig_height:Number
 	private var firstRun:Number;
 	
+	private var drawCount:Number;
+	private var maxCount:Number;
+	private var evtArr:Array;
+	
 	/**
 	* Constructor
 	*/
@@ -191,7 +195,7 @@
 					break;
 				case 'DRAW_TRANSITION' :
 					if (infoObj.tabID == _tabID && !mm.locked){
-						drawTransition(infoObj.data, mm)
+						drawTransition(infoObj.data, mm);
 					}
 					break;
 				case 'HIDE_TRANSITION' :
@@ -219,10 +223,16 @@
 					
 					break;
 				case 'DRAW_ALL' :
-					if (infoObj.tabID == _tabID && !mm.locked){
-						drawAll(infoObj.data, mm);
+					if (infoObj.tabID == _tabID && !mm.locked && mm.currentBranchingActivity == null){
+						evtArr = infoObj.data;
+						drawAll();
 					}
 					break;
+				case 'DRAW_LEARNERS' :
+					if(infoObj.tabID == _tabID && !mm.locked){
+						infoObj.data.drawLearners();
+					}
+					break;
 				case 'SET_ACTIVE' :
 					Debugger.log('setting active :' + infoObj.updateType + " event.data: " + infoObj.data + " condition: " + (infoObj.data == this),Debugger.CRITICAL,'update','org.lamsfoundation.lams.MonitorTabView');
 					transparentCover._visible = (infoObj.data == this) ? false : true;
@@ -401,17 +411,41 @@
 			mm.activitiesDisplayed.put(a.activityUIID,newActivity_mc);
 		}
 		
-		mm.getMonitor().getMV().getMonitorSequenceScp().redraw(true);
-		
 		return true;
 	}
 	
 	private function drawAll(objArr:Array, mm:MonitorModel){
-		for (var i=0; i<objArr.length; i++){
-			update(mm,objArr[i]);
+		Debugger.log("draw all: " + evtArr.length, Debugger.CRITICAL, "drawAll", "MonitorTabView");
+		drawCount = 0;
+		maxCount = evtArr.length;
+		
+		drawNext();
+	}
+	
+	public function drawNext():Void {
+		Debugger.log("draw next: " + drawCount, Debugger.CRITICAL, "drawNext", "MonitorTabView");
+		Debugger.log("max count: " + maxCount, Debugger.CRITICAL, "drawNext", "MonitorTabView");
+		
+		if(drawCount < maxCount) {
+			update(mm, evtArr[drawCount]);
+			
+			drawCount++;
+		
+			if(evtArr[drawCount-1].updateType != "DRAW_ACTIVITY")
+				drawNext();
+		} else {
+			mm.getMonitor().getMV().getMonitorSequenceScp().redraw(true);
 		}
+		
+		
 	}
 	
+	public function addEvt(updateType:String, data:Object):Void {
+		var evt = mm.createViewUpdate(updateType, data, _tabID, null);
+		evtArr.push(evt);
+		maxCount = evtArr.length;
+	}
+	
 	/**
 	* Returns an object that contains the vertical and horizontal spans of the activities from the DesignDataModel
 	* 
Index: lams_monitoring/web/lams_monitoring.swf
===================================================================
RCS file: /usr/local/cvsroot/lams_monitoring/web/Attic/lams_monitoring.swf,v
diff -u -r1.229 -r1.230
Binary files differ
Index: lams_monitoring/web/lams_monitoring_library.swf
===================================================================
RCS file: /usr/local/cvsroot/lams_monitoring/web/Attic/lams_monitoring_library.swf,v
diff -u -r1.197 -r1.198
Binary files differ