Index: lams_central/src/flash/org/lamsfoundation/lams/monitoring/mv/MonitorLearnerActivity.as =================================================================== diff -u -rd86ca7d1bd32c511ecdaea77d769a664c58472b2 -rc7381847ca8f11b1f91b797d429ba2fc23404fff --- lams_central/src/flash/org/lamsfoundation/lams/monitoring/mv/MonitorLearnerActivity.as (.../MonitorLearnerActivity.as) (revision d86ca7d1bd32c511ecdaea77d769a664c58472b2) +++ lams_central/src/flash/org/lamsfoundation/lams/monitoring/mv/MonitorLearnerActivity.as (.../MonitorLearnerActivity.as) (revision c7381847ca8f11b1f91b797d429ba2fc23404fff) @@ -64,6 +64,7 @@ private var todo_mc:MovieClip; private var attempted_mc:MovieClip; private var canvasActivity_mc:MovieClip; + private var clickTarget_mc:MovieClip; private var title_lbl:MovieClip; private var groupIcon_mc:MovieClip; private var stopSign_mc:MovieClip; @@ -124,12 +125,12 @@ } private function showAssets(isVisible:Boolean){ - //completed_mc._visible = isVisible; - //current_mc._visible = isVisible; - //canvasActivity_mc._visible = isVisible; - //clickTarget_mc._visible = isVisible; - //todo_mc._visible = isVisible; - //attempted_mc._visible = isVisible + completed_mc._visible = isVisible; + current_mc._visible = isVisible; + canvasActivity_mc._visible = isVisible; + clickTarget_mc.enabled = isVisible; + todo_mc._visible = isVisible; + attempted_mc._visible = isVisible title_lbl._visible = true; } @@ -150,10 +151,13 @@ * @return */ private function draw(){ - + clickTarget_mc.onPress = Proxy.create (this, localOnPress); + clickTarget_mc.onRelease = Proxy.create (this, localOnRelease); + clickTarget_mc.onReleaseOutside = Proxy.create (this, localOnReleaseOutside); Debugger.log(_activity.title+',_activity.isGateActivity():'+_activity.isGateActivity(),4,'draw','CanvasActivity'); - if (actStatus == null || actStatus == undefined){ - actStatus = _learnerTabView.compareProgressData(learner, this.activity.activityID); + trace("Status returned for the learner "+learner.getUserName()+" activityID "+this.activity.activityID+ " is "+actStatus) + if (actStatus == undefined){ + actStatus = _learnerTabView.compareProgressData(learner, _activity.activityID); } trace("Status returned for the learner "+learner.getUserName()+" activityID "+this.activity.activityID+ " is "+actStatus) @@ -164,18 +168,17 @@ switch (actStatus){ case 'completed_mc' : completed_mc._visible = true; - //this.attachMovie("completed_mc", "completed_mc", this.getNextHighestDepth(),{_x:xPos, _y:yPos}) - break; + clickTarget_mc.enabled = true; + break; case 'current_mc' : - //this.attachMovie("current_mc", "current_mc", this.getNextHighestDepth(),{_x:xPos, _y:yPos}) current_mc._visible = true; + clickTarget_mc.enabled = true; break; case 'attempted_mc' : - //this.attachMovie("attempted_mc", "attempted_mc", this.getNextHighestDepth(),{_x:xPos, _y:yPos}) - attempted_mc._visible = true; + attempted_mc._visible = true; + clickTarget_mc.enabled = true; break; default : - //this.attachMovie("todo_mc", "todo_mc", this.getNextHighestDepth(),{_x:xPos, _y:yPos}) todo_mc._visible = true; //Debugger.log('unknown update type :' + infoObj.updateType,Debugger.CRITICAL,'update','org.lamsfoundation.lams.MonitorView'); } @@ -187,7 +190,7 @@ } - private function onPress():Void{ + private function localOnPress():Void{ // check double-click @@ -209,7 +212,7 @@ } - private function onRelease():Void{ + private function localOnRelease():Void{ if(!_doubleClicking){ Debugger.log('Releasing:'+this,Debugger.GEN,'onRelease','MonitorLearnerActivity'); trace("Activity ID is: "+this.activity.activityID) @@ -218,7 +221,7 @@ } - private function onReleaseOutside():Void{ + private function localOnReleaseOutside():Void{ Debugger.log('ReleasingOutside:'+this,Debugger.GEN,'onReleaseOutside','MonitorLearnerActivity'); _monitorController.activityReleaseOutside(this); }