From be8aec4751d764b6db95dd2f31f5fef6e89fddee Mon Sep 17 00:00:00 2001 From: Deon George Date: Tue, 4 Jun 2024 20:49:05 +1000 Subject: [PATCH] Make it easier to identify systems that have been marked not active --- resources/views/system/home.blade.php | 13 ++++++++++--- resources/views/system/ours.blade.php | 7 ++++++- 2 files changed, 16 insertions(+), 4 deletions(-) diff --git a/resources/views/system/home.blade.php b/resources/views/system/home.blade.php index 00d4a31..20cdd27 100644 --- a/resources/views/system/home.blade.php +++ b/resources/views/system/home.blade.php @@ -40,14 +40,15 @@ use App\Models\System; Address ZeroTier ID Addresses + Active - @foreach (System::active()->with(['addresses.zone.domain'])->get() as $oo) + @foreach (System::with(['addresses.zone.domain'])->get() as $oo) {{ $oo->id }} - {{ $oo->name }} @if(! $oo->active)[i]@endif + {{ $oo->name }} {{ $oo->sysop }} {{ $oo->location }} @@ -61,6 +62,7 @@ use App\Models\System; {{ $oo->addresses->pluck('ftn')->join(', ') }} {{ $oo->zt_id }} {{ $oo->addresses->count() }} + {{ $oo->active ? 'Active' : 'Not Active' }} @endforeach @@ -94,15 +96,20 @@ use App\Models\System; style: 'fade', speed: 500 // optional }, + order: [1,'asc'], + orderFixed: [8,'asc'], language: { paginate: { previous: '<<', next: '>>' } }, + rowGroup: { + dataSrc: [8], + }, columnDefs: [ { - targets: [5,6], + targets: [5,6,8], visible: false, } ], diff --git a/resources/views/system/ours.blade.php b/resources/views/system/ours.blade.php index 675b23b..8244adb 100644 --- a/resources/views/system/ours.blade.php +++ b/resources/views/system/ours.blade.php @@ -31,7 +31,12 @@ @foreach (\App\Models\SystemZone::select('*')->with(['system.addresses.zone.domain','zone.domain'])->get() as $oo) {{ $oo->zone->domain->name }} - {{ $oo->system_id }}@if($oo->system->hold)@endif + + {{ $oo->system_id }} + @if(! $oo->system->active) + @elseif($oo->system->hold) + @endif + {{ $oo->system->name }} {{ $oo->system->sysop }} {{ $oo->system->location }}