Index: lams_central/src/flash/org/lamsfoundation/lams/authoring/cv/CanvasParallelActivity.as
===================================================================
diff -u -r33f754a308b5a1cc620dd4e5b22ca8e6dc113d6e -r013963fdbe58ebda4814de11e72d8448415f6ed4
--- lams_central/src/flash/org/lamsfoundation/lams/authoring/cv/CanvasParallelActivity.as	(.../CanvasParallelActivity.as)	(revision 33f754a308b5a1cc620dd4e5b22ca8e6dc113d6e)
+++ lams_central/src/flash/org/lamsfoundation/lams/authoring/cv/CanvasParallelActivity.as	(.../CanvasParallelActivity.as)	(revision 013963fdbe58ebda4814de11e72d8448415f6ed4)
@@ -27,7 +27,7 @@
 import org.lamsfoundation.lams.authoring.*;
 import org.lamsfoundation.lams.authoring.cv.*;
 import org.lamsfoundation.lams.monitoring.mv.*;
-import org.lamsfoundation.lams.monitoring.mv.tabviews.LearnerTabView;
+import org.lamsfoundation.lams.monitoring.mv.tabviews.*;
 import mx.controls.*;
 import mx.managers.*
 
@@ -46,7 +46,8 @@
 	private var _canvasController:CanvasController;
 	private var _canvasView:CanvasView;
 	private var _monitorController:MonitorController;
-	private var _monitorView:MonitorView;
+	private var _learnerTabView : LearnerTabView;
+	private var _monitorTabView : MonitorTabView;
 	//Set by the init obj
 	private var _activity:Activity;
 	private var _children:Array;
@@ -73,7 +74,6 @@
 	
 	// Only for Monitor Optional Container children
 	private var fromModuleTab:String;
-	private var _learnerTabView:LearnerTabView;
 	private var learner:Object = new Object();
 	private var containerPanelHeader:MovieClip;
 	private var completed_mc:MovieClip;
@@ -118,11 +118,21 @@
 		}
 		
 		//so now it is placed on in the IDE and we just call init
-		if (fromModuleTab == "monitorMonitorTab"|| fromModuleTab == "monitorLearnerTab"){
+		if (fromModuleTab == "monitorMonitorTab"){
+			//set the positioning co-ords
+			child1.xCoord = CHILD_OFFSET_X;
+			child1.yCoord = CHILD1_OFFSET_Y;
+			child2.xCoord = CHILD_OFFSET_X;
+			child2.yCoord = CHILD2_OFFSET_Y;
+			child1_mc.init({activity:child1,_monitorController:_monitorController,_monitorView:_monitorTabView});
+			child2_mc.init({activity:child2,_monitorController:_monitorController,_monitorView:_monitorTabView});
 			
-			child1_mc.init({activity:child1,_monitorController:_monitorController,_monitorView:_monitorView, learner:learner, _module:"monitoring"});
-			child2_mc.init({activity:child2,_monitorController:_monitorController,_monitorView:_monitorView, learner:learner, _module:"monitoring"});
 			
+		}else if (fromModuleTab == "monitorLearnerTab"){
+			//var progStatus:String = Progress.compareProgressData(learner, _children [i].activityID);
+			child1_mc.init({activity:child1,_monitorController:_monitorController,_monitorView:_learnerTabView, learner:learner, _module:"monitoring"});
+			child2_mc.init({activity:child2,_monitorController:_monitorController,_monitorView:_learnerTabView, learner:learner, _module:"monitoring"});
+			
 			//set the visibility to false
 			child1_mc._visible = false;
 			child2_mc._visible = false;
@@ -169,19 +179,17 @@
 	
 	private function draw(){
 			
-		var actStatus:String = _learnerTabView.compareProgressData(learner, _activity.activityID);
+		var actStatus:String = Progress.compareProgressData(learner, _activity.activityID);
 		switch (actStatus){
 			case 'completed_mc' :
-				//trace("TabID for Selected tab is: "+infoObj.tabID)
 				completed_mc._visible = true;
-		
 				break;
 			case 'current_mc' :
 				current_mc._visible = true;
 				break;
-			//case 'toto_mc' :
-				//todo_mc._visible = true;
-				//break;
+			 case 'attempted_mc' :
+			    current_mc._visible = true;
+                break;
 			default :
 				todo_mc._visible = true;
 				//Debugger.log('unknown update type :' + infoObj.updateType,Debugger.CRITICAL,'update','org.lamsfoundation.lams.MonitorView');
@@ -196,6 +204,30 @@
 		container_pnl.setStyle("backgroundColor",0x4289FF);
 		
 		if (fromModuleTab != "monitorLearnerTab"){
+			
+			containerPanelHeader.title_lbl.text = 'Parallel Activities'
+			
+		}else {
+			if(fromModuleTab == "monitorMonitorTab"){
+				var mm:MonitorModel = MonitorModel(_monitorController.getModel());
+			trace("all learner progress length in Canvas activity: "+mm.allLearnersProgress.length);
+			
+			// get the length of learners from the Monitor Model and run a for loop.
+				for (var j=0; j<mm.allLearnersProgress.length; j++){
+					var learner:Object = new Object();
+					learner = mm.allLearnersProgress[j]
+					
+					//Gets a true if learner's currect activityID matches this activityID else false.
+					
+					var isLearnerCurrentAct:Boolean = Progress.isLearnerCurrentActivity(learner, _activity.activityID);
+					if (isLearnerCurrentAct){
+						trace(_activity.title+": is the learner's current Activity.")
+						this.attachMovie("learnerIcon", "learnerIcon"+learner.getUserName(), this.getNextHighestDepth(),{name_lbl:learner.getUserName()});
+					}else {
+						trace(_activity.title+": is not the learner's current Activity.")
+					}
+				}
+			}
 			//position the container (this)
 			_x = _activity.xCoord;
 			_y = _activity.yCoord;
@@ -209,8 +241,6 @@
 				padlockClosed_mc._visible = false;
 				clickTarget_mc._height = 38;
 			}
-		}else {
-			containerPanelHeader.title_lbl.text = 'Parallel Activities'
 		}
 	
 		_visible = true;