From be8aec4751d764b6db95dd2f31f5fef6e89fddee Mon Sep 17 00:00:00 2001
From: Deon George <deon@dege.au>
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;
 						<th>Address</th>
 						<th>ZeroTier ID</th>
 						<th>Addresses</th>
+						<th>Active</th>
 					</tr>
 					</thead>
 
 					<tbody>
-					@foreach (System::active()->with(['addresses.zone.domain'])->get() as $oo)
+					@foreach (System::with(['addresses.zone.domain'])->get() as $oo)
 						<tr>
 							<td><a href="{{ url('system/addedit',[$oo->id]) }}" @cannot('update_nn',$oo)class="disabled" @endcannot>{{ $oo->id }}</a></td>
-							<td>{{ $oo->name }} @if(! $oo->active)<span class="float-end"><small>[i]</small></span>@endif</td>
+							<td>{{ $oo->name }}</td>
 							<td>{{ $oo->sysop }}</td>
 							<td>{{ $oo->location }}</td>
 							<td>
@@ -61,6 +62,7 @@ use App\Models\System;
 							<td>{{ $oo->addresses->pluck('ftn')->join(', ') }}</td>
 							<td>{{ $oo->zt_id }}</td>
 							<td>{{ $oo->addresses->count() }}</td>
+							<td>{{ $oo->active ? 'Active' : 'Not Active' }}</td>
 						</tr>
 					@endforeach
 					</tbody>
@@ -94,15 +96,20 @@ use App\Models\System;
 					style: 'fade',
 					speed: 500 // optional
 				},
+				order: [1,'asc'],
+				orderFixed: [8,'asc'],
 				language: {
 					paginate: {
 						previous: '&lt;&lt;',
 						next: '&gt;&gt;'
 					}
 				},
+				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)
 						<tr>
 							<td>{{ $oo->zone->domain->name }}</td>
-							<td><a href="{{ url('system/addedit',[$oo->system_id]) }}">{{ $oo->system_id }}</a>@if($oo->system->hold)<span class="float-end"><i class="text-danger bi bi-stop-circle"></i></span>@endif</td>
+							<td>
+								<a href="{{ url('system/addedit',[$oo->system_id]) }}">{{ $oo->system_id }}</a>
+								@if(! $oo->system->active)<span class="float-end"><i class="text-danger bi bi-slash-circle"></i></span>
+								@elseif($oo->system->hold)<span class="float-end"><i class="text-danger bi bi-stop-circle"></i></span>
+								@endif
+							</td>
 							<td>{{ $oo->system->name }}</td>
 							<td>{{ $oo->system->sysop }}</td>
 							<td>{{ $oo->system->location }}</td>