From 1894d128e533e4d4edbb09ec2d9603a2392e9816 Mon Sep 17 00:00:00 2001
From: Julio Montoya <gugli100@gmail.com>
Date: Tue, 15 Feb 2011 12:57:33 +0100
Subject: [PATCH] Fixing experimental exercise graphs

---
 main/inc/lib/tracking.lib.php | 18 +++++++++++++-----
 main/session/index.php        |  5 ++++-
 2 files changed, 17 insertions(+), 6 deletions(-)

diff --git a/main/inc/lib/tracking.lib.php b/main/inc/lib/tracking.lib.php
index f88cfad8c3..7ae9223c2a 100755
--- a/main/inc/lib/tracking.lib.php
+++ b/main/inc/lib/tracking.lib.php
@@ -2282,6 +2282,8 @@ class Tracking {
             $html .= '</table>';
             
             
+            //Experimental graphics
+            
             require_once api_get_path(LIBRARY_PATH).'pchart/pData.class.php';
 		    require_once api_get_path(LIBRARY_PATH).'pchart/pChart.class.php';
 		    require_once api_get_path(LIBRARY_PATH).'pchart/pCache.class.php';
@@ -2289,12 +2291,11 @@ class Tracking {
 		    foreach ($to_graph_exercise_result as $exercise_id => $attempts) {
 		        $exercise_title= $attempts['title'];	
 		        $attempts = $attempts['data']; 	        
-		        $my_exercise_result = 0;                
-                $exercise_result = array();
+		        $my_exercise_result_array = $exercise_result = array();
 		        foreach ($attempts as $attempt) {         
 		            if (api_get_user_id() == $attempt['exe_user_id']) {
 		                if ($attempt['exe_weighting'] != 0 ) {
-		                    $my_exercise_result = $attempt['exe_result']/$attempt['exe_weighting'];
+		                    $my_exercise_result_array[]= $attempt['exe_result']/$attempt['exe_weighting'];
 		                }		                 
 		            } else {
 		                if ($attempt['exe_weighting'] != 0 ) {		                
@@ -2302,6 +2303,12 @@ class Tracking {
 		                }   
 		            }		            
 		        }
+		        //Getting best result		        
+		        rsort($my_exercise_result_array);
+		         $my_exercise_result = 0;
+		        if (isset($my_exercise_result_array[0])) {		           		            
+		            $my_exercise_result = $my_exercise_result_array[0] *100;		            
+		        }
 		        
 		        //var_dump($exercise_result,$my_exercise_result);
     		    
@@ -2326,10 +2333,11 @@ class Tracking {
                         }
                     }                
                     $final_array[]= $count;
-                    if ($my_exercise_result > $min && $my_exercise_result < $max) {
+                    
+                    if ($my_exercise_result > $min && $my_exercise_result <= $max) {
                         $my_final_array[] = 1;
                     } else {
-                      //  $my_final_array[] = 0;
+                        $my_final_array[] = 0;
                     }
                     
                 } 
diff --git a/main/session/index.php b/main/session/index.php
index bc3b0c8899..192d2417bd 100644
--- a/main/session/index.php
+++ b/main/session/index.php
@@ -220,7 +220,10 @@ foreach($final_array as $session_data) {
     }
 }  
 $my_real_array = msort($my_real_array, 'date','asc');
-$my_real_array = array_merge($new_exercises, $my_real_array);
+
+if (!empty($new_exercises)) {
+    $my_real_array = array_merge($new_exercises, $my_real_array);
+}
 
 echo Display::tag('h1', $session_info['name']);