Index: lams_flash/src/central/flash/org/lamsfoundation/lams/monitoring/mv/LearnerIcon.as =================================================================== diff -u -r36a58619b25a62884e05e3a0d58c2cae326d2e1c -ra6f21ede1cb0afef705bc817bd1b4a87b2d43012 --- lams_flash/src/central/flash/org/lamsfoundation/lams/monitoring/mv/LearnerIcon.as (.../LearnerIcon.as) (revision 36a58619b25a62884e05e3a0d58c2cae326d2e1c) +++ lams_flash/src/central/flash/org/lamsfoundation/lams/monitoring/mv/LearnerIcon.as (.../LearnerIcon.as) (revision a6f21ede1cb0afef705bc817bd1b4a87b2d43012) @@ -161,18 +161,24 @@ if((now - _dcStartTime) <= Config.DOUBLE_CLICK_DELAY){ if (app.controlKeyPressed != "transition"){ _doubleClicking = true; + Debugger.log('DoubleClicking: '+this.activity.activityID,Debugger.CRITICAL,'localOnPress','CanvasActivity For Monitoring'); + + if(_clone_mc != null); + _clone_mc.stopDrag(); + var _learnerID:Number = learner.getLearnerId() - _monitorController.activityDoubleClick(_activity, "MonitorTabViewLearner", _learnerID); + viewLearner(); } } else { - _doubleClicking = false; - Debugger.log('SingleClicking:+'+this,Debugger.GEN,'onPress','CanvasActivity for monitoring'); + Debugger.log('SingleClicking:+'+this,Debugger.GEN,'localOnPress','LearnerIcon'); + _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, _clone: true }); _clone_mc._y = _root._ymouse - ICON_HEIGHT/2; _clone_mc._x = _root._xmouse - ICON_WIDTH/2 + _monitorController.activityClick(_clone_mc, "LearnerIcon"); } @@ -189,22 +195,33 @@ showAssets(false); } - private function localOnRelease():Void{ if(!_doubleClicking){ - Debugger.log('Releasing:'+this,Debugger.GEN,'onRelease','CanvasActivity'); _monitorController.activityRelease(_clone_mc, "LearnerIcon"); _clone_mc.removeMovieClip(); } } private function localOnReleaseOutside():Void{ - Debugger.log('ReleasingOutside:'+this,Debugger.GEN,'onReleaseOutside','CanvasActivity'); + Debugger.log('ReleasingOutside:'+this,Debugger.GEN,'onReleaseOutside','LearnerIcon'); showAssets(false); - _monitorController.activityRelease(_clone_mc, "LearnerIcon"); - _clone_mc.removeMovieClip(); + + if(!_doubleClicking){ + _monitorController.activityRelease(_clone_mc, "LearnerIcon"); + } + + if(_clone_mc != null) + _clone_mc.removeMovieClip(); } + public function viewLearner(URLToSend:String):Void { + if(_activity != null) { + if(learner != null) { + var _URLToSend = (URLToSend != null) ? URLToSend : _root.serverURL+_root.monitoringURL+'getLearnerActivityURL&activityID='+_activity.activityID+'&userID='+learner.getLearnerId()+'&lessonID='+_root.lessonID; + JsPopup.getInstance().launchPopupWindow(_URLToSend, 'MonitorLearnerActivity', 600, 800, true, true, false, false, false); + } + } + } public function get xCoord():Number{ return learnerOffset_X; Index: lams_flash/src/central/flash/org/lamsfoundation/lams/monitoring/mv/MonitorController.as =================================================================== diff -u -r36a58619b25a62884e05e3a0d58c2cae326d2e1c -ra6f21ede1cb0afef705bc817bd1b4a87b2d43012 --- lams_flash/src/central/flash/org/lamsfoundation/lams/monitoring/mv/MonitorController.as (.../MonitorController.as) (revision 36a58619b25a62884e05e3a0d58c2cae326d2e1c) +++ lams_flash/src/central/flash/org/lamsfoundation/lams/monitoring/mv/MonitorController.as (.../MonitorController.as) (revision a6f21ede1cb0afef705bc817bd1b4a87b2d43012) @@ -280,6 +280,7 @@ if(_monitorModel.isDragging){ act.stopDrag(); } + // hittest learner icon and finish door var dropTarget:Object = findParentActivity(eval(act._droptarget)); Debugger.log("dropTarget.activity.title: "+dropTarget.activity.title, Debugger.GEN, "activityRelease", "MonitorController"); @@ -391,8 +392,8 @@ } public function activityDoubleClick(ca:Object, forTabView:String, learnerID:Number, fromContextMenu:Boolean):Void{ - Debugger.log("ca.activity.isBranchingActivity(): "+ca.activity.isBranchingActivity(), Debugger.GEN, "activityDoubleClick", "MonitorController"); + if(!fromContextMenu && ca.activity.isBranchingActivity() && _monitorModel.getSelectedTab() == MonitorTabView._tabID) { _monitorModel.openBranchActivityContent(ca, true); } @@ -432,7 +433,8 @@ getURL("javascript:alert('"+alertMSG+"');"); } else { - JsPopup.getInstance().launchPopupWindow(URLToSend, 'MonitorLearnerActivity', 600, 800, true, true, false, false, false); + if(ca instanceof LearnerIcon) LearnerIcon(ca).viewLearner(URLToSend); + else JsPopup.getInstance().launchPopupWindow(URLToSend, 'MonitorLearnerActivity', 600, 800, true, true, false, false, false); } } else { @@ -444,7 +446,8 @@ Debugger.log("open complex viewer: " + ca.activity.activityUIID, Debugger.CRITICAL, "activityDoubleClick", "MonitorController") _monitorModel.getMonitor().openComplexView(ca); } else { - JsPopup.getInstance().launchPopupWindow(URLToSend, 'MonitorLearnerActivity', 600, 800, true, true, false, false, false); + if(ca instanceof LearnerIcon) LearnerIcon(ca).viewLearner(URLToSend); + else JsPopup.getInstance().launchPopupWindow(URLToSend, 'MonitorLearnerActivity', 600, 800, true, true, false, false, false); } } Index: lams_monitoring/web/lams_monitoring.swf =================================================================== diff -u -r36a58619b25a62884e05e3a0d58c2cae326d2e1c -ra6f21ede1cb0afef705bc817bd1b4a87b2d43012 Binary files differ Index: lams_monitoring/web/lams_monitoring_library.swf =================================================================== diff -u -r36a58619b25a62884e05e3a0d58c2cae326d2e1c -ra6f21ede1cb0afef705bc817bd1b4a87b2d43012 Binary files differ