Merge remote-tracking branch 'origin/master'

This commit is contained in:
Thomas Zilio 2020-07-20 14:40:35 +02:00
commit cae1be3893
2 changed files with 7 additions and 2 deletions

View File

@ -85,6 +85,11 @@ var chart_options = {
} }
} }
}, },
elements: {
line: {
tension: 0
}
},
annotation: { annotation: {
annotations: [{ annotations: [{
type: "line", type: "line",

View File

@ -33,11 +33,11 @@ class LineChart extends Stat {
chart.data.datasets.push({ chart.data.datasets.push({
calendar_id: calendar_id, calendar_id: calendar_id,
label: label, label: label,
backgroundColor: color, backgroundColor: color + '55',
borderColor: color, borderColor: color,
data: dataset, data: dataset,
labels: labels, labels: labels,
fill: false, fill: true,
}); });
chart.update(); chart.update();