Skip to content

A free open source IT asset/license management system

Added a few more scopes

snipe96a42d0f33c9
diff --git a/app/Models/Builders/MaintenanceQueryBuilder.php b/app/Models/Builders/MaintenanceQueryBuilder.php
index 6d596b3395..06c49f497f 100644
--- a/app/Models/Builders/MaintenanceQueryBuilder.php
+++ b/app/Models/Builders/MaintenanceQueryBuilder.php
@@ -8,6 +8,16 @@ use Illuminate\Database\Eloquent\Builder;
class MaintenanceQueryBuilder extends Builder
{
+ public function active(): static
+ {
+ return $this->whereNull('maintenances.completed_at');
+ }
+
+ public function completed(): static
+ {
+ return $this->whereNotNull('maintenances.completed_at');
+ }
+
public function dueForCompletion(Setting $settings): static
{
$interval = (int) ($settings->audit_warning_days ?? 0);
diff --git a/resources/views/hardware/view.blade.php b/resources/views/hardware/view.blade.php
index 02335bdafb..6560433a4b 100755
--- a/resources/views/hardware/view.blade.php
+++ b/resources/views/hardware/view.blade.php
@@ -299,7 +299,7 @@
<x-well class="well-sm">
<div class="well-display">
<x-data-row icon_type="maintenances" label="Active Maintenances" align="right">
- {{ $asset->maintenances->whereNull('completion_date')->count() }}
+ {{ $asset->maintenances()->active()->count() }}
</x-data-row>
<x-data-row icon_type="checkout" :label="trans('general.checkouts_count')" align="right">