From 499a3debcdd1e996ac05fa8dc28d2e39e2bdcb2a Mon Sep 17 00:00:00 2001 From: akemidx Date: Tue, 11 Jul 2023 14:08:55 -0400 Subject: [PATCH 001/106] this WILL break. i'm back to site not found which is something missing. otherwise the columns are either blank or another value like expected checkin i was using to test a bit --- app/Http/Controllers/ReportsController.php | 4 ++++ resources/views/reports/custom.blade.php | 18 +++++++++++++++++- 2 files changed, 21 insertions(+), 1 deletion(-) diff --git a/app/Http/Controllers/ReportsController.php b/app/Http/Controllers/ReportsController.php index 80fe24255c..c61d2de303 100644 --- a/app/Http/Controllers/ReportsController.php +++ b/app/Http/Controllers/ReportsController.php @@ -649,6 +649,10 @@ class ReportsController extends Controller $assets->whereBetween('assets.expected_checkin', [$request->input('expected_checkin_start'), $request->input('expected_checkin_end')]); } + if (($request->filled('eol')) && ($request->filled('eol'))) { + $assets->whereBetween('assets.eol', [$request->input('eol_start'), $request->input('eol_end')]); + } + if (($request->filled('last_audit_start')) && ($request->filled('last_audit_end'))) { $assets->whereBetween('assets.last_audit_date', [$request->input('last_audit_start'), $request->input('last_audit_end')]); } diff --git a/resources/views/reports/custom.blade.php b/resources/views/reports/custom.blade.php index c48f8df20a..2ccc0e8e98 100644 --- a/resources/views/reports/custom.blade.php +++ b/resources/views/reports/custom.blade.php @@ -88,7 +88,7 @@