DRCIT/snipe-it
1
0
Fork 0
mirror of https://github.com/snipe/snipe-it.git synced 2025-01-23 19:59:18 -08:00
Code Issues Actions 13 Packages Projects Releases Wiki Activity

adding eol fields

Browse source
This commit is contained in:
akemidx 2023-07-26 17:31:06 -04:00
parent 499a3debcd
commit f71b69a739
2 changed files with 7 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
app/Http/Controllers/ReportsController.php
View file

@ -649,8 +649,8 @@ class ReportsController extends Controller
$assets->whereBetween('assets.expected_checkin', [$request->input('expected_checkin_start'), $request->input('expected_checkin_end')]);
}
if (($request->filled('eol')) && ($request->filled('eol'))) {
$assets->whereBetween('assets.eol', [$request->input('eol_start'), $request->input('eol_end')]);
if (($request->filled('asset_eol_date_start')) && ($request->filled('asset_eol_date_end'))) {
$assets->whereBetween('assets.asset_eol_date', [$request->input('asset_eol_date_start'), $request->input('asset_eol_date_end')]);
}
if (($request->filled('last_audit_start')) && ($request->filled('last_audit_end'))) {

10
resources/views/reports/custom.blade.php
View file

@ -304,12 +304,12 @@
</div>
<!-- EoL Date -->
<div class="form-group eol-range">
<label for="eol" class="col-md-3 control-label">{{ trans('admin/hardware/form.eol_date') }}</label>
<div class="form-group asset_eol_date-range">
<label for="asset_eol_date" class="col-md-3 control-label">{{ trans('admin/hardware/form.eol_date') }}</label>
<div class="input-daterange input-group col-md-6" id="datepicker">
<input type="text" class="form-control" name="eol_start" aria-label="eol_start">
<input type="text" class="form-control" name="asset_eol_date_start" aria-label="asset_eol_date_start">
<span class="input-group-addon">to</span>
<input type="text" class="form-control" name="eol_end" aria-label="eol_end">
<input type="text" class="form-control" name="asset_eol_date_end" aria-label="asset_eol_date_end">
</div>
</div>
@ -401,7 +401,7 @@
format: 'yyyy-mm-dd'
});
$('.eol-range .input-daterange').datepicker({
$('.asset_eol_date-range .input-daterange').datepicker({
clearBtn: true,
todayHighlight: true,
format: 'yyyy-mm-dd'