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

Merge remote-tracking branch 'origin/develop'

Browse source
This commit is contained in:
snipe 2022-08-02 20:00:13 -07:00
parent b0e66ae445 6eac133caf
commit eadb36cb26
2 changed files with 24 additions and 13 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -552,6 +552,10 @@ class ReportsController extends Controller
$header[] = trans('general.updated_at'); $header[] = trans('general.updated_at');
} }
if ($request->filled('deleted_at')) {
$header[] = trans('general.deleted');
}
if ($request->filled('last_audit_date')) { if ($request->filled('last_audit_date')) {
$header[] = trans('general.last_audit'); $header[] = trans('general.last_audit');
} }
@ -586,7 +590,6 @@ class ReportsController extends Controller
} }
if ($request->filled('by_rtd_location_id')) { if ($request->filled('by_rtd_location_id')) {
\Log::debug('RTD location should match: '.$request->input('by_rtd_location_id'));
$assets->where('assets.rtd_location_id', $request->input('by_rtd_location_id')); $assets->where('assets.rtd_location_id', $request->input('by_rtd_location_id'));
} }
@ -607,7 +610,6 @@ class ReportsController extends Controller
} }
if ($request->filled('by_dept_id')) { if ($request->filled('by_dept_id')) {
\Log::debug('Only users in dept '.$request->input('by_dept_id'));
$assets->CheckedOutToTargetInDepartment($request->input('by_dept_id')); $assets->CheckedOutToTargetInDepartment($request->input('by_dept_id'));
} }
@ -642,13 +644,13 @@ class ReportsController extends Controller
if (($request->filled('next_audit_start')) && ($request->filled('next_audit_end'))) { if (($request->filled('next_audit_start')) && ($request->filled('next_audit_end'))) {
$assets->whereBetween('assets.next_audit_date', [$request->input('next_audit_start'), $request->input('next_audit_end')]); $assets->whereBetween('assets.next_audit_date', [$request->input('next_audit_start'), $request->input('next_audit_end')]);
} }
if($request->filled('exclude_archived')){ if ($request->filled('exclude_archived')) {
$assets->notArchived(); $assets->notArchived();
} }
if($request->input('deleted_assets') == '1'){ if ($request->input('deleted_assets') == '1') {
$assets->withTrashed(); $assets->withTrashed();
} }
if($request->input('deleted_assets') == '0'){ if ($request->input('deleted_assets') == '0') {
$assets->onlyTrashed(); $assets->onlyTrashed();
} }
@ -816,6 +818,10 @@ class ReportsController extends Controller
$row[] = ($asset->updated_at) ? $asset->updated_at : ''; $row[] = ($asset->updated_at) ? $asset->updated_at : '';
} }
if ($request->filled('deleted_at')) {
$row[] = ($asset->deleted_at) ? $asset->deleted_at : '';
}
if ($request->filled('last_audit_date')) { if ($request->filled('last_audit_date')) {
$row[] = ($asset->last_audit_date) ? $asset->last_audit_date : ''; $row[] = ($asset->last_audit_date) ? $asset->last_audit_date : '';
} }

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

@ -178,6 +178,13 @@
{{ trans('general.updated_at') }} {{ trans('general.updated_at') }}
</label> </label>
</div> </div>
<div class="checkbox col-md-12">
<label>
{{ Form::checkbox('deleted_at', '1', '1', ['class' => 'minimal']) }}
{{ trans('general.deleted') }}
</label>
</div>
<div class="checkbox col-md-12"> <div class="checkbox col-md-12">
<label> <label>
{{ Form::checkbox('last_audit_date', '1', '1', ['class' => 'minimal']) }} {{ Form::checkbox('last_audit_date', '1', '1', ['class' => 'minimal']) }}
@ -354,16 +361,14 @@
<div class="col-md-9 col-md-offset-3"> <div class="col-md-9 col-md-offset-3">
<br> <br>
<label for= "deleted_assets"> {{ Form::radio('deleted_assets', '', true, ['aria-label'=>'deleted_assets', 'class'=>'minimal', 'id'=>'deleted_assets_exclude_deleted'])}}
{{ Form::radio('deleted_assets', '', true, ['aria-label'=>'deleted_assets', 'class'=>'minimal'])}} <label for="deleted_assets_exclude_deleted">{{ trans('general.exclude_deleted') }}</label>
{{ trans('general.exclude_deleted') }}
<br> <br>
{{ Form::radio('deleted_assets', '1', old('deleted_assets'), ['aria-label'=>'deleted_assets','class' => 'minimal']) }} {{ Form::radio('deleted_assets', '1', old('deleted_assets'), ['aria-label'=>'deleted_assets','class' => 'minimal', 'id'=>'deleted_assets_include_deleted']) }}
{{ trans('general.include_deleted') }} <label for="deleted_assets_include_deleted">{{ trans('general.include_deleted') }}</label>
<br> <br>
{{ Form::radio('deleted_assets', '0', old('deleted_assets'), ['aria-label'=>'deleted_assets','class' => 'minimal']) }} {{ Form::radio('deleted_assets', '0', old('deleted_assets'), ['aria-label'=>'deleted_assets','class' => 'minimal','id'=>'deleted_assets_only_deleted']) }}
{{ trans('general.only_deleted') }} <label for="deleted_assets_only_deleted">{{ trans('general.only_deleted') }}</label>
</label>
</div> </div>
</div> </div>