DRCIT/snipe-it
1
0
Fork 0
mirror of https://github.com/snipe/snipe-it.git synced 2024-12-26 22:19:41 -08:00
Code Issues Actions 11 Packages Projects Releases Wiki Activity

fixed a layout issue with the month field in depreciations [ch17111]

Browse source
This commit is contained in:
Godfrey M 2021-08-24 15:02:42 -07:00
parent 193a52876e
commit a197b730a1
2 changed files with 27 additions and 22 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -418,6 +418,7 @@
// --------------------------- // ---------------------------
// - ASSET STATUS CHART - // - ASSET STATUS CHART -
// --------------------------- // ---------------------------
var pieChartCanvas = $("#statusPieChart").get(0).getContext("2d"); var pieChartCanvas = $("#statusPieChart").get(0).getContext("2d");
var pieChart = new Chart(pieChartCanvas); var pieChart = new Chart(pieChartCanvas);
var ctx = document.getElementById("statusPieChart"); var ctx = document.getElementById("statusPieChart");
@ -426,27 +427,32 @@
position: 'top', position: 'top',
responsive: true, responsive: true,
maintainAspectRatio: true, maintainAspectRatio: true,
} }
}; };
$.ajax({ $.ajax({
type: 'GET', type: 'GET',
url: '{{ route('api.statuslabels.assets.bytype') }}', url: '{{ route('api.statuslabels.assets.bytype') }}',
headers: { headers: {
"X-Requested-With": 'XMLHttpRequest', "X-Requested-With": 'XMLHttpRequest',
"X-CSRF-TOKEN": $('meta[name="csrf-token"]').attr('content') "X-CSRF-TOKEN": $('meta[name="csrf-token"]').attr('content')
}, },
dataType: 'json', dataType: 'json',
success: function (data) { success: function (data) {
var myPieChart = new Chart(ctx,{
type : 'doughnut', var myPieChart = new Chart(ctx, {
data : data, type: 'doughnut',
options: pieOptions data: data,
}); options: pieOptions
}, });
error: function (data) {
// window.location.reload(true); },
} error: function (data) {
// window.location.reload(true);
}
}); });
</script> </script>
@endpush @endpush

9
resources/views/depreciations/edit.blade.php
View file

@ -15,13 +15,12 @@
<label for="months" class="col-md-3 control-label"> <label for="months" class="col-md-3 control-label">
{{ trans('admin/depreciations/general.number_of_months') }} {{ trans('admin/depreciations/general.number_of_months') }}
</label> </label>
<div class="col-md-7{{ (\App\Helpers\Helper::checkIfRequired($item, 'months')) ? ' required' : '' }}"> <div class="col-md-7 col-sm-12 {{ (\App\Helpers\Helper::checkIfRequired($item, 'months')) ? ' required' : '' }}">
<div class="col-md-2" style="padding-left:0px"> <input class="form-control" type="text" name="months" aria-label="months" id="months" value="{{ Request::old('months', $item->months) }}" style="width: 80px;" />
<input class="form-control" type="text" name="months" id="months" value="{{ Request::old('months', $item->months) }}" style="width: 80px;" /> {!! $errors->first('months', '<span class="alert-msg" aria-hidden="true"><i class="fa fa-times" aria-hidden="true"></i> :message</span>') !!}
</div> </div>
</div>
{!! $errors->first('months', '<span class="alert-msg" aria-hidden="true"><i class="fa fa-times" aria-hidden="true"></i> :message</span>') !!}
</div> </div>
<!-- Depreciation Minimum --> <!-- Depreciation Minimum -->
<div class="form-group {{ $errors->has('depreciation_min') ? ' has-error' : '' }}"> <div class="form-group {{ $errors->has('depreciation_min') ? ' has-error' : '' }}">
<label for="depreciation_min" class="col-md-3 control-label"> <label for="depreciation_min" class="col-md-3 control-label">