[svn r20127] logic changes - when displaying the graph of total score - (partial FS#3909)

main/gradebook/lib/fe/flatviewtable.class.php

@@ -74,7 +74,6 @@ class FlatViewTable extends SortableTable
 			array_pop($header_name);			
 			$user_results = ($this->datagen->get_data_to_graph());				
 			$pre_result = $new_result = array();
-			
 			$DataSet = new pData;
 			//filling the Dataset			
 			foreach($user_results as $result) {
@@ -92,15 +91,14 @@ class FlatViewTable extends SortableTable
 						$show_draw  = true; 					
 					$DataSet->AddPoint($total,"Serie".$i);					
 					$DataSet->SetSerieName($header_name[$i-1],"Serie".$i);
+					// Dataset definition   		  
+					$DataSet->AddAllSeries();  
+					$DataSet->SetAbsciseLabelSerie(); 
 					$i++; 	
 				}
 			}			
 			//print_r($pre_result); print_r($header_name);			
 				
-			// Dataset definition   		  
-			$DataSet->AddAllSeries();  
-			$DataSet->SetAbsciseLabelSerie();
-			
 			// Cache definition   
 			$Cache = new pCache();
 			// the graph id

main/gradebook/lib/flatview_data_generator.class.php

@@ -239,7 +239,7 @@ class FlatViewDataGenerator
 			}
 				$total_score=array($item_value,$item_total);			
 				$score_final = round(($item_value / $item_total) * 100,2);
-				$row[] =array ($score_final, strip_tags($scoredisplay->display_score($score,SCORE_DIV_PERCENT, SCORE_ONLY_CUSTOM)));		
+				$row[] =array ($score_final, strip_tags($scoredisplay->display_score($total_score,SCORE_DIV_PERCENT, SCORE_ONLY_CUSTOM)));		
 			//$total_score=array($item_value,$item_total);			
 			//$score_final = round(($item_value / $item_total) * 100,2);				
 			//$row[] = $score_final;