Index: lams_central/src/flash/org/lamsfoundation/lams/monitoring/mv/MonitorModel.as
===================================================================
diff -u -r706d39684e637baaf48a4297f4eeee751861ced3 -r62f9177bfcc5b69a0a4b9e7123df3a13238fb120
--- lams_central/src/flash/org/lamsfoundation/lams/monitoring/mv/MonitorModel.as	(.../MonitorModel.as)	(revision 706d39684e637baaf48a4297f4eeee751861ced3)
+++ lams_central/src/flash/org/lamsfoundation/lams/monitoring/mv/MonitorModel.as	(.../MonitorModel.as)	(revision 62f9177bfcc5b69a0a4b9e7123df3a13238fb120)
@@ -43,15 +43,13 @@
 	private var __x:Number;
 	private var __y:Number;
 	private var _isDirty:Boolean;
-	private var infoObj:Object;
-	
-	
-	private var _dialogOpen:String;		// the type of dialog currently open
-	
+	private var infoObj:Object;
+	private var selectedTab:Number;
+	private var _dialogOpen:String;		// the type of dialog currently open
 	private var _monitor:Monitor;
 	
 	// add model data
-	private var _activeSeq:Sequence;
+	private var _activeSeq:Sequence;
 	private var _org:Organisation;
 	private var _todos:Array;  // Array of ToDo ContributeActivity(s)
 	// state data
@@ -81,22 +79,22 @@
 	
 	// add get/set methods
 	
-	public function setSequence(activeSeq:Sequence){
-		_activeSeq = activeSeq;
-		_monitor.openLearningDesign(_activeSeq)
+	public function setSequence(activeSeq:Sequence){
+		_activeSeq = activeSeq;
+		_monitor.openLearningDesign(activeSeq)
 		setChanged();
 		
 		//send an update
 		infoObj = {};
 		infoObj.updateType = "SEQUENCE";
-		infoObj.tabID = getMonitor().getMV().getMonitorTab().selectedIndex;
+		infoObj.tabID = getSelectedTab();
 		notifyObservers(infoObj);
 	}
 	
 	public function getSequence():Sequence{
 		return _activeSeq;
 	}
-	
+	
 	public function setOrganisation(org:Organisation){
 		_org = org;
 		
@@ -167,6 +165,68 @@
 	
 	public function isShowLearners():Boolean{
 		return _showLearners;
+	}
+	
+	/**
+	 * Compares the design in the CanvasModel (what is displayed on the screen) 
+	 * against the design in the DesignDataModel and updates the Canvas Model accordingly.
+	 * NOTE: Design elements are added to the DDM here, but removed in the View
+	 * 
+	 * @usage   
+	 * @return  
+	 */
+	public function clearDesign(){
+	
+		//porobbably need to get a bit more granular
+		Debugger.log('Running',Debugger.GEN,'refreshDesign','MonitorModel');
+		//go through the design and see what has changed, compare DDM to canvasModel
+		//var ddmActivity_keys:Array = _monitor.ddm.activities.keys();
+		var mmActivity_keys:Array = _activitiesDisplayed.keys();
+		//var longest = Math.max(ddmActivity_keys.length, mmActivity_keys.length);
+		var longest = mmActivity_keys.length;
+		//chose which array we are going to loop over
+		var indexArray:Array;
+		
+		//if(ddmActivity_keys.length == longest){
+		//	indexArray = ddmActivity_keys;
+		//}else{
+			indexArray = mmActivity_keys;
+		//}
+		trace("Longest: "+longest)
+		//loop through and do comparison
+		for(var i=0;i<longest;i++){
+			var keyToCheck:Number = indexArray[i];
+			//var ddm_activity:Activity = _monitor.ddm.activities.get(keyToCheck);
+			var mm_activity:Activity = _activitiesDisplayed.get(keyToCheck).activity;
+			
+			//var r_activity:Object = compareActivities(ddm_activity, mm_activity);
+			//trace("Value of R: "+r_activity)
+			//if(r_activity == "DELETE"){
+				broadcastViewUpdate("REMOVE_ACTIVITY",mm_activity, getSelectedTab());
+			//}
+			//else if(r_activity == "NEW"){
+			//	broadcastViewUpdate("DRAW_ACTIVITY",ddm_activity, getSelectedTab());
+			//}else{
+	
+			//}
+		}
+		
+		/*--------For Clearing Transitions---------*/
+		
+		var mmTransition_keys:Array = _transitionsDisplayed.keys();
+		var transLongest = mmTransition_keys.length;
+		//chose which array we are going to loop over
+		var transIndexArray:Array;
+		transIndexArray = mmTransition_keys;
+		
+		trace("Longest: "+transLongest)
+		//loop through and do comparison
+		for(var i=0;i<transLongest;i++){
+			var transkeyToCheck:Number = transIndexArray[i];
+			var mm_transition:Transition = _transitionsDisplayed.get(transkeyToCheck).transition;
+			broadcastViewUpdate("REMOVE_TRANSITION",mm_transition, getSelectedTab());
+			
+		}
 	}
 	
 	/**
@@ -221,28 +281,29 @@
 		}
 		
 	}
-	
-	public function setDialogOpen(dialogOpen:String){
-		_dialogOpen = dialogOpen;
-		broadcastViewUpdate(_dialogOpen, null, null);
-	}
 	
+	public function setDialogOpen(dialogOpen:String){
+		_dialogOpen = dialogOpen;
+		broadcastViewUpdate(_dialogOpen, null, null);
+	}
+
 	public function broadcastViewUpdate(updateType, data, tabID){
 		//getMonitor().getMV().clearView();
 		setChanged();
 		
 		//send an update
 		infoObj = {};
 		infoObj.updateType = updateType;
-		infoObj.drawData = data;
+		infoObj.data = data;
 		infoObj.tabID = tabID;
 		notifyObservers(infoObj);
 		
 	}
 	
 	
 	public function changeTab(tabID:Number){
-		//getMonitor().getMV().clearView();
+		//getMonitor().getMV().clearView();
+		selectedTab = tabID;
 		setChanged();
 		
 		//send an update
@@ -252,6 +313,12 @@
 		notifyObservers(infoObj);
 		
 	}
+	
+	public function setDirty(){
+		_isDirty = true;
+		trace("In setDirty")
+		clearDesign();
+	}
 	
 	public function setSize(width:Number,height:Number) {
 		__width = width;
@@ -347,14 +414,14 @@
 	 * @param   newselectedTreeNode 
 	 * @return  
 	 */
-	public function setSelectedTreeNode (newselectedTreeNode:XMLNode):Void {
-		_selectedTreeNode = newselectedTreeNode;
-		trace('branch: ' + _selectedTreeNode.attributes.isBranch);
-		if(!_selectedTreeNode.attributes.isBranch){
-			getMonitor().requestOrgUsersByRole(_selectedTreeNode.attributes.data, "LEARNER");
-		}
-		//dispatch an update to the view
-		//broadcastViewUpdate('ITEM_SELECTED',_selectedTreeNode);
+	public function setSelectedTreeNode (newselectedTreeNode:XMLNode):Void {
+		_selectedTreeNode = newselectedTreeNode;
+		trace('branch: ' + _selectedTreeNode.attributes.isBranch);
+		if(!_selectedTreeNode.attributes.isBranch){
+			getMonitor().requestOrgUsersByRole(_selectedTreeNode.attributes.data, "LEARNER");
+		}
+		//dispatch an update to the view
+		//broadcastViewUpdate('ITEM_SELECTED',_selectedTreeNode);
 	}
 	/**
 	 * 
@@ -364,7 +431,14 @@
 	public function getSelectedTreeNode ():XMLNode {
 		return _selectedTreeNode;
 	}
-
+	
+	public function setSelectedTab(tabID:Number){
+		selectedTab = tabID;
+	}
+	
+	public function getSelectedTab():Number{
+		return selectedTab;
+	}
 	
 	//Accessors for x + y coordinates
     public function get x():Number{