enhanced charts demo

- added pie chart
- added stacked bar chart
pull/2133/head
REJack 2019-06-12 10:06:42 +02:00
parent b84dfe673b
commit 95ca8ec4da
No known key found for this signature in database
GPG Key ID: 9F3976CC630CC888
1 changed files with 90 additions and 11 deletions

View File

@ -580,7 +580,25 @@
</div> </div>
</div> </div>
<div class="card-body"> <div class="card-body">
<canvas id="pieChart" style="height:250px"></canvas> <canvas id="donutChart" style="height:230px"></canvas>
</div>
<!-- /.card-body -->
</div>
<!-- /.card -->
<!-- PIE CHART -->
<div class="card card-danger">
<div class="card-header">
<h3 class="card-title">Pie Chart</h3>
<div class="card-tools">
<button type="button" class="btn btn-tool" data-widget="collapse"><i class="fas fa-minus"></i>
</button>
<button type="button" class="btn btn-tool" data-widget="remove"><i class="fas fa-times"></i></button>
</div>
</div>
<div class="card-body">
<canvas id="pieChart" style="height:230px"></canvas>
</div> </div>
<!-- /.card-body --> <!-- /.card-body -->
</div> </div>
@ -629,6 +647,26 @@
</div> </div>
<!-- /.card --> <!-- /.card -->
<!-- STACKED BAR CHART -->
<div class="card card-success">
<div class="card-header">
<h3 class="card-title">Stacked Bar Chart</h3>
<div class="card-tools">
<button type="button" class="btn btn-tool" data-widget="collapse"><i class="fas fa-minus"></i>
</button>
<button type="button" class="btn btn-tool" data-widget="remove"><i class="fas fa-times"></i></button>
</div>
</div>
<div class="card-body">
<div class="chart">
<canvas id="stackedBarChart" style="height:230px"></canvas>
</div>
</div>
<!-- /.card-body -->
</div>
<!-- /.card -->
</div> </div>
<!-- /.col (RIGHT) --> <!-- /.col (RIGHT) -->
</div> </div>
@ -753,11 +791,11 @@
}) })
//------------- //-------------
//- PIE CHART - //- DONUT CHART -
//------------- //-------------
// Get context with jQuery - using jQuery's .get() method. // Get context with jQuery - using jQuery's .get() method.
var pieChartCanvas = $('#pieChart').get(0).getContext('2d') var donutChartCanvas = $('#donutChart').get(0).getContext('2d')
var pieData = { var donutData = {
labels: [ labels: [
'Chrome', 'Chrome',
'IE', 'IE',
@ -773,16 +811,35 @@
} }
] ]
} }
var donutOptions = {
maintainAspectRatio : false,
responsive : true,
}
//Create pie or douhnut chart
// You can switch between pie and douhnut using the method below.
var donutChart = new Chart(donutChartCanvas, {
type: 'doughnut',
data: donutData,
options: donutOptions
})
//-------------
//- PIE CHART -
//-------------
// Get context with jQuery - using jQuery's .get() method.
var pieChartCanvas = $('#pieChart').get(0).getContext('2d')
var pieData = donutData;
var pieOptions = { var pieOptions = {
maintainAspectRatio : false,
responsive : true,
} }
//Create pie or douhnut chart //Create pie or douhnut chart
// You can switch between pie and douhnut using the method below. // You can switch between pie and douhnut using the method below.
var pieChart = new Chart(pieChartCanvas, { var pieChart = new Chart(pieChartCanvas, {
type: 'doughnut', type: 'pie',
data: pieData, data: pieData,
options: pieOptions options: pieOptions
}) })
// pieChart.Doughnut(PieData, pieOptions)
//------------- //-------------
//- BAR CHART - //- BAR CHART -
@ -793,21 +850,43 @@
var temp1 = areaChartData.datasets[1] var temp1 = areaChartData.datasets[1]
barChartData.datasets[0] = temp1 barChartData.datasets[0] = temp1
barChartData.datasets[1] = temp0 barChartData.datasets[1] = temp0
// barChartData.datasets[1].backgroundColor = '#00a65a'
// barChartData.datasets[1].borderColor = '#00a65a'
var barChartOptions = { var barChartOptions = {
responsive : true, responsive : true,
maintainAspectRatio : true maintainAspectRatio : false,
datasetFill : false
} }
barChartOptions.datasetFill = false
var barChart = new Chart(barChartCanvas, { var barChart = new Chart(barChartCanvas, {
type: 'bar', type: 'bar',
data: barChartData, data: barChartData,
options: barChartOptions options: barChartOptions
}) })
// barChart.Bar(barChartData, barChartOptions)
//---------------------
//- STACKED BAR CHART -
//---------------------
var stackedBarChartCanvas = $('#stackedBarChart').get(0).getContext('2d')
var stackedBarChartData = jQuery.extend(true, {}, barChartData)
var stackedBarChartOptions = {
responsive : true,
maintainAspectRatio : false,
scales: {
xAxes: [{
stacked: true,
}],
yAxes: [{
stacked: true
}]
}
}
var stackedBarChart = new Chart(stackedBarChartCanvas, {
type: 'bar',
data: stackedBarChartData,
options: stackedBarChartOptions
})
}) })
</script> </script>
</body> </body>