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.65 -r1.66
--- lams_flash/src/central/flash/org/lamsfoundation/lams/authoring/br/CanvasBranchView.as	5 Feb 2008 02:37:50 -0000	1.65
+++ lams_flash/src/central/flash/org/lamsfoundation/lams/authoring/br/CanvasBranchView.as	5 Feb 2008 04:17:55 -0000	1.66
@@ -374,18 +374,19 @@
 		close();
 	}
 	
-	public function open():Void {
+	public function open(doTransition:Boolean):Void {
 		Debugger.log("calling open: " + _open, Debugger.CRITICAL, "open", " CanvasBranchView");
 		if(model instanceof CanvasModel) model.getCanvas().addBin(this.activityLayer);
 			
 		setSize(model);
 		
-		if (!(model.activeView instanceof CanvasBranchView)) {
+		if(doTransition || doTransition == null) {
 			var tm:TransitionManager = new TransitionManager(this);
 			tm.startTransition({type:mx.transitions.Zoom, 
 							direction:0, duration:1, easing:mx.transitions.easing.Bounce.easeOut});
 			tm.addEventListener("allTransitionsInDone", finishedOpen);
 		}
+		
 	}
 	
 	public function finishedOpen(evt:Object):Void {
Index: lams_flash/src/central/flash/org/lamsfoundation/lams/monitoring/mv/MonitorController.as
===================================================================
RCS file: /usr/local/cvsroot/lams_flash/src/central/flash/org/lamsfoundation/lams/monitoring/mv/MonitorController.as,v
diff -u -r1.16 -r1.17
--- lams_flash/src/central/flash/org/lamsfoundation/lams/monitoring/mv/MonitorController.as	5 Feb 2008 02:37:50 -0000	1.16
+++ lams_flash/src/central/flash/org/lamsfoundation/lams/monitoring/mv/MonitorController.as	5 Feb 2008 04:17:55 -0000	1.17
@@ -481,10 +481,12 @@
 		} else if(tgt.indexOf("exportPortfolio_btn") != -1){
 			exportClassPortfolio();
 		}else if(tgt.indexOf("refresh_btn") != -1){
+			
 			if(_monitorModel.activeView instanceof CanvasBranchView) {
 				_monitorModel.activeView.removeMovieClip();
 				_monitorModel.getMonitor.closeBranchView();
 			}
+			
 			if (_monitorModel.getSelectedTab() == 2)
 				_monitorModel.resetLearnerIndexBar();
 			
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.25 -r1.26
--- lams_flash/src/central/flash/org/lamsfoundation/lams/monitoring/mv/MonitorModel.as	5 Feb 2008 02:37:50 -0000	1.25
+++ lams_flash/src/central/flash/org/lamsfoundation/lams/monitoring/mv/MonitorModel.as	5 Feb 2008 04:17:55 -0000	1.26
@@ -138,6 +138,8 @@
 	private var backupLearnersProgArr:Array;
 	private var _searchResultsBackup:Array;
 	
+	private var _openBranchingActivity:Number;
+	
 	private var dispatchEvent:Function;       
     public var addEventListener:Function;  
     public var removeEventListener:Function;
@@ -1060,6 +1062,7 @@
 			activeView = (visible) ? ba.branchView : activeView;
 			
 			ba.branchView.setOpen(visible);
+			
 			ba.branchView.open();
 			
 			setDirty();
@@ -1394,4 +1397,12 @@
 		return _isDirty;
 	}
 	
+	public function set openBranchingActivity(a:Number):Void {
+		_openBranchingActivity = a;
+	}
+	
+	public function get openBranchingActivity():Number {
+		return _openBranchingActivity;
+	}
+	
 }
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.24 -r1.25
--- lams_flash/src/central/flash/org/lamsfoundation/lams/monitoring/mv/tabviews/MonitorTabView.as	5 Feb 2008 02:37:49 -0000	1.24
+++ lams_flash/src/central/flash/org/lamsfoundation/lams/monitoring/mv/tabviews/MonitorTabView.as	5 Feb 2008 04:17:54 -0000	1.25
@@ -214,7 +214,6 @@
 						drawDesignCalled = "called";
 						
 						mm.drawDesign(infoObj.tabID);
-						
 					}
 					break;
 				case 'DRAW_ALL' :
@@ -231,7 +230,6 @@
 			}
 
 	}
-	
 	/**
     * layout visual elements on the MonitorTabView on initialisation
     */
@@ -272,19 +270,21 @@
 	 */
 	private function reloadProgress(isChanged:Boolean){
 		var s:Object = mm.getSize();
-		var openBranchingActivity:Object = mm.currentBranchingActivity;
+		//var openBranchingActivity:Object = mm.currentBranchingActivity;
 		
 		drawDesignCalled = undefined;
 		
+		/**
 		if(openBranchingActivity && (mm.activeView instanceof CanvasBranchView)) { // learner has been force-completed
 			showAssets(false);
 			mm.getMonitor().getProgressData(mm.getSequence());
 			mm.activeView.removeMovieClip();
 			mm.getMonitor().openBranchView(openBranchingActivity, true);
 		} 
 		else {
-
+		*/
 			showAssets(true);
+			mm.openBranchingActivity = mm.currentBranchingActivity.activity.activityUIID;
 			mm.getMonitor().closeBranchView();
 		
 			//Remove all the movies drawn on the transition and activity movieclip holder
@@ -317,7 +317,7 @@
 			mm.activitiesDisplayed.clear();
 			
 			mm.getMonitor().getProgressData(mm.getSequence());
-		}
+		//}
 	}
 	
 	public function showAssets(v:Boolean) {
@@ -381,7 +381,7 @@
 		} else if(a.activityTypeID==Activity.OPTIONAL_ACTIVITY_TYPE || a.activityTypeID==Activity.OPTIONS_WITH_SEQUENCES_TYPE){
 			var children:Array = mm.getMonitor().ddm.getComplexActivityChildren(a.activityUIID);
 			newActivity_mc = activityLayer.createChildAtDepth("CanvasOptionalActivity", DepthManager.kTop, {_activity:a, _children:children, _monitorController:mc, _monitorTabView:mtv, fromModuleTab:"monitorMonitorTab", learnerContainer:_learnerContainer_mc});	
-		} else if(a.isBranchingActivity()){	
+		} else if(a.isBranchingActivity()){
 			newActivity_mc = activityLayer.createChildAtDepth("CanvasActivity", DepthManager.kBottom, {_activity:a,_monitorController:mc, _monitorView:mtv, _module:"monitoring", learnerContainer:_learnerContainer_mc, setupBranchView:false});
 		} else {
 			Debugger.log('The activity:'+a.title+','+a.activityUIID+' is of unknown type, it cannot be drawn',Debugger.CRITICAL,'drawActivity','MonitorTabView');