Index: lams_flash/src/central/flash/org/lamsfoundation/lams/monitoring/mv/tabviews/LessonTabView.as
===================================================================
RCS file: /usr/local/cvsroot/lams_flash/src/central/flash/org/lamsfoundation/lams/monitoring/mv/tabviews/LessonTabView.as,v
diff -u -r1.5 -r1.6
--- lams_flash/src/central/flash/org/lamsfoundation/lams/monitoring/mv/tabviews/LessonTabView.as	3 Oct 2007 02:43:20 -0000	1.5
+++ lams_flash/src/central/flash/org/lamsfoundation/lams/monitoring/mv/tabviews/LessonTabView.as	5 Mar 2008 23:56:15 -0000	1.6
@@ -626,45 +626,46 @@
 			if (ca._parentActivityID == null){
 				requiredTaskList[listCount].contributeActivity.text = "  "+ca.title
 				requiredTaskList[listCount].contributeActivity.backgroundColor = 0xD5E6FF;
-			}else {
+				listCount++;
+			}
+			else {
 				requiredTaskList[listCount].contributeActivity.text = "\t"+ca.title
 				requiredTaskList[listCount].contributeActivity.backgroundColor = 0xF9F2DD;
+				listCount++;
+				
+				for(var i=0; i<array.length; i++){
+					var o:Object = array[i];
+					if (o instanceof ContributeActivity){
+						Debugger.log("it is a contribute activity", Debugger.CRITICAL, "drawIsRequiredTasks", "LessonTabView");
+						// normal CA entries
+						requiredTaskList[listCount] =_monitorReqTask_mc.attachMovie("contributeEntryRow", "contributeEntryRow"+listCount, this._monitorReqTask_mc.getNextHighestDepth(), {_x:x, _y:19*listCount, buttonLabel:btnLabel})
+						reqTasks_scp.redraw(true);
+						requiredTaskList[listCount].contributeEntry.text = "\t\t"+mm.getMonitor().getCELiteral(o._contributionType);
+						requiredTaskList[listCount].goContribute._x = reqTasks_scp._width-50
+						
+						requiredTaskList[listCount].goContribute.onRelease = function (){
+							JsPopup.getInstance().launchPopupWindow(o.taskURL, 'ContributeActivity', 600, 800, true, true, false, false, false);
+						}
+						
+						requiredTaskList[listCount].goContribute.onRollOver = Proxy.create(this,this['showToolTip'], requiredTaskList[listCount].goContribute, "goContribute_btn_tooltip", reqTasks_scp._y+requiredTaskList[listCount]._y+requiredTaskList[listCount]._height, reqTasks_scp._x);
+						requiredTaskList[listCount].goContribute.onRollOut = Proxy.create(this,this['hideToolTip']);
+						
+						var styleObj = _tm.getStyleObject('button');
+						requiredTaskList[listCount].goContribute.setStyle('styleName',styleObj); 
+						listCount++;
+					}
+				}
 			}
-			
-			listCount++
 		}
 		
 		for(var i=0; i<array.length; i++){
 			var o:Object = array[i];
 			
-			if(o instanceof ContributeActivity){
-				// normal CA entries
-				trace('write out entry with GO link'+o.taskURL);
-				requiredTaskList[listCount] =_monitorReqTask_mc.attachMovie("contributeEntryRow", "contributeEntryRow"+listCount, this._monitorReqTask_mc.getNextHighestDepth(), {_x:x, _y:19*listCount, buttonLabel:btnLabel})
-				reqTasks_scp.redraw(true);
-				requiredTaskList[listCount].contributeEntry.text = "\t\t"+mm.getMonitor().getCELiteral(o._contributionType);
-				requiredTaskList[listCount].goContribute._x = reqTasks_scp._width-50
-				
-				requiredTaskList[listCount].goContribute.onRelease = function (){
-					trace("Contribute Type is: "+o.taskURL);
-					JsPopup.getInstance().launchPopupWindow(o.taskURL, 'ContributeActivity', 600, 800, true, true, false, false, false);
-				}
-				
-				requiredTaskList[listCount].goContribute.onRollOver = Proxy.create(this,this['showToolTip'], requiredTaskList[listCount].goContribute, "goContribute_btn_tooltip", reqTasks_scp._y+requiredTaskList[listCount]._y+requiredTaskList[listCount]._height, reqTasks_scp._x);
-				requiredTaskList[listCount].goContribute.onRollOut = Proxy.create(this,this['hideToolTip']);
-				
-				var styleObj = _tm.getStyleObject('button');
-				requiredTaskList[listCount].goContribute.setStyle('styleName',styleObj); 
-				
-				listCount++;
-			
-			}else{
-				// child CA
+			if(!(o instanceof ContributeActivity)){
 				if(o.entries.length > 0){
 					// write child ca title (indented - x + 10 position)
 					drawIsRequiredTasks(o.child, o.entries, x);
 				}
-				
 			}
 		}
 		
Index: lams_monitoring/web/lams_monitoring.swf
===================================================================
RCS file: /usr/local/cvsroot/lams_monitoring/web/Attic/lams_monitoring.swf,v
diff -u -r1.168 -r1.169
Binary files differ
Index: lams_monitoring/web/lams_monitoring_library.swf
===================================================================
RCS file: /usr/local/cvsroot/lams_monitoring/web/Attic/lams_monitoring_library.swf,v
diff -u -r1.136 -r1.137
Binary files differ