Update palette use - refs CT#7408

main/inc/lib/tracking.lib.php

@@ -4595,9 +4595,7 @@ class Tracking
         $myData->setSerieDescription('Serie1', get_lang('MyResults'));
         $myData->setSerieDescription('Serie2', get_lang('AverageScore'));
         $myData->setAxisUnit(0, '%');
-        $myData->loadPalette(api_get_path(SYS_CODE_PATH) . 'palettes/pchart/default.txt');
+        $myData->loadPalette(api_get_path(SYS_CODE_PATH) . 'palettes/pchart/default.color', true);
-        // @TODO: Define a custom palette
-
         // Cache definition
         $cachePath = api_get_path(SYS_ARCHIVE_PATH);
         $myCache = new pCache(array('CacheFolder' => substr($cachePath, 0, strlen($cachePath) - 1)));
@@ -4818,7 +4816,7 @@ class Tracking
         $dataSet->addPoints($final_array, 'Serie1');
         $dataSet->addPoints($my_final_array, 'Serie2');
         $dataSet->normalize(100, "%");
-        $dataSet->loadPalette(api_get_path(SYS_CODE_PATH) . 'palettes/pchart/default.txt');
+        $dataSet->loadPalette(api_get_path(SYS_CODE_PATH) . 'palettes/pchart/default.color', true);
 
         // Cache definition
         $cachePath = api_get_path(SYS_ARCHIVE_PATH);
@@ -5003,7 +5001,7 @@ class Tracking
         $dataSet->setXAxisName(get_lang('Score'));
         $dataSet->normalize(100, "%");
 
-        $dataSet->loadPalette(api_get_path(SYS_CODE_PATH) . 'palettes/pchart/default.txt');
+        $dataSet->loadPalette(api_get_path(SYS_CODE_PATH) . 'palettes/pchart/default.color', true);
 
         // Cache definition
         $cachePath = api_get_path(SYS_ARCHIVE_PATH);

main/mySpace/myspace.lib.php

@@ -2842,7 +2842,7 @@ function grapher($sql_result, $start_date, $end_date, $type = "")
         $myData->setSerieWeight('Serie1', 1);
         $myData->setSerieDescription('Serie1', get_lang('MyResults'));
         $myData->setAxisName(0, get_lang('Minutes'));
-        $myData->loadPalette(api_get_path(SYS_CODE_PATH) . 'palettes/pchart/default.txt');
+        $myData->loadPalette(api_get_path(SYS_CODE_PATH) . 'palettes/pchart/default.color', true);
 
 
         // Cache definition

plugin/dashboard/block_evaluation_graph/block_evaluation_graph.class.php

@@ -163,7 +163,7 @@ class BlockEvaluationGraph extends Block
 
                         $dataSet->normalize(100, '%');
 
-                        $dataSet->loadPalette(api_get_path(SYS_CODE_PATH) . 'palettes/pchart/default.txt');
+                        $dataSet->loadPalette(api_get_path(SYS_CODE_PATH) . 'palettes/pchart/default.color', true);
 
                         // Cache definition
                         $cachePath = api_get_path(SYS_ARCHIVE_PATH);
@@ -341,7 +341,7 @@ class BlockEvaluationGraph extends Block
 
                             $dataSet->normalize(100, '%');
 
-                            $dataSet->loadPalette(api_get_path(SYS_CODE_PATH) . 'palettes/pchart/default.txt');
+                            $dataSet->loadPalette(api_get_path(SYS_CODE_PATH) . 'palettes/pchart/default.color', true);
 
                             // Cache definition
                             $cachePath = api_get_path(SYS_ARCHIVE_PATH);

plugin/dashboard/block_teacher_graph/block_teacher_graph.class.php

@@ -129,7 +129,7 @@ class BlockTeacherGraph extends Block
 			$dataSet->setAbscissaName($last_week);
 			$dataSet->setAxisName(0, get_lang('Minutes'));
             $dataSet->setAbscissa('Days');
-            $dataSet->loadPalette(api_get_path(SYS_CODE_PATH) . 'palettes/pchart/default.txt');
+            $dataSet->loadPalette(api_get_path(SYS_CODE_PATH) . 'palettes/pchart/default.color', true);
 
             // Cache definition
             $cachePath = api_get_path(SYS_ARCHIVE_PATH);