From 75844c594223064850dd026af40217f45b36b4d6 Mon Sep 17 00:00:00 2001
From: Godfrey M <godmartinz@gmail.com>
Date: Mon, 11 Jul 2022 09:56:58 -0700
Subject: [PATCH 1/4] adds a checkbox to exclude archived assets from custom
 reports

---
 app/Http/Controllers/ReportsController.php | 3 +++
 resources/lang/en/general.php              | 1 +
 resources/views/reports/custom.blade.php   | 5 ++++-
 3 files changed, 8 insertions(+), 1 deletion(-)

diff --git a/app/Http/Controllers/ReportsController.php b/app/Http/Controllers/ReportsController.php
index 500b57c964..1869b87b5e 100644
--- a/app/Http/Controllers/ReportsController.php
+++ b/app/Http/Controllers/ReportsController.php
@@ -642,6 +642,9 @@ 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')){
+                $assets->where('archived', '=', 0);
+            }
             $assets->orderBy('assets.id', 'ASC')->chunk(20, function ($assets) use ($handle, $customfields, $request) {
             
                 $executionTime = microtime(true) - $_SERVER['REQUEST_TIME_FLOAT'];
diff --git a/resources/lang/en/general.php b/resources/lang/en/general.php
index 97a704a1d0..9b1380f255 100644
--- a/resources/lang/en/general.php
+++ b/resources/lang/en/general.php
@@ -101,6 +101,7 @@ return [
     'employee_number'       => 'Employee Number',
     'email_domain_help'		=> 'This is used to generate email addresses when importing',
     'error'				    => 'Error',
+    'exclude_archived'      => 'Exclude Archived Assets',
     'example'				=> 'Example: ',
     'filastname_format'			=> 'First Initial Last Name (jsmith@example.com)',
     'firstname_lastname_format'	=> 'First Name Last Name (jane.smith@example.com)',
diff --git a/resources/views/reports/custom.blade.php b/resources/views/reports/custom.blade.php
index 9a6a7e4322..96fbc114fd 100644
--- a/resources/views/reports/custom.blade.php
+++ b/resources/views/reports/custom.blade.php
@@ -340,11 +340,14 @@
               </div>
 
             <div class="col-md-9 col-md-offset-3">
+            <label>
+              {{ Form::checkbox('exclude_archived', '1') }}
+              {{ trans('general.exclude_archived') }}
+            </label>
               <label>
                 {{ Form::checkbox('use_bom', '1') }}
                 {{ trans('general.bom_remark') }}
               </label>
-
             </div>
 
           </div>

From 48349071ed36032b613bc22c6f184777fb2795e3 Mon Sep 17 00:00:00 2001
From: Godfrey M <godmartinz@gmail.com>
Date: Tue, 12 Jul 2022 09:46:44 -0700
Subject: [PATCH 2/4] accounts for status_id as well

---
 app/Http/Controllers/ReportsController.php | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/app/Http/Controllers/ReportsController.php b/app/Http/Controllers/ReportsController.php
index 1869b87b5e..73cc4618ee 100644
--- a/app/Http/Controllers/ReportsController.php
+++ b/app/Http/Controllers/ReportsController.php
@@ -643,8 +643,9 @@ class ReportsController extends Controller
                 $assets->whereBetween('assets.next_audit_date', [$request->input('next_audit_start'), $request->input('next_audit_end')]);
             }
             if($request->filled('exclude_archived')){
-                $assets->where('archived', '=', 0);
+                $assets->where('archived', '=', 0) && $assets->where('status_id', '!=', 3);
             }
+
             $assets->orderBy('assets.id', 'ASC')->chunk(20, function ($assets) use ($handle, $customfields, $request) {
             
                 $executionTime = microtime(true) - $_SERVER['REQUEST_TIME_FLOAT'];

From 58c54cc3dceb02c86e76ecf969af42138609d948 Mon Sep 17 00:00:00 2001
From: Godfrey M <godmartinz@gmail.com>
Date: Tue, 12 Jul 2022 12:20:11 -0700
Subject: [PATCH 3/4] uses notArchived scope instead now

---
 app/Http/Controllers/ReportsController.php | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/app/Http/Controllers/ReportsController.php b/app/Http/Controllers/ReportsController.php
index 73cc4618ee..d37e1e6b28 100644
--- a/app/Http/Controllers/ReportsController.php
+++ b/app/Http/Controllers/ReportsController.php
@@ -643,7 +643,8 @@ class ReportsController extends Controller
                 $assets->whereBetween('assets.next_audit_date', [$request->input('next_audit_start'), $request->input('next_audit_end')]);
             }
             if($request->filled('exclude_archived')){
-                $assets->where('archived', '=', 0) && $assets->where('status_id', '!=', 3);
+                $assets->notArchived();
+//                where('archived', '=', 0) && $assets->where('status_id', '!=', 3);
             }
 
             $assets->orderBy('assets.id', 'ASC')->chunk(20, function ($assets) use ($handle, $customfields, $request) {

From 27039325f3f624a17fc5b8da140e6bd2d094dd55 Mon Sep 17 00:00:00 2001
From: Godfrey M <godmartinz@gmail.com>
Date: Tue, 12 Jul 2022 12:41:07 -0700
Subject: [PATCH 4/4] removed comments, because I forgot

---
 app/Http/Controllers/ReportsController.php | 1 -
 1 file changed, 1 deletion(-)

diff --git a/app/Http/Controllers/ReportsController.php b/app/Http/Controllers/ReportsController.php
index d37e1e6b28..74d709adca 100644
--- a/app/Http/Controllers/ReportsController.php
+++ b/app/Http/Controllers/ReportsController.php
@@ -644,7 +644,6 @@ class ReportsController extends Controller
             }
             if($request->filled('exclude_archived')){
                 $assets->notArchived();
-//                where('archived', '=', 0) && $assets->where('status_id', '!=', 3);
             }
 
             $assets->orderBy('assets.id', 'ASC')->chunk(20, function ($assets) use ($handle, $customfields, $request) {