Index: lams_central/src/flash/org/lamsfoundation/lams/authoring/cv/CanvasOptionalActivity.as
===================================================================
diff -u -r380843f24a9ff5dd9909d669b5e0838829bb638c -r705e46f5a95d075036b16b9fdc1ce322559c327a
--- lams_central/src/flash/org/lamsfoundation/lams/authoring/cv/CanvasOptionalActivity.as	(.../CanvasOptionalActivity.as)	(revision 380843f24a9ff5dd9909d669b5e0838829bb638c)
+++ lams_central/src/flash/org/lamsfoundation/lams/authoring/cv/CanvasOptionalActivity.as	(.../CanvasOptionalActivity.as)	(revision 705e46f5a95d075036b16b9fdc1ce322559c327a)
@@ -26,6 +26,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.authoring.cv.DesignDataModel;
 import org.lamsfoundation.lams.common.style. *;
 import mx.controls. *;
@@ -40,7 +41,7 @@
 	private var CHILD_OFFSET_X : Number = 8;
 	private var CHILD_OFFSET_Y : Number = 57;
 	private var CHILD_INCRE : Number = 60;
-	private var fromModuleTab:String;
+	
 	//this is set by the init object
 	private var _canvasController : CanvasController;
 	private var _canvasView : CanvasView;
@@ -52,19 +53,28 @@
 	private var panelHeight : Number;
 	//refs to screen items:
 	private var container_pnl : Panel;
-	private var containerPanelHeader:MovieClip;
 	private var header_pnl : Panel;
 	private var act_pnl : Panel;
 	private var title_lbl : Label;
 	private var actCount_lbl : Label;
+	//locals
 	private var childActivities_mc : MovieClip;
 	private var optionalActivity_mc : MovieClip;
 	private var clickTarget_mc : MovieClip;
 	private var padlockClosed_mc : MovieClip;
 	private var padlockOpen_mc : MovieClip;
 	private var _dcStartTime : Number = 0;
 	private var _doubleClicking : Boolean;
-
+	// Only for Monitor Optional Container children
+	private var fromModuleTab:String;
+	private var _learnerTabView:LearnerTabView;
+	private var actStatus:String;
+	private var learner:Object = new Object();
+	private var containerPanelHeader:MovieClip;
+	private var completed_mc:MovieClip;
+	private var current_mc:MovieClip;
+	private var todo_mc:MovieClip;
+	//---------------------------//
 	private var child_mc : MovieClip;
 	private var _locked : Boolean;
 	private var _visibleHeight : Number;
@@ -92,7 +102,7 @@
 		
 		_ddm.getComplexActivityChildren(_activity.activityUIID);
 		_locked = false;
-		
+		showStatus(false);
 		childActivities_mc = this;
 		var children_mc : Array = new Array ();
 		
@@ -105,10 +115,11 @@
 			children_mc [i].activity.yCoord = CHILD_OFFSET_Y + (i * CHILD_INCRE);
 			
 			}else {
-				children_mc [i] = childActivities_mc.attachMovie ("CanvasActivityLinear_forOptional", "CanvasActivity" + i, childActivities_mc.getNextHighestDepth (), {_activity : _children [i] , _monitorController : _monitorController, _monitorView : _monitorView, _module:"monitoring", actLabel:_children [i].title});
+				trace("child's activityID is "+_children [i].activityID)
+				children_mc [i] = childActivities_mc.attachMovie ("CanvasActivityLinear_forOptional", "CanvasActivity" + i, childActivities_mc.getNextHighestDepth (), {_activity : _children [i] , _monitorController : _monitorController, _monitorView : _monitorView, actLabel:_children [i].title, learner:learner});
 				//set the positioning co-ords
 				children_mc [i]._y = (i*21)+8;
-				children_mc [i]._x = 58;
+				children_mc [i]._x = 57;
 			
 			
 			}
@@ -118,6 +129,12 @@
 		MovieClipUtils.doLater (Proxy.create (this, draw));
 	}
 	
+	private function showStatus(isVisible:Boolean){
+		completed_mc._visible = isVisible;
+		current_mc._visible = isVisible;
+		todo_mc._visible = isVisible;
+	}
+	
 	public function get activity () : Activity
 	{
 		return getActivity ();
@@ -137,8 +154,25 @@
 	{
 		_activity = a;
 	}
-	private function draw ()
-	{
+	private function draw (){
+		
+		actStatus = _learnerTabView.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;
+			default :
+				todo_mc._visible = true;
+                //Debugger.log('unknown update type :' + infoObj.updateType,Debugger.CRITICAL,'update','org.lamsfoundation.lams.MonitorView');
+		}
 		clickTarget_mc.swapDepths(childActivities_mc.getNextHighestDepth());
 		var numOfChildren = _children.length
 		panelHeight = CHILD_OFFSET_Y + (numOfChildren * CHILD_INCRE);
@@ -160,7 +194,7 @@
 			_y = _activity.yCoord;
 		}else {
 			containerPanelHeader.title_lbl.text = 'Optional Activities'
-			container_pnl._height = 15+(numOfChildren * 21);
+			container_pnl._height = 16+(numOfChildren * 21);
 		}
 		//dimentions of container (this)
 		if (_locked)
Index: lams_central/src/flash/org/lamsfoundation/lams/authoring/cv/CanvasParallelActivity.as
===================================================================
diff -u -r630afd3318d7c0a12ea203eacfbf4406b26ec128 -r705e46f5a95d075036b16b9fdc1ce322559c327a
--- lams_central/src/flash/org/lamsfoundation/lams/authoring/cv/CanvasParallelActivity.as	(.../CanvasParallelActivity.as)	(revision 630afd3318d7c0a12ea203eacfbf4406b26ec128)
+++ lams_central/src/flash/org/lamsfoundation/lams/authoring/cv/CanvasParallelActivity.as	(.../CanvasParallelActivity.as)	(revision 705e46f5a95d075036b16b9fdc1ce322559c327a)
@@ -27,6 +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 mx.controls.*;
 import mx.managers.*
 
@@ -70,8 +71,16 @@
 	private var _visibleHeight:Number;
 	private var _visibleWidth:Number;
 	
+	// Only for Monitor Optional Container children
+	private var fromModuleTab:String;
+	private var _learnerTabView:LearnerTabView;
+	private var actStatus:String;
+	private var learner:Object = new Object();
+	private var containerPanelHeader:MovieClip;
+	private var completed_mc:MovieClip;
+	private var current_mc:MovieClip;
+	private var todo_mc:MovieClip;
 	
-	
 	
 	function CanvasParallelActivity(){
 		Debugger.log("_activity:"+_activity.title+'uiID:'+_activity.activityUIID+' children:'+_children.length,Debugger.GEN,'Constructor','CanvasParallelActivity');
@@ -95,8 +104,8 @@
 		_ddm.getComplexActivityChildren(_activity.activityUIID);
 		_locked = true;
 		
+		showStatus(false);
 		
-		
 		var child1:Activity;
 		var child2:Activity;
 		if(_children[0].orderID < _children[1].orderID){
@@ -108,22 +117,34 @@
 			child2 = _children[0];
 		
 		}
-		//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;
-	
+		
 		//so now it is placed on in the IDE and we just call init
-		child1_mc.init({activity:child1,_canvasController:_canvasController,_canvasView:_canvasView});
-		child2_mc.init({activity:child2,_canvasController:_canvasController,_canvasView:_canvasView});
+		if (fromModuleTab != "monitorLearnerTab"){
+			//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,_canvasController:_canvasController,_canvasView:_canvasView});
+			child2_mc.init({activity:child2,_canvasController:_canvasController,_canvasView:_canvasView});
+		} else {
+			
+			child1_mc.init({activity:child1,_monitorController:_monitorController,_monitorView:_monitorView, learner:learner});
+			child2_mc.init({activity:child2,_monitorController:_monitorController,_monitorView:_monitorView, learner:learner});
+		}
 		
 		//let it wait one frame to set up the components.
 		//childActivities_mc.createChildAtDepth("Bin",DepthManager.kTop);
 		MovieClipUtils.doLater(Proxy.create(this,draw));
 		
 	}
 	
+	private function showStatus(isVisible:Boolean){
+		completed_mc._visible = isVisible;
+		current_mc._visible = isVisible;
+		todo_mc._visible = isVisible;
+	}
+	
 	public function get activity():Activity{
 		return getActivity();
 	}
@@ -143,15 +164,33 @@
 	
 	private function draw(){
 			
-			//write text
-			title_lbl.text = _activity.title;
-			actCount_lbl.text = _children.length+" activities";
-			
+		actStatus = _learnerTabView.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;
+			default :
+				todo_mc._visible = true;
+				//Debugger.log('unknown update type :' + infoObj.updateType,Debugger.CRITICAL,'update','org.lamsfoundation.lams.MonitorView');
+		}
+		//write text
+		title_lbl.text = _activity.title;
+		actCount_lbl.text = _children.length+" activities";
+		
 //			_global.breakpoint();
-			
-			header_pnl.borderType='outset';
-			container_pnl.setStyle("backgroundColor",0x4289FF);
-			
+		
+		header_pnl.borderType='outset';
+		container_pnl.setStyle("backgroundColor",0x4289FF);
+		
+		if (fromModuleTab != "monitorLearnerTab"){
 			//position the container (this)
 			_x = _activity.xCoord;
 			_y = _activity.yCoord;
@@ -165,10 +204,13 @@
 				padlockClosed_mc._visible = false;
 				clickTarget_mc._height = 38;
 			}
-		
-			_visible = true;
-			//child1_mc._visible = true;
-						
+		}else {
+			containerPanelHeader.title_lbl.text = 'Parallel Activities'
+		}
+	
+		_visible = true;
+		//child1_mc._visible = true;
+					
 	}