From 975b4dee2f62d72d3a8f50a52a4c3dd87f37da6b Mon Sep 17 00:00:00 2001
From: snipe <snipe@snipe.net>
Date: Tue, 2 Aug 2022 19:58:17 -0700
Subject: [PATCH 1/3] Added deleted header

Signed-off-by: snipe <snipe@snipe.net>
---
 app/Http/Controllers/ReportsController.php | 4 ++++
 resources/views/reports/custom.blade.php   | 7 +++++++
 2 files changed, 11 insertions(+)

diff --git a/app/Http/Controllers/ReportsController.php b/app/Http/Controllers/ReportsController.php
index 06629c175a..e596eeffa2 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');
             }
diff --git a/resources/views/reports/custom.blade.php b/resources/views/reports/custom.blade.php
index 4653fb1faa..c81c7c8041 100644
--- a/resources/views/reports/custom.blade.php
+++ b/resources/views/reports/custom.blade.php
@@ -178,6 +178,13 @@
                 {{ trans('general.updated_at') }}
               </label>
             </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">
               <label>
                 {{ Form::checkbox('last_audit_date', '1', '1', ['class' => 'minimal']) }}

From 02caa13222edb68c75d395eea33557d0a0d364c3 Mon Sep 17 00:00:00 2001
From: snipe <snipe@snipe.net>
Date: Tue, 2 Aug 2022 19:58:30 -0700
Subject: [PATCH 2/3] Removed debugging

Signed-off-by: snipe <snipe@snipe.net>
---
 app/Http/Controllers/ReportsController.php | 2 --
 1 file changed, 2 deletions(-)

diff --git a/app/Http/Controllers/ReportsController.php b/app/Http/Controllers/ReportsController.php
index e596eeffa2..fce784cdcb 100644
--- a/app/Http/Controllers/ReportsController.php
+++ b/app/Http/Controllers/ReportsController.php
@@ -590,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'));
             }
 
@@ -611,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'));
             }
 

From cc92d342ea5df5f7ad9d596957722b9ad3ebf27e Mon Sep 17 00:00:00 2001
From: snipe <snipe@snipe.net>
Date: Tue, 2 Aug 2022 19:58:37 -0700
Subject: [PATCH 3/3] Added deleted at value

Signed-off-by: snipe <snipe@snipe.net>
---
 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 : '';
                     }