Index: lams_flash/src/central/flash/org/lamsfoundation/lams/authoring/cv/CanvasActivity.as =================================================================== RCS file: /usr/local/cvsroot/lams_flash/src/central/flash/org/lamsfoundation/lams/authoring/cv/CanvasActivity.as,v diff -u -r1.37 -r1.38 --- lams_flash/src/central/flash/org/lamsfoundation/lams/authoring/cv/CanvasActivity.as 27 Feb 2008 08:38:30 -0000 1.37 +++ lams_flash/src/central/flash/org/lamsfoundation/lams/authoring/cv/CanvasActivity.as 4 Mar 2008 04:48:05 -0000 1.38 @@ -367,12 +367,12 @@ Debugger.log("learner_X: " + learner_X + " ref: " + learnerContainer + " xcoord: " + xCoord, Debugger.CRITICAL, "drawLearners", "CanvasActivity"); if(learner_X > (xCoord + getVisibleWidth() - 10)) { - learnerContainer.attachMovie("learnerIcon", "learnerIcon"+learner.getUserName(), learnerContainer.getNextHighestDepth(), {_activity:_activity, learner:learner, _monitorController:_monitorController, _x:learner_X, _y:learner_Y, _hasPlus:true, _clone:false }); + 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 }); return; } - + // attach icon - learnerContainer.attachMovie("learnerIcon", "learnerIcon"+learner.getUserName(), learnerContainer.getNextHighestDepth(), {_activity:_activity, learner:learner, _monitorController:_monitorController, _x:learner_X, _y:learner_Y, _hasPlus:false, _clone:false }); + 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; Index: lams_flash/src/central/flash/org/lamsfoundation/lams/monitoring/mv/LearnerIcon.as =================================================================== RCS file: /usr/local/cvsroot/lams_flash/src/central/flash/org/lamsfoundation/lams/monitoring/mv/LearnerIcon.as,v diff -u -r1.5 -r1.6 --- lams_flash/src/central/flash/org/lamsfoundation/lams/monitoring/mv/LearnerIcon.as 31 Oct 2007 08:06:10 -0000 1.5 +++ lams_flash/src/central/flash/org/lamsfoundation/lams/monitoring/mv/LearnerIcon.as 4 Mar 2008 04:48:06 -0000 1.6 @@ -96,7 +96,7 @@ if(initObj){ _monitorView = initObj._monitorView; _monitorController = initObj._monitorController; - _activity = initObj.activity; + _activity = initObj._activity; learner = initObj.learner; learnerOffset_X = initObj._x; learnerOffset_Y = initObj._y; @@ -176,7 +176,7 @@ if((now - _dcStartTime) <= Config.DOUBLE_CLICK_DELAY){ if (app.controlKeyPressed != "transition"){ _doubleClicking = true; - Debugger.log('DoubleClicking: '+this.activity.activityID,Debugger.CRITICAL,'onPress','CanvasActivity For Monitoring'); + Debugger.log('DoubleClicking: '+this.activity.activityID,Debugger.CRITICAL,'localOnPress','CanvasActivity For Monitoring'); var _learnerID:Number = learner.getLearnerId() _monitorController.activityDoubleClick(_activity, "MonitorTabViewLearner", _learnerID); @@ -186,7 +186,7 @@ _doubleClicking = false; Debugger.log('SingleClicking:+'+this,Debugger.GEN,'onPress','CanvasActivity for monitoring'); - _clone_mc = ApplicationParent.root.attachMovie("learnerIcon", _name + "_clone", DepthManager.kTop, {_activity:_activity, learner:learner, _monitorController:_monitorController, _x:_x + org.lamsfoundation.lams.monitoring.Application.MONITOR_X, _y:_y + org.lamsfoundation.lams.monitoring.Application.MONITOR_Y, _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, _hasPlus:_hasPlus, _clone: true }); _clone_mc._y = _root._ymouse - ICON_HEIGHT/2; _clone_mc._x = _root._xmouse - ICON_WIDTH/2 _monitorController.activityClick(_clone_mc, "LearnerIcon"); @@ -233,8 +233,8 @@ return learnerOffset_Y; } - public function get Learner():Progress{ - return getLearner(); + public function get Learner():Progress { + return learner; } public function set Learner(a:Progress){ Index: lams_monitoring/web/lams_monitoring.swf =================================================================== RCS file: /usr/local/cvsroot/lams_monitoring/web/Attic/lams_monitoring.swf,v diff -u -r1.167 -r1.168 Binary files differ Index: lams_monitoring/web/lams_monitoring_library.swf =================================================================== RCS file: /usr/local/cvsroot/lams_monitoring/web/Attic/lams_monitoring_library.swf,v diff -u -r1.135 -r1.136 Binary files differ