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.14 -r1.15
--- lams_flash/src/central/flash/org/lamsfoundation/lams/monitoring/mv/MonitorController.as	11 Jan 2008 07:32:14 -0000	1.14
+++ lams_flash/src/central/flash/org/lamsfoundation/lams/monitoring/mv/MonitorController.as	25 Jan 2008 03:53:15 -0000	1.15
@@ -149,13 +149,12 @@
 	 * Check the force complete order for validity
 	 * 
 	 * @usage   
-	 * @param   indexArray 	Top-level canvas member activities on the canvas
 	 * @param   index      	index position 
 	 * @param   isChild    
 	 * @return  
 	 */
 	
-	private function checkHit(cActivity:Object, learnerObj:Object, indexArray:Array):Boolean {
+	private function checkHit(cActivity:Object, learnerObj:Object):Boolean {
 		
 		var actUIIDToCompare = learnerObj.activity.activityUIID;
 		var parentUIIDToCompare = learnerObj.activity.parentUIID;
@@ -167,7 +166,7 @@
 			if(actUIIDToCompare == cActivity.activity.activityUIID)
 				activitySnapBack(learnerObj);
 			else {
-				forceCompleteTransfer(learnerObj, cActivity, indexArray);
+				forceCompleteTransfer(learnerObj, cActivity);
 			}
 				
 		} else {
@@ -185,20 +184,25 @@
 	 * @usage   
 	 * @param   learnerObj 
 	 * @param   cActivity  
-	 * @param   indexArray 
 	 * @return  
 	 */
-	
-	private function forceCompleteTransfer(learnerObj:Object, cActivity:Object, indexArray:Array):Void {
-		var activityUIIDToCheck:Number = (cActivity.activity.parentUIID != null) ? cActivity.activity.parentUIID : cActivity.activity.activityUIID;
-		var prevActivityID:Number = indexArray[checkLearnerCurrentActivity(indexArray,activityUIIDToCheck) - 1].activity.activityID;
-		var URLToSend:String = _root.monitoringURL+"forceComplete&lessonID="+_root.lessonID+"&learnerID="+learnerObj.Learner.getLearnerId()+"&activityID="+prevActivityID;
-		
-		var fnOk:Function = Proxy.create(this, this.reloadProgress, this, URLToSend);
-		var fnCancel:Function = Proxy.create(this, this.activitySnapBack, learnerObj);
-		
-		LFMessage.showMessageConfirm(Dictionary.getValue('al_confirm_forcecomplete_toactivity',[learnerObj.Learner.getFullName(), cActivity.activity.title]), fnOk,fnCancel);
-		
+	private function forceCompleteTransfer(learnerObj:Object, cActivity:Object):Void {
+		var learnerActivityID:Number = learnerObj.Learner.getCurrentActivityId();
+		var activityToCheck = cActivity.activity; // initially the Activity where the learner icon has been dropped
+		var targetIsAccessible:Boolean = _monitorModel.getIsValidDropTarget(learnerActivityID, activityToCheck);
+
+		if (targetIsAccessible) {
+			var transObj:Object = _monitorModel.getMonitor().ddm.getTransitionsForActivityUIID(cActivity.activity.activityUIID);
+			var previousAct = _monitorModel.getMonitor().ddm.getActivityByUIID(transObj.into.fromUIID);
+			var URLToSend:String = _root.monitoringURL+"forceComplete&lessonID="+_root.lessonID+"&learnerID="+learnerObj.Learner.getLearnerId()+"&activityID="+previousAct.activityID;
+			var fnOk:Function = Proxy.create(this, this.reloadProgress, this, URLToSend);
+			var fnCancel:Function = Proxy.create(this, this.activitySnapBack, learnerObj);
+			
+			_monitorModel.inBranchView = true;
+			
+			LFMessage.showMessageConfirm(Dictionary.getValue('al_confirm_forcecomplete_toactivity',[learnerObj.Learner.getFullName(), cActivity.activity.title]), fnOk,fnCancel);			
+		} else
+			LFMessage.showMessageAlert(learnerObj.Learner.getFullName() +" cannot be dropped at the chosen location.", null, null);
 	}
 	
 	/**
@@ -209,28 +213,10 @@
 	 * @param   activityID      
 	 * @return  
 	 */
-	
 	private function checkifActivityNotComplete(learnerProgress:Progress, activityID:Number):Boolean {
 		return (Progress.compareProgressData(learnerProgress, activityID) != "completed_mc") ? true : false;
 	}
 	
-	/**
-	 * Return activity index
-	 * 
-	 * @usage   
-	 * @param   arr     
-	 * @param   actUIID 
-	 * @return  index 
-	 */
-	
-	private function checkLearnerCurrentActivity(arr:Array, actUIID:Number):Number{
-		for (var i=0; i<arr.length; i++){
-			if (arr[i].activity.activityUIID == actUIID){
-				return i;
-			}
-		}
-	}
-	
 	public function activityRelease(act:Object, forObj:String):Void{
 		
 		Debugger.log('activityRelease CanvasActivity:'+act.activity.activityID,Debugger.GEN,'activityRelease','MonitorController');
@@ -256,7 +242,7 @@
 							&& !cActivity.activity.isBranchingActivity())
 						cActivity = matchChildActivity(cActivity.children, dropTarget);
 					
-					hasHit = (cActivity.activity.activityUIID == dropTarget.activity.activityUIID) ? checkHit(cActivity, act, indexArray) : hasHit;
+					hasHit = (cActivity.activity.activityUIID == dropTarget.activity.activityUIID) ? checkHit(cActivity, act) : hasHit;
 				} 
 
 			}
@@ -307,7 +293,7 @@
 			r.showErrorAlert();
 		} else if(r) {
 			LFMessage.showMessageAlert(r);
-			_monitorModel.broadcastViewUpdate("RELOADPROGRESS", null, _monitorModel.getSelectedTab())
+			_monitorModel.broadcastViewUpdate("RELOADPROGRESS", null, _monitorModel.getSelectedTab());
 		}
 	}
 	
@@ -413,6 +399,7 @@
 			exportClassPortfolio();
 		}else if(tgt.indexOf("refresh_btn") != -1){
 			if(_monitorModel.activeView instanceof CanvasBranchView) {
+				_monitorModel.inBranchView = false;
 				_monitorModel.activeView.removeMovieClip();
 				_monitorModel.getMonitor.closeBranchView();
 			}
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.23 -r1.24
--- lams_flash/src/central/flash/org/lamsfoundation/lams/monitoring/mv/MonitorModel.as	11 Jan 2008 07:32:14 -0000	1.23
+++ lams_flash/src/central/flash/org/lamsfoundation/lams/monitoring/mv/MonitorModel.as	25 Jan 2008 03:53:15 -0000	1.24
@@ -62,6 +62,7 @@
 	private var selectedTab:Number;
 	private var _dialogOpen:String;		// the type of dialog currently open
 	
+	private var _inBranchView:Boolean;
 	private var _staffLoaded:Boolean;
 	private var _learnersLoaded:Boolean;
 	private var _isLessonProgressChanged:Boolean;
@@ -150,6 +151,7 @@
 	public function MonitorModel (monitor:Monitor){
 		_monitor = monitor;
 		
+		_inBranchView = false;
 		_showLearners = true;
 		isDesignDrawn = true;
 		_drawButtons = true;
@@ -387,16 +389,32 @@
 	
 	public function isShowLearners():Boolean{
 		return _showLearners;
-	}
-
-
+	}
+	
+	public function getIsValidDropTarget(learnerActivityID:Number, activity:Object):Boolean {
+		var activityToCheck = activity;
+		var targetIsAccessible:Boolean = false; // must check if target is accessible, i.e. if inside branching, on the same branch
+		do {
+			var transObj:Object = app.getMonitor().ddm.getTransitionsForActivityUIID(activityToCheck.activityUIID);
+			var previousAct = app.getMonitor().ddm.getActivityByUIID(transObj.into.fromUIID);
+			if (previousAct.activityID == learnerActivityID) {
+				Debugger.log("Activity target is accessible", Debugger.CRITICAL, "getIsValidDropTarget", "MonitorModel");
+				targetIsAccessible = true;
+				break;
+			}
+			activityToCheck = previousAct;
+		} while (transObj.into.fromUIID != null);
+		
+		return targetIsAccessible;
+	}
+	
 	public function activitiesOnCanvas():Array{
 		var actAll:Array = new Array();
 		var k:Array = _activitiesDisplayed.values();
 		for (var i=0; i<k.length; i++){
 			actAll.push(k[i]);		
 		}
-		
+
 		return actAll;
 	}
 	/**
@@ -867,9 +885,16 @@
 		} else {
 			ApplicationParent.extCall("reloadWindow", null);
 		}
-		
 	}
 	
+	public function get inBranchView():Boolean {
+		return _inBranchView;
+	}
+	
+	public function set inBranchView(s:Boolean) {
+		_inBranchView = s;
+	}
+	
 	public function tabHelp(){
 		var callback:Function = Proxy.create(this, openTabHelp);
 		app.getHelpURL(callback)
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.22 -r1.23
--- lams_flash/src/central/flash/org/lamsfoundation/lams/monitoring/mv/tabviews/MonitorTabView.as	9 Jan 2008 02:50:49 -0000	1.22
+++ lams_flash/src/central/flash/org/lamsfoundation/lams/monitoring/mv/tabviews/MonitorTabView.as	25 Jan 2008 03:53:15 -0000	1.23
@@ -147,7 +147,7 @@
 							}
 							
 							if(mm.getIsProgressChangedSequence()){
-								reloadProgress(false);
+								reloadProgress(o.hasChanged(), mm);
 							}
 						}
 						
@@ -169,7 +169,7 @@
 					break;
 				case 'RELOADPROGRESS' :	
 					if (infoObj.tabID == _tabID && !mm.locked){
-						reloadProgress(true)
+						reloadProgress(o.hasChanged(), mm);
 					}
 					break;	
 				case 'DRAW_ACTIVITY' :
@@ -270,44 +270,62 @@
 	 * @usage   
 	 * @return  nothing
 	 */
-	private function reloadProgress(isChanged:Boolean){
-			var s:Object = mm.getSize();
-			drawDesignCalled = undefined;
-			
+	private function reloadProgress(isChanged:Boolean){
+		var s:Object = mm.getSize();
+		var openBranchingActivity:Object = mm.currentBranchingActivity;
+		
+		drawDesignCalled = undefined;
+		
+		if(openBranchingActivity && mm.inBranchView == true) { // learner has been force-completed
+			showAssets(false);
+			mm.getMonitor().getProgressData(mm.getSequence());
+			mm.activeView.removeMovieClip();
+			mm.getMonitor().openBranchView(openBranchingActivity, true);
+		} 
+		else {
+
+			showAssets(true);
 			mm.getMonitor().closeBranchView();
-			
-			//Remove all the movies drawn on the transition and activity movieclip holder
+		
+			//Remove all the movies drawn on the transition and activity movieclip holder
 			
-			this._learnerContainer_mc.removeMovieClip();
-			this.transitionLayer.removeMovieClip();
+			this._learnerContainer_mc.removeMovieClip();
+			this.transitionLayer.removeMovieClip();
 			this.activityLayer.removeMovieClip();
-			this.transparentCover.removeMovieClip();
-			
-			//Recreate both Transition holder and Activity holder Movieclips
-			transitionLayer = this.createEmptyMovieClip("_transitionLayer_mc", this.getNextHighestDepth());
+			this.transparentCover.removeMovieClip();
 			
-			activityLayer = this.createEmptyMovieClip("_activityLayer_mc", this.getNextHighestDepth(),{_y:learnerMenuBar._height});
+			//Recreate both Transition holder and Activity holder Movieclips
+			transitionLayer = this.createEmptyMovieClip("_transitionLayer_mc", this.getNextHighestDepth());
 			
-			_learnerContainer_mc = this.createEmptyMovieClip("_learnerContainer_mc", this.getNextHighestDepth());
+			activityLayer = this.createEmptyMovieClip("_activityLayer_mc", this.getNextHighestDepth(),{_y:learnerMenuBar._height});
 			
+			_learnerContainer_mc = this.createEmptyMovieClip("_learnerContainer_mc", this.getNextHighestDepth());
+			
 			transparentCover = this.attachMovie("Panel", "_transparentCover_mc", this.getNextHighestDepth(), {_visible: false, enabled: false, _alpha: 50});
 			transparentCover.onPress = null;
-		
-			if (isChanged == false){
-				mm.setIsProgressChangedSequence(false);
-				
-			} else {
-				mm.setIsProgressChangedLesson(true);
-				mm.setIsProgressChangedLearner(true);
+		
+			if (isChanged == false){
+				mm.setIsProgressChangedSequence(false);
+				
+			} else {
+				mm.setIsProgressChangedLesson(true);
+				mm.setIsProgressChangedLearner(true);
 			}
 			
 			mm.branchesDisplayed.clear();
 			mm.transitionsDisplayed.clear();
 			mm.activitiesDisplayed.clear();
 			
 			mm.getMonitor().getProgressData(mm.getSequence());
-			
+		}
 	}
+	
+	public function showAssets(v:Boolean) {
+		this._learnerContainer_mc._visible = v;
+		this.transitionLayer._visible = v;
+		this.activityLayer._visible = v;
+		this.transparentCover._visible = v;
+	}
 	
 	/**
 	 * Remove the activityies from screen on selection of new lesson
@@ -346,7 +364,6 @@
 	 * @return  Boolean - successfullit
 	 */
 	private function drawActivity(a:Activity,mm:MonitorModel):Boolean{
-		
 		var mtv = MonitorTabView(this);
 		var mc = getController();
 		var newActivity_mc = null;