Index: lams_flash/src/central/flash/lams_monitoring_v1.fla
===================================================================
diff -u -r2c4bb9370bf36386236d0c7d92edc46437d50800 -r36a58619b25a62884e05e3a0d58c2cae326d2e1c
Binary files differ
Index: lams_flash/src/central/flash/org/lamsfoundation/lams/authoring/cv/CanvasActivity.as
===================================================================
diff -u -rcdaf8d56ec7cf8c47c0b11eb79f00621d5148eb5 -r36a58619b25a62884e05e3a0d58c2cae326d2e1c
--- lams_flash/src/central/flash/org/lamsfoundation/lams/authoring/cv/CanvasActivity.as	(.../CanvasActivity.as)	(revision cdaf8d56ec7cf8c47c0b11eb79f00621d5148eb5)
+++ lams_flash/src/central/flash/org/lamsfoundation/lams/authoring/cv/CanvasActivity.as	(.../CanvasActivity.as)	(revision 36a58619b25a62884e05e3a0d58c2cae326d2e1c)
@@ -383,34 +383,50 @@
 		}
 		
 		// get the length of learners from the Monitor Model and run a for loop.
-		var learnersProgress:Array = mm.allLearnersProgress;
+		findCurrentUsersInProgress(mm.allLearnersProgress, true, [learner_X, learner_Y, xCoord]);
+		
+	}
+	
+	private function findCurrentUsersInProgress(learnersProgress:Array, attachIcons:Boolean, offsets:Array):Number {
+		var noOfCurrent:Number = 0;
+		var learner_X = offsets[0];
+		var learner_Y = offsets[1];
+		var xCoord = offsets[2];
+		
 		for (var j=0; j<learnersProgress.length; j++){
-				
+			
 			var learner:Object = new Object();
 			learner = learnersProgress[j]
 					
 			//Gets a true if learner's currect activityID matches this activityID else false.
 			var isLearnerCurrentAct:Boolean = Progress.isLearnerCurrentActivity(learner, _activity.activityID);
 			
 			if (isLearnerCurrentAct){
+				noOfCurrent++;
 				
-				// Add + icon to indicate that more users are currently at the Activity. 
-				// We are unable to display all the users across the Activity's panel.
-				Debugger.log("learner_X: " + learner_X + " ref: " + learnerContainer + " xcoord: " + xCoord, Debugger.CRITICAL, "drawLearners", "CanvasActivity");
-				
-				if(learner_X > (xCoord + getVisibleWidth() - 30)) {
-					learnerContainer.attachMovie("learnerIcon", "learnerIcon"+learner.getUserName()+activity.activityUIID, learnerContainer.getNextHighestDepth(), {_activity:_activity, learner:learner, _monitorController:_monitorController, _x:learner_X, _y:learner_Y, _hasPlus:true, _clone:false });
-					learnerContainer.attachMovie("plusIcon", "plusIcon", learnerContainer.getNextHighestDepth(), {_activity:_activity, _monitorController:_monitorController, _x:learner_X+PLUS_MARGIN_X, _y:learner_Y+PLUS_MARGIN_Y});
-					return;
+				if(attachIcons) {
+					// Add + icon to indicate that more users are currently at the Activity. 
+					// We are unable to display all the users across the Activity's panel.
+					Debugger.log("learner_X: " + learner_X + " ref: " + learnerContainer, Debugger.CRITICAL, "drawLearners", "CanvasActivity");
+					
+					if(learner_X > (xCoord + getVisibleWidth() - 30)) {
+						noOfCurrent += findCurrentUsersInProgress(learnersProgress.slice(j+1, learnersProgress.length), false, null, null);
+						learnerContainer.attachMovie("learnerIcon", "learnerIcon"+learner.getUserName()+activity.activityUIID, learnerContainer.getNextHighestDepth(), {_activity:_activity, learner:learner, _monitorController:_monitorController, _x:learner_X, _y:learner_Y, _clone:false});
+						learnerContainer.attachMovie("plusIcon", "plusIcon", learnerContainer.getNextHighestDepth(), {_activity:_activity, _monitorController:_monitorController, _x:learner_X+PLUS_MARGIN_X, _y:learner_Y+PLUS_MARGIN_Y, _noOfLearners: noOfCurrent});
+						
+						return noOfCurrent;
+					}
+	
+					// attach icon
+					learnerContainer.attachMovie("learnerIcon", "learnerIcon"+learner.getUserName()+activity.activityUIID, learnerContainer.getNextHighestDepth(), {_activity:_activity, learner:learner, _monitorController:_monitorController, _x:learner_X, _y:learner_Y, _clone:false });
+					
+					//  space icons
+					learner_X += 10;
 				}
-
-				// attach icon
-				learnerContainer.attachMovie("learnerIcon", "learnerIcon"+learner.getUserName()+activity.activityUIID, learnerContainer.getNextHighestDepth(), {_activity:_activity, learner:learner, _monitorController:_monitorController, _x:learner_X, _y:learner_Y, _hasPlus:false, _clone:false });
-				
-				//  space icons
-				learner_X += 10;
 			}
 		}
+		
+		return noOfCurrent;
 	}
 	
 	/**
Index: lams_flash/src/central/flash/org/lamsfoundation/lams/authoring/cv/CanvasOptionalActivity.as
===================================================================
diff -u -rcdaf8d56ec7cf8c47c0b11eb79f00621d5148eb5 -r36a58619b25a62884e05e3a0d58c2cae326d2e1c
--- lams_flash/src/central/flash/org/lamsfoundation/lams/authoring/cv/CanvasOptionalActivity.as	(.../CanvasOptionalActivity.as)	(revision cdaf8d56ec7cf8c47c0b11eb79f00621d5148eb5)
+++ lams_flash/src/central/flash/org/lamsfoundation/lams/authoring/cv/CanvasOptionalActivity.as	(.../CanvasOptionalActivity.as)	(revision 36a58619b25a62884e05e3a0d58c2cae326d2e1c)
@@ -326,35 +326,52 @@
 		var learner_X = (mm.activeView instanceof CanvasComplexView) ? this._x + learnerOffset_X : _activity.xCoord + learnerOffset_X;
 		var learner_Y = (mm.activeView instanceof CanvasComplexView) ? this._y + learnerOffset_Y : _activity.yCoord + learnerOffset_Y;
 		
+		findCurrentUsersInProgress(mm.allLearnersProgress, true, learner_X, learner_Y);
+	}
+	
+	private function findCurrentUsersInProgress(learnersProgress:Array, attachIcons:Boolean, offsetX, offsetY):Number {
+		var mm:MonitorModel = MonitorModel(_monitorController.getModel());
+		
+		var noOfCurrent:Number = 0;
+		var learner_X = offsetX;
+		var learner_Y = offsetY;
+		
 		// get the length of learners from the Monitor Model and run a for loop.
-		for (var j=0; j<mm.allLearnersProgress.length; j++){
+		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);
-			var hasPlus:Boolean = false;
 			
-			if (isLearnerCurrentAct){
-				var actX:Number = (mm.activeView instanceof CanvasComplexView) ? this._x : _activity.xCoord;
+			if (isLearnerCurrentAct) {
+				noOfCurrent++;
 				
-				if (learner_X > (actX + 92)){
-					learner_X = actX + learnerOffset_X ;
-					learner_Y = 27;
-					hasPlus = true;
+				if(attachIcons) {
+				
+					var actX:Number = (mm.activeView instanceof CanvasComplexView) ? this._x : _activity.xCoord;
 					
-					learnerContainer.attachMovie("learnerIcon", "learnerIcon"+learner.getUserName(), learnerContainer.getNextHighestDepth(),{_activity:_activity, learner:learner, _monitorController:_monitorController, _x:learner_X, _y:learner_Y, _hasPlus:hasPlus });
-					learnerContainer.attachMovie("plusIcon", "plusIcon", learnerContainer.getNextHighestDepth(), {_activity:_activity, _monitorController:_monitorController, _x:learner_X+PLUS_MARGIN_X, _y:learner_Y+PLUS_MARGIN_Y});
-					return;
+					if (learner_X > (actX + 92)){
+						learner_X = actX + learnerOffset_X ;
+						learner_Y = 27;
+						
+						noOfCurrent += findCurrentUsersInProgress(learnersProgress.slice(j+1, learnersProgress.length), false, null, null);
+							
+						learnerContainer.attachMovie("learnerIcon", "learnerIcon"+learner.getUserName(), learnerContainer.getNextHighestDepth(),{_activity:_activity, learner:learner, _monitorController:_monitorController, _x:learner_X, _y:learner_Y});
+						learnerContainer.attachMovie("plusIcon", "plusIcon", learnerContainer.getNextHighestDepth(), {_activity:_activity, _monitorController:_monitorController, _x:learner_X+PLUS_MARGIN_X, _y:learner_Y+PLUS_MARGIN_Y, _noOfLearners:noOfCurrent});
+						
+						return noOfCurrent;
+					}
+						
+					learnerContainer.attachMovie("learnerIcon", "learnerIcon"+learner.getUserName(), learnerContainer.getNextHighestDepth(),{_activity:_activity, learner:learner, _monitorController:_monitorController, _x:learner_X, _y:learner_Y});
+					learner_X += 10;
 				}
-					
-				learnerContainer.attachMovie("learnerIcon", "learnerIcon"+learner.getUserName(), learnerContainer.getNextHighestDepth(),{_activity:_activity, learner:learner, _monitorController:_monitorController, _x:learner_X, _y:learner_Y, _hasPlus:hasPlus});
-				learner_X = learner_X+10;
 			}
 		}
+		
+		return noOfCurrent;
 	}
 	
-	
 	private function draw (){
 		
 		var numOfChildren = _children.length;
Index: lams_flash/src/central/flash/org/lamsfoundation/lams/authoring/cv/CanvasParallelActivity.as
===================================================================
diff -u -rcdaf8d56ec7cf8c47c0b11eb79f00621d5148eb5 -r36a58619b25a62884e05e3a0d58c2cae326d2e1c
--- lams_flash/src/central/flash/org/lamsfoundation/lams/authoring/cv/CanvasParallelActivity.as	(.../CanvasParallelActivity.as)	(revision cdaf8d56ec7cf8c47c0b11eb79f00621d5148eb5)
+++ lams_flash/src/central/flash/org/lamsfoundation/lams/authoring/cv/CanvasParallelActivity.as	(.../CanvasParallelActivity.as)	(revision 36a58619b25a62884e05e3a0d58c2cae326d2e1c)
@@ -252,31 +252,47 @@
 		var learner_X = (mm.activeView instanceof CanvasComplexView) ? this._x + learnerOffset_X : _activity.xCoord + learnerOffset_X;
 		var learner_Y = (mm.activeView instanceof CanvasComplexView) ? this._y + learnerOffset_Y : _activity.yCoord + learnerOffset_Y;
 			
+		findCurrentUsersInProgress(mm.allLearnersProgress, true, learner_X, learner_Y);
+	}
+	
+	private function findCurrentUsersInProgress(learnersProgress:Array, attachIcons:Boolean, offsetX, offsetY):Number {
+		var mm:MonitorModel = MonitorModel(_monitorController.getModel());
+		
+		var noOfCurrent:Number = 0;
+		var learner_X = offsetX;
+		var learner_Y = offsetY;
+		
 		// get the length of learners from the Monitor Model and run a for loop.
-		for (var j=0; j<mm.allLearnersProgress.length; j++){
+		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);
-			var hasPlus:Boolean = false;
 			
 			if (isLearnerCurrentAct){
-				var actX:Number = (mm.activeView instanceof CanvasComplexView) ? this._x : _activity.xCoord;
-					
-				if (learner_X > (actX + 92)){
-					learner_X = actX + learnerOffset_X 
-					learner_Y = 27
-					hasPlus = true;
-					learnerContainer.attachMovie("learnerIcon", "learnerIcon"+learner.getUserName(), this._parent.getNextHighestDepth(),{_activity:_activity, learner:learner, _monitorController:_monitorController, _x:learner_X, _y:learner_Y, _hasPlus:hasPlus });
-					learnerContainer.attachMovie("plusIcon", "plusIcon", learnerContainer.getNextHighestDepth(), {_activity:_activity, _monitorController:_monitorController, _x:learner_X+PLUS_MARGIN_X, _y:learner_Y+PLUS_MARGIN_Y});
-					return;
+				noOfCurrent++;
+				
+				if(attachIcons) {
+					var actX:Number = (mm.activeView instanceof CanvasComplexView) ? this._x : _activity.xCoord;
+						
+					if (learner_X > (actX + 92)){
+						learner_X = actX + learnerOffset_X;
+						learner_Y = 27;
+						
+						learnerContainer.attachMovie("learnerIcon", "learnerIcon"+learner.getUserName(), this._parent.getNextHighestDepth(),{_activity:_activity, learner:learner, _monitorController:_monitorController, _x:learner_X, _y:learner_Y});
+						learnerContainer.attachMovie("plusIcon", "plusIcon", learnerContainer.getNextHighestDepth(), {_activity:_activity, _monitorController:_monitorController, _x:learner_X+PLUS_MARGIN_X, _y:learner_Y+PLUS_MARGIN_Y, _noOfLearners:noOfCurrent});
+						
+						return noOfCurrent;
+					}
+						
+					learnerContainer.attachMovie("learnerIcon", "learnerIcon"+learner.getUserName(), this._parent.getNextHighestDepth(),{_activity:_activity, learner:learner, _monitorController:_monitorController, _x:learner_X, _y:learner_Y});
+					learner_X += 10;
 				}
-					
-				learnerContainer.attachMovie("learnerIcon", "learnerIcon"+learner.getUserName(), this._parent.getNextHighestDepth(),{_activity:_activity, learner:learner, _monitorController:_monitorController, _x:learner_X, _y:learner_Y, _hasPlus:hasPlus});
-				learner_X = learner_X+10
 			}
 		}
+		
+		return noOfCurrent;
 	}
 	
 	private function draw(){
Index: lams_flash/src/central/flash/org/lamsfoundation/lams/monitoring/LearnersDialog.as
===================================================================
diff -u -r7b65bab3de4ed5068c5631a245c30cb4eaa8f098 -r36a58619b25a62884e05e3a0d58c2cae326d2e1c
--- lams_flash/src/central/flash/org/lamsfoundation/lams/monitoring/LearnersDialog.as	(.../LearnersDialog.as)	(revision 7b65bab3de4ed5068c5631a245c30cb4eaa8f098)
+++ lams_flash/src/central/flash/org/lamsfoundation/lams/monitoring/LearnersDialog.as	(.../LearnersDialog.as)	(revision 36a58619b25a62884e05e3a0d58c2cae326d2e1c)
@@ -22,6 +22,7 @@
  */
 
 import mx.controls.*
+import mx.controls.gridclasses.DataGridColumn;
 import mx.utils.*
 import mx.managers.*
 import mx.events.*
@@ -31,6 +32,7 @@
 import org.lamsfoundation.lams.common.dict.*
 import org.lamsfoundation.lams.common.style.*
 import org.lamsfoundation.lams.common.*
+import org.lamsfoundation.lams.authoring.Activity;
 import org.lamsfoundation.lams.monitoring.*
 import org.lamsfoundation.lams.monitoring.mv.*
 import org.lamsfoundation.lams.monitoring.mv.tabviews.*
@@ -41,19 +43,16 @@
 */
 class LearnersDialog extends MovieClip implements Dialog{
 	
-	public var RT_ORG:String = "Organisation";
-	public static var USERS_X:Number = -5;
-	public static var USER_OFFSET:Number = 20;
-	
 	//References to components + clips 
     private var _container:MovieClip;  //The container window that holds the dialog
 	
     private var close_btn:Button;         // Close window button
+	private var view_btn:Button;
+	
     private var learners_lbl:Label;
 	private var panel:MovieClip;       //The underlaying panel base
 	
-	private var learner_scp:MovieClip;		// learners container
-	private var _learner_mc:MovieClip;
+	private var learner_dgd:DataGrid;
 	
     private var fm:FocusManager;            //Reference to focus manager
     private var themeManager:ThemeManager;  //Theme manager
@@ -62,27 +61,29 @@
     private var xCloseOffset:Number;
     private var yCloseOffset:Number;
 	
-	private var _lessonTabView:LessonTabView;
+	private var learner_dgd_Xoffset:Number;
+	private var learner_dgd_Yoffset:Number;
+	
 	private var _monitorModel:MonitorModel;
-	private var _monitorView:MonitorView;
+	private var _monitorView;
 	private var _monitorController:MonitorController;
-
-	private var _learnerList:Array;
 	
+	private var currentActivity:Activity;
+	
 	//These are defined so that the compiler can 'see' the events that are added at runtime by EventDispatcher
     private var dispatchEvent:Function;     
     public var addEventListener:Function;
     public var removeEventListener:Function;
 	
-	 /**
+	/**
     * constructor
     */
     function LearnersDialog(){
 		//Set up this class to use the Flash event delegation model
         EventDispatcher.initialize(this);
         
         //Create a clip that will wait a frame before dispatching init to give components time to setup
-        MovieClipUtils.doLater(Proxy.create(this,init));
+        MovieClipUtils.doLater(Proxy.create(this, init));
 	}
 	
 	/**
@@ -97,13 +98,18 @@
 		
         //Set the text for buttons
 		close_btn.label = Dictionary.getValue('ls_win_learners_close_btn');
+		view_btn.label = "View Learner"; //Dictionary.getValue('ls_win_learners_view_btn');
 		
+		view_btn._visible = false;
+		view_btn.enabled = false;
         //Set the labels
 		
         //EVENTS
         //Add event listeners for ok, cancel and close buttons
-        close_btn.addEventListener('click',Delegate.create(this, close));
-        
+        close_btn.addEventListener('click', Delegate.create(this, close));
+        view_btn.addEventListener('click', Delegate.create(this, viewLearner));
+		learner_dgd.addEventListener('cellPress', Delegate.create(this, cellPress));
+		
 		//Assign Click (close button) and resize handlers
         _container.addEventListener('click',this);
         _container.addEventListener('size',this);
@@ -112,6 +118,9 @@
         xCloseOffset = panel._width - close_btn._x;
         yCloseOffset = panel._height - close_btn._y;
 		
+		learner_dgd_Xoffset = learner_dgd._width/panel._width;
+		learner_dgd_Yoffset = learner_dgd._height/panel._height;
+		
 		//fire event to say we have loaded
 		_container.contentLoaded();
     }
@@ -121,20 +130,27 @@
 	 * @usage   
 	 * @return  
 	 */
-	public function setUpContent():Void{
-		Debugger.log('_monitorView:'+_monitorView,Debugger.GEN,'setUpContent','org.lamsfoundation.lams.LearnersDialog');
-		
+	public function setUpContent(mm:MonitorModel, _currentActivity:Activity):Void{
 		//get a ref to the controller and kkep it here to listen for events:
-		_monitorController = _monitorView.getController();
-		var mm:MonitorModel = MonitorModel(_monitorController.getModel());
+		_monitorController = (_monitorView instanceof LessonTabView) ? LessonTabView(_monitorView).getController() : MonitorTabView(_monitorView).getController();
+		_monitorModel = mm;
 		
-		learners_lbl.text = Dictionary.getValue('ls_win_learners_heading_lbl') + " " + mm.getSequence().organisationName;
+		currentActivity = (_currentActivity != null || _currentActivity != undefined) ? _currentActivity : null;
 		
+		learners_lbl.text = (currentActivity != null) ? Dictionary.getValue('ls_win_learners_heading_lbl', [Dictionary.getValue('ls_win_learners_heading_activity_lbl'), currentActivity.title]) : Dictionary.getValue('ls_win_learners_heading_lbl', [Dictionary.getValue('ls_win_learners_heading_class_lbl'), _monitorModel.getSequence().organisationName]);
+		learners_lbl.autoSize = "left";
+		
 		 //Add event listeners for ok, cancel and close buttons
-        close_btn.addEventListener('onPress',Delegate.create(this, close));
+        close_btn.addEventListener('onPress', Delegate.create(this, close));
+		view_btn._visible = (currentActivity != null);
 		
-		var callback:Function = Proxy.create(this,loadLearners);
-		Application.getInstance().getComms().getRequest('monitoring/monitoring.do?method=getLessonLearners&lessonID='+_root.lessonID,callback, false);
+		if(currentActivity == null) {
+			var callback:Function = Proxy.create(this, loadLearners);
+			Application.getInstance().getComms().getRequest('monitoring/monitoring.do?method=getLessonLearners&lessonID='+_root.lessonID, callback, false);
+		} else {
+			// get users from progress details
+			loadLearners(_monitorModel.allLearnersProgress);
+		}
 	}
 	
     /**
@@ -150,12 +166,13 @@
 		panel.setStyle('styleName', styleObj);
 
 		//Apply scrollpane style
-		styleObj = themeManager.getStyleObject('scrollpane');
-		learner_scp.setStyle('styleName', styleObj);
+		styleObj = themeManager.getStyleObject('datagrid');
+		learner_dgd.setStyle('styleName', styleObj);
 
         //Get the button style from the style manager and apply to both buttons
         styleObj = themeManager.getStyleObject('button');
         close_btn.setStyle('styleName',styleObj);
+		view_btn.setStyle('styleName', styleObj);
         
         //Apply label style 
         styleObj = themeManager.getStyleObject('label');
@@ -198,7 +215,7 @@
 	 * @param   newworkspaceView 
 	 * @return  
 	 */
-	public function set monitorView (newMonitorView:MonitorView):Void {
+	public function set monitorView (newMonitorView):Void {
 		_monitorView = newMonitorView;
 	}
 	
@@ -207,7 +224,7 @@
 	 * @usage   
 	 * @return  
 	 */
-	public function get monitorView ():MonitorView {
+	public function get monitorView () {
 		return _monitorView;
 	}
 	
@@ -222,14 +239,8 @@
 	* Clear Method to clear movies from scrollpane
 	* 
 	*/
-	public static function clearScp(array:Array):Array{
-		if(array != null){
-			for (var i=0; i <array.length; i++){
-				array[i].removeMovieClip();
-			}
-		}
-		array = new Array();
-	return array;
+	public function clearDatagrid():Void{
+		learner_dgd.removeAll();
 	}
 	
 
@@ -240,39 +251,73 @@
 	
 	public function loadLearners(users:Array):Void{
 		Debugger.log("loadLearners invoked", Debugger.GEN, "loadLearners", "LearnersDialog");
-		_learnerList = clearScp(_learnerList);
-		_learner_mc = learner_scp.content;
+		Debugger.log("currentActivity: " + currentActivity, Debugger.CRITICAL, "loadLearners", "LearnersDialog");
+		Debugger.log("users: " + users.length, Debugger.CRITICAL, "loadLearners", "LearnersDialog");
 		
+		clearDatagrid();
+		
+		var learner_dgd_col:DataGridColumn = new DataGridColumn;
+		learner_dgd_col.headerText = "Learners";
+		
 		var usersArr:Array = new Array(); // contains User objects
-
-		for(var i=0; i<users.length; i++){
-			var user:User = new User(users[i]);
-			usersArr.push(user);
+		
+		if(currentActivity == null) {
+			for(var i=0; i<users.length; i++){
+				var user = new User(users[i]);
+				usersArr.push(user);
+			}
+			
+			usersArr.sortOn(["_firstName", "_lastName"], Array.CASEINSENSITIVE);
+			
+			learner_dgd_col.labelFunction = function(user) {
+				return (user != null) ? user.getFirstName() + " " + user.getLastName() + " (" + user.getUsername() + ")" : null;
+			};
+			
+		} else {
+			
+			for(var i=0; i<users.length; i++) {
+				if(Progress.isLearnerCurrentActivity(Progress(users[i]), currentActivity.activityID))
+					usersArr.push(Progress(users[i]));
+			}
+			
+			usersArr.sortOn(["_learnerFName", "_learnerLName"], Array.CASEINSENSITIVE);
+			
+			learner_dgd_col.labelFunction = function(user) {
+				return (user != null) ? user.getLearnerFirstName() + " " + user.getLearnerLastName() + " (" + user.getUserName() + ")" : null;
+			}
 		}
 		
-		usersArr.sortOn(["_firstName", "_lastName"], Array.CASEINSENSITIVE);
+		learner_dgd.addColumn(learner_dgd_col);
+		learner_dgd.dataProvider = usersArr;
 		
-		for(var i=0; i<usersArr.length; i++){
-			_learnerList[i] = this._learner_mc.attachMovie('staff_learner_dataRow', 'staff_learner_dataRow' + i, this._learner_mc.getNextHighestDepth());
-			_learnerList[i].fullName.text = usersArr[i].getFirstName() + " " + usersArr[i].getLastName() + " (" + usersArr[i].getUsername() + ")";
-			_learnerList[i]._x = USERS_X;
-			_learnerList[i]._y = USER_OFFSET * i;
-			var listItem:MovieClip = MovieClip(_learnerList[i]);
-		}
-		learner_scp.redraw(true);
 	}
 	
+	public function viewLearner():Void {
+		if(currentActivity != null) {
+			var learner:Progress = Progress(learner_dgd.selectedItem);
+			if(learner != null) {
+				var URLToSend = _root.serverURL+_root.monitoringURL+'getLearnerActivityURL&activityID='+currentActivity.activityID+'&userID='+learner.getLearnerId()+'&lessonID='+_root.lessonID;
+				JsPopup.getInstance().launchPopupWindow(URLToSend, 'MonitorLearnerActivity', 600, 800, true, true, false, false, false);
+			}
+		}
+	}
     /**
     * Main resize method, called by scrollpane container/parent
     */
     public function setSize(w:Number,h:Number):Void{
         //Size the panel
         panel.setSize(w,h);
+		learner_dgd.setSize(Math.round(w*learner_dgd_Xoffset), Math.round(h*learner_dgd_Yoffset));
 
         //Buttons
         close_btn.move(w-xCloseOffset,h-yCloseOffset);
+		view_btn.move(close_btn._x - view_btn._width - 15, close_btn._y);
 		
     }
+	
+	private function cellPress(evtObj):Void {
+		view_btn.enabled = (learner_dgd.selectedItem != null);
+	}
     
     /**
     * set the container refernce to the window holding the dialog
@@ -281,8 +326,4 @@
         _container = value;
     }
 	
-	public function get learnerList():Array{
-		return _learnerList;
-	}
-	
 }
\ No newline at end of file
Index: lams_flash/src/central/flash/org/lamsfoundation/lams/monitoring/mv/LearnerIcon.as
===================================================================
diff -u -r5b44cd0646c0ee06e57059948a5d5f730040f431 -r36a58619b25a62884e05e3a0d58c2cae326d2e1c
--- lams_flash/src/central/flash/org/lamsfoundation/lams/monitoring/mv/LearnerIcon.as	(.../LearnerIcon.as)	(revision 5b44cd0646c0ee06e57059948a5d5f730040f431)
+++ lams_flash/src/central/flash/org/lamsfoundation/lams/monitoring/mv/LearnerIcon.as	(.../LearnerIcon.as)	(revision 36a58619b25a62884e05e3a0d58c2cae326d2e1c)
@@ -66,9 +66,6 @@
 	private var _visibleHeight:Number;
 	private var _selected_mc:MovieClip;
 	
-	private var smallCross:MovieClip;
-	private var _hasPlus:Boolean;
-	
 	private var _clone_mc:MovieClip;
 	private var _clone:Boolean;
 	
@@ -97,7 +94,6 @@
 			learner = initObj.learner;
 			learnerOffset_X = initObj._x;
 			learnerOffset_Y = initObj._y;
-			_hasPlus = initObj._hasPlus;
 			_clone = initObj._clone;
 		}
 		
@@ -153,9 +149,6 @@
 		Debugger.log('Learner is in Activity: '+_activity.title,4,'draw','LearnerIcon');
 		setStyles();
 		
-		Debugger.log('hasPlus: '+ _hasPlus,Debugger.CRITICAL,'draw','CanvasActivity');
-		smallCross._visible = _hasPlus;
-		
 		_visible = true;
 	}
 	
@@ -171,14 +164,13 @@
 				Debugger.log('DoubleClicking: '+this.activity.activityID,Debugger.CRITICAL,'localOnPress','CanvasActivity For Monitoring');
 				var _learnerID:Number = learner.getLearnerId()
 				_monitorController.activityDoubleClick(_activity, "MonitorTabViewLearner", _learnerID);
-						
 			}
 			
 		} else {
 
 			_doubleClicking = false;
 			Debugger.log('SingleClicking:+'+this,Debugger.GEN,'onPress','CanvasActivity for monitoring');
-			_clone_mc = org.lamsfoundation.lams.monitoring.Application.root.attachMovie("learnerIcon", String(_name + "_clone" + _activity.activityUIID), DepthManager.kTop, {_x:(this._x + org.lamsfoundation.lams.monitoring.Application.MONITOR_X), _y:(this._y + org.lamsfoundation.lams.monitoring.Application.MONITOR_Y), _activity:_activity, learner:learner, _monitorController:_monitorController, _hasPlus:_hasPlus, _clone: true });
+			_clone_mc = org.lamsfoundation.lams.monitoring.Application.root.attachMovie("learnerIcon", String(_name + "_clone" + _activity.activityUIID), DepthManager.kTop, {_x:(this._x + org.lamsfoundation.lams.monitoring.Application.MONITOR_X), _y:(this._y + org.lamsfoundation.lams.monitoring.Application.MONITOR_Y), _activity:_activity, learner:learner, _monitorController:_monitorController, _clone: true });
 			_clone_mc._y = 	_root._ymouse - ICON_HEIGHT/2;
 			_clone_mc._x = 	_root._xmouse - ICON_WIDTH/2
 			_monitorController.activityClick(_clone_mc, "LearnerIcon");
Index: lams_flash/src/central/flash/org/lamsfoundation/lams/monitoring/mv/MonitorController.as
===================================================================
diff -u -r3324d1674d074f6ca89110d29e30ed09d63a3c56 -r36a58619b25a62884e05e3a0d58c2cae326d2e1c
--- lams_flash/src/central/flash/org/lamsfoundation/lams/monitoring/mv/MonitorController.as	(.../MonitorController.as)	(revision 3324d1674d074f6ca89110d29e30ed09d63a3c56)
+++ lams_flash/src/central/flash/org/lamsfoundation/lams/monitoring/mv/MonitorController.as	(.../MonitorController.as)	(revision 36a58619b25a62884e05e3a0d58c2cae326d2e1c)
@@ -517,34 +517,30 @@
 			_monitorModel.broadcastViewUpdate("TRIGGER_ACTION", null);
 		}
 	}
-
 	
-	
-	
 	/**
 	 * called when the dialog is loaded, calles methods to set up content in dialogue
 	 * also sets up the okClicked event listener
 	 * @usage   
 	 * @param   evt 
 	 * @return  
 	 */
-    public function openDialogLoaded(evt:Object) {
+    public function openDialogLoaded(evt:Object, activity:Activity) {
         Debugger.log('!evt.type:'+evt.type,Debugger.GEN,'openDialogLoaded','org.lamsfoundation.lams.MonitorController');
         
 		//Check type is correct
 		if(evt.type == 'contentLoaded'){
 			//set a ref to the view
-			evt.target.scrollContent.monitorView = LessonTabView(getView());
+			var view:MonitorView = MonitorView(_monitorModel.getMonitor().getMV());
 			
-			//set a ref to the dia in the view
-			LessonTabView(getView()).dialog = evt.target.scrollContent;
-			
-			//set up UI
-			//note this function registeres the dialog to receive view updates
-			if (evt.target.scrollContent instanceof org.lamsfoundation.lams.authoring.cmpt.CompetenceEditorDialog) {
-				evt.target.scrollContent.setUpContent(_monitorModel);
+			//set a ref to the dialog in the view
+			evt.target.scrollContent.monitorView = (activity == null || activity == undefined) ? view.getLessonTabView() : view.getMonitorTabView();
+			evt.target.scrollContent.monitorView.dialog = evt.target.scrollContent;
+
+			if(activity != null) {
+				evt.target.scrollContent.setUpContent(_monitorModel, activity);
 			} else {
-				evt.target.scrollContent.setUpContent();
+				evt.target.scrollContent.setUpContent(_monitorModel);
 			}
 			
         } else {
@@ -698,4 +694,13 @@
             //TODO DI 25/05/05 raise wrong event type error 
         }
 	}
+	
+	/**
+	* Open Learners Dialog for display of learners currently at the Activity.
+	* @param Activity
+	*/
+	public function openCurrentLearnersDialog(currentActivity:Activity):Void {
+			_monitorModel.getMonitor().getMV().getLessonTabView().showLearnersDialog(_monitorModel, currentActivity);
+	}
+	
 }
\ No newline at end of file
Index: lams_flash/src/central/flash/org/lamsfoundation/lams/monitoring/mv/PlusIcon.as
===================================================================
diff -u -rb5f1c6147aeaaec0f5084813209fe0cf59a1c386 -r36a58619b25a62884e05e3a0d58c2cae326d2e1c
--- lams_flash/src/central/flash/org/lamsfoundation/lams/monitoring/mv/PlusIcon.as	(.../PlusIcon.as)	(revision b5f1c6147aeaaec0f5084813209fe0cf59a1c386)
+++ lams_flash/src/central/flash/org/lamsfoundation/lams/monitoring/mv/PlusIcon.as	(.../PlusIcon.as)	(revision 36a58619b25a62884e05e3a0d58c2cae326d2e1c)
@@ -27,7 +27,8 @@
 import org.lamsfoundation.lams.authoring.*;
 import org.lamsfoundation.lams.authoring.cv.*;
 import org.lamsfoundation.lams.monitoring.mv.*;
-import org.lamsfoundation.lams.common.style.*
+import org.lamsfoundation.lams.common.style.*;
+import org.lamsfoundation.lams.common.dict.*;
 
 import com.polymercode.Draw;
 import mx.managers.*
@@ -52,8 +53,11 @@
 	private var _monitorView;
 	private var _tm:ThemeManager;
 	private var _activity:Activity;
-	private var learner:Progress;
+	private var _noOfLearners:Number;
 	
+	private var _dcStartTime:Number = 0;
+	private var _doubleClicking:Boolean;
+	
 	private var _isSelected:Boolean;
 	private var app:ApplicationParent; 
 	private var toolTip:ToolTip;
@@ -65,7 +69,9 @@
 		app = ApplicationParent.getInstance();
 		
 		toolTip = new ToolTip();
-		init();
+		
+		if(_activity != undefined)
+			init();
 	}
 	
 	public function init(initObj):Void{
@@ -75,5 +81,67 @@
 			this._x = initObj._x;
 			this._y = initObj._y;
 		}
+		
+		click_mc.onRollOver = Proxy.create (this, localOnRollOver);
+		click_mc.onRollOut = Proxy.create (this, localOnRollOut);
+		
+		if (_activity != undefined){
+			click_mc.onPress = Proxy.create (this, localOnPress);
+			click_mc.onRelease = Proxy.create (this, localOnRelease);
+			click_mc.onReleaseOutside = Proxy.create (this, localOnReleaseOutside);
+		}
 	}
+	
+	public function showToolTip(visible:Boolean):Void{
+		if(!visible) {
+			toolTip.CloseToolTip();
+			return;
+		}
+		
+		var ttHolder = this;
+		var ttMessage = Dictionary.getValue("learner_plus_tooltip", [_noOfLearners]);		
+		var ttWidth = StringUtils.getButtonWidthForStr(ttMessage);
+		
+		toolTip.DisplayToolTip(ttHolder, ttMessage, -5, -10, undefined, ttWidth);
+		
+	}
+	
+	private function localOnPress():Void{
+		
+		// check double-click
+		var now:Number = new Date().getTime();
+		
+		if((now - _dcStartTime) <= Config.DOUBLE_CLICK_DELAY){
+			_doubleClicking = true;
+			Debugger.log('DoubleClicking: '+this.activity.activityID,Debugger.CRITICAL,'localOnPress','PlusIcon');
+			showToolTip(false);
+			_monitorController.openCurrentLearnersDialog(activity);
+			
+		} else {
+			_doubleClicking = false;
+			Debugger.log('SingleClicking:+'+this,Debugger.GEN,'onPress','PlusIcon');
+		}
+		
+		_dcStartTime = now;
+	
+	}
+	
+	private function localOnRollOver():Void{
+		showToolTip(true);
+	}
+	
+	private function localOnRollOut():Void{
+		showToolTip(false);
+	}
+	
+	public function get activity():Activity {
+		return _activity;
+	}
+	
+	private function localOnRelease():Void{}
+	
+	private function localOnReleaseOutside():Void{
+		showToolTip(false);
+	}
+	
 }
\ No newline at end of file
Index: lams_flash/src/central/flash/org/lamsfoundation/lams/monitoring/mv/tabviews/LessonTabView.as
===================================================================
diff -u -rad0a84c2d1f2eccc03aaba9d8245cb2ee5cdb849 -r36a58619b25a62884e05e3a0d58c2cae326d2e1c
--- lams_flash/src/central/flash/org/lamsfoundation/lams/monitoring/mv/tabviews/LessonTabView.as	(.../LessonTabView.as)	(revision ad0a84c2d1f2eccc03aaba9d8245cb2ee5cdb849)
+++ lams_flash/src/central/flash/org/lamsfoundation/lams/monitoring/mv/tabviews/LessonTabView.as	(.../LessonTabView.as)	(revision 36a58619b25a62884e05e3a0d58c2cae326d2e1c)
@@ -718,9 +718,9 @@
 	/**
     * Opens the lesson manager dialog
     */
-    public function showLearnersDialog(mm:MonitorModel) {
+    public function showLearnersDialog(mm:MonitorModel, activity:Activity) {
 		var opendialog:MovieClip = PopUpManager.createPopUp(mm.getMonitor().root, LFWindow, true,{title:Dictionary.getValue('ls_win_learners_title'),closeButton:true,scrollContentPath:'learnersDialog'});
-		opendialog.addEventListener('contentLoaded',Delegate.create(_monitorController,_monitorController.openDialogLoaded));
+		opendialog.addEventListener('contentLoaded', Proxy.create(_monitorController,_monitorController.openDialogLoaded, activity));
 		
     }
 	
Index: lams_flash/src/central/flash/org/lamsfoundation/lams/monitoring/mv/tabviews/MonitorTabView.as
===================================================================
diff -u -rcdaf8d56ec7cf8c47c0b11eb79f00621d5148eb5 -r36a58619b25a62884e05e3a0d58c2cae326d2e1c
--- lams_flash/src/central/flash/org/lamsfoundation/lams/monitoring/mv/tabviews/MonitorTabView.as	(.../MonitorTabView.as)	(revision cdaf8d56ec7cf8c47c0b11eb79f00621d5148eb5)
+++ lams_flash/src/central/flash/org/lamsfoundation/lams/monitoring/mv/tabviews/MonitorTabView.as	(.../MonitorTabView.as)	(revision 36a58619b25a62884e05e3a0d58c2cae326d2e1c)
@@ -83,6 +83,8 @@
 	private var maxCount:Number;
 	private var evtArr:Array;
 	
+	private var _dialog:MovieClip;
+	
 	/**
 	* Constructor
 	*/
@@ -621,4 +623,22 @@
     public function defaultController (model:Observable):Controller {
         return new MonitorController(model);
     }
+	
+		/**
+	 * 
+	 * @usage   
+	 * @param   newworkspaceDialog 
+	 * @return  
+	 */
+	public function set dialog (dialog:MovieClip):Void {
+		_dialog = dialog;
+	}
+	/**
+	 * 
+	 * @usage   
+	 * @return  
+	 */
+	public function get dialog ():MovieClip {
+		return _dialog;
+	}
 }
\ No newline at end of file
Index: lams_monitoring/web/lams_monitoring.swf
===================================================================
diff -u -rcdaf8d56ec7cf8c47c0b11eb79f00621d5148eb5 -r36a58619b25a62884e05e3a0d58c2cae326d2e1c
Binary files differ
Index: lams_monitoring/web/lams_monitoring_library.swf
===================================================================
diff -u -rcdaf8d56ec7cf8c47c0b11eb79f00621d5148eb5 -r36a58619b25a62884e05e3a0d58c2cae326d2e1c
Binary files differ