diff --git a/app/Http/Controllers/ReportsController.php b/app/Http/Controllers/ReportsController.php index 954b7cb64c30..fd753e7fb784 100644 --- a/app/Http/Controllers/ReportsController.php +++ b/app/Http/Controllers/ReportsController.php @@ -29,6 +29,7 @@ use App\Http\Requests\CustomAssetReportRequest; use Illuminate\Support\Facades\Log; use Illuminate\Http\RedirectResponse; +use function Livewire\before; /** * This controller handles all actions related to Reports for @@ -740,9 +741,15 @@ public function postCustom(CustomAssetReportRequest $request) : StreamedResponse $assets->whereBetween('assets.updated_at', [$request->input('last_updated_start'), $request->input('last_updated_end')]); } + if(($request->filled('last_updated_before'))){ + $last_updated_window = Carbon::parse(today()->subDays($request->input('last_updated_before'))); + $assets->where('assets.updated_at', '<' , $last_updated_window); + } + if ($request->filled('exclude_archived')) { $assets->notArchived(); } + if ($request->input('deleted_assets') == 'include_deleted') { $assets->withTrashed(); } diff --git a/resources/lang/en-US/general.php b/resources/lang/en-US/general.php index b06d6899fd1b..e1dd09e47f6c 100644 --- a/resources/lang/en-US/general.php +++ b/resources/lang/en-US/general.php @@ -95,6 +95,7 @@ 'created_by' => 'Created By', 'record_created' => 'Record Created', 'updated_at' => 'Updated at', + 'updated_before' => 'Updated Before', 'currency' => '$', // this is deprecated 'currency_text' => 'Currency', // 'current' => 'Current', @@ -104,6 +105,7 @@ 'dashboard' => 'Dashboard', 'data_source' => 'Data Source', 'days' => 'days', + 'days_ago' => 'days ago', 'days_to_next_audit' => 'Days to Next Audit', 'date' => 'Date', 'debug_warning' => 'Warning!', diff --git a/resources/views/reports/custom.blade.php b/resources/views/reports/custom.blade.php index 835a8d9013ab..fea7f9dc9303 100644 --- a/resources/views/reports/custom.blade.php +++ b/resources/views/reports/custom.blade.php @@ -562,7 +562,21 @@ class="form-control" {!! $errors->first('last_updated_end', '') !!} @endif + + + +
+ +
+ + {{ trans('general.days_ago') }} +
+ @if ($errors->has('last_updated_before')) +
+ {!! $errors->first('last_updated_before', '') !!} +
+ @endif