From cc92d342ea5df5f7ad9d596957722b9ad3ebf27e Mon Sep 17 00:00:00 2001 From: snipe Date: Tue, 2 Aug 2022 19:58:37 -0700 Subject: [PATCH] Added deleted at value Signed-off-by: snipe --- app/Http/Controllers/ReportsController.php | 10 +++++++--- 1 file changed, 7 insertions(+), 3 deletions(-) diff --git a/app/Http/Controllers/ReportsController.php b/app/Http/Controllers/ReportsController.php index fce784cdcb..76b766a060 100644 --- a/app/Http/Controllers/ReportsController.php +++ b/app/Http/Controllers/ReportsController.php @@ -644,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(); } @@ -818,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 : ''; }