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.9 -r1.10
--- lams_flash/src/common/flash/org/lamsfoundation/lams/common/LearnerActivity.as	7 Mar 2008 02:48:55 -0000	1.9
+++ lams_flash/src/common/flash/org/lamsfoundation/lams/common/LearnerActivity.as	7 Mar 2008 05:25:52 -0000	1.10
@@ -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
===================================================================
RCS file: /usr/local/cvsroot/lams_flash/src/common/flash/org/lamsfoundation/lams/common/LearnerComplexActivity.as,v
diff -u -r1.13 -r1.14
--- lams_flash/src/common/flash/org/lamsfoundation/lams/common/LearnerComplexActivity.as	7 Mar 2008 02:48:55 -0000	1.13
+++ lams_flash/src/common/flash/org/lamsfoundation/lams/common/LearnerComplexActivity.as	7 Mar 2008 05:25:52 -0000	1.14
@@ -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<children.length; i++) {
+			var progressStr:String = Progress.compareProgressData(learner, children[i].activityID);
+			
+			if(progressStr == 'attempted_mc' || progressStr == 'completed_mc') {
+				var actOrder:Array = model.getDesignOrder(SequenceActivity(children[i]).firstActivityUIID, true);
+				actOrder.unshift(children[i]);
+				drawChildren(actOrder, container, count);
+				
+				return;
+			}
+		}
+	}
 	
 	private function showStatus(isVisible:Boolean) {
 		completed_mc._visible = isVisible;
Index: lams_learning/web/lams_learner.swf
===================================================================
RCS file: /usr/local/cvsroot/lams_learning/web/Attic/lams_learner.swf,v
diff -u -r1.80 -r1.81
Binary files differ