summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authormsquare <msquare@notrademark.de>2018-12-09 13:07:19 +0100
committermsquare <msquare@notrademark.de>2018-12-09 13:07:19 +0100
commit412be8e1884eab7d543c26fafcc93fca3eca8cd1 (patch)
treec3e914edc3a6ace530da26d7e87e5fcf481d1239
parent93b819025c833eaaec730007ad3953c1e8c27768 (diff)
upgrade chart.js lib and fix bargraph. fixes #511
-rw-r--r--includes/helper/graph_helper.php11
-rw-r--r--package.json6
2 files changed, 10 insertions, 7 deletions
diff --git a/includes/helper/graph_helper.php b/includes/helper/graph_helper.php
index f49ab635..7c6e6114 100644
--- a/includes/helper/graph_helper.php
+++ b/includes/helper/graph_helper.php
@@ -25,7 +25,7 @@ function bargraph($dom_id, $key, $row_names, $colors, $data)
}
$datasets[] = [
'label' => $name,
- 'fillColor' => $colors[$row_key],
+ 'backgroundColor' => $colors[$row_key],
'data' => $values
];
}
@@ -34,9 +34,12 @@ function bargraph($dom_id, $key, $row_names, $colors, $data)
<script type="text/javascript">
$(function(){
var ctx = $(\'#' . $dom_id . '\').get(0).getContext(\'2d\');
- var chart = new Chart(ctx).Bar(' . json_encode([
- 'labels' => $labels,
- 'datasets' => $datasets
+ var chart = new Chart(ctx, ' . json_encode([
+ 'type' => 'bar',
+ 'data' => [
+ 'labels' => $labels,
+ 'datasets' => $datasets
+ ]
]) . ');
});
</script>';
diff --git a/package.json b/package.json
index 991f5ea6..5c902a45 100644
--- a/package.json
+++ b/package.json
@@ -3,8 +3,8 @@
"version": "1.1.0",
"main": "index.js",
"repository": "https://github.com/engelsystem/engelsystem.git",
- "author": "marudor <marudor@marudor.de>",
- "license": "MIT",
+ "author": "https://github.com/engelsystem/engelsystem/contributors",
+ "license": "GPL-2.0-only",
"scripts": {
"build": "npm run -s build:clean && NODE_ENV=production run-p build:assets build:webpack",
"build:clean": "rimraf public/assets",
@@ -15,7 +15,7 @@
"dependencies": {
"bootstrap": "^3",
"eonasdan-bootstrap-datetimepicker": "^4.17.47",
- "chart.js": "^1",
+ "chart.js": "^2",
"jquery": "^3.3.1",
"jquery-ui": "^1.11.2",
"moment": "^2.8.2",