Index: lams_flash/src/common/flash/org/lamsfoundation/lams/common/LearnerActivity.as =================================================================== RCS file: /usr/local/cvsroot/lams_flash/src/common/flash/org/lamsfoundation/lams/common/LearnerActivity.as,v diff -u -r1.20 -r1.21 --- lams_flash/src/common/flash/org/lamsfoundation/lams/common/LearnerActivity.as 25 Jun 2008 00:50:39 -0000 1.20 +++ lams_flash/src/common/flash/org/lamsfoundation/lams/common/LearnerActivity.as 27 Jun 2008 05:57:44 -0000 1.21 @@ -30,6 +30,7 @@ import org.lamsfoundation.lams.monitoring.mv.*; import org.lamsfoundation.lams.monitoring.mv.tabviews.LearnerTabView; import org.lamsfoundation.lams.authoring.Activity; +import org.lamsfoundation.lams.authoring.GateActivity; import org.lamsfoundation.lams.authoring.SequenceActivity; import org.lamsfoundation.lams.authoring.ComplexActivity; import org.lamsfoundation.lams.common.style.*; @@ -251,7 +252,8 @@ } - public function showToolTip(btnObj, btnTT:String):Void{ + public function showToolTip(btnObj, ttMessage:String):Void{ + Debugger.log("showToolTip invoked", Debugger.CRITICAL, "showToolTip", "LearnerActivity"); var appData = getAppData(); if(_complex){ var ttXpos = appData.compX + xPos; @@ -262,16 +264,19 @@ }else { var ttXpos = appData.compX + this._x; } - var ttYpos = appData.compY + this._y+btnObj._height; + var targetHeightOffset:Number = (btnObj._height == undefined) ? 15 : btnObj._height; + var ttYpos = appData.compY + this._y+targetHeightOffset; } var ttHolder = appData.ttHolder; - trace("x pos: "+ttXpos+" and y pos: "+ttYpos+" and tt holder is: "+ttHolder) - if (btnTT == undefined || btnTT == null || btnTT == "" || btnTT == "undefined"){ - var ttMessage = ""+ _activity.title+"" - }else { - var ttMessage = ""+ _activity.title +" \n"+Dictionary.getValue(btnTT); + Debugger.log("ttHolder: "+ttHolder, Debugger.CRITICAL, "showToolTip", "LearnerActivity"); + + if (ttMessage == undefined || ttMessage == null || ttMessage == "" || ttMessage == "undefined"){ + ttMessage = ""+ _activity.title+""; + } else { + ttMessage = ""+ _activity.title+"\n" + ttMessage; } + var ttWidth = 140; _tip.DisplayToolTip(ttHolder, ttMessage, ttXpos, ttYpos, undefined, ttWidth); @@ -283,15 +288,39 @@ private function onRollOver(){ if (actStatus == "completed_mc"){ - showToolTip(this.clickTarget_mc, "completed_act_tooltip"); + showToolTip(this.clickTarget_mc, Dictionary.getValue("completed_act_tooltip")); + }else if (actStatus == "current_mc"){ - showToolTip(this.clickTarget_mc, "current_act_tooltip"); - }else { - if (String(_activity.title).length > 19){ - showToolTip(this.clickTarget_mc, "undefined"); + showToolTip(this.clickTarget_mc, Dictionary.getValue("current_act_tooltip")); + + }else { // Handle tooltips for not yet attempted activities + var attemptedActs:Array = learner.getAttemptedActivities(); + var attempted:Boolean = false; + for (var i=0; i