1.8.8

app/Http/Livewire/Administration/DatalinkAuthoritiesTable.php

@@ -0,0 +1,61 @@
+<?php
+
+namespace App\Http\Livewire\Administration;
+
+use App\Models\DatalinkAuthority;
+use Rappasoft\LaravelLivewireTables\DataTableComponent;
+use Rappasoft\LaravelLivewireTables\Views\Column;
+use Rappasoft\LaravelLivewireTables\Views\Columns\BooleanColumn;
+
+class DatalinkAuthoritiesTable extends DataTableComponent
+{
+    protected $model = DatalinkAuthority::class;
+
+    public function configure(): void
+    {
+        $this->setPrimaryKey('id');
+    }
+
+    public function columns(): array
+    {
+        return [
+            Column::make("Id", "id")
+                ->sortable(),
+            Column::make("Name", "name")
+                ->sortable(),
+            Column::make("Prefix", "prefix")
+                ->sortable(),
+            BooleanColumn::make("Auto acknowledge participant", "auto_acknowledge_participant")
+                ->sortable()->toggleable('changeAutoAcknowledge'),
+            BooleanColumn::make("Valid rcl target", "valid_rcl_target")
+                ->sortable()->toggleable('changeValidRclTarget'),
+            BooleanColumn::make("System", "system")
+                ->sortable()->toggleable('changeSystem'),
+            Column::make("Created at", "created_at")
+                ->sortable(),
+            Column::make("Updated at", "updated_at")
+                ->sortable(),
+        ];
+    }
+
+    public function changeAutoAcknowledge(string $id)
+    {
+        $authority = $this->model::find($id);
+        $authority->auto_acknowledge_participant = !$authority->auto_acknowledge_participant;
+        $authority->save();
+    }
+
+    public function changeValidRclTarget(string $id)
+    {
+        $authority = $this->model::find($id);
+        $authority->valid_rcl_target = !$authority->valid_rcl_target;
+        $authority->save();
+    }
+
+    public function changeSystem(string $id)
+    {
+        $authority = $this->model::find($id);
+        $authority->system = !$authority->system;
+        $authority->save();
+    }
+}

app/Http/Livewire/Controllers/NotifyNewEtaForPilot.php

@@ -24,7 +24,7 @@ public function mount()
     {
         $this->domesticAuthorities = DomesticAuthorities::cases();
         $dataService = new VatsimDataService();
-        $this->activeDomesticAuthority = $dataService->getActiveDomesticControllerAuthorirty(Auth::user())->value ?? DomesticAuthorities::UNKN->value;
+        $this->activeDomesticAuthority = $dataService->getActiveDomesticControllerAuthority(Auth::user())->value ?? DomesticAuthorities::UNKN->value;
     }
 
     public function render()

app/Services/VatsimDataService.php

@@ -79,8 +79,8 @@ public function isActiveOceanicController(VatsimAccount $vatsimAccount)
 
         if ($online) {
             $authorities = [];
-            foreach (DatalinkAuthorities::cases() as $authority) {
-                $authorities[] = $authority->value;
+            foreach (DatalinkAuthority::all() as $authority) {
+                $authorities[] = $authority->prefix;
             }
 
             $callsign = $this->getActiveControllerData($vatsimAccount)->callsign;
@@ -107,8 +107,10 @@ public function isActiveBoundaryDomesticController(VatsimAccount $vatsimAccount)
 
         if ($online) {
             $authorities = [];
-            foreach (DomesticAuthorities::cases() as $authority) {
-                $authorities[] = $authority->value;
+            foreach (DatalinkAuthority::all() as $authority) {
+                if (! $authority->valid_rcl_target) {
+                    $authorities[] = $authority->prefix;
+                }
             }
             $callsign = $this->getActiveControllerData($vatsimAccount)->callsign;
             if ((in_array(strtok($callsign, '_'), $authorities)) || (in_array(strtok($callsign, '-'), $authorities))) {
@@ -136,7 +138,7 @@ public function getActiveControllerAuthority(VatsimAccount $vatsimAccount)
         return null;
     }
 
-    public function getActiveDomesticControllerAuthorirty(VatsimAccount $vatsimAccount)
+    public function getActiveDomesticControllerAuthority(VatsimAccount $vatsimAccount)
     {
         if (! $this->isActiveBoundaryDomesticController($vatsimAccount) || $this->getActiveControllerData($vatsimAccount) == null) {
             return null;

resources/views/_layouts/main.blade.php

@@ -6,6 +6,7 @@
     @vite(['resources/scss/bootstrap.scss', 'resources/scss/site.scss', 'resources/js/app.js', 'resources/css/datatables.css'])
     @livewireStyles
     <title>@if(isset($_pageTitle)) {{ $_pageTitle }} :: @endif natTrak :: VATSIM</title>
+    <link rel="shortcut icon" href="{{ asset('favicon.ico') }}" type="image/x-icon">
 </head>
 <body>
 <header id="header">
@@ -44,6 +45,10 @@
                                     <li>
                                         <a href="{{ route('administration.utility') }}" class="dropdown-item">Utility</a>
                                     </li>
+                                    <li>
+                                        <a href="{{ route('administration.datalink-authorities') }}"
+                                           class="dropdown-item">Datalink Authorities</a>
+                                    </li>
                                 </ul>
                             </li>
                         @endcan

resources/views/administration/datalink-authorities.blade.php

@@ -0,0 +1,7 @@
+@extends('_layouts.main')
+@section('page')
+    <div class="container">
+        <h2 class="fs-2 font-display text-primary-emphasis">Datalink authorities</h2>
+        <livewire:administration.datalink-authorities-table />
+    </div>
+@endsection

resources/views/controllers/clx/rcl-messages/show.blade.php

@@ -10,7 +10,7 @@
                 </a>
             </p>
             <p class="mb-4">
-                <a class="icon-link icon-link-hover" href="{{ route('controllers.clx.processed') }}">
+                <a class="icon-link icon-link-hover" href="{{ route('controllers.clx.pending') }}">
                     <i class="fa-solid fa-chevron-left"></i>
                     Processed
                 </a>

resources/views/controllers/nav.blade.php

@@ -5,15 +5,15 @@
                 @can('activeBoundaryController')
                     Domestic
                 @else
-                    {{ current_dl_authority() ?? 'Offline' }}
+                    {{ current_dl_authority()->prefix ?? 'Offline' }}
                 @endcan
             </span>
             <button class="navbar-toggler" type="button" data-bs-toggle="collapse" data-bs-target="#controller-nav" aria-controls="controller-nav" aria-expanded="false" aria-label="Toggle navigation">
                 <span class="navbar-toggler-icon"></span>
             </button>
             <div class="collapse navbar-collapse" id="controller-nav">
                 <ul class="navbar-nav gap-2">
-                    @can('activeController')
+                    @canany('activeController')
                         <li class="nav-item">
                             <a class="nav-link {{ Request::is('controllers/clx/pending') ? 'active' : '' }}" href="{{ route('controllers.clx.pending') }}">Pending Messages</a>
                         </li>

resources/views/livewire/controllers/create-manual-clx.blade.php

@@ -8,7 +8,7 @@
                 </a>
             </p>
             <p class="mb-4">
-                <a class="icon-link icon-link-hover" href="{{ route('controllers.clx.pending') }}">
+                <a class="icon-link icon-link-hover" href="{{ route('controllers.clx.processed') }}">
                     <i class="fa-solid fa-chevron-left"></i>
                     Processed
                 </a>
@@ -93,7 +93,7 @@
                                 <div class="fst-italic">or...</div>
                             </div>
                         </div>
-                        <div class="col-auto">
+                        <div class="col-lg">
                             <div class="form-floating">
                                 <input wire:model.blur="randomRouteing" value="{{ old('random_routeing') }}" type="text" class="form-control" name="random_routeing" id="random_routeing" placeholder="e.g. GOMUP 59/20 59/30 58/40 56/50 JANJO" onblur="this.value = this.value.toUpperCase()">
                                 <label for="random_routeing">Random routeing</label>

routes/web.php

@@ -50,6 +50,8 @@
 
     Route::get('/utility', [AdministrationController::class, 'utility'])->name('.utility');
     Route::post('/utility/clear', [AdministrationController::class, 'clearDb'])->name('.clear-db');
+
+    Route::view('/datalink-authorities', 'administration.datalink-authorities')->name('.datalink-authorities');
 });
 
 Route::prefix('pilots')->name('pilots')->middleware('can:activePilot')->group(function () {