diff --git a/resources/views/dashboard.blade.php b/resources/views/dashboard.blade.php index ef14addc30..f3d380116d 100755 --- a/resources/views/dashboard.blade.php +++ b/resources/views/dashboard.blade.php @@ -418,6 +418,7 @@ // --------------------------- // - ASSET STATUS CHART - // --------------------------- + var pieChartCanvas = $("#statusPieChart").get(0).getContext("2d"); var pieChart = new Chart(pieChartCanvas); var ctx = document.getElementById("statusPieChart"); @@ -426,27 +427,32 @@ position: 'top', responsive: true, maintainAspectRatio: true, + } }; $.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 myPieChart = new Chart(ctx,{ - type : 'doughnut', - data : data, - options: pieOptions - }); - }, - error: function (data) { - // window.location.reload(true); - } + 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 myPieChart = new Chart(ctx, { + type: 'doughnut', + data: data, + options: pieOptions + }); + + }, + error: function (data) { + + // window.location.reload(true); + } + }); @endpush diff --git a/resources/views/depreciations/edit.blade.php b/resources/views/depreciations/edit.blade.php index ce8dba8a8e..6e5a4ffe39 100755 --- a/resources/views/depreciations/edit.blade.php +++ b/resources/views/depreciations/edit.blade.php @@ -15,13 +15,12 @@ -
-
- +
+ + {!! $errors->first('months', '') !!}
-
- {!! $errors->first('months', '') !!}
+