Index: lams_central/src/flash/org/lamsfoundation/lams/authoring/cv/CanvasActivity.as =================================================================== diff -u -r75861a1ca05723c73c11fda63c393c23c90b1e4a -r01423970e82bd6e32252bed8eac5a7b3fbbc73fc --- lams_central/src/flash/org/lamsfoundation/lams/authoring/cv/CanvasActivity.as (.../CanvasActivity.as) (revision 75861a1ca05723c73c11fda63c393c23c90b1e4a) +++ lams_central/src/flash/org/lamsfoundation/lams/authoring/cv/CanvasActivity.as (.../CanvasActivity.as) (revision 01423970e82bd6e32252bed8eac5a7b3fbbc73fc) @@ -263,19 +263,24 @@ if (isLearnerCurrentAct){ var ref = this._parent; + var xCoord = _activity.xCoord; if (_activity.parentUIID != null) { ref = this._parent._parent; + xCoord = parentAct.xCoord; + if(parentAct.activityTypeID != Activity.PARALLEL_ACTIVITY_TYPE){ + xCoord = _activity.xCoord; learner_X = (learner_X != null) ? learner_X + this._parent._x : null; learner_Y = learner_Y + this._parent._y } - } + } // 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)) { + Debugger.log("learner_X: " + learner_X + " ref: " + ref + " xcoord: " + xCoord, Debugger.CRITICAL, "drawLearners", "CanvasActivity"); + if(learner_X > (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; @@ -285,7 +290,7 @@ 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 + learner_X = learner_X+10; } } } Index: lams_central/src/flash/org/lamsfoundation/lams/authoring/cv/CanvasOptionalActivity.as =================================================================== diff -u -r2e97ddd536091a64a868ee3b89018fad86c1e097 -r01423970e82bd6e32252bed8eac5a7b3fbbc73fc --- lams_central/src/flash/org/lamsfoundation/lams/authoring/cv/CanvasOptionalActivity.as (.../CanvasOptionalActivity.as) (revision 2e97ddd536091a64a868ee3b89018fad86c1e097) +++ lams_central/src/flash/org/lamsfoundation/lams/authoring/cv/CanvasOptionalActivity.as (.../CanvasOptionalActivity.as) (revision 01423970e82bd6e32252bed8eac5a7b3fbbc73fc) @@ -173,6 +173,37 @@ public function setActivity (a : Activity) { _activity = a; } + + private function drawLearners():Void { + var mm:MonitorModel = MonitorModel(_monitorController.getModel()); + var learner_X = _activity.xCoord + learnerOffset_X; + var learner_Y = _activity.yCoord + learnerOffset_Y; + + // 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 + hasPlus = true; + this._parent.attachMovie("learnerIcon", "learnerIcon"+learner.getUserName(), this._parent.getNextHighestDepth(),{_activity:_activity, learner:learner, _monitorController:_monitorController, _x:learner_X, _y:learner_Y, _hasPlus:hasPlus }); + return; + } + + this._parent.attachMovie("learnerIcon", "learnerIcon"+learner.getUserName(), this._parent.getNextHighestDepth(),{_activity:_activity, learner:learner, _monitorController:_monitorController, _x:learner_X, _y:learner_Y, _hasPlus:hasPlus}); + learner_X = learner_X+10 + } + } + } + private function draw (){ @@ -193,41 +224,11 @@ _x = _activity.xCoord; _y = _activity.yCoord; - - - //dimentions of container (this) setLocking(); - - if(fromModuleTab == "monitorMonitorTab"){ - var mm:MonitorModel = 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; - // 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("this._parent is "+this._parent) - trace(_activity.title+": is the learner's current Activity.") - this._parent.attachMovie("learnerIcon", "learnerIcon"+learner.getUserName(), this._parent.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.") - } - } - } + if(fromModuleTab == "monitorMonitorTab") + drawLearners(); Debugger.log ("I am in Draw :" + _activity.title + 'uiID:' + _activity.activityUIID + ' children:' + _children.length, Debugger.GEN, 'Draw', 'CanvasOptionalActivity'); _visible = true; Index: lams_central/src/flash/org/lamsfoundation/lams/authoring/cv/CanvasParallelActivity.as =================================================================== diff -u -r2e97ddd536091a64a868ee3b89018fad86c1e097 -r01423970e82bd6e32252bed8eac5a7b3fbbc73fc --- lams_central/src/flash/org/lamsfoundation/lams/authoring/cv/CanvasParallelActivity.as (.../CanvasParallelActivity.as) (revision 2e97ddd536091a64a868ee3b89018fad86c1e097) +++ lams_central/src/flash/org/lamsfoundation/lams/authoring/cv/CanvasParallelActivity.as (.../CanvasParallelActivity.as) (revision 01423970e82bd6e32252bed8eac5a7b3fbbc73fc) @@ -207,53 +207,51 @@ return styleObj; } - - private function draw(){ + private function drawLearners():Void { + var mm:MonitorModel = MonitorModel(_monitorController.getModel()); + var learner_X = _activity.xCoord + learnerOffset_X; + var learner_Y = _activity.yCoord + learnerOffset_Y; - //write text - title_lbl.text = _activity.title; - //actCount_lbl.text = _children.length+ Dictionary.getValue('lbl_num_activities'); //" activities"; - -// _global.breakpoint(); - - //header_pnl.borderType='outset'; - - if(fromModuleTab == "monitorMonitorTab"){ - var mm:MonitorModel = 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; // 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 - } + //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){ - trace("this._parent is "+this._parent) - trace(_activity.title+": is the learner's current Activity.") - this._parent.attachMovie("learnerIcon", "learnerIcon"+learner.getUserName(), this._parent.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.") + if (learner_X > (_activity.xCoord + 112)){ + learner_X = _activity.xCoord + learnerOffset_X + learner_Y = 27 + hasPlus = true; + this._parent.attachMovie("learnerIcon", "learnerIcon"+learner.getUserName(), this._parent.getNextHighestDepth(),{_activity:_activity, learner:learner, _monitorController:_monitorController, _x:learner_X, _y:learner_Y, _hasPlus:hasPlus }); + return; } + + this._parent.attachMovie("learnerIcon", "learnerIcon"+learner.getUserName(), this._parent.getNextHighestDepth(),{_activity:_activity, learner:learner, _monitorController:_monitorController, _x:learner_X, _y:learner_Y, _hasPlus:hasPlus}); + learner_X = learner_X+10 } } + } + + private function draw(){ + + //write text + title_lbl.text = _activity.title; + + if(fromModuleTab == "monitorMonitorTab") + drawLearners() + //position the container (this) _x = _activity.xCoord //- newContainerXCoord; _y = _activity.yCoord setLocking() setStyles() _visible = true; - //child1_mc._visible = true; } Index: lams_monitoring/web/lams_monitoring.swf =================================================================== diff -u -r3889df0718cb8f4a1812cb636e717bccf003bd58 -r01423970e82bd6e32252bed8eac5a7b3fbbc73fc Binary files differ Index: lams_monitoring/web/lams_monitoring_library.swf =================================================================== diff -u -r3889df0718cb8f4a1812cb636e717bccf003bd58 -r01423970e82bd6e32252bed8eac5a7b3fbbc73fc Binary files differ