Index: lams_flash/src/central/flex/TimeChart/src/org/lamsfoundation/lams/business/ChartManager.as
===================================================================
diff -u -rf6dafb83f9dc6236b4243b5dce063898846424f7 -r559d69ef3eeb3ebfa2878c3195d5652bb67a26d4
--- lams_flash/src/central/flex/TimeChart/src/org/lamsfoundation/lams/business/ChartManager.as	(.../ChartManager.as)	(revision f6dafb83f9dc6236b4243b5dce063898846424f7)
+++ lams_flash/src/central/flex/TimeChart/src/org/lamsfoundation/lams/business/ChartManager.as	(.../ChartManager.as)	(revision 559d69ef3eeb3ebfa2878c3195d5652bb67a26d4)
@@ -92,8 +92,7 @@
 				var c_count:int = 0;
 				trace('progress user: ' + learnerProgress.learner_username);
 				for each(var completedActivity:CompletedActivity in learnerProgress.completedActivities) {
-					var _prev:CompletedActivity = (c_count > 0) ? learnerProgress.getCompletedActivity(c_count-1) : null;
-					completedActivity.createDataObject(_prev, learnerProgress);
+					completedActivity.createDataObject(learnerProgress);
 					
 					updateAverage(completedActivity, average);
 			
Index: lams_flash/src/central/flex/TimeChart/src/org/lamsfoundation/lams/views/Chart.mxml
===================================================================
diff -u -r36d58516270e64c1a292ca45b1f7ded31d6600f7 -r559d69ef3eeb3ebfa2878c3195d5652bb67a26d4
--- lams_flash/src/central/flex/TimeChart/src/org/lamsfoundation/lams/views/Chart.mxml	(.../Chart.mxml)	(revision 36d58516270e64c1a292ca45b1f7ded31d6600f7)
+++ lams_flash/src/central/flex/TimeChart/src/org/lamsfoundation/lams/views/Chart.mxml	(.../Chart.mxml)	(revision 559d69ef3eeb3ebfa2878c3195d5652bb67a26d4)
@@ -65,6 +65,8 @@
 				showAverage.selected = true;
 				
 				initButtons();
+				
+				chart_button_bar.selectedIndex = COMPLETION__BUTTON;
 			}
 			
 			private function initButtons():void {
Index: lams_flash/src/central/flex/TimeChart/src/org/lamsfoundation/lams/vos/CompletedActivity.as
===================================================================
diff -u -rc18e988af13e3ade386f0c2b76e84e5ea44dbd83 -r559d69ef3eeb3ebfa2878c3195d5652bb67a26d4
--- lams_flash/src/central/flex/TimeChart/src/org/lamsfoundation/lams/vos/CompletedActivity.as	(.../CompletedActivity.as)	(revision c18e988af13e3ade386f0c2b76e84e5ea44dbd83)
+++ lams_flash/src/central/flex/TimeChart/src/org/lamsfoundation/lams/vos/CompletedActivity.as	(.../CompletedActivity.as)	(revision 559d69ef3eeb3ebfa2878c3195d5652bb67a26d4)
@@ -6,6 +6,8 @@
 		
 		public var aid:uint;
 		public var title:String;
+		
+		public var start_datetime:Number;
 		public var completed_datetime:Number;
 		
 		public var dataObject:Object
@@ -15,18 +17,19 @@
 		{
 			this.aid = completedActivity.completedActivityId;
 			this.title = completedActivity.completedActivityTitle;
+			this.start_datetime = completedActivity.startDateTime;
 			this.completed_datetime = completedActivity.completedDateTime;
 		}
 		
-		public function createDataObject(prev:CompletedActivity, learnerProgress:LearnerProgress):void {
-			var c_datetime:Number = (this.completed_datetime/1000);
-			var c_duration:Number = (prev != null) ? c_datetime - prev.dataObject.Completed
-													: c_datetime;
+		public function createDataObject(learnerProgress:LearnerProgress):void {
+			var c_started__datetime:Number = (this.start_datetime/1000);
+			var c_completed__datetime:Number = (this.completed_datetime/1000);
+			var c_duration:Number = c_completed__datetime - c_started__datetime;
 													
 			dataObject = {Learner: learnerProgress.learner_username, 
 								Activity: this.aid,
 								Title: this.title, 
-								Completed: Math.floor(c_datetime), 
+								Completed: Math.floor(c_completed__datetime), 
 								Duration: Math.floor(c_duration)};
 				
 		}
Index: lams_monitoring/web/TimeChart.swf
===================================================================
diff -u -r3b820664dd3af70b0de9ed188782a49c4ccc920f -r559d69ef3eeb3ebfa2878c3195d5652bb67a26d4
Binary files differ