lunax/snipe_it
1
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity Actions

this WILL break. i'm back to site not found which is something missing. otherwise the columns are either blank or another value like expected checkin i was using to test a bit

Browse source
This commit is contained in:
akemidx 2023-07-11 14:08:55 -04:00
parent 0f76eda4af
commit 499a3debcd
2 changed files with 21 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -649,6 +649,10 @@ class ReportsController extends Controller
$assets->whereBetween('assets.expected_checkin', [$request->input('expected_checkin_start'), $request->input('expected_checkin_end')]); $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('last_audit_start')) && ($request->filled('last_audit_end'))) { if (($request->filled('last_audit_start')) && ($request->filled('last_audit_end'))) {
$assets->whereBetween('assets.last_audit_date', [$request->input('last_audit_start'), $request->input('last_audit_end')]); $assets->whereBetween('assets.last_audit_date', [$request->input('last_audit_start'), $request->input('last_audit_end')]);
} }

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

@ -88,7 +88,7 @@
<label class="form-control"> <label class="form-control">
{{ Form::checkbox('eol', '1', '1') }} {{ Form::checkbox('eol', '1', '1') }}
{{ trans('admin/hardware/table.eol') }} {{ trans('admin/hardware/form.eol_date') }}
</label> </label>
<label class="form-control"> <label class="form-control">
@ -303,6 +303,16 @@
</div> </div>
</div> </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="input-daterange input-group col-md-6" id="datepicker">
<input type="text" class="form-control" name="eol_start" aria-label="eol_start">
<span class="input-group-addon">to</span>
<input type="text" class="form-control" name="eol_end" aria-label="eol_end">
</div>
</div>
<!-- Last Audit Date --> <!-- Last Audit Date -->
<div class="form-group last_audit-range"> <div class="form-group last_audit-range">
<label for="last_audit_start" class="col-md-3 control-label">{{ trans('general.last_audit') }}</label> <label for="last_audit_start" class="col-md-3 control-label">{{ trans('general.last_audit') }}</label>
@ -391,6 +401,12 @@
format: 'yyyy-mm-dd' format: 'yyyy-mm-dd'
}); });
$('.eol-range .input-daterange').datepicker({
clearBtn: true,
todayHighlight: true,
format: 'yyyy-mm-dd'
});
$('.last_audit-range .input-daterange').datepicker({ $('.last_audit-range .input-daterange').datepicker({
clearBtn: true, clearBtn: true,
todayHighlight: true, todayHighlight: true,