DRCIT/snipe-it
1
0
Fork 0
mirror of https://github.com/snipe/snipe-it.git synced 2025-03-05 20:52:15 -08:00
Code Issues Actions 1 Packages Projects Releases Wiki Activity

Commented out dashboard chart until proper data provided

Browse source
This commit is contained in:
snipe 2017-06-06 02:51:29 -07:00
parent 12a7309ecd
commit fbcc40a145
1 changed files with 25 additions and 28 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

53
resources/views/dashboard.blade.php
View file

@ -152,7 +152,7 @@
</p>
<div class="chart">
<canvas id="salesChart" style="height:200px"></canvas>
<canvas id="salesChart-temp" style="height:200px"></canvas>
</div>
<!-- /.chart-responsive -->
</div>
@ -263,7 +263,7 @@
<div class="row">
<div class="col-md-12">
<div class="chart-responsive">
<canvas id="statusPieChart" height="150"></canvas>
<canvas id="statusPieChart" height="300"></canvas>
</div> <!-- ./chart-responsive -->
</div> <!-- /.col -->
</div> <!-- /.row -->
@ -387,35 +387,32 @@
var ctx = document.getElementById('salesChart').getContext("2d")
var myChart = new Chart(ctx, {
type: 'line'
//var ctx = document.getElementById('salesChart').getContext("2d")
//var myChart = new Chart(ctx, {
// type: 'line'
//});
//$.ajax({
// type: 'GET',
// url: '{{ route('api.statuslabels.assets.bytype') }}',
// headers: {
// "X-Requested-With": 'XMLHttpRequest',
// "X-CSRF-TOKEN": $('meta[name="csrf-token"]').attr('content')
// },
});
$.ajax({
type: 'GET',
url: '{{ route('api.statuslabels.assets.bytype') }}',
headers: {
"X-Requested-With": 'XMLHttpRequest',
"X-CSRF-TOKEN": $('meta[name="csrf-token"]').attr('content')
},
dataType: 'json',
success: function (data) {
var ctx = new Chart(ctx,{
type: 'line',
data: data,
options: lineOptions
});
},
error: function (data) {
window.location.reload(true);
}
});
// dataType: 'json',
// success: function (data) {
// var ctx = new Chart(ctx,{
// type: 'line',
// data: data,
// options: lineOptions
// });
// },
// error: function (data) {
// window.location.reload(true);
// }
// });