Index: lams_central/src/flash/org/lamsfoundation/lams/monitoring/mv/MonitorModel.as
===================================================================
diff -u -r62f9177bfcc5b69a0a4b9e7123df3a13238fb120 -r1ddf9ffd16f1d3d1a4b36b817919b8bd0fcb2d72
--- lams_central/src/flash/org/lamsfoundation/lams/monitoring/mv/MonitorModel.as	(.../MonitorModel.as)	(revision 62f9177bfcc5b69a0a4b9e7123df3a13238fb120)
+++ lams_central/src/flash/org/lamsfoundation/lams/monitoring/mv/MonitorModel.as	(.../MonitorModel.as)	(revision 1ddf9ffd16f1d3d1a4b36b817919b8bd0fcb2d72)
@@ -35,21 +35,26 @@
 class MonitorModel extends Observable{
 	private var _className:String = "MonitorModel";
    
-   public var RT_FOLDER:String = "Folder";
-   public var RT_ORG:String = "Organisation";
-   
+	public var RT_FOLDER:String = "Folder";
+	public var RT_ORG:String = "Organisation";
+	   
+	private static var LEARNER_ROLE:String = "LEARNER";
+	private static var STAFF_ROLE:String = "STAFF";
+	private static var TEACHER_ROLE:String = "TEACHER";
+	   
 	private var __width:Number;
 	private var __height:Number;
 	private var __x:Number;
 	private var __y:Number;
 	private var _isDirty:Boolean;
-	private var infoObj:Object;
-	private var selectedTab:Number;
-	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
@@ -79,9 +84,9 @@
 	
 	// 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
@@ -94,7 +99,7 @@
 	public function getSequence():Sequence{
 		return _activeSeq;
 	}
-	
+	
 	public function setOrganisation(org:Organisation){
 		_org = org;
 		
@@ -165,69 +170,70 @@
 	
 	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());
-			
-		}
 	}
+
+	/**
+	 * 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());
+			
+		}
+	}
+	
 	
 	/**
 	 * get the design in the DesignDataModel and update the Monitor Model accordingly.
@@ -281,12 +287,12 @@
 		}
 		
 	}
+	
+	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();
@@ -302,7 +308,7 @@
 	
 	
 	public function changeTab(tabID:Number){
-		//getMonitor().getMV().clearView();
+		//getMonitor().getMV().clearView();
 		selectedTab = tabID;
 		setChanged();
 		
@@ -313,13 +319,13 @@
 		notifyObservers(infoObj);
 		
 	}
-	
-	public function setDirty(){
-		_isDirty = true;
-		trace("In setDirty")
-		clearDesign();
-	}
 	
+	public function setDirty(){
+		_isDirty = true;
+		trace("In setDirty")
+		clearDesign();
+	}
+
 	public function setSize(width:Number,height:Number) {
 		__width = width;
 		__height = height;
@@ -414,14 +420,16 @@
 	 * @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){
+			// get the organisations (node) users by role
+			var roles:Array = new Array(LEARNER_ROLE, STAFF_ROLE, TEACHER_ROLE);
+			getMonitor().requestOrgUsersByRole(_selectedTreeNode.attributes.data, roles);
+		}
+		//dispatch an update to the view
+		//broadcastViewUpdate('ITEM_SELECTED',_selectedTreeNode);
 	}
 	/**
 	 * 
@@ -431,14 +439,13 @@
 	public function getSelectedTreeNode ():XMLNode {
 		return _selectedTreeNode;
 	}
-	
-	public function setSelectedTab(tabID:Number){
-		selectedTab = tabID;
+	public function setSelectedTab(tabID:Number){
+		selectedTab = tabID;
+	}
+	
+	public function getSelectedTab():Number{
+		return selectedTab;
 	}
-	
-	public function getSelectedTab():Number{
-		return selectedTab;
-	}
 	
 	//Accessors for x + y coordinates
     public function get x():Number{