Index: lams_flash/src/central/flash/org/lamsfoundation/lams/authoring/br/CanvasBranchView.as =================================================================== diff -u -r96b7d23e6ff1d27f5f2637fa1c1dfe471861fa63 -r7a9b710e06a36df574d235d7afc61665580249ec --- lams_flash/src/central/flash/org/lamsfoundation/lams/authoring/br/CanvasBranchView.as (.../CanvasBranchView.as) (revision 96b7d23e6ff1d27f5f2637fa1c1dfe471861fa63) +++ lams_flash/src/central/flash/org/lamsfoundation/lams/authoring/br/CanvasBranchView.as (.../CanvasBranchView.as) (revision 7a9b710e06a36df574d235d7afc61665580249ec) @@ -81,6 +81,8 @@ private var _defaultSequenceActivity:SequenceActivity; private var _fingerprint:MovieClip; + private var _learnerContainer_mc:MovieClip; + private var _open:Boolean; /** @@ -233,9 +235,11 @@ activityComplexLayer = content.createEmptyMovieClip("_activityComplexLayer_mc", content.getNextHighestDepth()); activityLayer = content.createEmptyMovieClip("_activityLayer_mc", content.getNextHighestDepth()); + _learnerContainer_mc = content.createEmptyMovieClip("_learnerContainer_mc", content.getNextHighestDepth()); + transparentCover = content.createClassObject(Panel, "_transparentCover_mc", content.getNextHighestDepth(), {_visible: false, enabled: false, _alpha: 50}); transparentCover.onPress = null; - + bkg_pnl.onRelease = function(){ Application.getInstance().getCanvas().getCanvasView().getController().canvasRelease(this); } @@ -373,13 +377,13 @@ Debugger.log('controller obj cbc :'+cbc, Debugger.CRITICAL, 'drawActivity','CanvasBranchView'); var newActivity_mc = (_module != "monitoring") ? activityLayer.createChildAtDepth("CanvasActivity",DepthManager.kTop,{_activity:a, _canvasController:cbc, _canvasBranchView:cbv}) - : activityLayer.createChildAtDepth("CanvasActivity",DepthManager.kTop,{_activity:a, _monitorController:cbc, _canvasBranchView:cbv, _module:_module}); + : activityLayer.createChildAtDepth("CanvasActivity",DepthManager.kTop,{_activity:a, _monitorController:cbc, _canvasBranchView:cbv, _module:_module, learnerContainer:_learnerContainer_mc}); cm.activitiesDisplayed.put(a.activityUIID,newActivity_mc); Debugger.log('Tool or gate activity a.title:'+a.title+','+a.activityUIID+' added to the cm.activitiesDisplayed hashtable:'+newActivity_mc,4,'drawActivity','CanvasBranchView'); } else if (a.isGateActivity()){ var newActivity_mc = (_module != "monitoring") ? activityLayer.createChildAtDepth("CanvasGateActivity",DepthManager.kTop,{_activity:a, _canvasController:cbc, _canvasBranchView:cbv}) - : activityLayer.createChildAtDepth("CanvasGateActivity",DepthManager.kTop,{_activity:a, _monitorController:cbc, _canvasBranchView:cbv, _module:_module}); + : activityLayer.createChildAtDepth("CanvasGateActivity",DepthManager.kTop,{_activity:a, _monitorController:cbc, _canvasBranchView:cbv, _module:_module, learnerContainer:_learnerContainer_mc}); cm.activitiesDisplayed.put(a.activityUIID,newActivity_mc); Debugger.log('Gate activity a.title:'+a.title+','+a.activityUIID+' added to the cm.activitiesDisplayed hashtable:'+newActivity_mc,4,'drawActivity','CanvasBranchView'); @@ -389,7 +393,7 @@ var children:Array = cm.getCanvas().ddm.getComplexActivityChildren(a.activityUIID); var newActivity_mc = (_module != "monitoring") ? activityLayer.createChildAtDepth("CanvasParallelActivity",DepthManager.kTop,{_activity:a,_children:children, _canvasController:cbc,_canvasBranchView:cbv, _locked:a.isReadOnly()}) - : activityLayer.createChildAtDepth("CanvasParallelActivity",DepthManager.kTop,{_activity:a,_children:children, _monitorController:cbc,_canvasBranchView:cbv, _locked:a.isReadOnly(), fromModuleTab:fromModuleTab}); + : activityLayer.createChildAtDepth("CanvasParallelActivity",DepthManager.kTop,{_activity:a,_children:children, _monitorController:cbc,_canvasBranchView:cbv, _locked:a.isReadOnly(), fromModuleTab:fromModuleTab, learnerContainer:_learnerContainer_mc}); cm.activitiesDisplayed.put(a.activityUIID,newActivity_mc); Debugger.log('Parallel activity a.title:'+a.title+','+a.activityUIID+' added to the cm.activitiesDisplayed hashtable :'+newActivity_mc,4,'drawActivity','CanvasBranchView'); @@ -398,14 +402,14 @@ var children:Array = cm.getCanvas().ddm.getComplexActivityChildren(a.activityUIID); var newActivity_mc = (_module != "monitoring") ? activityComplexLayer.createChildAtDepth("CanvasOptionalActivity",DepthManager.kTop,{_activity:a,_children:children, _canvasController:cbc,_canvasBranchView:cbv,_locked:a.isReadOnly()}) - : activityComplexLayer.createChildAtDepth("CanvasOptionalActivity",DepthManager.kTop,{_activity:a,_children:children, _monitorController:cbc,_canvasBranchView:cbv,_locked:a.isReadOnly(), fromModuleTab:fromModuleTab}); + : activityComplexLayer.createChildAtDepth("CanvasOptionalActivity",DepthManager.kTop,{_activity:a,_children:children, _monitorController:cbc,_canvasBranchView:cbv,_locked:a.isReadOnly(), fromModuleTab:fromModuleTab, learnerContainer:_learnerContainer_mc}); cm.activitiesDisplayed.put(a.activityUIID,newActivity_mc); Debugger.log('Optional activity Type a.title:'+a.title+','+a.activityUIID+' added to the cm.activitiesDisplayed hashtable :'+newActivity_mc,4,'drawActivity','CanvasBranchView'); } else if(a.isBranchingActivity()) { var newActivity_mc = (_module != "monitoring") ? activityLayer.createChildAtDepth("CanvasActivity",DepthManager.kTop,{_activity:a, _canvasController:cbc,_canvasBranchView:cbv}) - : activityLayer.createChildAtDepth("CanvasActivity",DepthManager.kTop,{_activity:a, _monitorController:cbc,_canvasBranchView:cbv, _module:_module}); + : activityLayer.createChildAtDepth("CanvasActivity",DepthManager.kTop,{_activity:a, _monitorController:cbc,_canvasBranchView:cbv, _module:_module, learnerContainer:_learnerContainer_mc}); cm.activitiesDisplayed.put(a.activityUIID,newActivity_mc); Debugger.log('Branching activity Type a.title:'+a.title+','+a.activityUIID+' added to the cm.activitiesDisplayed hashtable :'+newActivity_mc,4,'drawActivity','CanvasBranchView'); Index: lams_flash/src/central/flash/org/lamsfoundation/lams/authoring/cv/CanvasActivity.as =================================================================== diff -u -rfaa2451a2961575550669f2bceb7522490dde9b4 -r7a9b710e06a36df574d235d7afc61665580249ec --- lams_flash/src/central/flash/org/lamsfoundation/lams/authoring/cv/CanvasActivity.as (.../CanvasActivity.as) (revision faa2451a2961575550669f2bceb7522490dde9b4) +++ lams_flash/src/central/flash/org/lamsfoundation/lams/authoring/cv/CanvasActivity.as (.../CanvasActivity.as) (revision 7a9b710e06a36df574d235d7afc61665580249ec) @@ -274,9 +274,9 @@ var xCoord = _activity.xCoord; if (_activity.parentUIID != null) { - xCoord = parentAct.xCoord; + xCoord = (parentAct.activityTypeID == Activity.SEQUENCE_ACTIVITY_TYPE) ? _activity.xCoord : parentAct.xCoord; - if(parentAct.activityTypeID != Activity.PARALLEL_ACTIVITY_TYPE){ + if(parentAct.activityTypeID != Activity.PARALLEL_ACTIVITY_TYPE && parentAct.activityTypeID != Activity.SEQUENCE_ACTIVITY_TYPE){ xCoord = parentAct.xCoord + _activity.xCoord; learner_X = (learner_X != null) ? learner_X + parentAct.xCoord : null; learner_Y = learner_Y + parentAct.yCoord; Index: lams_flash/src/central/flash/org/lamsfoundation/lams/monitoring/mv/LearnerIcon.as =================================================================== diff -u -r6d8883713aa3ab5ee1cd28432101f70cfbf0d201 -r7a9b710e06a36df574d235d7afc61665580249ec --- lams_flash/src/central/flash/org/lamsfoundation/lams/monitoring/mv/LearnerIcon.as (.../LearnerIcon.as) (revision 6d8883713aa3ab5ee1cd28432101f70cfbf0d201) +++ lams_flash/src/central/flash/org/lamsfoundation/lams/monitoring/mv/LearnerIcon.as (.../LearnerIcon.as) (revision 7a9b710e06a36df574d235d7afc61665580249ec) @@ -56,7 +56,7 @@ private var app:ApplicationParent; //locals - private var toolTip:MovieClip; + private var toolTip:ToolTip; private var learnerOffset_X:Number private var learnerOffset_Y:Number private var click_mc:MovieClip; @@ -76,6 +76,8 @@ function LearnerIcon(){ //Debugger.log("_activity:"+_activity.title,4,'Constructor','CanvasActivity'); _tm = ThemeManager.getInstance(); + toolTip = new ToolTip(); + //Get reference to application and design data model app = ApplicationParent.getInstance(); //let it wait one frame to set up the components. @@ -124,8 +126,25 @@ } + public function showToolTip():Void{ + + var ttHolder = this; + var ttMessage = learner.getFullName(); + + var ttWidth = StringUtils.getButtonWidthForStr(ttMessage); + + toolTip.DisplayToolTip(ttHolder, ttMessage, -5, -10, undefined, ttWidth); + + } + + public function hideToolTip():Void{ + toolTip.CloseToolTip(); + } + private function showAssets(isVisible:Boolean){ - toolTip._visible = isVisible; + //toolTip._visible = isVisible; + if(isVisible) showToolTip(); + else hideToolTip(); } /** @@ -140,7 +159,7 @@ Debugger.log('Learner is in Activity: '+_activity.title,4,'draw','LearnerIcon'); setStyles(); - toolTip.text = learner.getFullName(); + //toolTip.text = learner.getFullName(); Debugger.log('hasPlus: '+ _hasPlus,Debugger.CRITICAL,'draw','CanvasActivity'); smallCross._visible = _hasPlus; @@ -179,11 +198,13 @@ } private function localOnRollOver():Void{ - toolTip._visible = true; + //toolTip._visible = true; + showAssets(true); } private function localOnRollOut():Void{ - toolTip._visible = false; + //toolTip._visible = false; + showAssets(false); } @@ -197,7 +218,8 @@ private function localOnReleaseOutside():Void{ Debugger.log('ReleasingOutside:'+this,Debugger.GEN,'onReleaseOutside','CanvasActivity'); - toolTip._visible = false; + //toolTip._visible = false; + showAssets(false); _monitorController.activityRelease(_clone_mc, "LearnerIcon"); _clone_mc.removeMovieClip(); } Index: lams_flash/src/central/flash/org/lamsfoundation/lams/monitoring/mv/MonitorController.as =================================================================== diff -u -r345e61bed6622f37845b0056796ce63d60ac0640 -r7a9b710e06a36df574d235d7afc61665580249ec --- lams_flash/src/central/flash/org/lamsfoundation/lams/monitoring/mv/MonitorController.as (.../MonitorController.as) (revision 345e61bed6622f37845b0056796ce63d60ac0640) +++ lams_flash/src/central/flash/org/lamsfoundation/lams/monitoring/mv/MonitorController.as (.../MonitorController.as) (revision 7a9b710e06a36df574d235d7afc61665580249ec) @@ -132,6 +132,8 @@ var actUIIDToCompare = learnerObj.activity.activityUIID; var parentUIIDToCompare = learnerObj.activity.parentUIID; + Debugger.log("completed: " + checkifActivityNotComplete(learnerObj.Learner, cActivity.activity.activityID), Debugger.CRITICAL, "checkHit", "MonitorController"); + //if learner is on the next or further activity - get new progress data. if(checkifActivityNotComplete(learnerObj.Learner, cActivity.activity.activityID)) { if(actUIIDToCompare == cActivity.activity.activityUIID) @@ -214,16 +216,19 @@ act.stopDrag(); } + var dropTarget:Object = findParentActivity(eval(act._droptarget)); + //run a loop to check which activity has been hitted by the learner. for (var i=0; i