Browse Source

Fix pChart issue with custom colors palette with PHP 7.1 - Bump pChart version to 3.0.4

Yannick Warnier 7 years ago
parent
commit
45c42a6fe7

+ 1 - 1
composer.json

@@ -81,7 +81,7 @@
         "zendframework/zend-soap": "2.5.1|~2.6",
 
         "ezyang/htmlpurifier": "4.6.0",
-        "szymach/c-pchart": "2.0.4",
+        "szymach/c-pchart": "3.0.4",
         "aferrandini/phpqrcode": "1.0.1",
         "mpdf/mpdf": "6.1.*",
         "studio-42/elfinder": "2.1.*",

+ 3 - 3
main/gradebook/lib/fe/flatviewtable.class.php

@@ -3,9 +3,9 @@
 
 set_time_limit(0);
 
-use CpChart\Chart\Cache as pCache;
-use CpChart\Chart\Data as pData;
-use CpChart\Chart\Image as pImage;
+use CpChart\Cache as pCache;
+use CpChart\Data as pData;
+use CpChart\Image as pImage;
 
 /**
  * Class FlatViewTable

+ 3 - 3
main/gradebook/lib/fe/gradebooktable.class.php

@@ -2,9 +2,9 @@
 /* For licensing terms, see license.txt */
 
 use ChamiloSession as Session;
-use CpChart\Chart\Cache as pCache;
-use CpChart\Chart\Data as pData;
-use CpChart\Chart\Image as pImage;
+use CpChart\Cache as pCache;
+use CpChart\Data as pData;
+use CpChart\Image as pImage;
 
 /**
  * GradebookTable Class

+ 3 - 3
main/inc/lib/myspace.lib.php

@@ -1,9 +1,9 @@
 <?php
 /* For licensing terms, see /license.txt */
 
-use CpChart\Chart\Cache as pCache;
-use CpChart\Chart\Data as pData;
-use CpChart\Chart\Image as pImage;
+use CpChart\Cache as pCache;
+use CpChart\Data as pData;
+use CpChart\Image as pImage;
 
 /**
  * Class MySpace

+ 3 - 3
main/inc/lib/tracking.lib.php

@@ -2,9 +2,9 @@
 /* For licensing terms, see /license.txt */
 
 use Chamilo\CoreBundle\Entity\ExtraField as EntityExtraField;
-use CpChart\Chart\Cache as pCache;
-use CpChart\Chart\Data as pData;
-use CpChart\Chart\Image as pImage;
+use CpChart\Cache as pCache;
+use CpChart\Data as pData;
+use CpChart\Image as pImage;
 use Chamilo\UserBundle\Entity\User;
 use Chamilo\CoreBundle\Entity\Course;
 use Chamilo\CoreBundle\Entity\Session;

+ 9 - 9
main/palettes/pchart/default.color

@@ -1,9 +1,9 @@
-186, 206, 151, 1
-210, 148, 147, 1
-148, 170, 208, 1
-221, 133, 61, 1
-65, 153, 176, 1
-114, 88, 144, 1
-138, 166, 78, 1
-171, 70, 67, 1
-69, 115, 168, 1
+186,206,151,100
+210,148,147,100
+148,170,208,100
+221,133,61,100
+65,153,176,100
+114,88,144,100
+138,166,78,100
+171,70,67,100
+69,115,168,100

+ 3 - 3
plugin/dashboard/block_evaluation_graph/block_evaluation_graph.class.php

@@ -1,9 +1,9 @@
 <?php
 /* For licensing terms, see /license.txt */
 
-use CpChart\Chart\Data as pData;
-use CpChart\Chart\Image as pImage;
-use CpChart\Chart\Cache as pCache;
+use CpChart\Data as pData;
+use CpChart\Image as pImage;
+use CpChart\Cache as pCache;
 
 /**
  * Class BlockEvaluationGraph

+ 3 - 3
plugin/dashboard/block_student_graph/block_student_graph.class.php

@@ -9,9 +9,9 @@
  * @author Julio Montoya <gugli100@gmail.com>
  */
 
-use CpChart\Chart\Data as pData;
-use CpChart\Chart\Image as pImage;
-use CpChart\Chart\Cache as pCache;
+use CpChart\Data as pData;
+use CpChart\Image as pImage;
+use CpChart\Cache as pCache;
 
 /**
  * This class is used like controller for student graph block plugin,

+ 3 - 3
plugin/dashboard/block_teacher_graph/block_teacher_graph.class.php

@@ -10,9 +10,9 @@
  * required files for getting data
  */
 
-use CpChart\Chart\Data as pData;
-use CpChart\Chart\Image as pImage;
-use CpChart\Chart\Cache as pCache;
+use CpChart\Data as pData;
+use CpChart\Image as pImage;
+use CpChart\Cache as pCache;
 
 /**
  * This class is used like controller for teacher graph block plugin,