tim/invoiceninja
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Adding charts to reports

Browse source
This commit is contained in:
Hillel Coren 2018-02-27 10:36:13 +02:00
parent bac8c6af63
commit 4492ea07e5
2 changed files with 22 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
app/Ninja/Reports/AbstractReport.php
View file

@ -246,4 +246,9 @@ class AbstractReport
return $data; return $data;
} }
public function getPieChartData()
{
}
} }

20
resources/views/reports/chart_builder.blade.php
View file

@ -2,7 +2,7 @@
function loadLineChart(data) { function loadLineChart(data) {
var ctx = document.getElementById('lineChartCanvas').getContext('2d'); var ctx = document.getElementById('lineChartCanvas').getContext('2d');
window.myChart = new Chart(ctx, { new Chart(ctx, {
type: 'line', type: 'line',
data: data, data: data,
options: { options: {
@ -51,18 +51,32 @@ function loadLineChart(data) {
}); });
} }
function loadPieChart(data) {
}
$(function() { $(function() {
var lineChartData = {!! json_encode($report->getLineChartData()) !!}; var lineChartData = {!! json_encode($report->getLineChartData()) !!};
//console.log(chartData);
loadLineChart(lineChartData); loadLineChart(lineChartData);
//console.log(chartData);
/*
var pieChartData = {!! json_encode($report->getPieChartData()) !!};
loadPieChart(pieChartData);
console.log(pieChartData);
*/
}); });
</script> </script>
<div class="row"> <div class="row">
<div class="col-md-12"> <div class="col-md-6">
<canvas id="lineChartCanvas" style="background-color:white; padding:20px; width:100%; height: 250px;"></canvas> <canvas id="lineChartCanvas" style="background-color:white; padding:20px; width:100%; height: 250px;"></canvas>
</div> </div>
<div class="col-md-6">
<canvas id="pieChartCanvas" style="background-color:white; padding:20px; width:100%; height: 250px;"></canvas>
</div>
</div> </div>
<p>&nbsp;</p> <p>&nbsp;</p>