Skip to content

A free open source IT asset/license management system

Link dashboard “needs attention” to past eol filter

snipe4832f33e9eff
diff --git a/app/Http/Controllers/Api/AssetsController.php b/app/Http/Controllers/Api/AssetsController.php
index c1435b5e08..b1ceb72239 100644
--- a/app/Http/Controllers/Api/AssetsController.php
+++ b/app/Http/Controllers/Api/AssetsController.php
@@ -223,6 +223,10 @@ class AssetsController extends Controller
break;
}
+ if ($request->boolean('past_eol')) {
+ $assets->PastEol();
+ }
+
/**
* End handling due and overdue audits and checkin dates
*/
diff --git a/app/Models/Asset.php b/app/Models/Asset.php
index 91db955f2b..64012a16c3 100644
--- a/app/Models/Asset.php
+++ b/app/Models/Asset.php
@@ -1757,6 +1757,19 @@ class Asset extends Depreciable
->NotArchived();
}
+ /**
+ * Query builder scope for Assets whose asset_eol_date is in the past. Used by
+ * the NeedsAttention dashboard tile count and the hardware/past-eol view.
+ *
+ * @return \Illuminate\Database\Query\Builder Modified query builder
+ */
+ public function scopePastEol($query)
+ {
+ return $query->whereNotNull('assets.asset_eol_date')
+ ->where('assets.asset_eol_date', '<', Carbon::now()->format('Y-m-d'))
+ ->NotArchived();
+ }
+
/**
* Query builder scope for Assets that are due for auditing OR overdue, based on the assets.next_audit_date
* and settings.audit_warning_days.
diff --git a/resources/views/hardware/index.blade.php b/resources/views/hardware/index.blade.php
index 0f4fd861be..b2b75484b9 100755
--- a/resources/views/hardware/index.blade.php
+++ b/resources/views/hardware/index.blade.php
@@ -7,6 +7,7 @@
$requestOrderNumber = request()->input('order_number');
$requestCompanyId = request()->input('company_id');
$requestStatusTypeId = request()->input('status_id');
+ $requestPastEol = request()->boolean('past_eol');
@endphp
@if (is_scalar($requestCompanyId) && ($company instanceof \App\Models\Company))
@@ -61,6 +62,7 @@
'order_number' => is_scalar($requestOrderNumber) ? strval($requestOrderNumber) : null,
'company_id' => is_scalar($requestCompanyId) ? $requestCompanyId : null,
'status_id' => is_scalar($requestStatusTypeId) ? $requestStatusTypeId : null,
+ 'past_eol' => $requestPastEol ? 1 : null,
))"
:status_type="is_scalar($requestStatusType) ? $requestStatusType : null"
/>
diff --git a/resources/views/livewire/needs-attention.blade.php b/resources/views/livewire/needs-attention.blade.php
index 1f8d16d857..62a359a22e 100644
--- a/resources/views/livewire/needs-attention.blade.php
+++ b/resources/views/livewire/needs-attention.blade.php
@@ -52,7 +52,7 @@
@can('view', \App\Models\Asset::class)
<li class="list-group-item">
- <a href="{{ route('hardware.index') }}">
+ <a href="{{ $assetsPastEol > 0 ? route('hardware.index', ['past_eol' => 1]) : route('hardware.index') }}">
<x-icon type="asset" class="fa-fw"/>
<span class="dashboard-attention-label">{{ trans('general.dashboard_assets_past_eol') }}</span>
<span class="badge dashboard-attention-count">{{ number_format($assetsPastEol) }}</span>