diff --git a/app/Http/Controllers/ReportsController.php b/app/Http/Controllers/ReportsController.php index 06629c175a..76b766a060 100644 --- a/app/Http/Controllers/ReportsController.php +++ b/app/Http/Controllers/ReportsController.php @@ -552,6 +552,10 @@ class ReportsController extends Controller $header[] = trans('general.updated_at'); } + if ($request->filled('deleted_at')) { + $header[] = trans('general.deleted'); + } + if ($request->filled('last_audit_date')) { $header[] = trans('general.last_audit'); } @@ -586,7 +590,6 @@ class ReportsController extends Controller } 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')); } @@ -607,7 +610,6 @@ class ReportsController extends Controller } if ($request->filled('by_dept_id')) { - \Log::debug('Only users in dept '.$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'))) { $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(); } - if($request->input('deleted_assets') == '1'){ + if ($request->input('deleted_assets') == '1') { $assets->withTrashed(); } - if($request->input('deleted_assets') == '0'){ + if ($request->input('deleted_assets') == '0') { $assets->onlyTrashed(); } @@ -816,6 +818,10 @@ class ReportsController extends Controller $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')) { $row[] = ($asset->last_audit_date) ? $asset->last_audit_date : ''; } diff --git a/resources/views/reports/custom.blade.php b/resources/views/reports/custom.blade.php index fbd9878170..c81c7c8041 100644 --- a/resources/views/reports/custom.blade.php +++ b/resources/views/reports/custom.blade.php @@ -178,6 +178,13 @@ {{ trans('general.updated_at') }} +