Index: lams_flash/src/common/flash/org/lamsfoundation/lams/common/LearnerActivity.as =================================================================== diff -u -rcd6814f65fbbdefb772f8948bc566db523ae3271 -rf8b2fe3dcd100582f6af76e4f06702a779714fbd --- lams_flash/src/common/flash/org/lamsfoundation/lams/common/LearnerActivity.as (.../LearnerActivity.as) (revision cd6814f65fbbdefb772f8948bc566db523ae3271) +++ lams_flash/src/common/flash/org/lamsfoundation/lams/common/LearnerActivity.as (.../LearnerActivity.as) (revision f8b2fe3dcd100582f6af76e4f06702a779714fbd) @@ -329,17 +329,16 @@ var activeSequence = LearnerComplexActivity(this._parent._parent).getActiveSequence(); Debugger.log('activeSequence:'+activeSequence, Debugger.CRITICAL,'onRelease','LearnerActivity'); - if(activeSequence == this.activity) { - // close current active sequence - LearnerComplexActivity(this._parent._parent).removeAllChildrenAndInputSequence(null); - } else { - // open sequence - LearnerComplexActivity(this._parent._parent).removeAllChildrenAndInputSequence(this.activity); + if(LearnerComplexActivity(this._parent._parent).activity.activityUIID == this.activity.parentUIID) { + + if(activeSequence == this.activity) { + // close current active sequence + LearnerComplexActivity(this._parent._parent).removeAllChildrenAndInputSequence(null); + } else { + // open sequence + LearnerComplexActivity(this._parent._parent).removeAllChildrenAndInputSequence(this.activity); + } } - } else if(this.activity.isBranchingActivity()) { - Debugger.log("hitting branching: " + this.activity.activityUIID, Debugger.CRITICAL,'onRelease','LearnerActivity'); - - } controller.activityRelease(this); Index: lams_flash/src/common/flash/org/lamsfoundation/lams/common/LearnerComplexActivity.as =================================================================== diff -u -rcd6814f65fbbdefb772f8948bc566db523ae3271 -rf8b2fe3dcd100582f6af76e4f06702a779714fbd --- lams_flash/src/common/flash/org/lamsfoundation/lams/common/LearnerComplexActivity.as (.../LearnerComplexActivity.as) (revision cd6814f65fbbdefb772f8948bc566db523ae3271) +++ lams_flash/src/common/flash/org/lamsfoundation/lams/common/LearnerComplexActivity.as (.../LearnerComplexActivity.as) (revision f8b2fe3dcd100582f6af76e4f06702a779714fbd) @@ -192,9 +192,33 @@ drawChildren(actOrder, container, count); } } + + + if(learnerAct.activity.isBranchingActivity() && !isLearnerModule()) { + Debugger.log('test: ' + (learnerAct.isAttempted || learnerAct.isCompleted), Debugger.CRITICAL, 'drawChildren', 'LearnerComplexActivity'); + + if(learnerAct.isAttempted || learnerAct.isCompleted) + drawActiveBranch(learnerAct, container, count); + } } } + + private function drawActiveBranch(learnerAct:LearnerActivity, container:Array, count:Number):Void { + var children:Array = model.ddm.getComplexActivityChildren(learnerAct.activity.activityUIID); + + for(var i=0; i