Mirrors/invoiceninja
1
0
Fork 0
mirror of https://github.com/invoiceninja/invoiceninja.git synced 2024-09-20 00:11:35 +02:00
Code Issues Releases Activity

Working on charts

Browse Source
This commit is contained in:
Hillel Coren 2018-03-03 23:47:55 +02:00
parent b3047fb202
commit 940b960e7f
1 changed files with 3 additions and 50 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

53
resources/views/reports/chart_builder.blade.php
View File

@ -2,6 +2,9 @@
function loadLineChart(data) { function loadLineChart(data) {
var ctx = document.getElementById('lineChartCanvas').getContext('2d'); var ctx = document.getElementById('lineChartCanvas').getContext('2d');
@if (! $report->isPieChartEnabled())
document.getElementById('lineChartCanvas').height = 80;
@endif
new Chart(ctx, { new Chart(ctx, {
type: 'line', type: 'line',
data: data, data: data,
@ -18,11 +21,6 @@ function loadLineChart(data) {
}, },
label: function(item, data) { label: function(item, data) {
//return label + formatMoney(item.yLabel, chartCurrencyId, account.country_id); //return label + formatMoney(item.yLabel, chartCurrencyId, account.country_id);
/*
console.log('tooltip:');
console.log(item);
console.log(data);
*/
return item.yLabel; return item.yLabel;
} }
} }
@ -30,10 +28,6 @@ function loadLineChart(data) {
scales: { scales: {
xAxes: [{ xAxes: [{
type: 'time', type: 'time',
time: {
unit: "{{ $report->chartGroupBy() }}",
round: "{{ $report->chartGroupBy() }}",
},
gridLines: { gridLines: {
display: false, display: false,
}, },
@ -56,48 +50,7 @@ function loadPieChart(data) {
new Chart(ctx, { new Chart(ctx, {
type: 'doughnut', type: 'doughnut',
data: data, data: data,
options: {
/*
tooltips: {
mode: 'x-axis',
titleFontSize: 15,
titleMarginBottom: 12,
bodyFontSize: 15,
bodySpacing: 10,
callbacks: {
title: function(item) {
return moment(item[0].xLabel).format("{{ $account->getMomentDateFormat() }}");
},
label: function(item, data) {
//return label + formatMoney(item.yLabel, chartCurrencyId, account.country_id);
return item.yLabel;
}
}
},
scales: {
xAxes: [{
type: 'time',
time: {
unit: "{{ $report->chartGroupBy() }}",
round: "{{ $report->chartGroupBy() }}",
},
gridLines: {
display: false,
},
}],
yAxes: [{
ticks: {
beginAtZero: true,
callback: function(label, index, labels) {
return roundSignificant(label);
}
},
}]
}
*/
}
}); });
} }