Index: lams_flash/src/central/flash/org/lamsfoundation/lams/learner/ls/LessonModel.as
===================================================================
RCS file: /usr/local/cvsroot/lams_flash/src/central/flash/org/lamsfoundation/lams/learner/ls/LessonModel.as,v
diff -u -r1.3 -r1.4
--- lams_flash/src/central/flash/org/lamsfoundation/lams/learner/ls/LessonModel.as	12 Sep 2007 10:02:18 -0000	1.3
+++ lams_flash/src/central/flash/org/lamsfoundation/lams/learner/ls/LessonModel.as	24 Oct 2007 06:41:22 -0000	1.4
@@ -308,28 +308,31 @@
 	}
 	
 	private function orderDesign(activity:Activity, order:Array):Void{
+		Debugger.log("order design activity: " + activity.title, Debugger.CRITICAL, "orderDesign", "LessonModel");
+		
 		order.push(activity);
 		
+		if(activity.isBranchingActivity()) {
+			Debugger.log("branching activity found: " + activity.activityUIID, Debugger.CRITICAL, "orderDesign", "LessonModel");
+		
+			var children:Array = learningDesignModel.getComplexActivityChildren(activity.activityUIID);
+			Debugger.log("seq children length: " + children.length, Debugger.CRITICAL, "orderDesign", "LessonModel");
+		
+			for(var i=0; i<children.length; i++) {
+				Debugger.log("progress: " + Progress.compareProgressData(_progressData, children[i].activityID), Debugger.CRITICAL, "orderDesign", "LessonModel");
+				var _progress:String = Progress.compareProgressData(_progressData, children[i].activityID);
+				if((_progress == "attempted_mc" || _progress == "completed_mc") && children[i].isSequenceActivity())
+					orderDesign(Activity(learningDesignModel.activities.get(SequenceActivity(children[i]).firstActivityUIID)), order);
+			
+			}
+		}
+		
 		for(var i=0;i<ddmTransition_keys.length;i++){
 			var transitionKeyToCheck:Number = ddmTransition_keys[i];
 			var ddmTransition:Transition = learningDesignModel.transitions.get(transitionKeyToCheck);
 			
 				if (ddmTransition.fromUIID == activity.activityUIID){
 					var ddm_activity:Activity = learningDesignModel.activities.get(ddmTransition.toUIID);
-					
-					if(ddm_activity.isBranchingActivity()) {
-						var children:Array = learningDesignModel.getComplexActivityChildren(ddm_activity.activityUIID);
-						Debugger.log("brancing child length: " + children.length, Debugger.CRITICAL, "orderDesign", "LessonModel");
-						if(children.length > 0) {
-							for(var j=0; j < children.length; j++) {
-								if(Progress.compareProgressData(_progressData, children[i].activityID) == "attempted_mc" && children[i] instanceof SequenceActivity) {
-									orderDesign(learningDesignModel.activities.get(SequenceActivity(children[i].firstActivityUIID)), order);
-									Debugger.log("child is attempted (UIID): " + children[i].activityUIID, Debugger.CRITICAL, "orderDesign", "LessonModel");
-								}
-							}
-						}
-					}
-					
 					orderDesign(ddm_activity, order);
 				}
 				
@@ -338,7 +341,6 @@
 	}
 	
 	private function setDesignOrder(){
-		trace("set Design order called")
 		ddmActivity_keys = learningDesignModel.activities.keys();
 		ddmTransition_keys = learningDesignModel.transitions.keys();
 		
@@ -422,20 +424,18 @@
 			var keyToCheck:Number = indexArray[i].activityUIID;
 			var ddm_activity:Activity = learningDesignModel.activities.get(keyToCheck);
 			
-			if(ddm_activity.parentActivityID > 0 || ddm_activity.parentUIID > 0){
+			if(ddm_activity.parentActivityID > 0 || ddm_activity.parentUIID > 0) {
 				if(_learningDesignModel.getActivityByUIID(ddm_activity.parentUIID).isSequenceActivity())
-					broadcastViewUpdate("UPDATE_ACTIVITY",ddm_activity);
-				return;
-			}else {
+					broadcastViewUpdate("DRAW_ACTIVITY", ddm_activity);
+					return;
+			} else {
 				broadcastViewUpdate("DRAW_ACTIVITY",ddm_activity);
 			}
 		}
 
 	}
 	
 	public function updateDesign(){
-		
-		
 		var indexArray:Array = setDesignOrder();
 		
 		if(indexArray.length > activitiesDisplayed.length) {
@@ -478,7 +478,6 @@
 		infoObj.updateType = updateType;
 		infoObj.data = data;
 		notifyObservers(infoObj);
-		
 	}
 	
 	/**
Index: lams_flash/src/central/flash/org/lamsfoundation/lams/learner/ls/LessonView.as
===================================================================
RCS file: /usr/local/cvsroot/lams_flash/src/central/flash/org/lamsfoundation/lams/learner/ls/LessonView.as,v
diff -u -r1.2 -r1.3
--- lams_flash/src/central/flash/org/lamsfoundation/lams/learner/ls/LessonView.as	12 Sep 2007 10:02:18 -0000	1.2
+++ lams_flash/src/central/flash/org/lamsfoundation/lams/learner/ls/LessonView.as	24 Oct 2007 06:41:22 -0000	1.3
@@ -108,8 +108,7 @@
 	public function createLesson() {
 		//Delete the enterframe dispatcher
         delete this.onEnterFrame;
-		
-		trace('creating new Lesson ...');
+		
         setStyles();
 		
         _lesson_mc = this;
@@ -129,8 +128,8 @@
 	public function update (o:Observable,infoObj:Object):Void {
 	    //Cast the generic observable object into the Toolbar model.
         var lm:LessonModel = LessonModel(o);
-		trace('getting lesson update...');
-        //Update view from info object
+		
+		//Update view from info object
         switch (infoObj.updateType) {
             case 'POSITION' :
                 setPosition(lm);
@@ -194,7 +193,6 @@
 	 */
 	private function removeActivity(a:Activity,lm:LessonModel){
 		//dispatch an event to show the design  has changed
-		trace("in removeActivity")
 		var r = lm.activitiesDisplayed.remove(a.activityUIID);
 		r.removeMovieClip();
 		var s:Boolean = (r==null) ? false : true;