Index: lams_flash/src/common/flash/org/lamsfoundation/lams/common/LearnerActivity.as =================================================================== diff -u -r067c9015b58a0a86faf7f60fd05bc27d32b02bf1 -r17587e18dd4f1488eac9e1ff5ef60636da33bad0 --- lams_flash/src/common/flash/org/lamsfoundation/lams/common/LearnerActivity.as (.../LearnerActivity.as) (revision 067c9015b58a0a86faf7f60fd05bc27d32b02bf1) +++ lams_flash/src/common/flash/org/lamsfoundation/lams/common/LearnerActivity.as (.../LearnerActivity.as) (revision 17587e18dd4f1488eac9e1ff5ef60636da33bad0) @@ -229,9 +229,8 @@ } Debugger.log("parent level: " + _parent._parent.level, Debugger.CRITICAL, "draw", "LearnerActivity"); - if(_parent._parent.level > 0) { - for(var i=0; i<_parent._parent.level; i++) + for(var i=0; i<(_parent._parent.level + _parent._parent.complexLevel); i++) toolTitle = "-" + toolTitle; } Index: lams_flash/src/common/flash/org/lamsfoundation/lams/common/LearnerComplexActivity.as =================================================================== diff -u -r067c9015b58a0a86faf7f60fd05bc27d32b02bf1 -r17587e18dd4f1488eac9e1ff5ef60636da33bad0 --- lams_flash/src/common/flash/org/lamsfoundation/lams/common/LearnerComplexActivity.as (.../LearnerComplexActivity.as) (revision 067c9015b58a0a86faf7f60fd05bc27d32b02bf1) +++ lams_flash/src/common/flash/org/lamsfoundation/lams/common/LearnerComplexActivity.as (.../LearnerComplexActivity.as) (revision 17587e18dd4f1488eac9e1ff5ef60636da33bad0) @@ -129,9 +129,10 @@ if(!_nested) _level = 0; - - _complexLevel = 0; + if(_complexLevel == null) + _complexLevel = 0; + init(); } @@ -259,8 +260,11 @@ */ } else if(learnerAct.activity == activeComplex) { var _cChildren:Array = (model instanceof LessonModel) ? model.learningDesignModel.getComplexActivityChildren(activeComplex.activityUIID) : model.ddm.getComplexActivityChildren(activeComplex.activityUIID); + Debugger.log("learner level: " + _level, Debugger.CRITICAL, "drawChildren", "LearnerComplexActivity"); + Debugger.log("learner complex level: " + _complexLevel, Debugger.CRITICAL, "drawChildren", "LearnerComplexActivity"); + - learnerAct = LearnerComplexActivity(childHolder_mc.createChildAtDepth("LearnerComplexActivity_Nested", DepthManager.kTop, {_activity:_children[i], _children:_cChildren, _controller:_controller, _view:_view, learner:learner, actStatus:progStatus, _nested:true, _level: _level+_complexLevel+1, _x:0, _y:childCoordY+21})); + learnerAct = LearnerComplexActivity(childHolder_mc.createChildAtDepth("LearnerComplexActivity_Nested", DepthManager.kTop, {_activity:_children[i], _children:_cChildren, _controller:_controller, _view:_view, learner:learner, actStatus:progStatus, _nested:true, _level: _level+1, _complexLevel:_complexLevel, _x:0, _y:childCoordY+21})); children_mc.push(learnerAct); return i+1; @@ -369,17 +373,21 @@ if(children_mc[i].activity != activeSequence) activeSequence = children_mc[i].activity; } else if(isChildCurrent && (children_mc[i].activity.isOptionsWithSequencesActivity() || children_mc[i].activity.isOptionalActivity() || children_mc[i].activity.isParallelActivity())) { - if(children_mc[i].activity != activeComplex) + if(children_mc[i].activity != activeComplex) { activeComplex = children_mc[i].activity; + _complexLevel = children_mc[i].level; + } } if(isChildAttempted && children_mc[i].activity.isSequenceActivity()) { // check children of sequence (level 1) for current activity if(model.checkComplexHasCurrentActivity(children_mc[i].activity, learner) && (children_mc[i].activity != activeSequence)) activeSequence = children_mc[i].activity; } else if(isChildAttempted && (children_mc[i].activity.isOptionsWithSequencesActivity() || children_mc[i].activity.isOptionalActivity() || children_mc[i].activity.isParallelActivity())) { - if(model.checkComplexHasCurrentActivity(children_mc[i].activity, learner) && (children_mc[i].activity != activeComplex)) + if(model.checkComplexHasCurrentActivity(children_mc[i].activity, learner) && (children_mc[i].activity != activeComplex)) { activeComplex = children_mc[i].activity; + _complexLevel = children_mc[i].level; + } } if(children_mc[i].activityStatus == "completed_mc") { @@ -446,9 +454,11 @@ updateComplex(); } - public function removeAllChildrenAndInputComplex(activity:ComplexActivity, complexLevel:Number):Void { + public function removeAllChildrenAndInputComplex(activity:ComplexActivity, tempComplexLevel:Number):Void { + Debugger.log("activecomplex: " + tempComplexLevel, Debugger.CRITICAL, "removeAllChildrenAndInputComplex", "LearnerComplexActivity"); + activeComplex = activity; - _complexLevel = complexLevel; + _complexLevel = tempComplexLevel; manualSelect = true; @@ -524,6 +534,10 @@ var styleObject = _tm.getStyleObject("progressBar"); + Debugger.log("style level: " + _level, Debugger.CRITICAL, "draw", "LearnerComplexActivity"); + + Debugger.log("style mod: " + (_level%styleObject.colors.length), Debugger.CRITICAL, "draw", "LearnerComplexActivity"); + bgcolor.setRGB(styleObject.colors[_level%styleObject.colors.length].backgroundColor); border_color.setRGB(styleObject.colors[_level%styleObject.colors.length].borderColor); @@ -755,6 +769,10 @@ return _level; } + public function get complexLevel():Number { + return _complexLevel; + } + public function destroy():Void { this._visible = false; this.removeMovieClip(); Index: lams_learning/web/lams_learner.swf =================================================================== diff -u -r067c9015b58a0a86faf7f60fd05bc27d32b02bf1 -r17587e18dd4f1488eac9e1ff5ef60636da33bad0 Binary files differ Index: lams_monitoring/web/lams_monitoring.swf =================================================================== diff -u -re7d58455ba164aaacf47e088a304b2d7bea4e7ea -r17587e18dd4f1488eac9e1ff5ef60636da33bad0 Binary files differ Index: lams_monitoring/web/lams_monitoring_library.swf =================================================================== diff -u -re7d58455ba164aaacf47e088a304b2d7bea4e7ea -r17587e18dd4f1488eac9e1ff5ef60636da33bad0 Binary files differ