fixed: advanced statistics graphs working again

Author: jdalsem

views/json/advanced_statistics/entity_view_counter/recent.php

@@ -4,9 +4,7 @@
 
 $entity = elgg_extract('entity', $vars);
 
-$result = [
-	'options' => advanced_statistics_get_default_chart_options('date'),
-];
+$result = advanced_statistics_get_default_chart_options('date');
 
 $qb = Select::fromTable('annotations', 'a');
 $qb->select("FROM_UNIXTIME(a.time_created, '%Y-%m-%d') AS date_created");
@@ -22,14 +20,12 @@
 if ($query_result) {
 	foreach ($query_result as $row) {
 		$data[] = [
-			$row['date_created'],
-			(int) $row['total'],
+			'x' => $row['date_created'],
+			'y' => (int) $row['total'],
 		];
 	}
 }
 
-$result['data'] = [$data];
-$result['options']['series'] = [['showMarker' => false]];
-$result['options']['axes']['yaxis']['tickOptions']['show'] = false;
+$result['data']['datasets'][] = ['data' => $data];
 
 echo json_encode($result);

views/json/advanced_statistics/entity_view_counter/views.php

@@ -4,9 +4,7 @@
 
 $user = elgg_extract('entity', $vars);
 
-$result = [
-	'options' => advanced_statistics_get_default_chart_options('date'),
-];
+$result = advanced_statistics_get_default_chart_options('date');
 
 $qb = Select::fromTable('annotations', 'a');
 $qb->select("FROM_UNIXTIME(a.time_created, '%x-%v') AS yearweek");
@@ -25,12 +23,12 @@
 		list ($year, $week) = explode('-', $row['yearweek']);
 
 		$data[] = [
-			date('Y-m-d', strtotime("first monday of january {$year} + {$week} weeks")),
-			(int) $row['total'],
+			'x' => date('Y-m-d', strtotime("first monday of january {$year} + {$week} weeks")),
+			'y' => (int) $row['total'],
 		];
 	}
 }
 
-$result['data'] = [$data];
+$result['data']['datasets'][] = ['data' => $data];
 
 echo json_encode($result);

views/json/advanced_statistics/entity_view_counter/years.php

@@ -4,9 +4,7 @@
 
 $entity = elgg_extract('entity', $vars);
 
-$result = [
-	'options' => advanced_statistics_get_default_chart_options('bar'),
-];
+$result = advanced_statistics_get_default_chart_options('bar');
 
 $qb = Select::fromTable('annotations', 'a');
 $qb->select("FROM_UNIXTIME(a.time_created, '%Y') AS year");
@@ -22,14 +20,12 @@
 if ($query_result) {
 	foreach ($query_result as $row) {
 		$data[] = [
-			$row['year'],
-			(int) $row['total'],
+			'x' => $row['year'],
+			'y' => (int) $row['total'],
 		];
 	}
 }
 
-$result['data'] = [$data];
-$result['options']['series'] = [['showMarker' => false]];
-$result['options']['axes']['yaxis']['tickOptions']['show'] = false;
+$result['data']['datasets'][] = ['data' => $data];
 
 echo json_encode($result);