Index: lams_central/src/flash/org/lamsfoundation/lams/authoring/cv/CanvasActivity.as =================================================================== diff -u -r99d83b79ade77d5fccbefe7ae488796cfa03e46b -r75861a1ca05723c73c11fda63c393c23c90b1e4a --- lams_central/src/flash/org/lamsfoundation/lams/authoring/cv/CanvasActivity.as (.../CanvasActivity.as) (revision 99d83b79ade77d5fccbefe7ae488796cfa03e46b) +++ lams_central/src/flash/org/lamsfoundation/lams/authoring/cv/CanvasActivity.as (.../CanvasActivity.as) (revision 75861a1ca05723c73c11fda63c393c23c90b1e4a) @@ -244,62 +244,75 @@ icon_mc._y = (CanvasActivity.TOOL_ACTIVITY_HEIGHT / 2) - (icon_mc._height / 2) - 6; } - /** - * Does the work of laying out the screen assets. - * Depending on type of Activity different bits will be shown - * @usage - * @return - */ - private function draw(){ + private function drawLearners():Void { + mm = MonitorModel(_monitorController.getModel()); - //Code for Drawing learner on the activty. - trace("Activity type ID : "+_activity.activityTypeID) - trace("Activity has parent UI ID : "+_activity.parentUIID) - trace("value of _Module in Canvas Activity: "+_module) - trace("Monitor Model is: "+_monitorController.getModel()) - if (_module == "monitoring"){ - var ref = this._parent; - mm = MonitorModel(_monitorController.getModel()); - trace("all learner progress length in Canvas activity: "+mm.allLearnersProgress.length); - var learner_X = _activity.xCoord + learnerOffset_X; - var learner_Y = _activity.yCoord + learnerOffset_Y; - var parentAct:Activity = mm.getMonitor().ddm.getActivityByUIID(_activity.parentUIID) - // get the length of learners from the Monitor Model and run a for loop. - for (var j=0; j (_activity.xCoord + 112)){ - learner_X = _activity.xCoord + learnerOffset_X - learner_Y = 27 - } - - trace(_activity.title+": is the learner's current Activity.") - trace("this._parent is "+this._parent) - - if (_activity.parentUIID != null && parentAct.activityTypeID != Activity.PARALLEL_ACTIVITY_TYPE){ - ref = this._parent._parent; - learner_X = learner_X + this._parent._x + //Gets a true if learner's currect activityID matches this activityID else false. + var isLearnerCurrentAct:Boolean = Progress.isLearnerCurrentActivity(learner, _activity.activityID); + var hasPlus:Boolean = false; + + if (isLearnerCurrentAct){ + var ref = this._parent; + + if (_activity.parentUIID != null) { + ref = this._parent._parent; + if(parentAct.activityTypeID != Activity.PARALLEL_ACTIVITY_TYPE){ + learner_X = (learner_X != null) ? learner_X + this._parent._x : null; learner_Y = learner_Y + this._parent._y - }else if (_activity.parentUIID != null && parentAct.activityTypeID == Activity.PARALLEL_ACTIVITY_TYPE){ - ref = this._parent._parent; - - } + } + } - ref.attachMovie("learnerIcon", "learnerIcon"+learner.getUserName(), ref.getNextHighestDepth(),{_activity:_activity, learner:learner, _monitorController:_monitorController, _x:learner_X, _y:learner_Y}); - learner_X = learner_X+10 - }else { - trace(_activity.title+": is not the learner's current Activity.") + + // Add + icon to indicate that more users are currently at the Activity. + // We are unable to display all the users across the Activity's panel. + if(learner_X > (_activity.xCoord + 112)) { + hasPlus = true; + ref.attachMovie("learnerIcon", "learnerIcon"+learner.getUserName(), ref.getNextHighestDepth(),{_activity:_activity, learner:learner, _monitorController:_monitorController, _x:learner_X, _y:learner_Y, _hasPlus:hasPlus }); + return; } + + // attach icon + ref.attachMovie("learnerIcon", "learnerIcon"+learner.getUserName(), ref.getNextHighestDepth(),{_activity:_activity, learner:learner, _monitorController:_monitorController, _x:learner_X, _y:learner_Y, _hasPlus:hasPlus }); + + // space icons + learner_X = learner_X+10 } } - + } + + /** + * Add + icon to indicate that more users are currently at the Activity. + * We are unable to display all the users across the Activity's panel. + * + * @usage + * @param target The target reference, this class OR a parent + * @param x_pos The X position of the icon + * @return + */ + + + /** + * Does the work of laying out the screen assets. + * Depending on type of Activity different bits will be shown + * @usage + * @return + */ + private function draw(){ + // Drawing learner on the activty. + if(_module == "monitoring") + drawLearners(); + Debugger.log(_activity.title+',_activity.isGateActivity():'+_activity.isGateActivity(),4,'draw','CanvasActivity'); setStyles(); @@ -314,7 +327,8 @@ stopSign_mc._y = 0; - }else{ + } else { + //chose the icon: if(_activity.isGroupActivity()){ groupIcon_mc._visible = true; @@ -325,6 +339,7 @@ icon_mc._visible = true; theIcon_mc = icon_mc; } + /* * some bug here - size always reported as 0x0 and wehn set to ICON_WIDTH it stays at 0, so maybe icon is still loading... trace(theIcon_mc._width+'x'+theIcon_mc._height ); @@ -334,10 +349,9 @@ trace('ICON_HEIGHT:'+ICON_HEIGHT); trace(theIcon_mc._width+'x'+theIcon_mc._height ); */ + theIcon_mc._visible = true; - - //chose the background mc if(_activity.groupingUIID > 0){ canvasActivityGrouped_mc._visible = true; @@ -358,14 +372,11 @@ clickTarget_mc._height= TOOL_ACTIVITY_HEIGHT; } - //position _x = _activity.xCoord //- (clickTarget_mc._width/2); _y = _activity.yCoord //- (clickTarget_mc._height/2); - - Debugger.log('canvasActivity_mc._visible'+canvasActivity_mc._visible,4,'draw','CanvasActivity'); _visible = true; if (_activity.runOffline){ Index: lams_central/src/flash/org/lamsfoundation/lams/monitoring/mv/LearnerIcon.as =================================================================== diff -u -r685191d727e343bf91b100e257960ed6d72b2396 -r75861a1ca05723c73c11fda63c393c23c90b1e4a --- lams_central/src/flash/org/lamsfoundation/lams/monitoring/mv/LearnerIcon.as (.../LearnerIcon.as) (revision 685191d727e343bf91b100e257960ed6d72b2396) +++ lams_central/src/flash/org/lamsfoundation/lams/monitoring/mv/LearnerIcon.as (.../LearnerIcon.as) (revision 75861a1ca05723c73c11fda63c393c23c90b1e4a) @@ -41,8 +41,8 @@ class org.lamsfoundation.lams.monitoring.mv.LearnerIcon extends MovieClip { //class org.lamsfoundation.lams.authoring.cv.CanvasActivity extends MovieClip{ - public static var ICON_WIDTH:Number = 7; - public static var ICON_HEIGHT:Number = 19; + public static var ICON_WIDTH:Number = 8; + public static var ICON_HEIGHT:Number = 20; //this is set by the init object private var _monitorController:MonitorController; @@ -66,6 +66,8 @@ private var _visibleHeight:Number; private var _selected_mc:MovieClip; + private var smallCross:MovieClip; + private var _hasPlus:Boolean; function LearnerIcon(){ @@ -82,6 +84,7 @@ init(); } + } public function init(initObj):Void{ @@ -92,11 +95,14 @@ learner = initObj.learner; learnerOffset_X = initObj._x learnerOffset_Y = initObj._y + _hasPlus = initObj._hasPlus; } learnerOffset_X = _x learnerOffset_Y = _y Debugger.log('Learner x pos and y pos : '+learnerOffset_X+ " and "+learnerOffset_Y ,4,'draw','LearnerIcon'); + showAssets(false); + //Click, Rollover and rollout Events for Learner Icon; click_mc.onRollOver = Proxy.create (this, localOnRollOver); click_mc.onRollOut = Proxy.create (this, localOnRollOut); @@ -112,11 +118,7 @@ } private function showAssets(isVisible:Boolean){ - - //canvasActivity_mc._visible = isVisible; toolTip._visible = isVisible; - //click_mc._visible = isVisible; - } /** @@ -133,8 +135,9 @@ setStyles(); toolTip.text = learner.getFullName(); + Debugger.log('hasPlus: '+ _hasPlus,Debugger.CRITICAL,'draw','CanvasActivity'); + smallCross._visible = _hasPlus; - //Debugger.log('canvasActivity_mc._visible'+canvasActivity_mc._visible,4,'draw','CanvasActivity'); _visible = true; } Index: lams_central/src/flash/org/lamsfoundation/lams/monitoring/mv/tabviews/MonitorTabView.as =================================================================== diff -u -r0d9ed62ea052e803ebcd6499ab55cfcffcc5ebac -r75861a1ca05723c73c11fda63c393c23c90b1e4a --- lams_central/src/flash/org/lamsfoundation/lams/monitoring/mv/tabviews/MonitorTabView.as (.../MonitorTabView.as) (revision 0d9ed62ea052e803ebcd6499ab55cfcffcc5ebac) +++ lams_central/src/flash/org/lamsfoundation/lams/monitoring/mv/tabviews/MonitorTabView.as (.../MonitorTabView.as) (revision 75861a1ca05723c73c11fda63c393c23c90b1e4a) @@ -270,7 +270,7 @@ var learner:Object = new Object(); learner = mm.allLearnersProgress[i] trace("Learner passed is: "+learner.getFullName()) - var temp_mc = _activityLayer_mc.attachMovie("learnerIcon", "learnerIcon"+learner.getUserName(), _activityLayer_mc.getNextHighestDepth(),{learner:learner, _monitorController:mc, _x:learner_X+(finishedLearners*10), _y:(endGate_mc._y+learner_Y)}); + var temp_mc = _activityLayer_mc.attachMovie("learnerIcon", "learnerIcon"+learner.getUserName(), _activityLayer_mc.getNextHighestDepth(),{learner:learner, _monitorController:mc, _x:learner_X+(finishedLearners*10), _y:(endGate_mc._y+learner_Y), _hasPlus: false}); finishedLearnersList.push(temp_mc); var learnerIcon_mc = _activityLayer_mc["learnerIcon"+learner.getUserName()] learnerIcon_mc.init(); Index: lams_monitoring/web/lams_monitoring.swf =================================================================== diff -u -r3c9fbd5d5974d4ad22823ea6ad0a52c9aadd4af0 -r75861a1ca05723c73c11fda63c393c23c90b1e4a Binary files differ Index: lams_monitoring/web/lams_monitoring_library.swf =================================================================== diff -u -r3c9fbd5d5974d4ad22823ea6ad0a52c9aadd4af0 -r75861a1ca05723c73c11fda63c393c23c90b1e4a Binary files differ