Index: lams_central/src/flash/org/lamsfoundation/lams/monitoring/mv/MonitorModel.as
===================================================================
diff -u -rd502e6d1f34632a757dd6bda2daf8b0c07e1c8a5 -r6f216fba347b83cec9643e97905a407e168dd8c4
--- lams_central/src/flash/org/lamsfoundation/lams/monitoring/mv/MonitorModel.as	(.../MonitorModel.as)	(revision d502e6d1f34632a757dd6bda2daf8b0c07e1c8a5)
+++ lams_central/src/flash/org/lamsfoundation/lams/monitoring/mv/MonitorModel.as	(.../MonitorModel.as)	(revision 6f216fba347b83cec9643e97905a407e168dd8c4)
@@ -78,9 +78,12 @@
 	
 	private var _org:Organisation;
 	private var _todos:Array;  // Array of ToDo ContributeActivity(s)
-	// state data
+	
+	// state data
+	private var _isDesignDrawn:Boolean;
 	private var _showLearners:Boolean;
-	private var _endGate:MovieClip;
+	private var _endGate:MovieClip;
+	
 	//these are hashtables of mc refs MOVIECLIPS (like CanvasActivity or CanvasTransition)
 	//each on contains a reference to the emelment in the ddm (activity or transition)
 	private var _activitiesDisplayed:Hashtable;
@@ -112,7 +115,12 @@
 	*/
 	public function MonitorModel (monitor:Monitor){
 		_monitor = monitor;
-		_showLearners = true;
+		
+		_showLearners = true;
+		isDesignDrawn = true;
+		_staffLoaded = false;
+		_learnersLoaded = false;
+		
 		_activitiesDisplayed = new Hashtable("_activitiesDisplayed");
 		_transitionsDisplayed = new Hashtable("_transitionsDisplayed");
 		_learnersProgress = new Hashtable("_learnersProgress")
@@ -121,20 +129,20 @@
 		learnerTabActArr = new Array();
 		ddmActivity_keys = new Array();
 		ddmTransition_keys = new Array();
-		_staffLoaded = false;
-		_learnersLoaded = false;
-
+		
 		_resultDTO = new Object();
 		ttHolder = Application.tooltip;
 		monitor_y = Application.MONITOR_Y;
 		monitor_x = Application.MONITOR_X;
+		
 		mx.events.EventDispatcher.initialize(this);
 		app = Application.getInstance();
 	}
 	
 	// add get/set methods
 	
 	public function setSequence(activeSeq:Sequence){
+		
 		Debugger.log("Active seq: " + activeSeq.ID + " ddm: " + activeSeq.getLearningDesignModel(), Debugger.CRITICAL, "setSequence", "MonitorModel");
 		_activeSeq = activeSeq;
 		
@@ -148,8 +156,6 @@
 			getMonitor().openLearningDesign(_activeSeq);
 		}
 		
-		
-		
 		setChanged();
 		
 		// if seq locked for edit TODO
@@ -211,6 +217,7 @@
 		_learnersProgress.clear();
 		learnerTabActArr = new Array();
 		learnerTabActArr = learnerProg;
+		
 		for(var i=0; i<learnerProg.length;i++){
 			_learnersProgress.put(learnerProg[i].getLearnerId(),learnerProg[i]);
 		}
@@ -221,7 +228,6 @@
 		
 		//send an update
 		infoObj = {};
-		//infoObj.data = learnerProg[i].getLearnerId()
 		infoObj.updateType = "DRAW_DESIGN";
 		infoObj.tabID = getSelectedTab();
 		notifyObservers(infoObj);
@@ -285,7 +291,6 @@
 	}
 	
 	public function setToDos(todos:Array){
-		trace('saving contrib activities...');
 		_todos = new Array();
 		
 		for(var i=0; i< todos.length; i++){
@@ -335,16 +340,13 @@
 
 
 	public function activitiesOnCanvas():Array{
-		//_activitiesDisplayed
-		//var _ddm.getActivityByUIID(Activity.OPTIONAL_ACTIVITY_TYPE)
 		var actAll:Array = new Array();
 		var k:Array = _activitiesDisplayed.values();
-		//trace("findOptionalActivities Called "+k.length )
 		for (var i=0; i<k.length; i++){
-			actAll.push(k[i]);
-				trace("find the activity with id:"+k[i].activity.activityUIID )			
+			actAll.push(k[i]);		
 		}
-		return actAll
+		
+		return actAll;
 	}
 	/**
 	 * Compares the design in the CanvasModel (what is displayed on the screen) 
@@ -364,12 +366,12 @@
 		//porobbably need to get a bit more granular
 		Debugger.log('Running',Debugger.GEN,'refreshDesign','MonitorModel');
 		var mmActivity_keys:Array = _activitiesDisplayed.keys();
-		var longest = mmActivity_keys.length;
+		var longest = mmActivity_keys.length;
+		
 		//set index array with activity keyys length
 		var indexArray:Array;
 		indexArray = mmActivity_keys;
-	
-		trace("Longest: "+longest)
+
 		//loop through and remove activities
 		for(var i=0;i<longest;i++){
 			var keyToCheck:Number = indexArray[i];
@@ -385,13 +387,13 @@
 		var transIndexArray:Array;
 		transIndexArray = mmTransition_keys;
 		
-		trace("Longest: "+transLongest)
 		//loop through and remove transitions
 		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());
-		}
+		}
+
 	}
 	
 	public function getlearnerTabActArr():Array{
@@ -400,14 +402,11 @@
 	
 	
 	private function orderDesign(activity:Activity, order:Array):Void{
-		trace("==> "+activity.activityID);
 		order.push(activity);
-		trace("transition keys length: "+ddmTransition_keys.length);
+		
 		for(var i=0;i<ddmTransition_keys.length;i++){
 			var transitionKeyToCheck:Number = ddmTransition_keys[i];
 			var ddmTransition:Transition = _activeSeq.getLearningDesignModel().transitions.get(transitionKeyToCheck);
-			trace("transition value is: "+ ddmTransition.transitionUIID);
-			trace("transition from activity id: "+ ddmTransition.fromActivityID);
 			
 				if (ddmTransition.fromUIID == activity.activityUIID){
 					var ddm_activity:Activity = _activeSeq.getLearningDesignModel().activities.get(ddmTransition.toUIID);
@@ -419,7 +418,6 @@
 	}
 	
 	public function setDesignOrder():Array{
-		trace("set Design order called")
 		ddmActivity_keys = _activeSeq.getLearningDesignModel().activities.keys();
 		ddmTransition_keys = _activeSeq.getLearningDesignModel().transitions.keys();
 		
@@ -428,22 +426,14 @@
 		var dataObj:Object;
 		var ddmfirstActivity_key:Number = _activeSeq.getLearningDesignModel().firstActivityID;
 		var learnerFirstActivity:Activity = _activeSeq.getLearningDesignModel().activities.get(ddmfirstActivity_key);
-		trace("first activity in desgn: "+ddmfirstActivity_key);
 		
-		//trace("==> "+learnerFirstActivity.title);
 		// recursive method to order design
 		orderDesign(learnerFirstActivity, orderedActivityArr);
 		
-		for(var i=0; i<orderedActivityArr.length; i++){
-			trace("--> "+orderedActivityArr[i].title);
-			
-		}
 		return orderedActivityArr;
-		trace("New Ordered Activities has length: "+orderedActivityArr.length)
 		
 	}
 	
-	
 	/**
 	 * get the design in the DesignDataModel and update the Monitor Model accordingly.
 	 * NOTE: Design elements are added to the DDM here.
@@ -468,12 +458,13 @@
 			var keyToCheck:Number = indexArray[i].activityUIID;
 			var ddm_activity:Activity = _activeSeq.getLearningDesignModel().activities.get(keyToCheck);
 			
-			if(ddm_activity.parentActivityID > 0 || ddm_activity.parentUIID > 0){
-				trace("this is Child")
-			} else {
+			if(!(ddm_activity.parentActivityID > 0 || ddm_activity.parentUIID > 0) && !isDesignDrawn){
 				broadcastViewUpdate("DRAW_ACTIVITY", ddm_activity, tabID, drawLearner);
+			} else {
+				broadcastViewUpdate("CLONE_ACTIVITY", ddm_activity, tabID, drawLearner);
 			}
-		}
+		}
+		
 		//now check the transitions:
 		ddmTransition_keys = _activeSeq.getLearningDesignModel().transitions.keys();
 				
@@ -486,7 +477,9 @@
 			var transitionKeyToCheck:Number = trIndexArray[i];
 			var ddmTransition:Transition = _activeSeq.getLearningDesignModel().transitions.get(transitionKeyToCheck);
 			broadcastViewUpdate("DRAW_TRANSITION", ddmTransition, tabID);
-		}		
+		}
+		
+		isDesignDrawn = true;
 	}
 	
 	public function setDialogOpen(dialogOpen:String){
@@ -495,7 +488,6 @@
 	}
 	
 	public function broadcastViewUpdate(updateType, data, tabID, learner){
-		//getMonitor().getMV().clearView();
 		setChanged();
 		
 		//send an update
@@ -509,7 +501,6 @@
 	}
 	
 	public function changeTab(tabID:Number){
-		//getMonitor().getMV().clearView();
 		selectedTab = tabID;
 		setChanged();
 		
@@ -522,7 +513,6 @@
 	}
 	
 	public function refreshAllData(){
-		//getMonitor().getMV().clearView();
 		selectedTab = getSelectedTab();
 		setChanged();
 		
@@ -536,7 +526,6 @@
 	
 	public function tabHelp(){
 		var callback:Function = Proxy.create(this, openTabHelp);
-		//selectedTab = getSelectedTab();
 		app.getHelpURL(callback)
 	}
 	
@@ -554,7 +543,6 @@
 				tabName = "learners"
 				break;
             default :
-                //styleObj = _tm.getStyleObject('ACTPanel0')
 		}
 		return tabName;
 		
@@ -602,35 +590,24 @@
 	
 	public function requestLearners(data:Object, callback:Function){
 		
-		trace('requesting learners...');
-		//var callback:Function = Proxy.create(this,saveLearners);
 		_monitor.requestUsers(LEARNER_ROLE, data.organisationID, callback);
 	}
 
 	
 	public function requestStaff(data:Object, callback:Function){
 		
-		trace('requesting staff members...');
-		//var callback:Function = Proxy.create(this,saveStaff);
-		
 		_monitor.requestUsers(MONITOR_ROLE, data.organisationID, callback);
 	}
 	
 	public function saveLearners(users:Array){
-		trace('retrieving back users for org by role: ' + MonitorModel.LEARNER_ROLE);
-		
 		saveUsers(users, LEARNER_ROLE);
 		
-		//dispatchEvent({type:'learnersLoad',target:this});
 		broadcastViewUpdate("LEARNERS_LOADED", null, null);
 	}
 	
 	public function saveStaff(users:Array){
-		trace('retrieving back users for org by role: ' + MONITOR_ROLE);
-		
 		saveUsers(users, MONITOR_ROLE);
 		
-		//dispatchEvent({type:'staffLoad',target:this});
 		broadcastViewUpdate("STAFF_LOADED", null, null);
 	}
 
@@ -698,7 +675,6 @@
 
 	public function setDirty(){
 		_isDirty = true;
-		trace("In setDirty")
 		clearDesign();
 	}
 
@@ -934,6 +910,14 @@
 	public function get locked():Boolean{
 		return _isLocked;
 	}
+	
+	public function set isDesignDrawn(a:Boolean){
+		_isDesignDrawn = a;
+	}
+	
+	public function get isDesignDrawn():Boolean{
+		return _isDesignDrawn;
+	}
 
 	/**
 	 * Returns a reference to the Activity Movieclip for the UIID passed in.  Gets from _activitiesDisplayed Hashable
@@ -958,7 +942,7 @@
 	
 	public function get allLearnersProgress():Array{
 		return learnerTabActArr;
-	}	
+	}
 	
 	public function getActivityKeys():Array{
 		trace("ddmActivity_keys length: "+ ddmActivity_keys.length)
Index: lams_central/src/flash/org/lamsfoundation/lams/monitoring/mv/tabviews/LearnerTabView.as
===================================================================
diff -u -rd502e6d1f34632a757dd6bda2daf8b0c07e1c8a5 -r6f216fba347b83cec9643e97905a407e168dd8c4
--- lams_central/src/flash/org/lamsfoundation/lams/monitoring/mv/tabviews/LearnerTabView.as	(.../LearnerTabView.as)	(revision d502e6d1f34632a757dd6bda2daf8b0c07e1c8a5)
+++ lams_central/src/flash/org/lamsfoundation/lams/monitoring/mv/tabviews/LearnerTabView.as	(.../LearnerTabView.as)	(revision 6f216fba347b83cec9643e97905a407e168dd8c4)
@@ -21,24 +21,25 @@
  * ************************************************************************
  */
 
-import org.lamsfoundation.lams.common.util.*
-import org.lamsfoundation.lams.common.ui.*
-import org.lamsfoundation.lams.common.style.*
-import org.lamsfoundation.lams.monitoring.mv.*
+import org.lamsfoundation.lams.common.util.*;
+import org.lamsfoundation.lams.common.ui.*;
+import org.lamsfoundation.lams.common.style.*;
+import org.lamsfoundation.lams.monitoring.mv.*;
 import org.lamsfoundation.lams.monitoring.mv.tabviews.*;
 import org.lamsfoundation.lams.monitoring.*;
-import org.lamsfoundation.lams.common.dict.*
-import org.lamsfoundation.lams.common.mvc.*
+import org.lamsfoundation.lams.common.dict.*;
+import org.lamsfoundation.lams.common.mvc.*;
+import org.lamsfoundation.lams.common.ApplicationParent;
 import org.lamsfoundation.lams.authoring.Activity;
 import org.lamsfoundation.lams.authoring.ComplexActivity;
 import org.lamsfoundation.lams.authoring.cv.CanvasActivity;
 import org.lamsfoundation.lams.common.ToolTip;
-import org.lamsfoundation.lams.authoring.Transition;
-//import org.lamsfoundation.lams.authoring.cv.*;
-import mx.managers.*
+import org.lamsfoundation.lams.authoring.Transition;
+
+import mx.managers.*;
 import mx.containers.*;
-import mx.events.*
-import mx.utils.*
+import mx.events.*;
+import mx.utils.*;
 import mx.controls.*;
 
 
@@ -48,8 +49,10 @@
 */
 
 class org.lamsfoundation.lams.monitoring.mv.tabviews.LearnerTabView extends AbstractView{
+	
 	public static var _tabID:Number = 2;
 	private var _className = "LearnerTabView";
+	
 	//constants:
 	private var GRID_HEIGHT:Number;
 	private var GRID_WIDTH:Number;
@@ -65,45 +68,39 @@
 	private var prevLearner:Number;
 	private var learnersDrawn:Number;
 	private var learnerListArr:Array = new Array();
-	
-	private var bkg_pnl:MovieClip;
 
 	private var _tm:ThemeManager;
-	private var _tip:ToolTip;
+	private var _tip:ToolTip;
+	
 	private var mm:MonitorModel;
-	private var _learnerTabView:LearnerTabView;
-
+	private var _learnerTabView:LearnerTabView;
+	private var _learnerTabViewContainer_mc:MovieClip;
+	private var learnerMenuBar:MovieClip;
 	
-	//Canvas clip
-	
-	private var _learnerTabViewContainer_mc:MovieClip
+	private var _activityLayer_mc:MovieClip;
+	private var _activityLayer_mc_clones:Array;
+	private var _nameLayer_mc:MovieClip;
 	
-	private var learnerMenuBar:MovieClip;
-	//private var _helpLayer_mc:MovieClip;
-	private var _gridLayer_mc:MovieClip;
-	private var _learnersLayer_mc:MovieClip;
-	private var _activityLayerComplex_mc:MovieClip;
-	private var _activityLayer_mc:MovieClip;
+	private var bkg_pnl:MovieClip;
 	private var completed_mc:MovieClip;
+	
 	private var refresh_btn:Button;
 	private var help_btn:Button;
 	
-	//private var _transitionPropertiesOK:Function;
     //Defined so compiler can 'see' events added at runtime by EventDispatcher
     private var dispatchEvent:Function;     
     public var addEventListener:Function;
     public var removeEventListener:Function;
-	//public var menu:ContextMenu;
 
-	
 	/**
 	* Constructor
 	*/
 	function LearnerTabView(){
 		_learnerTabView = this;
 		_learnerTabViewContainer_mc = this;
 		_tm = ThemeManager.getInstance();
-		_tip = new ToolTip();
+		_tip = new ToolTip();
+		
         //Init for event delegation
         mx.events.EventDispatcher.initialize(this);
 	}
@@ -114,7 +111,8 @@
 	public function init(m:Observable,c:Controller){
 		//Invoke superconstructor, which sets up MVC relationships.
 		super (m, c);
-		mm = MonitorModel(model)
+		mm = MonitorModel(model)
+		
         //Set up parameters for the grid
 		H_GAP = 10;
 		V_GAP = 10;
@@ -140,64 +138,54 @@
 					setSize(mm);
 					break;
 				case 'TABCHANGE' :
-					if (infoObj.tabID == _tabID && !mm.locked){
-						//this._visible = true;
-						mm.getMonitor().getMV().getMonitorLearnerScp()._visible = true;
+					if (infoObj.tabID == _tabID && !mm.locked){
 						hideMainExp(mm);
 						mm.broadcastViewUpdate("JOURNALSSHOWHIDE", true);
-
-						trace("TabID for Selected tab is (TABCHANGE): "+infoObj.tabID)
-						
+
 						if (mm.activitiesDisplayed.isEmpty()){
 							mm.getMonitor().openLearningDesign(mm.getSequence());
-							
-						}else {
-									
-							if (learnersDrawn != mm.allLearnersProgress.length){
-								drawAllLearnersDesign(mm, infoObj.tabID)
-							}
-							
-							if(mm.getIsProgressChangedLearner()){
-								reloadProgress(false);
-							}
+						} else if(mm.getIsProgressChangedLearner()) {
+							reloadProgress(false);
+						} else if(learnersDrawn != mm.allLearnersProgress.length){
+							reloadProgress(true);
 						}
+						
+						mm.getMonitor().getMV().getMonitorLearnerScp()._visible = true;
 						LFMenuBar.getInstance().setDefaults();
 						
-					}else {
+					} else {
 						mm.getMonitor().getMV().getMonitorLearnerScp()._visible = false;
-						//this._visible = false;
 					}
 					break;
 				case 'PROGRESS' :
 					if (infoObj.tabID == _tabID && !mm.locked){
-						mm.getMonitor().getProgressData(mm.getSequence())
+						mm.getMonitor().getProgressData(mm.getSequence());
 					}
 					break;	
 					
 				case 'RELOADPROGRESS' :	
 					if (infoObj.tabID == _tabID && !mm.locked){
-						reloadProgress(true)
+						reloadProgress(true);
 					}
 					break;	
 				case 'DRAW_ACTIVITY' :
-					if (infoObj.tabID == _tabID && !mm.locked){
-						trace("DRAWING_ACTIVITY")
-						drawActivity(infoObj.data, mm, infoObj.learner)
-						//MovieClipUtils.doLater(Proxy.create(this,draw));
+					if (infoObj.tabID == _tabID && !mm.locked){
+						drawActivity(infoObj.data, mm, infoObj.learner);
 					}
+					break;
+				case 'CLONE_ACTIVITY' :
+					if (infoObj.tabID == _tabID && !mm.locked){
+						cloneActivity(infoObj.data, mm, infoObj.learner);
+					}
 					break;
 				case 'REMOVE_ACTIVITY' :
 					if (infoObj.tabID == _tabID && !mm.locked){
-						trace("REMOVE_ACTIVITY")
-						removeActivity(infoObj.data, mm)
-						//MovieClipUtils.doLater(Proxy.create(this,draw));
+						removeActivity(infoObj.data, mm);
 					}
 					break;
-				
 				case 'DRAW_DESIGN' :
 					if (infoObj.tabID == _tabID && !mm.locked){
-						trace("TabID for Selected tab is (LearnerTab): "+infoObj.tabID)
-						drawAllLearnersDesign(mm, infoObj.tabID)
+						drawAllLearnersDesign(mm, infoObj.tabID);
 					}
 					break;
 				default :
@@ -211,25 +199,16 @@
     */
 	private function draw(){
 		//set up the Movie Clips to load relevant  
-
-		_learnersLayer_mc = this.createEmptyMovieClip("_learnersLayer_mc", this.getNextHighestDepth());
-		_gridLayer_mc = this.createEmptyMovieClip("_gridLayer_mc", this.getNextHighestDepth());
 		
-		_activityLayerComplex_mc = this.createEmptyMovieClip("_activityLayerComplex_mc", this.getNextHighestDepth());
-		_activityLayer_mc = this.createEmptyMovieClip("_activityLayer_mc", this.getNextHighestDepth(),{_y:learnerMenuBar._height});
+		this._activityLayer_mc = this.createEmptyMovieClip("_activityLayer_mc", this.getNextHighestDepth(),{_y:learnerMenuBar._height});
+		this._nameLayer_mc = this.createEmptyMovieClip("_nameLayer_mc", this.getNextHighestDepth(),{_y:learnerMenuBar._height});
 		
-		//learnerMenuBar.refresh_btn.onRelease = Proxy.create (this, reloadProgress);
-		trace("Help layer path: "+ learnerMenuBar.refresh_btn.label)
-		//setSize (mm)
-		
-		
 		setStyles();
 		
 		dispatchEvent({type:'load',target:this});
 	}
 	
 	private function hideMainExp(mm:MonitorModel):Void{
-		//var mcontroller = getController();
 		mm.broadcastViewUpdate("EXPORTSHOWHIDE", false);
 		mm.broadcastViewUpdate("EDITFLYSHOWHIDE", false);
 	}
@@ -258,8 +237,9 @@
 				array[i].removeMovieClip();
 			}
 		}
+		
 		array = new Array();
-	return array;
+		return array;
 	}
 	
 	/**
@@ -270,36 +250,50 @@
 	 */
 	private function reloadProgress(isChanged:Boolean){
 		
-		//if (learnersDrawn != mm.allLearnersProgress.length){
-			trace("reloading Progress data for Learners")
 			learnersDrawn = 0;
+			learnerListArr = new Array();
+			
 			ACT_X = 0;
 			ACT_Y = 35;
-			//for(var i=0; i<_activityLayer_mc.children.length;i++){
-				_activityLayer_mc.removeMovieClip();
-				_activityLayer_mc = this.createEmptyMovieClip("_activityLayer_mc", this.getNextHighestDepth(),{_y:learnerMenuBar._height});
-			//}
+			
+			this._activityLayer_mc.removeMovieClip();
+			this._nameLayer_mc.removeMovieClip();
+			
+			this._activityLayer_mc = this.createEmptyMovieClip("_activityLayer_mc", this.getNextHighestDepth(),{_y:learnerMenuBar._height});
+			this._nameLayer_mc = this.createEmptyMovieClip("_nameLayer_mc", this.getNextHighestDepth(),{_y:learnerMenuBar._height});
+		
+
 			if (isChanged == false){
 				mm.setIsProgressChangedLearner(false);
-				mm.setIsProgressChangedSequence(true)
-			}else {
+				mm.setIsProgressChangedSequence(true);
+			} else {
 				mm.setIsProgressChangedLesson(true);
-				mm.setIsProgressChangedSequence(true)
+				mm.setIsProgressChangedSequence(true);
 			}
-			mm.getMonitor().getProgressData(mm.getSequence());
 			
-		//}
+			mm.transitionsDisplayed.clear();
+			mm.activitiesDisplayed.clear();
+			
+			mm.getMonitor().getProgressData(mm.getSequence());
 		
-	}
-	private function drawAllLearnersDesign(mm:MonitorModel, tabID:Number){
-		//learnerListArr = clearLearnersData(learnerListArr)
-		for (var j=0; j<mm.allLearnersProgress.length; j++){
-			learnersDrawn = j+1
+	}
+	
+	private function drawAllLearnersDesign(mm:MonitorModel, tabID:Number){
+		mm.isDesignDrawn = false;
+		
+		for(var i=0; i<mm.allLearnersProgress.length; i++){
+			
+			learnersDrawn = i+1;
 			ACT_X = 0;
-			ACT_Y = (j*80)+35;
-			mm.drawDesign(tabID, mm.allLearnersProgress[j]);
+			ACT_Y = (i*80)+35;
+			
+			mm.drawDesign(tabID, mm.allLearnersProgress[i]);
+			
 			setSize(mm);
 		}
+		
+		mm.getMonitor().getMV().getMonitorLearnerScp().redraw(true);
+		
 	}
 	
 	/**
@@ -317,7 +311,7 @@
 		
 	}
 	
-	private function printLearner(a:Activity,mm:MonitorModel, learner:Object){
+	private function printLearner(mm:MonitorModel, learner:Object){
 		
 		var z:Object = mm.getSize();
 		var styleObj = _tm.getStyleObject('button');
@@ -327,11 +321,21 @@
 		
 		var exp_url = _root.serverURL+"learning/exportWaitingPage.jsp?mode=learner&role=teacher&lessonID="+_root.lessonID+"&userID="+learner.getLearnerId();
 		
-		_activityLayer_mc.createTextField("learnerName"+learner.getLearnerId(), _activityLayer_mc.getNextHighestDepth(), ACT_X+2, ACT_Y, z.w-22, 20);
-		_activityLayer_mc.attachMovie("Button", "learnerName"+learner.getLearnerId()+"_btn", _activityLayer_mc.getNextHighestDepth(),{label:EP_btn_label, _x:z.w-110, _y:ACT_Y+2, styleName:styleObj} )
-		var learnerName_txt = _activityLayer_mc["learnerName"+learner.getLearnerId()];
+		if(_nameLayer_mc["learnerName"+learner.getLearnerId()] != undefined) {
+			_nameLayer_mc["learnerName"+learner.getLearnerId()+"_btn"].removeTextField();
+		}
 		
-		var learnerExp_btn = _activityLayer_mc["learnerName"+learner.getLearnerId()+"_btn"];
+		_nameLayer_mc.createTextField("learnerName"+learner.getLearnerId(), _nameLayer_mc.getNextHighestDepth(), ACT_X+2, ACT_Y, z.w-22, 20);
+		
+		if(_nameLayer_mc["learnerName"+learner.getLearnerId()+"_btn"] != undefined) {
+			_nameLayer_mc["learnerName"+learner.getLearnerId()+"_btn"].removeMovieClip();
+		}
+		
+		_nameLayer_mc.attachMovie("Button", "learnerName"+learner.getLearnerId()+"_btn", _nameLayer_mc.getNextHighestDepth(),{label:EP_btn_label, _x:z.w-110, _y:ACT_Y+2, styleName:styleObj} )
+		
+		var learnerName_txt = _nameLayer_mc["learnerName"+learner.getLearnerId()];
+		var learnerExp_btn = _nameLayer_mc["learnerName"+learner.getLearnerId()+"_btn"];
+		
 		learnerExp_btn.setSize(90, 17);
 		learnerExp_btn.onRelease = function (){
 			JsPopup.getInstance().launchPopupWindow(exp_url, 'ExportPortfolio', 410, 640, true, true, false, false, false);
@@ -362,10 +366,9 @@
 	}
 
 	public function showToolTip(btnObj, btnTT:String):Void{
-		var scpWidth:Number = mm.getMonitor().getMV().getMonitorLearnerScp().width
-		trace("xlocation for tooltip: "+scpWidth)
+		var scpWidth:Number = mm.getMonitor().getMV().getMonitorLearnerScp().width;
 		var btnLabel = btnObj.label;
-		var xpos:Number = scpWidth - 190
+		var xpos:Number = scpWidth - 190;
 		var Xpos = xpos;
 		var Ypos = (Application.MONITOR_Y+ btnObj._y+btnObj.height)+5;
 		var ttHolder = Application.tooltip;
@@ -385,49 +388,83 @@
 	 * @param   cm - Refernce to the model
 	 * @return  Boolean - successfullit
 	 */
-	private function drawActivity(a:Activity,mm:MonitorModel, learner:Object):Boolean{
+	private function drawActivity(a:Activity, mm:MonitorModel, learner:Object):Boolean{
+		
+		var ltv = LearnerTabView(this);
+		var mc = getController();
+		var newActivity_mc = null;
 		
 		Debugger.log('The activity:'+a.title+','+a.activityTypeID+' is now be drawn',Debugger.CRITICAL,'drawActivity','LearnerTabView');
-		if (ACT_X == 0){
-			printLearner(a, mm, learner)
+		
+		if (ACT_X == 0) {
+			printLearner(mm, learner);
 		}
-		var s:Boolean = false;
 		
-		var ltv = LearnerTabView(this);
-		
-		var mc = getController();
-		
 		//take action depending on act type
-		if(a.activityTypeID==Activity.TOOL_ACTIVITY_TYPE || a.isGroupActivity()){
-			var newActivity_mc = _activityLayer_mc.createChildAtDepth("LearnerActivity", DepthManager.kTop,{_activity:a,_controller:mc,_view:ltv, _x:ACT_X, _y:ACT_Y+40, learner:learner});
-			ACT_X = newActivity_mc._x + newActivity_mc._width;
-		}else if(a.isGateActivity()){
+		if(a.activityTypeID==Activity.TOOL_ACTIVITY_TYPE || a.isGroupActivity()){
+			newActivity_mc = _activityLayer_mc.createChildAtDepth("LearnerActivity", _activityLayer_mc.getNextHighestDepth(),{_activity:a,_controller:mc,_view:ltv, _x:ACT_X, _y:ACT_Y+40, learner:learner});
+			
+			ACT_X = newActivity_mc._x + newActivity_mc._width;
+			
+		} else if(a.isGateActivity()){
 			var actLabel:String = gateTitle(a);
-			trace("Title to pass for Gate Activity: "+actLabel)
-			var newActivity_mc = _activityLayer_mc.createChildAtDepth("LearnerGateActivity", DepthManager.kTop,{_activity:a,_controller:mc,_view:ltv, _x:ACT_X, _y:ACT_Y+40, actLabel:actLabel, learner:learner});
+			newActivity_mc = _activityLayer_mc.createChildAtDepth("LearnerGateActivity", _activityLayer_mc.getNextHighestDepth(),{_activity:a,_controller:mc,_view:ltv, _x:ACT_X, _y:ACT_Y+40, actLabel:actLabel, learner:learner});
+			
 			ACT_X = newActivity_mc._x + newActivity_mc._width;
-		}else if(a.activityTypeID==Activity.PARALLEL_ACTIVITY_TYPE || a.activityTypeID==Activity.OPTIONAL_ACTIVITY_TYPE){
+			
+		} else if(a.activityTypeID==Activity.PARALLEL_ACTIVITY_TYPE || a.activityTypeID==Activity.OPTIONAL_ACTIVITY_TYPE){
 			//get the children
 			var children:Array = mm.getMonitor().ddm.getComplexActivityChildren(a.activityUIID);
-			
-			var newActivity_mc = _activityLayer_mc.createChildAtDepth("LearnerComplexActivity",DepthManager.kTop,{_activity:a,_children:children,_controller:mc,_view:ltv, _x:ACT_X, _y:ACT_Y+40, learner:learner});
-			ACT_X = newActivity_mc._x + newActivity_mc._width;
-		}else{
+			newActivity_mc = _activityLayer_mc.createChildAtDepth("LearnerComplexActivity", _activityLayer_mc.getNextHighestDepth(),{_activity:a,_children:children,_controller:mc,_view:ltv, _x:ACT_X, _y:ACT_Y+40, learner:learner});
+			
+			ACT_X = newActivity_mc._x + newActivity_mc._width;
+			
+		} else{
 			Debugger.log('The activity:'+a.title+','+a.activityUIID+' is of unknown type, it cannot be drawn',Debugger.CRITICAL,'drawActivity','LearnerTabView');
-		}
+		}
+		
+		var actItems:Number = mm.activitiesDisplayed.size();
 		
-		var actItems:Number = mm.activitiesDisplayed.size()
-		
-		if (actItems < mm.getActivityKeys().length){
-			trace("total: "+mm.getActivityKeys().length)
+		if (actItems < mm.getActivityKeys().length) 
 			mm.activitiesDisplayed.put(a.activityUIID,newActivity_mc);
-		}
-		s = true;
-		//actLenght++;
-		trace("total activities: "+mm.getActivityKeys().length-1)
-		//setSize(mm);
-		mm.getMonitor().getMV().getMonitorLearnerScp().redraw(true);
-		return s;
+		
+		return true;
+	}
+	
+	/**
+	 * Create a clone of the Learning Design with the learner progress data applied to the cloned instance.
+	 * 
+	 * @usage   
+	 * @param   learner 	Learner's progress data
+	 * @return  
+	 */
+	
+	private function cloneActivity(a:Activity, mm:MonitorModel, learner:Object) {
+		var ltv = LearnerTabView(this);
+		var mc = getController();
+		
+		var mc:MovieClip = MovieClip(mm.activitiesDisplayed.get(a.activityUIID));
+		var _activityLayer_mc_clone:MovieClip = null;
+		
+		if (ACT_X == 0) {
+			printLearner(mm, learner);
+		}
+		
+		//take action depending on act type
+		if(a.isGateActivity()){
+			var actLabel:String = gateTitle(a);
+			_activityLayer_mc_clone = ApplicationParent.cloneMovieClip(mc, "_activityLayer_mc_clone_" + learner.getLearnerId() + "_" + a.activityUIID, _activityLayer_mc.getNextHighestDepth(), {_activity:a, _controller:mc, _view:ltv, _x:ACT_X, _y:ACT_Y+40, actLabel:actLabel, learner:learner});
+		} else if(a.activityTypeID==Activity.PARALLEL_ACTIVITY_TYPE || a.activityTypeID==Activity.OPTIONAL_ACTIVITY_TYPE){
+			var children:Array = mm.getMonitor().ddm.getComplexActivityChildren(a.activityUIID);
+			_activityLayer_mc_clone = ApplicationParent.cloneMovieClip(mc, "_activityLayer_mc_clone_" + learner.getLearnerId() + "_" + a.activityUIID, _activityLayer_mc.getNextHighestDepth(), {_activity:a, _children:children, _controller:mc,_view:ltv, _x:ACT_X, _y:ACT_Y+40, learner:learner});
+		} else {
+			_activityLayer_mc_clone = ApplicationParent.cloneMovieClip(mc, "_activityLayer_mc_clone_" + learner.getLearnerId() + "_" + a.activityUIID, _activityLayer_mc.getNextHighestDepth(), {_activity:a, _controller:mc, _view:ltv, _x:ACT_X, _y:ACT_Y+40, learner:learner});
+		}
+		
+		ACT_X = (_activityLayer_mc_clone != null) ? _activityLayer_mc_clone._x + _activityLayer_mc_clone._width : 0;
+			
+		Debugger.log("_clone:" + _activityLayer_mc_clone + " xPOS=" + mc._x + " yPOS=" + mc._y + " _x=" + _activityLayer_mc_clone._x + " _y=" + _activityLayer_mc_clone._y, Debugger.CRITICAL, "cloneDesign", "LTV");
+
 	}
 
 	/**
@@ -490,7 +527,6 @@
     */
 	private function setPosition(mm:MonitorModel):Void{
         var p:Object = mm.getPosition();
-		trace("X pos set in Model is: "+p.x+" and Y pos set in Model is "+p.y)
         this._x = p.x;
         this._y = p.y;
 	}
@@ -511,6 +547,7 @@
     */
     public function defaultController (model:Observable):Controller {
         return new MonitorController(model);
-    }
+    }
 	
+	
 }
\ No newline at end of file
Index: lams_central/src/flash/org/lamsfoundation/lams/monitoring/mv/tabviews/MonitorTabView.as
===================================================================
diff -u -r7030857cad8ac26f3cef13a7dd1034b3255e3857 -r6f216fba347b83cec9643e97905a407e168dd8c4
--- lams_central/src/flash/org/lamsfoundation/lams/monitoring/mv/tabviews/MonitorTabView.as	(.../MonitorTabView.as)	(revision 7030857cad8ac26f3cef13a7dd1034b3255e3857)
+++ lams_central/src/flash/org/lamsfoundation/lams/monitoring/mv/tabviews/MonitorTabView.as	(.../MonitorTabView.as)	(revision 6f216fba347b83cec9643e97905a407e168dd8c4)
@@ -142,23 +142,20 @@
 				case 'TABCHANGE' :
 					if (infoObj.tabID == _tabID && !mm.locked){
 						setStyles();
-						//this._visible = true;
 						mm.getMonitor().getMV().getMonitorSequenceScp()._visible = true;
 						hideMainExp(mm);
 						mm.broadcastViewUpdate("JOURNALSSHOWHIDE", false);
 
-						trace("TabID for Selected tab is (TABCHANGE): "+infoObj.tabID)
 						if (mm.activitiesDisplayed.isEmpty() || mm.transitionsDisplayed.isEmpty()){
 							mm.getMonitor().openLearningDesign(mm.getSequence());
-						}else {
+						} else {
 							
 							if (drawDesignCalled == undefined){
 								drawDesignCalled = "called";
 								mm.drawDesign(infoObj.tabID);
 							}
 							
 							if(mm.getIsProgressChangedSequence()){
-								trace("I am calling reloadProgress now")
 								reloadProgress(false);
 							}
 						}
@@ -185,6 +182,11 @@
 						drawActivity(infoObj.data, mm)
 					}
 					break;
+				case 'CLONE_ACTIVITY' :
+					if (infoObj.tabID == _tabID && !mm.locked){
+						drawActivity(infoObj.data, mm)
+					}
+					break;
 				case 'HIDE_ACTIVITY' :
 					if (infoObj.tabID == _tabID && !mm.locked){
 						hideActivity(infoObj.data, mm)
@@ -210,13 +212,15 @@
 					break;
 				case 'DRAW_DESIGN' :
 					if (infoObj.tabID == _tabID && !mm.locked){
+						
 						setStyles();
 						setSize(mm);
+						
 						drawDesignCalled = "called";
-						trace("TabID for Selected tab is (MonitorTab): "+infoObj.tabID)
+						
 						showEndGateData(mm);
 						mm.drawDesign(infoObj.tabID);
-						//mm.setIsProgressChanged(false);
+						
 					}
 					break;
 				default :
@@ -232,24 +236,18 @@
 		
 		bkg_pnl = this.attachMovie("Panel", "bkg_pnl", this.getNextHighestDepth());
 
-		//set up the 
-		//_canvas_mc = this;
 		_gridLayer_mc = this.createEmptyMovieClip("_gridLayer_mc", this.getNextHighestDepth());
-		//learnerMenuBar = this.attachMovie("RefreshBar", "RefreshBar", this.getNextHighestDepth())
-		//learnerMenuBar = eval(learnerMenuBar)
+		
 		_transitionLayer_mc = this.createEmptyMovieClip("_transitionLayer_mc", this.getNextHighestDepth());
 		_activityLayerComplex_mc = this.createEmptyMovieClip("_activityLayerComplex_mc", this.getNextHighestDepth());
 		_activityLayer_mc = this.createEmptyMovieClip("_activityLayer_mc", this.getNextHighestDepth(),{_y:learnerMenuBar._height});
-		//learnerMenuBar.refresh_btn.onRelease = Proxy.create (this, reloadProgress);	
-		trace("Loaded MonitorTabView Data"+ this)
-		//setSize (mm)
-		 var s:Object = mm.getSize();
+		
+		var s:Object = mm.getSize();
 		endGate_mc = _activityLayer_mc.createChildAtDepth("endGate",DepthManager.kTop, {_x:0, _y:s.h-endGateOffset});
 		mm.endGate(endGate_mc);
 		mm.endGate = endGate_mc;
 		endGate_mc.tt_btn.onRollOver = Proxy.create(this,this['showToolTip'], "finish_learner_tooltip");
 		endGate_mc.tt_btn.onRollOut =  Proxy.create(this,this['hideToolTip']);
-		//_activityLayer_mc.endgate
 		setStyles();
 		
 		dispatchEvent({type:'load',target:this});
@@ -307,14 +305,14 @@
 	 */
 	private function reloadProgress(isChanged:Boolean){
 			var s:Object = mm.getSize();
-			trace("reloading Progress data for Learners")
-			drawDesignCalled = undefined
+			drawDesignCalled = undefined;
 			
 			//Remove all the movies drawn on the transition and activity movieclip holder
 			
-			_transitionLayer_mc.removeMovieClip();
-			_activityLayer_mc.removeMovieClip();
-			endGate_mc.removeMovieClip();
+			this._transitionLayer_mc.removeMovieClip();
+			this._activityLayer_mc.removeMovieClip();
+			this.endGate_mc.removeMovieClip();
+			
 			//Recreate both Transition holder and Activity holder Movieclips
 			_transitionLayer_mc = this.createEmptyMovieClip("_transitionLayer_mc", this.getNextHighestDepth());
 			_activityLayer_mc = this.createEmptyMovieClip("_activityLayer_mc", this.getNextHighestDepth(),{_y:learnerMenuBar._height});
@@ -324,11 +322,14 @@
 			if (isChanged == false){
 				mm.setIsProgressChangedSequence(false);
 				
-			}else {
+			} else {
 				mm.setIsProgressChangedLesson(true);
 				mm.setIsProgressChangedLearner(true);
-				//mm.setIsProgressChangedSequence(true)
 			}
+			
+			mm.transitionsDisplayed.clear();
+			mm.activitiesDisplayed.clear();
+			
 			mm.getMonitor().getProgressData(mm.getSequence());
 	}
 	
@@ -341,7 +342,6 @@
 	 */
 	private function removeActivity(a:Activity,mm:MonitorModel){
 		//dispatch an event to show the design  has changed
-		trace("in removeActivity")
 		var r = mm.activitiesDisplayed.remove(a.activityUIID);
 		r.removeMovieClip();
 		var s:Boolean = (r==null) ? false : true;
@@ -373,7 +373,6 @@
 	 */
 	private function drawActivity(a:Activity,mm:MonitorModel):Boolean{
 		
-		var s:Boolean = false;
 		var mtv = MonitorTabView(this);
 		var mc = getController();
 		var newActivity_mc = null;
@@ -406,9 +405,8 @@
 		} 
 		
 		mm.getMonitor().getMV().getMonitorSequenceScp().redraw(true);
-		s = true;
 		
-		return s;
+		return true;
 	}
 	
 	/**
@@ -441,10 +439,7 @@
 	 * @return  
 	 */
 	private function drawTransition(t:Transition,mm:MonitorModel):Boolean{
-		var s:Boolean = true;
-		
 		var mtv = MonitorTabView(this);
-		
 		var mc = getController();
 		
 		var newTransition_mc:MovieClip = _transitionLayer_mc.createChildAtDepth("MonitorTransition",DepthManager.kTop,{_transition:t,_monitorController:mc,_monitorTabView:mtv});
@@ -455,7 +450,7 @@
 		}
 		
 		Debugger.log('drawn a transition:'+t.transitionUIID+','+newTransition_mc,Debugger.GEN,'drawTransition','MonitorTabView');
-		return s;
+		return true;
 		
 	}
 	
Index: lams_common/src/flash/org/lamsfoundation/lams/common/ApplicationParent.as
===================================================================
diff -u -r0150dec88425dee1117e7978370b9d964ba197dc -r6f216fba347b83cec9643e97905a407e168dd8c4
--- lams_common/src/flash/org/lamsfoundation/lams/common/ApplicationParent.as	(.../ApplicationParent.as)	(revision 0150dec88425dee1117e7978370b9d964ba197dc)
+++ lams_common/src/flash/org/lamsfoundation/lams/common/ApplicationParent.as	(.../ApplicationParent.as)	(revision 6f216fba347b83cec9643e97905a407e168dd8c4)
@@ -236,6 +236,13 @@
 		return _module;
 	}
 	
-	
+	public static function cloneMovieClip(
+		target:MovieClip, newName:String,
+		depth:Number, initObject:Object):MovieClip {
+		
+		target.duplicateMovieClip(newName, depth, initObject);
+		
+		return target._parent[newName];
+	}
 	
 }
\ No newline at end of file
Index: lams_common/src/flash/org/lamsfoundation/lams/common/LearnerActivity.as
===================================================================
diff -u -r5440d2fca669b2c801a56a591d6368608f3c6f89 -r6f216fba347b83cec9643e97905a407e168dd8c4
--- lams_common/src/flash/org/lamsfoundation/lams/common/LearnerActivity.as	(.../LearnerActivity.as)	(revision 5440d2fca669b2c801a56a591d6368608f3c6f89)
+++ lams_common/src/flash/org/lamsfoundation/lams/common/LearnerActivity.as	(.../LearnerActivity.as)	(revision 6f216fba347b83cec9643e97905a407e168dd8c4)
@@ -124,7 +124,7 @@
 			
 				_view = initObj._view;
 				_controller = initObj._controller;
-				_activity = initObj.activity;
+				_activity = initObj._activity;
 				learner = initObj.learner;
 		}
 		
@@ -153,7 +153,6 @@
 		
 		Debugger.log('initialising activity : ' + _activity.activityID ,Debugger.CRITICAL,'init','org.lamsfoundation.lams.LearnerActivity');
 		
-		trace("Data for sentFrom: "+sentFrom)
 		MovieClipUtils.doLater(Proxy.create(this,draw));
 
 	}
@@ -208,9 +207,7 @@
 			    attempted_mc._visible = true;
                 break;
 			default :
-				//actStatus = "todo_mc";
 				todo_mc._visible = true;
-                //Debugger.log('unknown update type :' + infoObj.updateType,Debugger.CRITICAL,'update','org.lamsfoundation.lams.MonitorView');
 		}
 			
 		//write text
@@ -229,11 +226,8 @@
 			
 		}
 		title_lbl.text = toolTitle;
-		//this.completed_mc.onRollOver = Proxy.create(this,this['showToolTip'], this.completed_mc, "completed_act_tooltip");
-		//this.completed_mc.onRollOut = Proxy.create(this,this['hideToolTip']);
-		//this.current_mc.onRollOver = Proxy.create(this,this['showToolTip'], this.current_mc, "current_act_tooltip");
-		//this.current_mc.onRollOut = Proxy.create(this,this['hideToolTip']);							//Debugger.log('canvasActivity_mc._visible'+canvasActivity_mc._visible,4,'draw','CanvasActivity');
-		//_visible = true;
+		
+		
 	}
 	
 	public function showToolTip(btnObj, btnTT:String):Void{
Index: lams_monitoring/web/lams_monitoring.swf
===================================================================
diff -u -r00ab62ab99ebcc19044975f448f71c238ba5fea3 -r6f216fba347b83cec9643e97905a407e168dd8c4
Binary files differ
Index: lams_monitoring/web/lams_monitoring_library.swf
===================================================================
diff -u -r00ab62ab99ebcc19044975f448f71c238ba5fea3 -r6f216fba347b83cec9643e97905a407e168dd8c4
Binary files differ