Add mongo adapter library to composer.

Fix chart bug related to json_encode changes in php7
hellifiknow · Jul 13, 2017 · 43adca0 · 43adca0
1 parent ec703c5
commit 43adca0
Show file tree

Hide file tree

Showing 3 changed files with 144 additions and 7 deletions.
diff --git a/composer.json b/composer.json
@@ -21,7 +21,8 @@
         "phpoffice/phpexcel": "dev-develop",
         "adodb/adodb-php": "dev-master",
         "lespoilus/spyc": "dev-master",
-        "google/apiclient": "1.0.*@beta"
+        "google/apiclient": "1.0.*@beta",
+        "alcaeus/mongo-php-adapter": "^1.1@dev"
     },
     "autoload": {
         "files": [

diff --git a/composer.lock b/composer.lock
diff --git a/templates/default/html/chart_report.twig b/templates/default/html/chart_report.twig
@@ -75,11 +75,20 @@
 				options_{{chart.num}}.colors.push('{{color}}');
 			{% endfor %}
 
-
 			if(!options_{{chart.num}}.colors.length) {
 				delete options_{{chart.num}}.colors;
 			}
 
+		if(Array.isArray(options_{{ chart.num }}.series)) {
+			var t = options_{{ chart.num }}.series;
+			var n = {};
+			for(var i=0;i<t.length;i++) {
+			    n[i+''] = t[i];
+			}
+			options_{{ chart.num }}.series = n;
+		}
+
+
         {% if chart.type == "Timeline" %}
             var chart_{{chart.num}} = new links.Timeline(document.getElementById('chart_div_{{chart.num}}'));
         {% elseif chart.type == "Bar" or chart.type == "Line" %}