fix: package.json & package-lock.json to reduce vulnerabilities

The following vulnerabilities are fixed with an upgrade:
- https://snyk.io/vuln/SNYK-JS-FOLLOWREDIRECTS-2332181

.github/scripts/build.sh

@@ -23,6 +23,7 @@ declare -a remove_files=(
   .eslintrc
   .php_cs
   .php_cs.cache
+  .php-cs-fixer.php
   .phpstorm.meta.php
   .styleci.yml
   .phpunit.result.cache

.github/workflows/build.yml

@@ -2,12 +2,12 @@ name: 'Build'
 on: ['push', 'pull_request', 'workflow_dispatch', 'release']
 jobs:
   build:
-    runs-on: ubuntu-18.04
+    runs-on: ubuntu-20.04
     if: github.repository == 'nabeelio/phpvms'
     strategy:
       fail-fast: true
       matrix:
-        php-versions: ['7.3', '7.4', '8.0']
+        php-versions: ['7.3', '7.4', '8.0', '8.1']
     name: PHP ${{ matrix.php-versions }}
     env:
       extensions: intl, pcov, mbstring
@@ -78,7 +78,8 @@ jobs:
 
     - name: Run Tests
       run: |
-        vendor/bin/php-cs-fixer fix --config=.php_cs -v --dry-run --diff --using-cache=no
+        export PHP_CS_FIXER_IGNORE_ENV=1
+        vendor/bin/php-cs-fixer fix --config=.php-cs-fixer.php -v --dry-run --diff --using-cache=no
         vendor/bin/phpunit --debug --verbose
 
   # This runs after all of the tests, run have run. Creates a cleaned up version of the

.php-cs-fixer.php

@@ -0,0 +1,69 @@
+<?php
+
+declare(strict_types=1);
+
+/*
+ * This file is part of PHP CS Fixer.
+ *
+ * (c) Fabien Potencier <fabien@symfony.com>
+ *     Dariusz Rumiński <dariusz.ruminski@gmail.com>
+ *
+ * This source file is subject to the MIT license that is bundled
+ * with this source code in the file LICENSE.
+ */
+
+$header = <<<'EOF'
+This file is part of PHP CS Fixer.
+(c) Fabien Potencier <fabien@symfony.com>
+    Dariusz Rumiński <dariusz.ruminski@gmail.com>
+This source file is subject to the MIT license that is bundled
+with this source code in the file LICENSE.
+EOF;
+
+$finder = PhpCsFixer\Finder::create()
+    ->ignoreVCSIgnored(true)
+    ->exclude('tests/data')
+    ->exclude('storage')
+    ->exclude('resources')
+    ->in(__DIR__)
+    ->append([
+        __DIR__.'/dev-tools/doc.php',
+        // __DIR__.'/php-cs-fixer', disabled, as we want to be able to run bootstrap file even on lower PHP version, to show nice message
+        __FILE__,
+    ])
+;
+
+$config = new PhpCsFixer\Config();
+$config
+    ->setRiskyAllowed(true)
+    ->setRules([
+        '@PSR2'                             => true,
+        'strict_param'                      => true,
+        'no_php4_constructor'               => true,
+        'no_extra_blank_lines'              => true,
+        'no_superfluous_elseif'             => true,
+        'single_line_comment_style'         => false,
+        'simple_to_complex_string_variable' => true,
+        'array_syntax'                      => [
+            'syntax' => 'short',
+        ],
+        'binary_operator_spaces' => [
+            'operators' => [
+                '=>' => 'align_single_space_minimal'
+            ]
+        ],
+        /*
+        'blank_line_before_statement'       => [
+            'statements' => [
+                'declare',
+                'for',
+                'return',
+                'throw',
+                'try',
+            ],
+        ],
+        */
+    ])
+    ->setFinder($finder);
+
+return $config;

.php_cs

@@ -1,37 +0,0 @@
-<?php
-
-$finder = PhpCsFixer\Finder::create()
-    ->in('app')
-    ->in('config');
-
-return PhpCsFixer\Config::create()
-    ->setHideProgress(true)
-    ->setUsingCache(false)
-    ->setRiskyAllowed(true)
-    ->setRules([
-        '@PSR2'                             => true,
-        'strict_param'                      => true,
-        'no_php4_constructor'               => true,
-        'no_extra_blank_lines'              => true,
-        'no_superfluous_elseif'             => true,
-        'single_line_comment_style'         => false,
-        'simple_to_complex_string_variable' => true,
-        'array_syntax'                      => [
-            'syntax' => 'short',
-        ],
-        'binary_operator_spaces'            => [
-            'align_double_arrow' => true,
-        ],
-        /*
-        'blank_line_before_statement'       => [
-            'statements' => [
-                'declare',
-                'for',
-                'return',
-                'throw',
-                'try',
-            ],
-        ],
-        */
-    ])
-    ->setFinder($finder);

app/Contracts/ImportExport.php

@@ -166,6 +166,27 @@ class ImportExport
                 return [];
             }
 
+            if (strpos($split_values[0], '?') !== false) {
+                // This contains the query string, which turns it into a multi-level array
+                $query_str = explode('?', $split_values[0]);
+                $parent = trim($query_str[0]);
+
+                $children = [];
+                $kvp = explode('&', trim($query_str[1]));
+                foreach ($kvp as $items) {
+                    if (!$items) {
+                        continue;
+                    }
+
+                    $this->kvpToArray($items, $children);
+                }
+
+                $ret[$parent] = $children;
+
+                return $ret;
+            }
+
+            // This is not a query string, return it back untouched
             return [$split_values[0]];
         }
 

app/Database/migrations/2021_11_23_184532_add_type_rating_tables.php

@@ -0,0 +1,53 @@
+<?php
+
+use App\Contracts\Migration;
+use Illuminate\Database\Schema\Blueprint;
+use Illuminate\Support\Facades\Schema;
+
+class AddTypeRatingTables extends Migration
+{
+    public function up()
+    {
+        if (!Schema::hasTable('typeratings')) {
+            Schema::create('typeratings', function (Blueprint $table) {
+                $table->increments('id');
+                $table->string('name');
+                $table->string('type');
+                $table->string('description')->nullable();
+                $table->string('image_url')->nullable();
+                $table->boolean('active')->default(true);
+                $table->timestamps();
+
+                $table->unique('id');
+                $table->unique('name');
+            });
+        }
+
+        if (!Schema::hasTable('typerating_user')) {
+            Schema::create('typerating_user', function (Blueprint $table) {
+                $table->unsignedInteger('typerating_id');
+                $table->unsignedInteger('user_id');
+
+                $table->primary(['typerating_id', 'user_id']);
+                $table->index(['typerating_id', 'user_id']);
+            });
+        }
+
+        if (!Schema::hasTable('typerating_subfleet')) {
+            Schema::create('typerating_subfleet', function (Blueprint $table) {
+                $table->unsignedInteger('typerating_id');
+                $table->unsignedInteger('subfleet_id');
+
+                $table->primary(['typerating_id', 'subfleet_id']);
+                $table->index(['typerating_id', 'subfleet_id']);
+            });
+        }
+    }
+
+    public function down()
+    {
+        Schema::dropIfExists('typeratings');
+        Schema::dropIfExists('typerating_user');
+        Schema::dropIfExists('typerating_subfleet');
+    }
+}

app/Database/migrations/2021_11_27_132418_add_hub_to_aircraft.php

@@ -0,0 +1,15 @@
+<?php
+
+use App\Contracts\Migration;
+use Illuminate\Database\Schema\Blueprint;
+use Illuminate\Support\Facades\Schema;
+
+class AddHubToAircraft extends Migration
+{
+    public function up()
+    {
+        Schema::table('aircraft', function (Blueprint $table) {
+            $table->string('hub_id', 5)->nullable()->after('airport_id');
+        });
+    }
+}

app/Database/migrations/2022_01_10_131604_update_awards_add_active.php

@@ -0,0 +1,15 @@
+<?php
+
+use App\Contracts\Migration;
+use Illuminate\Database\Schema\Blueprint;
+use Illuminate\Support\Facades\Schema;
+
+class UpdateAwardsAddActive extends Migration
+{
+    public function up()
+    {
+        Schema::table('awards', function (Blueprint $table) {
+            $table->boolean('active')->default(true)->nullable()->after('ref_model_params');
+        });
+    }
+}

app/Database/seeds/permissions.yml

@@ -42,6 +42,9 @@
 - name: ranks
   display_name: Ranks
   description: Create/edit ranks
+- name: typeratings
+  display_name: Type Ratings
+  description: Create/edit type ratings
 - name: users
   display_name: Users
   description: Create/edit users

app/Database/seeds/settings.yml

@@ -137,6 +137,13 @@
   options: ''
   type: int
   description: 'Initial zoom level on the map'
+- key: acars.update_interval
+  name: 'Refresh Interval'
+  group: acars
+  value: 60
+  options: ''
+  type: int
+  description: 'How often the live map updates its data'
 - key: airports.default_ground_handling_cost
   name: 'Default Ground Handling Cost'
   group: airports
@@ -283,7 +290,14 @@
   value: true
   options: ''
   type: boolean
-  description: 'Aircraft that can be flown are restricted to a user''s rank'
+  description: 'Aircraft restricted to user''s rank'
+- key: pireps.restrict_aircraft_to_typerating
+  name: 'Restrict Aircraft by Type Ratings'
+  group: pireps
+  value: false
+  options: ''
+  type: boolean
+  description: 'Aircraft restricted to user type ratings'
 - key: pireps.only_aircraft_at_dpt_airport
   name: 'Restrict Aircraft At Departure'
   group: pireps

app/Http/Controllers/Admin/AircraftController.php

@@ -79,6 +79,7 @@ class AircraftController extends Controller
     {
         return view('admin.aircraft.create', [
             'airports'    => $this->airportRepo->selectBoxList(),
+            'hubs'        => $this->airportRepo->selectBoxList(true, true),
             'subfleets'   => Subfleet::all()->pluck('name', 'id'),
             'statuses'    => AircraftStatus::select(false),
             'subfleet_id' => $request->query('subfleet'),
@@ -143,6 +144,7 @@ class AircraftController extends Controller
         return view('admin.aircraft.edit', [
             'aircraft'  => $aircraft,
             'airports'  => $this->airportRepo->selectBoxList(),
+            'hubs'      => $this->airportRepo->selectBoxList(true, true),
             'subfleets' => Subfleet::all()->pluck('name', 'id'),
             'statuses'  => AircraftStatus::select(false),
         ]);

app/Http/Controllers/Admin/FlightController.php

@@ -300,14 +300,18 @@ class FlightController extends Controller
     public function export(Request $request)
     {
         $exporter = app(ExportService::class);
-        $flights = $this->flightRepo->all();
+
+        $where = [];
+        $file_name = 'flights.csv';
+        if ($request->input('airline_id')) {
+            $airline_id = $request->input('airline_id');
+            $where['airline_id'] = $airline_id;
+            $file_name = 'flights-'.$airline_id.'.csv';
+        }
+        $flights = $this->flightRepo->where($where)->get();
 
         $path = $exporter->exportFlights($flights);
-        return response()
-            ->download($path, 'flights.csv', [
-                'content-type' => 'text/csv',
-            ])
-            ->deleteFileAfterSend(true);
+        return response()->download($path, $file_name, ['content-type' => 'text/csv'])->deleteFileAfterSend(true);
     }
 
     /**

app/Http/Controllers/Admin/SubfleetController.php

@@ -17,6 +17,7 @@ use App\Repositories\AircraftRepository;
 use App\Repositories\FareRepository;
 use App\Repositories\RankRepository;
 use App\Repositories\SubfleetRepository;
+use App\Repositories\TypeRatingRepository;
 use App\Services\ExportService;
 use App\Services\FareService;
 use App\Services\FleetService;
@@ -36,26 +37,29 @@ class SubfleetController extends Controller
     private $importSvc;
     private $rankRepo;
     private $subfleetRepo;
+    private $typeratingRepo;
 
     /**
      * SubfleetController constructor.
      *
-     * @param AircraftRepository $aircraftRepo
-     * @param FleetService       $fleetSvc
-     * @param FareRepository     $fareRepo
-     * @param FareService        $fareSvc
-     * @param ImportService      $importSvc
-     * @param RankRepository     $rankRepo
-     * @param SubfleetRepository $subfleetRepo
+     * @param AircraftRepository   $aircraftRepo
+     * @param FareRepository       $fareRepo
+     * @param FareService          $fareSvc
+     * @param FleetService         $fleetSvc
+     * @param ImportService        $importSvc
+     * @param RankRepository       $rankRepo
+     * @param SubfleetRepository   $subfleetRepo
+     * @param TypeRatingRepository $typeratingRepo
      */
     public function __construct(
         AircraftRepository $aircraftRepo,
-        FleetService $fleetSvc,
         FareRepository $fareRepo,
         FareService $fareSvc,
+        FleetService $fleetSvc,
         ImportService $importSvc,
         RankRepository $rankRepo,
-        SubfleetRepository $subfleetRepo
+        SubfleetRepository $subfleetRepo,
+        TypeRatingRepository $typeratingRepo
     ) {
         $this->aircraftRepo = $aircraftRepo;
         $this->fareRepo = $fareRepo;
@@ -64,48 +68,7 @@ class SubfleetController extends Controller
         $this->importSvc = $importSvc;
         $this->rankRepo = $rankRepo;
         $this->subfleetRepo = $subfleetRepo;
-    }
-
-    /**
-     * Get the ranks that are available to the subfleet
-     *
-     * @param $subfleet
-     *
-     * @return array
-     */
-    protected function getAvailRanks($subfleet)
-    {
-        $retval = [];
-        $all_ranks = $this->rankRepo->all();
-        $avail_ranks = $all_ranks->except($subfleet->ranks->modelKeys());
-        foreach ($avail_ranks as $rank) {
-            $retval[$rank->id] = $rank->name;
-        }
-
-        return $retval;
-    }
-
-    /**
-     * Get all the fares that haven't been assigned to a given subfleet
-     *
-     * @param mixed $subfleet
-     *
-     * @return array
-     */
-    protected function getAvailFares($subfleet)
-    {
-        $retval = [];
-        $all_fares = $this->fareRepo->all();
-        $avail_fares = $all_fares->except($subfleet->fares->modelKeys());
-        foreach ($avail_fares as $fare) {
-            $retval[$fare->id] = $fare->name.
-                ' (price: '.$fare->price.
-                ', type: '.FareType::label($fare->type).
-                ', cost: '.$fare->cost.
-                ', capacity: '.$fare->capacity.')';
-        }
-
-        return $retval;
+        $this->typeratingRepo = $typeratingRepo;
     }
 
     /**
@@ -152,8 +115,8 @@ class SubfleetController extends Controller
     {
         $input = $request->all();
         $subfleet = $this->subfleetRepo->create($input);
-
         Flash::success('Subfleet saved successfully.');
+
         return redirect(route('admin.subfleets.edit', [$subfleet->id]));
     }
 
@@ -172,10 +135,12 @@ class SubfleetController extends Controller
 
         if (empty($subfleet)) {
             Flash::error('Subfleet not found');
+
             return redirect(route('admin.subfleets.index'));
         }
 
         $avail_fares = $this->getAvailFares($subfleet);
+
         return view('admin.subfleets.show', [
             'subfleet'    => $subfleet,
             'avail_fares' => $avail_fares,
@@ -192,24 +157,27 @@ class SubfleetController extends Controller
     public function edit($id)
     {
         $subfleet = $this->subfleetRepo
-            ->with(['fares', 'ranks'])
+            ->with(['fares', 'ranks', 'typeratings'])
             ->findWithoutFail($id);
 
         if (empty($subfleet)) {
             Flash::error('Subfleet not found');
+
             return redirect(route('admin.subfleets.index'));
         }
 
         $avail_fares = $this->getAvailFares($subfleet);
         $avail_ranks = $this->getAvailRanks($subfleet);
+        $avail_ratings = $this->getAvailTypeRatings($subfleet);
 
         return view('admin.subfleets.edit', [
-            'airlines'    => Airline::all()->pluck('name', 'id'),
-            'hubs'        => Airport::where('hub', 1)->pluck('name', 'id'),
-            'fuel_types'  => FuelType::labels(),
-            'avail_fares' => $avail_fares,
-            'avail_ranks' => $avail_ranks,
-            'subfleet'    => $subfleet,
+            'airlines'      => Airline::all()->pluck('name', 'id'),
+            'hubs'          => Airport::where('hub', 1)->pluck('name', 'id'),
+            'fuel_types'    => FuelType::labels(),
+            'avail_fares'   => $avail_fares,
+            'avail_ranks'   => $avail_ranks,
+            'avail_ratings' => $avail_ratings,
+            'subfleet'      => $subfleet,
         ]);
     }
 
@@ -229,12 +197,13 @@ class SubfleetController extends Controller
 
         if (empty($subfleet)) {
             Flash::error('Subfleet not found');
+
             return redirect(route('admin.subfleets.index'));
         }
 
         $this->subfleetRepo->update($request->all(), $id);
-
         Flash::success('Subfleet updated successfully.');
+
         return redirect(route('admin.subfleets.index'));
     }
 
@@ -251,6 +220,7 @@ class SubfleetController extends Controller
 
         if (empty($subfleet)) {
             Flash::error('Subfleet not found');
+
             return redirect(route('admin.subfleets.index'));
         }
 
@@ -259,12 +229,13 @@ class SubfleetController extends Controller
         $aircraft = $this->aircraftRepo->findWhere(['subfleet_id' => $id], ['id']);
         if ($aircraft->count() > 0) {
             Flash::error('There are aircraft still assigned to this subfleet, you can\'t delete it!')->important();
+
             return redirect(route('admin.subfleets.index'));
         }
 
         $this->subfleetRepo->delete($id);
-
         Flash::success('Subfleet deleted successfully.');
+
         return redirect(route('admin.subfleets.index'));
     }
 
@@ -281,11 +252,8 @@ class SubfleetController extends Controller
         $subfleets = $this->subfleetRepo->all();
 
         $path = $exporter->exportSubfleets($subfleets);
-        return response()
-            ->download($path, 'subfleets.csv', [
-                'content-type' => 'text/csv',
-            ])
-            ->deleteFileAfterSend(true);
+
+        return response()->download($path, 'subfleets.csv', ['content-type' => 'text/csv'])->deleteFileAfterSend(true);
     }
 
     /**
@@ -312,77 +280,64 @@ class SubfleetController extends Controller
     }
 
     /**
-     * @param Subfleet $subfleet
+     * Get all the fares that haven't been assigned to a given subfleet
      *
-     * @return mixed
+     * @param mixed $subfleet
+     *
+     * @return array
      */
-    protected function return_ranks_view(?Subfleet $subfleet)
+    protected function getAvailFares($subfleet)
     {
-        $subfleet->refresh();
+        $retval = [];
+        $all_fares = $this->fareRepo->all();
+        $avail_fares = $all_fares->except($subfleet->fares->modelKeys());
+        foreach ($avail_fares as $fare) {
+            $retval[$fare->id] = $fare->name.
+                ' (price: '.$fare->price.
+                ', type: '.FareType::label($fare->type).
+                ', cost: '.$fare->cost.
+                ', capacity: '.$fare->capacity.')';
+        }
 
-        $avail_ranks = $this->getAvailRanks($subfleet);
-        return view('admin.subfleets.ranks', [
-            'subfleet'    => $subfleet,
-            'avail_ranks' => $avail_ranks,
-        ]);
+        return $retval;
     }
 
     /**
-     * @param Subfleet $subfleet
+     * Get the ranks that are available to the subfleet
      *
-     * @return mixed
+     * @param $subfleet
+     *
+     * @return array
      */
-    protected function return_fares_view(?Subfleet $subfleet)
+    protected function getAvailRanks($subfleet)
     {
-        $subfleet->refresh();
+        $retval = [];
+        $all_ranks = $this->rankRepo->all();
+        $avail_ranks = $all_ranks->except($subfleet->ranks->modelKeys());
+        foreach ($avail_ranks as $rank) {
+            $retval[$rank->id] = $rank->name;
+        }
 
-        $avail_fares = $this->getAvailFares($subfleet);
-        return view('admin.subfleets.fares', [
-            'subfleet'    => $subfleet,
-            'avail_fares' => $avail_fares,
-        ]);
+        return $retval;
     }
 
     /**
-     * Operations for associating ranks to the subfleet
+     * Get the type ratings that are available to the subfleet
      *
-     * @param         $id
-     * @param Request $request
+     * @param $subfleet
      *
-     * @return mixed
+     * @return array
      */
-    public function ranks($id, Request $request)
+    protected function getAvailTypeRatings($subfleet)
     {
-        $subfleet = $this->subfleetRepo->findWithoutFail($id);
-        if (empty($subfleet)) {
-            return $this->return_ranks_view($subfleet);
+        $retval = [];
+        $all_ratings = $this->typeratingRepo->all();
+        $avail_ratings = $all_ratings->except($subfleet->typeratings->modelKeys());
+        foreach ($avail_ratings as $tr) {
+            $retval[$tr->id] = $tr->name.' ('.$tr->type.')';
         }
 
-        if ($request->isMethod('get')) {
-            return $this->return_ranks_view($subfleet);
-        }
-
-        /*
-         * update specific rank data
-         */
-        if ($request->isMethod('post')) {
-            $rank = $this->rankRepo->find($request->input('rank_id'));
-            $this->fleetSvc->addSubfleetToRank($subfleet, $rank);
-        } elseif ($request->isMethod('put')) {
-            $override = [];
-            $rank = $this->rankRepo->find($request->input('rank_id'));
-            $override[$request->name] = $request->value;
-
-            $this->fleetSvc->addSubfleetToRank($subfleet, $rank, $override);
-        } // dissassociate fare from teh aircraft
-        elseif ($request->isMethod('delete')) {
-            $rank = $this->rankRepo->find($request->input('rank_id'));
-            $this->fleetSvc->removeSubfleetFromRank($subfleet, $rank);
-        }
-
-        $subfleet->save();
-
-        return $this->return_ranks_view($subfleet);
+        return $retval;
     }
 
     /**
@@ -398,6 +353,54 @@ class SubfleetController extends Controller
         ]);
     }
 
+    /**
+     * @param Subfleet $subfleet
+     *
+     * @return mixed
+     */
+    protected function return_fares_view(?Subfleet $subfleet)
+    {
+        $subfleet->refresh();
+        $avail_fares = $this->getAvailFares($subfleet);
+
+        return view('admin.subfleets.fares', [
+            'subfleet'    => $subfleet,
+            'avail_fares' => $avail_fares,
+        ]);
+    }
+
+    /**
+     * @param Subfleet $subfleet
+     *
+     * @return mixed
+     */
+    protected function return_ranks_view(?Subfleet $subfleet)
+    {
+        $subfleet->refresh();
+        $avail_ranks = $this->getAvailRanks($subfleet);
+
+        return view('admin.subfleets.ranks', [
+            'subfleet'    => $subfleet,
+            'avail_ranks' => $avail_ranks,
+        ]);
+    }
+
+    /**
+     * @param Subfleet $subfleet
+     *
+     * @return mixed
+     */
+    protected function return_typeratings_view(?Subfleet $subfleet)
+    {
+        $subfleet->refresh();
+        $avail_ratings = $this->getAvailTypeRatings($subfleet);
+
+        return view('admin.subfleets.type_ratings', [
+            'subfleet'      => $subfleet,
+            'avail_ratings' => $avail_ratings,
+        ]);
+    }
+
     /**
      * Operations for associating ranks to the subfleet
      *
@@ -479,4 +482,79 @@ class SubfleetController extends Controller
 
         return $this->return_fares_view($subfleet);
     }
+
+    /**
+     * Operations for associating ranks to the subfleet
+     *
+     * @param         $id
+     * @param Request $request
+     *
+     * @return mixed
+     */
+    public function ranks($id, Request $request)
+    {
+        $subfleet = $this->subfleetRepo->findWithoutFail($id);
+        if (empty($subfleet)) {
+            return $this->return_ranks_view($subfleet);
+        }
+
+        if ($request->isMethod('get')) {
+            return $this->return_ranks_view($subfleet);
+        }
+
+        // associate rank with the subfleet
+        if ($request->isMethod('post')) {
+            $rank = $this->rankRepo->find($request->input('rank_id'));
+            $this->fleetSvc->addSubfleetToRank($subfleet, $rank);
+        } // override definitions
+        elseif ($request->isMethod('put')) {
+            $override = [];
+            $rank = $this->rankRepo->find($request->input('rank_id'));
+            $override[$request->name] = $request->value;
+
+            $this->fleetSvc->addSubfleetToRank($subfleet, $rank, $override);
+        } // dissassociate rank from the subfleet
+        elseif ($request->isMethod('delete')) {
+            $rank = $this->rankRepo->find($request->input('rank_id'));
+            $this->fleetSvc->removeSubfleetFromRank($subfleet, $rank);
+        }
+
+        $subfleet->save();
+
+        return $this->return_ranks_view($subfleet);
+    }
+
+    /**
+     * Operations for associating type ratings to the subfleet
+     *
+     * @param         $id
+     * @param Request $request
+     *
+     * @return mixed
+     */
+    public function typeratings($id, Request $request)
+    {
+        $subfleet = $this->subfleetRepo->findWithoutFail($id);
+        if (empty($subfleet)) {
+            return $this->return_typeratings_view($subfleet);
+        }
+
+        if ($request->isMethod('get')) {
+            return $this->return_typeratings_view($subfleet);
+        }
+
+        // associate subfleet with type rating
+        if ($request->isMethod('post')) {
+            $typerating = $this->typeratingRepo->find($request->input('typerating_id'));
+            $this->fleetSvc->addSubfleetToTypeRating($subfleet, $typerating);
+        } // dissassociate subfleet from the type rating
+        elseif ($request->isMethod('delete')) {
+            $typerating = $this->typeratingRepo->find($request->input('typerating_id'));
+            $this->fleetSvc->removeSubfleetFromTypeRating($subfleet, $typerating);
+        }
+
+        $subfleet->save();
+
+        return $this->return_typeratings_view($subfleet);
+    }
 }

app/Http/Controllers/Admin/TypeRatingController.php

@@ -0,0 +1,168 @@
+<?php
+
+namespace App\Http\Controllers\Admin;
+
+use App\Contracts\Controller;
+use App\Http\Requests\CreateTypeRatingRequest;
+use App\Http\Requests\UpdateTypeRatingRequest;
+use App\Repositories\SubfleetRepository;
+use App\Repositories\TypeRatingRepository;
+use App\Services\FleetService;
+use Cache;
+use Illuminate\Http\Request;
+use Laracasts\Flash\Flash;
+use Prettus\Repository\Criteria\RequestCriteria;
+
+class TypeRatingController extends Controller
+{
+    private $fleetSvc;
+    private $subfleetRepo;
+    private $typeratingRepo;
+
+    public function __construct(
+        FleetService $fleetSvc,
+        SubfleetRepository $subfleetRepo,
+        TypeRatingRepository $typeratingRepo
+    ) {
+        $this->fleetSvc = $fleetSvc;
+        $this->subfleetRepo = $subfleetRepo;
+        $this->typeratingRepo = $typeratingRepo;
+    }
+
+    public function index(Request $request)
+    {
+        $this->typeratingRepo->pushCriteria(new RequestCriteria($request));
+        $typeratings = $this->typeratingRepo->all();
+
+        return view('admin.typeratings.index', [
+            'typeratings' => $typeratings,
+        ]);
+    }
+
+    public function create()
+    {
+        return view('admin.typeratings.create');
+    }
+
+    public function store(CreateTypeRatingRequest $request)
+    {
+        $input = $request->all();
+
+        $model = $this->typeratingRepo->create($input);
+        Flash::success('Type Rating saved successfully.');
+        // Cache::forget(config('cache.keys.RANKS_PILOT_LIST.key'));
+
+        return redirect(route('admin.typeratings.edit', [$model->id]));
+    }
+
+    public function show($id)
+    {
+        $typerating = $this->typeratingRepo->findWithoutFail($id);
+
+        if (empty($typerating)) {
+            Flash::error('Type Rating not found');
+
+            return redirect(route('admin.typeratings.index'));
+        }
+
+        return view('admin.typeratings.show', [
+            'typerating' => $typerating,
+        ]);
+    }
+
+    public function edit($id)
+    {
+        $typerating = $this->typeratingRepo->findWithoutFail($id);
+
+        if (empty($typerating)) {
+            Flash::error('Type Rating not found');
+
+            return redirect(route('admin.typeratings.index'));
+        }
+
+        $avail_subfleets = $this->getAvailSubfleets($typerating);
+
+        return view('admin.typeratings.edit', [
+            'typerating'      => $typerating,
+            'avail_subfleets' => $avail_subfleets,
+        ]);
+    }
+
+    public function update($id, UpdateTypeRatingRequest $request)
+    {
+        $typerating = $this->typeratingRepo->findWithoutFail($id);
+
+        if (empty($typerating)) {
+            Flash::error('Type Rating not found');
+
+            return redirect(route('admin.typeratings.index'));
+        }
+
+        $typerating = $this->typeratingRepo->update($request->all(), $id);
+        // Cache::forget(config('cache.keys.RANKS_PILOT_LIST.key'));
+        Flash::success('Type Rating updated successfully.');
+
+        return redirect(route('admin.typeratings.index'));
+    }
+
+    public function destroy($id)
+    {
+        $typerating = $this->typeratingRepo->findWithoutFail($id);
+
+        if (empty($typerating)) {
+            Flash::error('Type Rating not found');
+
+            return redirect(route('admin.typeratings.index'));
+        }
+
+        $this->typeratingRepo->delete($id);
+
+        Flash::success('Type Rating deleted successfully.');
+
+        return redirect(route('admin.typeratings.index'));
+    }
+
+    protected function getAvailSubfleets($typerating)
+    {
+        $retval = [];
+        $all_subfleets = $this->subfleetRepo->all();
+        $avail_subfleets = $all_subfleets->except($typerating->subfleets->modelKeys());
+        foreach ($avail_subfleets as $subfleet) {
+            $retval[$subfleet->id] = $subfleet->name.' (Airline: '.$subfleet->airline->code.')';
+        }
+
+        return $retval;
+    }
+
+    protected function return_subfleet_view($typerating)
+    {
+        $avail_subfleets = $this->getAvailSubfleets($typerating);
+
+        return view('admin.typeratings.subfleets', [
+            'typerating'      => $typerating,
+            'avail_subfleets' => $avail_subfleets,
+        ]);
+    }
+
+    public function subfleets($id, Request $request)
+    {
+        $typerating = $this->typeratingRepo->findWithoutFail($id);
+        if (empty($typerating)) {
+            Flash::error('Type Rating not found!');
+            return redirect(route('admin.typeratings.index'));
+        }
+
+        // add subfleet to type rating
+        if ($request->isMethod('post')) {
+            $subfleet = $this->subfleetRepo->find($request->input('subfleet_id'));
+            $this->fleetSvc->addSubfleetToTypeRating($subfleet, $typerating);
+        }
+        // remove subfleet from type rating
+        elseif ($request->isMethod('delete')) {
+            $subfleet = $this->subfleetRepo->find($request->input('subfleet_id'));
+            $this->fleetSvc->removeSubfleetFromTypeRating($subfleet, $typerating);
+        }
+
+        return $this->return_subfleet_view($typerating);
+    }
+}

app/Http/Controllers/Admin/UserController.php

@@ -12,6 +12,7 @@ use App\Repositories\AirlineRepository;
 use App\Repositories\AirportRepository;
 use App\Repositories\PirepRepository;
 use App\Repositories\RoleRepository;
+use App\Repositories\TypeRatingRepository;
 use App\Repositories\UserRepository;
 use App\Services\UserService;
 use App\Support\Timezonelist;
@@ -30,24 +31,27 @@ class UserController extends Controller
     private $airportRepo;
     private $pirepRepo;
     private $roleRepo;
+    private $typeratingRepo;
     private $userRepo;
     private $userSvc;
 
     /**
      * UserController constructor.
      *
-     * @param AirlineRepository $airlineRepo
-     * @param AirportRepository $airportRepo
-     * @param PirepRepository   $pirepRepo
-     * @param RoleRepository    $roleRepo
-     * @param UserRepository    $userRepo
-     * @param UserService       $userSvc
+     * @param AirlineRepository    $airlineRepo
+     * @param AirportRepository    $airportRepo
+     * @param PirepRepository      $pirepRepo
+     * @param RoleRepository       $roleRepo
+     * @param TypeRatingRepository $typeratingRepo
+     * @param UserRepository       $userRepo
+     * @param UserService          $userSvc
      */
     public function __construct(
         AirlineRepository $airlineRepo,
         AirportRepository $airportRepo,
         PirepRepository $pirepRepo,
         RoleRepository $roleRepo,
+        TypeRatingRepository $typeratingRepo,
         UserRepository $userRepo,
         UserService $userSvc
     ) {
@@ -55,6 +59,7 @@ class UserController extends Controller
         $this->airportRepo = $airportRepo;
         $this->pirepRepo = $pirepRepo;
         $this->roleRepo = $roleRepo;
+        $this->typeratingRepo = $typeratingRepo;
         $this->userSvc = $userSvc;
         $this->userRepo = $userRepo;
     }
@@ -149,7 +154,7 @@ class UserController extends Controller
     public function edit($id)
     {
         $user = $this->userRepo
-            ->with(['awards', 'fields', 'rank'])
+            ->with(['awards', 'fields', 'rank', 'typeratings'])
             ->findWithoutFail($id);
 
         if (empty($user)) {
@@ -169,17 +174,19 @@ class UserController extends Controller
         $airlines = $this->airlineRepo->selectBoxList();
         $airports = $this->airportRepo->selectBoxList(false);
         $roles = $this->roleRepo->selectBoxList(false, true);
+        $avail_ratings = $this->getAvailTypeRatings($user);
 
         return view('admin.users.edit', [
-            'user'      => $user,
-            'pireps'    => $pireps,
-            'country'   => new ISO3166(),
-            'countries' => $countries,
-            'timezones' => Timezonelist::toArray(),
-            'airports'  => $airports,
-            'airlines'  => $airlines,
-            'ranks'     => Rank::all()->pluck('name', 'id'),
-            'roles'     => $roles,
+            'user'          => $user,
+            'pireps'        => $pireps,
+            'country'       => new ISO3166(),
+            'countries'     => $countries,
+            'timezones'     => Timezonelist::toArray(),
+            'airports'      => $airports,
+            'airlines'      => $airlines,
+            'ranks'         => Rank::all()->pluck('name', 'id'),
+            'roles'         => $roles,
+            'avail_ratings' => $avail_ratings,
         ]);
     }
 
@@ -260,6 +267,7 @@ class UserController extends Controller
         $user = $this->userRepo->findWithoutFail($id);
         if (empty($user)) {
             Flash::error('User not found');
+
             return redirect(route('admin.users.index'));
         }
 
@@ -283,6 +291,7 @@ class UserController extends Controller
         $userAward = UserAward::where(['user_id' => $id, 'award_id' => $award_id]);
         if (empty($userAward)) {
             Flash::error('The user award could not be found');
+
             return redirect()->back();
         }
 
@@ -311,4 +320,73 @@ class UserController extends Controller
 
         return redirect(route('admin.users.edit', [$id]));
     }
+
+    /**
+     * Get the type ratings that are available to the user
+     *
+     * @param $user
+     *
+     * @return array
+     */
+    protected function getAvailTypeRatings($user)
+    {
+        $retval = [];
+        $all_ratings = $this->typeratingRepo->all();
+        $avail_ratings = $all_ratings->except($user->typeratings->modelKeys());
+        foreach ($avail_ratings as $tr) {
+            $retval[$tr->id] = $tr->name.' ('.$tr->type.')';
+        }
+
+        return $retval;
+    }
+
+    /**
+     * @param User $user
+     *
+     * @return mixed
+     */
+    protected function return_typeratings_view(?User $user)
+    {
+        $user->refresh();
+
+        $avail_ratings = $this->getAvailTypeRatings($user);
+        return view('admin.users.type_ratings', [
+            'user'          => $user,
+            'avail_ratings' => $avail_ratings,
+        ]);
+    }
+
+    /**
+     * Operations for associating type ratings to the user
+     *
+     * @param         $id
+     * @param Request $request
+     *
+     * @return mixed
+     */
+    public function typeratings($id, Request $request)
+    {
+        $user = $this->userRepo->findWithoutFail($id);
+        if (empty($user)) {
+            return $this->return_typeratings_view($user);
+        }
+
+        if ($request->isMethod('get')) {
+            return $this->return_typeratings_view($user);
+        }
+
+        // associate user with type rating
+        if ($request->isMethod('post')) {
+            $typerating = $this->typeratingRepo->find($request->input('typerating_id'));
+            $this->userSvc->addUserToTypeRating($user, $typerating);
+        } // dissassociate user from the type rating
+        elseif ($request->isMethod('delete')) {
+            $typerating = $this->typeratingRepo->find($request->input('typerating_id'));
+            $this->userSvc->removeUserFromTypeRating($user, $typerating);
+        }
+
+        $user->save();
+
+        return $this->return_typeratings_view($user);
+    }
 }

app/Http/Controllers/Api/AcarsController.php

@@ -148,10 +148,10 @@ class AcarsController extends Controller
         $pirep = Pirep::find($id);
         $this->checkCancelled($pirep);
 
-        Log::debug(
+        /*Log::debug(
             'Posting ACARS update (user: '.Auth::user()->ident.', pirep id :'.$id.'): ',
             $request->post()
-        );
+        );*/
 
         $count = 0;
         $positions = $request->post('positions');
@@ -223,7 +223,7 @@ class AcarsController extends Controller
         $pirep = Pirep::find($id);
         $this->checkCancelled($pirep);
 
-        Log::debug('Posting ACARS log, PIREP: '.$id, $request->post());
+        // Log::debug('Posting ACARS log, PIREP: '.$id, $request->post());
 
         $count = 0;
         $logs = $request->post('logs');

app/Http/Controllers/Api/PirepController.php

@@ -25,6 +25,7 @@ use App\Models\Pirep;
 use App\Models\PirepComment;
 use App\Models\PirepFare;
 use App\Models\PirepFieldValue;
+use App\Models\User;
 use App\Repositories\JournalRepository;
 use App\Repositories\PirepRepository;
 use App\Services\Finance\PirepFinanceService;
@@ -235,8 +236,12 @@ class PirepController extends Controller
         Log::info('PIREP Update, user '.Auth::id());
         Log::info($request->getContent());
 
+        /** @var User $user */
         $user = Auth::user();
+
+        /** @var Pirep $pirep */
         $pirep = Pirep::find($pirep_id);
+
         $this->checkCancelled($pirep);
 
         $attrs = $this->parsePirep($request);
@@ -278,6 +283,7 @@ class PirepController extends Controller
     {
         Log::info('PIREP file, user '.Auth::id(), $request->post());
 
+        /** @var User $user */
         $user = Auth::user();
 
         // Check if the status is cancelled...
@@ -332,7 +338,7 @@ class PirepController extends Controller
      */
     public function cancel($pirep_id, Request $request)
     {
-        Log::info('PIREP Cancel, user '.Auth::id(), $request->post());
+        Log::info('PIREP '.$pirep_id.' Cancel, user '.Auth::id(), $request->post());
 
         $pirep = Pirep::find($pirep_id);
         $this->pirepSvc->cancel($pirep);

app/Http/Controllers/Auth/RegisterController.php

@@ -62,7 +62,7 @@ class RegisterController extends Controller
     {
         $airports = $this->airportRepo->selectBoxList(false, setting('pilots.home_hubs_only'));
         $airlines = $this->airlineRepo->selectBoxList();
-        $userFields = UserField::where(['show_on_registration' => true])->get();
+        $userFields = UserField::where(['show_on_registration' => true, 'active' => true])->get();
 
         return view('auth.register', [
             'airports'   => $airports,
@@ -138,7 +138,7 @@ class RegisterController extends Controller
 
         Log::info('User registered: ', $user->toArray());
 
-        $userFields = UserField::all();
+        $userFields = UserField::where(['show_on_registration' => true, 'active' => true])->get();
         foreach ($userFields as $field) {
             $field_name = 'field_'.$field->slug;
             UserFieldValue::updateOrCreate([

app/Http/Controllers/Frontend/PirepController.php

@@ -91,8 +91,12 @@ class PirepController extends Controller
      */
     public function aircraftList($add_blank = false)
     {
+        $user = Auth::user();
+        $user_loc = filled($user->curr_airport_id) ? $user->curr_airport_id : $user->home_airport_id;
+        $location_check = setting('pireps.only_aircraft_at_dpt_airport', false);
+
         $aircraft = [];
-        $subfleets = $this->userSvc->getAllowableSubfleets(Auth::user());
+        $subfleets = $this->userSvc->getAllowableSubfleets($user);
 
         if ($add_blank) {
             $aircraft[''] = '';
@@ -100,7 +104,9 @@ class PirepController extends Controller
 
         foreach ($subfleets as $subfleet) {
             $tmp = [];
-            foreach ($subfleet->aircraft as $ac) {
+            foreach ($subfleet->aircraft->when($location_check, function ($query) use ($user_loc) {
+                return $query->where('airport_id', $user_loc);
+            }) as $ac) {
                 $tmp[$ac->id] = $ac['name'].' - '.$ac['registration'];
             }
 

app/Http/Controllers/Frontend/ProfileController.php

@@ -80,7 +80,7 @@ class ProfileController extends Controller
     public function show($id)
     {
         /** @var \App\Models\User $user */
-        $with = ['airline', 'awards', 'current_airport', 'fields.field', 'home_airport', 'last_pirep', 'rank'];
+        $with = ['airline', 'awards', 'current_airport', 'fields.field', 'home_airport', 'last_pirep', 'rank', 'typeratings'];
         $user = User::with($with)->where('id', $id)->first();
 
         if (empty($user)) {

app/Http/Controllers/Frontend/SimBriefController.php

@@ -80,46 +80,39 @@ class SimBriefController
 
         // No aircraft selected, show selection form
         if (!$aircraft_id) {
-            // If no subfleets defined for flight get them from user
-            if ($flight->subfleets->count() > 0) {
-                $subfleets = $flight->subfleets;
-            } else {
-                $subfleets = $this->userSvc->getAllowableSubfleets($user);
-            }
 
-            // Build an array of subfleet id's from the subfleets collection
-            $sf_ids = $subfleets->map(function ($subfleets) {
-                return collect($subfleets->toArray())
-                  ->only(['id'])
-                  ->all();
-            });
+            // Get user's allowed subfleets and intersect it with flight subfleets
+            // so we will have a proper list which the user is allowed to fly
+            $user_subfleets = $this->userSvc->getAllowableSubfleets($user)->pluck('id')->toArray();
+            $flight_subfleets = $flight->subfleets->pluck('id')->toArray();
 
-            // Now we can build a proper aircrafts collection
-            // Contents will be either members of flight->subfleets
-            // or members of user's allowable subfleets
-            $aircrafts = Aircraft::whereIn('subfleet_id', $sf_ids)
-                                ->where('state', AircraftState::PARKED)
-                                ->where('status', AircraftStatus::ACTIVE)
-                                ->orderby('icao')
-                                ->orderby('registration')
-                                ->get();
+            $subfleet_ids = filled($flight_subfleets) ? array_intersect($user_subfleets, $flight_subfleets) : $user_subfleets;
+
+            // Prepare variables for single aircraft query
+            $where = [];
+            $where['state'] = AircraftState::PARKED;
+            $where['status'] = AircraftStatus::ACTIVE;
 
             if (setting('pireps.only_aircraft_at_dpt_airport')) {
-                $aircrafts = $aircrafts->where('airport_id', $flight->dpt_airport_id);
+                $where['airport_id'] = $flight->dpt_airport_id;
             }
 
-            if (setting('simbrief.block_aircraft')) {
-                // Build a list of aircraft_id's being used for active sb packs
-                $sb_aircraft = SimBrief::whereNotNull('flight_id')->pluck('aircraft_id');
+            $withCount = ['simbriefs' => function ($query) {
+                $query->whereNull('pirep_id');
+            }];
 
-                // Filter aircraft list to non used/blocked ones
-                $aircrafts = $aircrafts->whereNotIn('id', $sb_aircraft);
-            }
+            // Build proper aircraft collection considering all possible settings
+            // Flight subfleets, user subfleet restrictions, pirep restrictions, simbrief blocking etc
+            $aircraft = Aircraft::withCount($withCount)->where($where)
+                ->when(setting('simbrief.block_aircraft'), function ($query) {
+                    return $query->having('simbriefs_count', 0);
+                })->whereIn('subfleet_id', $subfleet_ids)
+                ->orderby('icao')->orderby('registration')
+                ->get();
 
             return view('flights.simbrief_aircraft', [
                 'flight'    => $flight,
-                'aircrafts' => $aircrafts,
-                'subfleets' => $subfleets,
+                'aircrafts' => $aircraft,
             ]);
         }
 

app/Http/Requests/CreateTypeRatingRequest.php

@@ -0,0 +1,19 @@
+<?php
+
+namespace App\Http\Requests;
+
+use App\Contracts\FormRequest;
+use App\Models\Typerating;
+
+class CreateTypeRatingRequest extends FormRequest
+{
+    /**
+     * Get the validation rules that apply to the request.
+     *
+     * @return array
+     */
+    public function rules(): array
+    {
+        return Typerating::$rules;
+    }
+}

app/Http/Requests/UpdateTypeRatingRequest.php

@@ -0,0 +1,19 @@
+<?php
+
+namespace App\Http\Requests;
+
+use App\Contracts\FormRequest;
+use App\Models\Typerating;
+
+class UpdateTypeRatingRequest extends FormRequest
+{
+    /**
+     * Get the validation rules that apply to the request.
+     *
+     * @return array
+     */
+    public function rules(): array
+    {
+        return Typerating::$rules;
+    }
+}

app/Listeners/AwardHandler.php

@@ -60,7 +60,7 @@ class AwardHandler extends Listener
      */
     public function checkForAwards($user)
     {
-        $awards = Award::all();
+        $awards = Award::where('active', 1)->get();
         foreach ($awards as $award) {
             $klass = $award->getReference($award, $user);
             if ($klass) {

app/Models/Aircraft.php

@@ -13,6 +13,7 @@ use Znck\Eloquent\Traits\BelongsToThrough;
  * @property int      id
  * @property mixed    subfleet_id
  * @property string   airport_id   The apt where the aircraft is
+ * @property string   hub_id       The apt where the aircraft is based
  * @property string   ident
  * @property string   name
  * @property string   icao
@@ -22,6 +23,7 @@ use Znck\Eloquent\Traits\BelongsToThrough;
  * @property float    zfw
  * @property string   hex_code
  * @property Airport  airport
+ * @property Airport  hub
  * @property Subfleet subfleet
  * @property int      status
  * @property int      state
@@ -39,6 +41,7 @@ class Aircraft extends Model
     protected $fillable = [
         'subfleet_id',
         'airport_id',
+        'hub_id',
         'iata',
         'icao',
         'name',
@@ -127,6 +130,11 @@ class Aircraft extends Model
         return $this->belongsTo(Airport::class, 'airport_id');
     }
 
+    public function hub()
+    {
+        return $this->hasOne(Airport::class, 'id', 'hub_id');
+    }
+
     public function pireps()
     {
         return $this->hasMany(Pirep::class, 'aircraft_id');

app/Models/Award.php

@@ -21,6 +21,7 @@ class Award extends Model
         'image_url',
         'ref_model',
         'ref_model_params',
+        'active',
     ];
 
     public static $rules = [
@@ -29,6 +30,7 @@ class Award extends Model
         'image_url'        => 'nullable',
         'ref_model'        => 'required',
         'ref_model_params' => 'nullable',
+        'active'           => 'nullable',
     ];
 
     /**

app/Models/Subfleet.php

@@ -107,4 +107,9 @@ class Subfleet extends Model
         return $this->belongsToMany(Rank::class, 'subfleet_rank')
             ->withPivot('acars_pay', 'manual_pay');
     }
+
+    public function typeratings()
+    {
+        return $this->belongsToMany(Typerating::class, 'typerating_subfleet', 'subfleet_id', 'typerating_id');
+    }
 }

app/Models/Typerating.php

@@ -0,0 +1,37 @@
+<?php
+
+namespace App\Models;
+
+use App\Contracts\Model;
+
+class Typerating extends Model
+{
+    public $table = 'typeratings';
+
+    protected $fillable = [
+        'name',
+        'type',
+        'description',
+        'image_url',
+        'active',
+    ];
+
+    // Validation
+    public static $rules = [
+        'name'        => 'required',
+        'type'        => 'required',
+        'description' => 'nullable',
+        'image_url'   => 'nullable',
+    ];
+
+    // Relationships
+    public function subfleets()
+    {
+        return $this->belongsToMany(Subfleet::class, 'typerating_subfleet', 'typerating_id', 'subfleet_id');
+    }
+
+    public function users()
+    {
+        return $this->belongsToMany(User::class, 'typerating_user', 'typerating_id', 'user_id');
+    }
+}

app/Models/User.php

@@ -7,6 +7,7 @@ use App\Models\Traits\JournalTrait;
 use Illuminate\Foundation\Auth\User as Authenticatable;
 use Illuminate\Notifications\Notifiable;
 use Laratrust\Traits\LaratrustUserTrait;
+use Staudenmeir\EloquentHasManyDeep\HasRelationships;
 
 /**
  * @property int              id
@@ -42,6 +43,7 @@ use Laratrust\Traits\LaratrustUserTrait;
  * @property UserFieldValue[] fields
  * @property Role[]           roles
  * @property Subfleet[]       subfleets
+ * @property TypeRating[]     typeratings
  *
  * @mixin \Illuminate\Database\Eloquent\Builder
  * @mixin \Illuminate\Notifications\Notifiable
@@ -52,6 +54,7 @@ class User extends Authenticatable
     use JournalTrait;
     use LaratrustUserTrait;
     use Notifiable;
+    use HasRelationships;
 
     public $table = 'users';
 
@@ -191,8 +194,7 @@ class User extends Authenticatable
     {
         $default = config('gravatar.default');
 
-        $uri = config('gravatar.url')
-            .md5(strtolower(trim($this->email))).'?d='.urlencode($default);
+        $uri = config('gravatar.url').md5(strtolower(trim($this->email))).'?d='.urlencode($default);
 
         if ($size !== null) {
             $uri .= '&s='.$size;
@@ -265,4 +267,14 @@ class User extends Authenticatable
     {
         return $this->belongsTo(Rank::class, 'rank_id');
     }
+
+    public function typeratings()
+    {
+        return $this->belongsToMany(Typerating::class, 'typerating_user', 'user_id', 'typerating_id');
+    }
+
+    public function rated_subfleets()
+    {
+        return $this->hasManyDeep(Subfleet::class, ['typerating_user', Typerating::class, 'typerating_subfleet']);
+    }
 }

app/Providers/RouteServiceProvider.php

@@ -376,6 +376,21 @@ class RouteServiceProvider extends ServiceProvider
             ], 'settings', 'SettingsController@update')
                 ->name('settings.update')->middleware('ability:admin,settings');
 
+            // Type Ratings
+            Route::resource('typeratings', 'TypeRatingController')->middleware('ability:admin,typeratings');
+            Route::match([
+                'get',
+                'post',
+                'put',
+                'delete',
+            ], 'typeratings/{id}/subfleets', 'TypeRatingController@subfleets')->middleware('ability:admin,typeratings');
+            Route::match([
+                'get',
+                'post',
+                'put',
+                'delete',
+            ], 'typeratings/{id}/users', 'TypeRatingController@users')->middleware('ability:admin,typeratings');
+
             // maintenance
             Route::match(['get'], 'maintenance', 'MaintenanceController@index')
                 ->name('maintenance.index')->middleware('ability:admin,maintenance');
@@ -426,6 +441,13 @@ class RouteServiceProvider extends ServiceProvider
                 'delete',
             ], 'subfleets/{id}/ranks', 'SubfleetController@ranks')->middleware('ability:admin,fleet');
 
+            Route::match([
+                'get',
+                'post',
+                'put',
+                'delete',
+            ], 'subfleets/{id}/typeratings', 'SubfleetController@typeratings')->middleware('ability:admin,fleet');
+
             Route::resource('subfleets', 'SubfleetController')->middleware('ability:admin,fleet');
 
             /**
@@ -439,6 +461,13 @@ class RouteServiceProvider extends ServiceProvider
 
             Route::resource('users', 'UserController')->middleware('ability:admin,users');
 
+            Route::match([
+                'get',
+                'post',
+                'put',
+                'delete',
+            ], 'users/{id}/typeratings', 'UserController@typeratings')->middleware('ability:admin,users');
+
             // defaults
             Route::get('', ['uses' => 'DashboardController@index'])
                 ->middleware('update_pending', 'ability:admin,admin-access');

app/Repositories/TypeRatingRepository.php

@@ -0,0 +1,43 @@
+<?php
+
+namespace App\Repositories;
+
+use App\Contracts\Repository;
+use App\Models\Typerating;
+use Prettus\Repository\Contracts\CacheableInterface;
+use Prettus\Repository\Traits\CacheableRepository;
+
+class TypeRatingRepository extends Repository implements CacheableInterface
+{
+    use CacheableRepository;
+
+    protected $fieldSearchable = [
+        'name' => 'like',
+        'type' => 'like',
+    ];
+
+    public function model()
+    {
+        return Typerating::class;
+    }
+
+    public function selectBoxList($add_blank = false, $only_active = true): array
+    {
+        $retval = [];
+        $where = [
+            'active' => $only_active,
+        ];
+
+        $items = $this->findWhere($where);
+
+        if ($add_blank) {
+            $retval[''] = '';
+        }
+
+        foreach ($items as $i) {
+            $retval[$i->id] = $i->name;
+        }
+
+        return $retval;
+    }
+}

app/Services/FleetService.php

@@ -6,6 +6,7 @@ use App\Contracts\Service;
 use App\Models\Flight;
 use App\Models\Rank;
 use App\Models\Subfleet;
+use App\Models\Typerating;
 
 class FleetService extends Service
 {
@@ -33,7 +34,36 @@ class FleetService extends Service
     public function removeSubfleetFromRank(Subfleet $subfleet, Rank $rank)
     {
         $subfleet->ranks()->detach($rank->id);
+        $subfleet->save();
+        $subfleet->refresh();
 
+        return $subfleet;
+    }
+
+    /**
+     * Add the subfleet to a type rating
+     *
+     * @param Subfleet   $subfleet
+     * @param Typerating $typerating
+     */
+    public function addSubfleetToTypeRating(Subfleet $subfleet, Typerating $typerating)
+    {
+        $subfleet->typeratings()->syncWithoutDetaching([$typerating->id]);
+        $subfleet->save();
+        $subfleet->refresh();
+
+        return $subfleet;
+    }
+
+    /**
+     * Remove the subfleet from a type rating
+     *
+     * @param Subfleet   $subfleet
+     * @param Typerating $typerating
+     */
+    public function removeSubfleetFromTypeRating(Subfleet $subfleet, Typerating $typerating)
+    {
+        $subfleet->typeratings()->detach($typerating->id);
         $subfleet->save();
         $subfleet->refresh();
 

app/Services/ImportExport/AircraftImporter.php

@@ -25,6 +25,7 @@ class AircraftImporter extends ImportExport
         'subfleet'     => 'required',
         'iata'         => 'nullable',
         'icao'         => 'nullable',
+        'hub_id'       => 'nullable',
         'airport_id'   => 'nullable',
         'name'         => 'required',
         'registration' => 'required',
@@ -53,7 +54,7 @@ class AircraftImporter extends ImportExport
     }
 
     /**
-     * Import a flight, parse out the different rows
+     * Import an aircraft, parse out the different rows
      *
      * @param array $row
      * @param int   $index

app/Services/ImportExport/FlightImporter.php

@@ -253,8 +253,9 @@ class FlightImporter extends ImportExport
                 $fare_attributes = [];
             }
 
-            $fare = Fare::updateOrCreate(['code' => $fare_code], ['name' => $fare_code]);
+            $fare = Fare::firstOrCreate(['code' => $fare_code], ['name' => $fare_code]);
             $this->fareSvc->setForFlight($flight, $fare, $fare_attributes);
+            $fare->save();
         }
     }
 

app/Services/ImportExport/SubfleetImporter.php

@@ -84,8 +84,9 @@ class SubfleetImporter extends ImportExport
                 $fare_attributes = [];
             }
 
-            $fare = Fare::updateOrCreate(['code' => $fare_code], ['name' => $fare_code]);
+            $fare = Fare::firstOrCreate(['code' => $fare_code], ['name' => $fare_code]);
             $this->fareSvc->setForSubfleet($subfleet, $fare, $fare_attributes);
+            $fare->save();
         }
     }
 }

app/Services/UserService.php

@@ -15,6 +15,7 @@ use App\Models\Enums\UserState;
 use App\Models\Pirep;
 use App\Models\Rank;
 use App\Models\Role;
+use App\Models\Typerating;
 use App\Models\User;
 use App\Models\UserFieldValue;
 use App\Repositories\AircraftRepository;
@@ -343,7 +344,7 @@ class UserService extends Service
 
     /**
      * Return the subfleets this user is allowed access to,
-     * based on their current rank
+     * based on their current Rank and/or by Type Rating
      *
      * @param $user
      *
@@ -351,14 +352,31 @@ class UserService extends Service
      */
     public function getAllowableSubfleets($user)
     {
-        if ($user === null || setting('pireps.restrict_aircraft_to_rank') === false) {
-            /** @var Collection $subfleets */
-            $subfleets = $this->subfleetRepo->with('aircraft')->all();
+        $restrict_rank = setting('pireps.restrict_aircraft_to_rank', true);
+        $restrict_type = setting('pireps.restrict_aircraft_to_typerating', false);
+        $restricted_to = [];
+
+        if ($user) {
+            $rank_sf_array = $restrict_rank ? $user->rank->subfleets()->pluck('id')->toArray() : [];
+            $type_sf_array = $restrict_type ? $user->rated_subfleets->pluck('id')->toArray() : [];
+
+            if ($restrict_rank && !$restrict_type) {
+                $restricted_to = $rank_sf_array;
+            } elseif (!$restrict_rank && $restrict_type) {
+                $restricted_to = $type_sf_array;
+            } elseif ($restrict_rank && $restrict_type) {
+                $restricted_to = array_intersect($rank_sf_array, $type_sf_array);
+            }
         } else {
-            /** @var Collection $subfleets */
-            $subfleets = $user->rank->subfleets()->with('aircraft')->get();
+            $restrict_rank = false;
+            $restrict_type = false;
         }
 
+        // @var Collection $subfleets
+        $subfleets = $this->subfleetRepo->when(($restrict_rank || $restrict_type), function ($query) use ($restricted_to) {
+            return $query->whereIn('id', $restricted_to);
+        })->with('aircraft')->get();
+
         // Map the subfleets with the proper fare information
         return $subfleets->transform(function ($sf, $key) {
             $sf->fares = $this->fareSvc->getForSubfleet($sf);
@@ -398,9 +416,7 @@ class UserService extends Service
             return $user;
         }
 
-        Log::info('User '.$user->ident.' state changing from '
-            .UserState::label($old_state).' to '
-            .UserState::label($user->state));
+        Log::info('User '.$user->ident.' state changing from '.UserState::label($old_state).' to '.UserState::label($user->state));
 
         event(new UserStateChanged($user, $old_state));
 
@@ -561,11 +577,39 @@ class UserService extends Service
         // Recalc the rank
         $this->calculatePilotRank($user);
 
-        Log::info('User '.$user->ident.' updated; pirep count='.$pirep_count
-            .', rank='.$user->rank->name
-            .', flight_time='.$user->flight_time.' minutes');
+        Log::info('User '.$user->ident.' updated; pirep count='.$pirep_count.', rank='.$user->rank->name.', flight_time='.$user->flight_time.' minutes');
 
         $user->save();
         return $user;
     }
+
+    /**
+     * Attach a type rating to the user
+     *
+     * @param User       $user
+     * @param Typerating $typerating
+     */
+    public function addUserToTypeRating(User $user, Typerating $typerating)
+    {
+        $user->typeratings()->syncWithoutDetaching([$typerating->id]);
+        $user->save();
+        $user->refresh();
+
+        return $user;
+    }
+
+    /**
+     * Detach a type rating from the user
+     *
+     * @param User       $user
+     * @param Typerating $typerating
+     */
+    public function removeUserFromTypeRating(User $user, Typerating $typerating)
+    {
+        $user->typeratings()->detach($typerating->id);
+        $user->save();
+        $user->refresh();
+
+        return $user;
+    }
 }

bootstrap/application.php

@@ -39,7 +39,7 @@ class application extends Illuminate\Foundation\Application
         $bootstrappers = array_replace(
             $bootstrappers,
             array_fill_keys(
-                array_keys($bootstrappers, $find),
+                array_keys($bootstrappers, $find, true),
                 $replace
             )
         );

composer.json

@@ -20,7 +20,12 @@
         "symfony/polyfill-mbstring": "*",
         "symfony/polyfill-php74": "*",
         "symfony/polyfill-php80": "*",
-        "composer/composer": "~1.0",
+        "symfony/polyfill-php81": "*",
+        "symfony/event-dispatcher-contracts": "^2",
+        "symfony/property-info": "^5.4",
+        "symfony/string": "^5.4",
+        "psr/container": "1.1.1",
+        "composer/composer": "~2.0",
         "composer/installers": "~1.0",
         "laravel/framework": "~8.0",
         "anhskohbo/no-captcha": "^3.0",
@@ -42,7 +47,7 @@
         "laravelcollective/html": "~6.2.0",
         "jeremykendall/php-domain-parser": "~5.7.2",
         "league/commonmark": "~1.6",
-        "league/csv": "9.2.*",
+        "league/csv": "9.7.*",
         "league/geotools": "0.8.*",
         "league/iso3166": "^3.0.0",
         "markrogoyski/math-php": "^1.10",
@@ -70,14 +75,15 @@
         "queueworker/sansdaemon": "^1.2",
         "jpkleemans/attribute-events": "^1.1",
         "akaunting/laravel-money": "^1.2",
-        "staudenmeir/belongs-to-through": "^2.5"
+        "staudenmeir/belongs-to-through": "^2.5",
+        "staudenmeir/eloquent-has-many-deep": "1.14.3"
     },
     "require-dev": {
         "barryvdh/laravel-debugbar": "^3.5",
-        "barryvdh/laravel-ide-helper": "^2.9",
+        "barryvdh/laravel-ide-helper": "^2.10",
         "bpocallaghan/generators": "~7.0",
         "filp/whoops": "~2.0",
-        "friendsofphp/php-cs-fixer": "^2.16",
+        "friendsofphp/php-cs-fixer": "^3.3",
         "mockery/mockery": "^1.4.0",
         "nunomaduro/collision": "^5.3.0",
         "phpunit/phpunit": "~9.0",
@@ -105,7 +111,10 @@
          "installer-paths": {
              "modules/{$name}/": ["type:phpvms-module"]
          },
-         "module-dir": "modules"
+         "module-dir": "modules",
+         "symfony": {
+            "require": "^5.4"
+         }
     },
     "scripts": {
         "pre-package-uninstall": [

docker-compose.yml

@@ -2,7 +2,7 @@
 version: '3'
 services:
   app:
-    image: phpvms:latest
+    image: nabeelio/phpvms
     environment:
       DB_HOST: mysql
       REDIS_HOST: redis

package-lock.json

@@ -1,5 +1,5 @@
 {
-  "name": "phpvms",
+  "name": "npm-proj-1642020849949-0.24469316069542746I53GPG",
   "lockfileVersion": 2,
   "requires": true,
   "packages": {
@@ -22,7 +22,7 @@
         "jquery": "^3.5.1",
         "jquery-pjax": "~2.0",
         "js-yaml": "^3.14.0",
-        "laravel-mix": "^6.0.25",
+        "laravel-mix": "^6.0.30",
         "leaflet": "^1.3.4",
         "leaflet-ajax": "2.1.0",
         "leaflet-providers": "1.0.*",
@@ -1752,9 +1752,9 @@
       }
     },
     "node_modules/@types/http-proxy": {
-      "version": "1.17.7",
-      "resolved": "https://registry.npmjs.org/@types/http-proxy/-/http-proxy-1.17.7.tgz",
-      "integrity": "sha512-9hdj6iXH64tHSLTY+Vt2eYOGzSogC+JQ2H7bdPWkuh7KXP5qLllWx++t+K9Wk556c3dkDdPws/SpMRi0sdCT1w==",
+      "version": "1.17.8",
+      "resolved": "https://registry.npmjs.org/@types/http-proxy/-/http-proxy-1.17.8.tgz",
+      "integrity": "sha512-5kPLG5BKpWYkw/LVOGWpiq3nEVqxiN32rTgI53Sk12/xHFQ2rG3ehI9IO+O3W2QoKeyB92dJkoka8SUm6BX1pA==",
       "dependencies": {
         "@types/node": "*"
       }
@@ -1801,9 +1801,9 @@
       }
     },
     "node_modules/@types/json-schema": {
-      "version": "7.0.8",
-      "resolved": "https://registry.npmjs.org/@types/json-schema/-/json-schema-7.0.8.tgz",
-      "integrity": "sha512-YSBPTLTVm2e2OoQIDYx8HaeWJ5tTToLH67kXR7zYNGupXMEHa2++G8k+DczX2cFVgalypqtyZIcU19AFcmOpmg=="
+      "version": "7.0.9",
+      "resolved": "https://registry.npmjs.org/@types/json-schema/-/json-schema-7.0.9.tgz",
+      "integrity": "sha512-qcUXuemtEu+E5wZSJHNxUXeCZhAfXKQ41D+duX+VYPde7xyEVZci+/oXKJL13tnRs9lR2pr4fod59GT6/X1/yQ=="
     },
     "node_modules/@types/minimatch": {
       "version": "3.0.5",
@@ -2039,6 +2039,42 @@
         "url": "https://github.com/sponsors/epoberezkin"
       }
     },
+    "node_modules/ajv-formats": {
+      "version": "2.1.1",
+      "resolved": "https://registry.npmjs.org/ajv-formats/-/ajv-formats-2.1.1.tgz",
+      "integrity": "sha512-Wx0Kx52hxE7C18hkMEggYlEifqWZtYaRgouJor+WMdPnQyEK13vgEWyVNup7SoeeoLMsr4kf5h6dOW11I15MUA==",
+      "dependencies": {
+        "ajv": "^8.0.0"
+      },
+      "peerDependencies": {
+        "ajv": "^8.0.0"
+      },
+      "peerDependenciesMeta": {
+        "ajv": {
+          "optional": true
+        }
+      }
+    },
+    "node_modules/ajv-formats/node_modules/ajv": {
+      "version": "8.8.2",
+      "resolved": "https://registry.npmjs.org/ajv/-/ajv-8.8.2.tgz",
+      "integrity": "sha512-x9VuX+R/jcFj1DHo/fCp99esgGDWiHENrKxaCENuCxpoMCmAt/COCGVDwA7kleEpEzJjDnvh3yGoOuLu0Dtllw==",
+      "dependencies": {
+        "fast-deep-equal": "^3.1.1",
+        "json-schema-traverse": "^1.0.0",
+        "require-from-string": "^2.0.2",
+        "uri-js": "^4.2.2"
+      },
+      "funding": {
+        "type": "github",
+        "url": "https://github.com/sponsors/epoberezkin"
+      }
+    },
+    "node_modules/ajv-formats/node_modules/json-schema-traverse": {
+      "version": "1.0.0",
+      "resolved": "https://registry.npmjs.org/json-schema-traverse/-/json-schema-traverse-1.0.0.tgz",
+      "integrity": "sha512-NM8/P9n3XjXhIZn1lLhkFaACTOURQXjWhV4BA/RnOv8xvgqtqpAX9IO4mRQxSx1Rlo4tqzeqb0sOlruaOy3dug=="
+    },
     "node_modules/ajv-keywords": {
       "version": "3.5.2",
       "resolved": "https://registry.npmjs.org/ajv-keywords/-/ajv-keywords-3.5.2.tgz",
@@ -2082,10 +2118,10 @@
         "url": "https://github.com/sponsors/sindresorhus"
       }
     },
-    "node_modules/ansi-html": {
-      "version": "0.0.7",
-      "resolved": "https://registry.npmjs.org/ansi-html/-/ansi-html-0.0.7.tgz",
-      "integrity": "sha1-gTWEAhliqenm/QOflA0S9WynhZ4=",
+    "node_modules/ansi-html-community": {
+      "version": "0.0.8",
+      "resolved": "https://registry.npmjs.org/ansi-html-community/-/ansi-html-community-0.0.8.tgz",
+      "integrity": "sha512-1APHAyr3+PCamwNw3bXCPp4HFLONZt/yIH0sZp0/469KWNTEy+qN5jQ3GVX6DMZ1UXAi34yVwtTeaG/HpBuuzw==",
       "engines": [
         "node >= 0.8.0"
       ],
@@ -4009,6 +4045,14 @@
         "node": ">= 10"
       }
     },
+    "node_modules/define-lazy-prop": {
+      "version": "2.0.0",
+      "resolved": "https://registry.npmjs.org/define-lazy-prop/-/define-lazy-prop-2.0.0.tgz",
+      "integrity": "sha512-Ds09qNh8yw3khSjiJjiUInaGX9xlqZDY7JVryGxdxV7NPeuqQfplOpQ66yJFZut3jLa5zOwkXw1g9EI2uKh4Og==",
+      "engines": {
+        "node": ">=8"
+      }
+    },
     "node_modules/define-properties": {
       "version": "1.1.3",
       "resolved": "https://registry.npmjs.org/define-properties/-/define-properties-1.1.3.tgz",
@@ -6168,6 +6212,20 @@
         "url": "https://github.com/sponsors/ljharb"
       }
     },
+    "node_modules/has-tostringtag": {
+      "version": "1.0.0",
+      "resolved": "https://registry.npmjs.org/has-tostringtag/-/has-tostringtag-1.0.0.tgz",
+      "integrity": "sha512-kFjcSNhnlGV1kyoGk7OXKSawH5JOb/LzUc5w9B02hOTO0dfFRjbHQKvg1d6cf3HbeUmtU9VbbV3qzZ2Teh97WQ==",
+      "dependencies": {
+        "has-symbols": "^1.0.2"
+      },
+      "engines": {
+        "node": ">= 0.4"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/ljharb"
+      }
+    },
     "node_modules/has-value": {
       "version": "1.0.0",
       "resolved": "https://registry.npmjs.org/has-value/-/has-value-1.0.0.tgz",
@@ -7162,11 +7220,12 @@
       }
     },
     "node_modules/is-arguments": {
-      "version": "1.1.0",
-      "resolved": "https://registry.npmjs.org/is-arguments/-/is-arguments-1.1.0.tgz",
-      "integrity": "sha512-1Ij4lOMPl/xB5kBDn7I+b2ttPMKa8szhEIrXDuXQD/oe3HJLTLhqhgGspwgyGd6MOywBUqVvYicF72lkgDnIHg==",
+      "version": "1.1.1",
+      "resolved": "https://registry.npmjs.org/is-arguments/-/is-arguments-1.1.1.tgz",
+      "integrity": "sha512-8Q7EARjzEnKpt/PCD7e1cgUS0a6X8u5tdSiMqXhojOdoV9TsMsiO+9VLC5vAmO8N7/GmXn7yjR8qnA6bVAEzfA==",
       "dependencies": {
-        "call-bind": "^1.0.0"
+        "call-bind": "^1.0.2",
+        "has-tostringtag": "^1.0.0"
       },
       "engines": {
         "node": ">= 0.4"
@@ -7738,11 +7797,6 @@
         "node": ">=8"
       }
     },
-    "node_modules/killable": {
-      "version": "1.0.1",
-      "resolved": "https://registry.npmjs.org/killable/-/killable-1.0.1.tgz",
-      "integrity": "sha512-LzqtLKlUwirEUyl/nicirVmNiPvYs7l5n8wOPP7fyJVpUPkvCnW/vuiXGpylGUlnPDnB7311rARzAt3Mhswpjg=="
-    },
     "node_modules/kind-of": {
       "version": "3.2.2",
       "resolved": "https://registry.npmjs.org/kind-of/-/kind-of-3.2.2.tgz",
@@ -7778,9 +7832,9 @@
       }
     },
     "node_modules/laravel-mix": {
-      "version": "6.0.25",
-      "resolved": "https://registry.npmjs.org/laravel-mix/-/laravel-mix-6.0.25.tgz",
-      "integrity": "sha512-SDpLGUnXJ8g0rvtiLljSTJSR6awj86M2Jd3MhbtT32TCgwXdtajVLF7Mv2blsPLixGHtynwZgi+UFlYQbquPLg==",
+      "version": "6.0.30",
+      "resolved": "https://registry.npmjs.org/laravel-mix/-/laravel-mix-6.0.30.tgz",
+      "integrity": "sha512-Y5EjdPVEqVMgnglzJvDuDEpUa2EouutS4ySrukZkBWh2EPPYM1iszu8TItvQ2J08N5BPIrYWh8McUbTwq6tcrQ==",
       "dependencies": {
         "@babel/core": "^7.14.5",
         "@babel/plugin-proposal-object-rest-spread": "^7.14.5",
@@ -7827,7 +7881,7 @@
         "vue-style-loader": "^4.1.3",
         "webpack": "^5.38.1",
         "webpack-cli": "^4.7.2",
-        "webpack-dev-server": "4.0.0-beta.3",
+        "webpack-dev-server": "4.1.1",
         "webpack-merge": "^5.8.0",
         "webpack-notifier": "^1.13.0",
         "webpackbar": "^5.0.0-3",
@@ -7878,9 +7932,9 @@
       }
     },
     "node_modules/laravel-mix/node_modules/ansi-regex": {
-      "version": "5.0.0",
-      "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-5.0.0.tgz",
-      "integrity": "sha512-bY6fj56OUQ0hU1KjFNDQuJFezqKdrAyFdIevADiqrWHwSlbmBNMHp5ak2f40Pm8JTFyM2mqxkG6ngkHO11f/lg==",
+      "version": "5.0.1",
+      "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-5.0.1.tgz",
+      "integrity": "sha512-quJQXlTSUGL2LH9SUXo8VwsY4soanhgo6LNSm84E1LBcE8s3O0wpdiRzyR9z/ZZJMlMWv37qOOb9pdJlMUEKFQ==",
       "engines": {
         "node": ">=8"
       }
@@ -7981,9 +8035,9 @@
       }
     },
     "node_modules/laravel-mix/node_modules/http-proxy-middleware": {
-      "version": "1.3.1",
-      "resolved": "https://registry.npmjs.org/http-proxy-middleware/-/http-proxy-middleware-1.3.1.tgz",
-      "integrity": "sha512-13eVVDYS4z79w7f1+NPllJtOQFx/FdUW4btIvVRMaRlUY9VGstAbo5MOhLEuUgZFRHn3x50ufn25zkj/boZnEg==",
+      "version": "2.0.1",
+      "resolved": "https://registry.npmjs.org/http-proxy-middleware/-/http-proxy-middleware-2.0.1.tgz",
+      "integrity": "sha512-cfaXRVoZxSed/BmkA7SwBVNI9Kj7HFltaE5rqYOub5kWzWZ+gofV2koVN1j2rMW7pEfSSlCHGJ31xmuyFyfLOg==",
       "dependencies": {
         "@types/http-proxy": "^1.17.5",
         "http-proxy": "^1.18.1",
@@ -7992,7 +8046,7 @@
         "micromatch": "^4.0.2"
       },
       "engines": {
-        "node": ">=8.0.0"
+        "node": ">=12.0.0"
       }
     },
     "node_modules/laravel-mix/node_modules/import-local": {
@@ -8058,15 +8112,16 @@
       }
     },
     "node_modules/laravel-mix/node_modules/open": {
-      "version": "7.4.2",
-      "resolved": "https://registry.npmjs.org/open/-/open-7.4.2.tgz",
-      "integrity": "sha512-MVHddDVweXZF3awtlAS+6pgKLlm/JgxZ90+/NBurBoQctVOOB/zDdVjcyPzQ+0laDGbsWgrRkflI65sQeOgT9Q==",
+      "version": "8.4.0",
+      "resolved": "https://registry.npmjs.org/open/-/open-8.4.0.tgz",
+      "integrity": "sha512-XgFPPM+B28FtCCgSb9I+s9szOC1vZRSwgWsRUA5ylIxRTgKozqjOCrVOqGsYABPYK5qnfqClxZTFBa8PKt2v6Q==",
       "dependencies": {
-        "is-docker": "^2.0.0",
-        "is-wsl": "^2.1.1"
+        "define-lazy-prop": "^2.0.0",
+        "is-docker": "^2.1.1",
+        "is-wsl": "^2.2.0"
       },
       "engines": {
-        "node": ">=8"
+        "node": ">=12"
       },
       "funding": {
         "url": "https://github.com/sponsors/sindresorhus"
@@ -8175,11 +8230,11 @@
       }
     },
     "node_modules/laravel-mix/node_modules/strip-ansi": {
-      "version": "6.0.0",
-      "resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-6.0.0.tgz",
-      "integrity": "sha512-AuvKTrTfQNYNIctbR1K/YGTR1756GycPsg7b9bdV9Duqur4gv6aKqHXah67Z8ImS7WEz5QVcOtlfW2rZEugt6w==",
+      "version": "6.0.1",
+      "resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-6.0.1.tgz",
+      "integrity": "sha512-Y38VPSHcqkFrCpFnQ9vuSXmquuv5oXOKpGeT6aGrr3o3Gc9AlVa6JBfUSOCnbxGGZF+/0ooI7KrPuUSztUdU5A==",
       "dependencies": {
-        "ansi-regex": "^5.0.0"
+        "ansi-regex": "^5.0.1"
       },
       "engines": {
         "node": ">=8"
@@ -8251,37 +8306,35 @@
       }
     },
     "node_modules/laravel-mix/node_modules/webpack-dev-server": {
-      "version": "4.0.0-beta.3",
-      "resolved": "https://registry.npmjs.org/webpack-dev-server/-/webpack-dev-server-4.0.0-beta.3.tgz",
-      "integrity": "sha512-Ud7ieH15No/KiSdRuzk+2k+S4gSCR/N7m4hJhesDbKQEZy3P+NPXTXfsimNOZvbVX2TRuIEFB+VdLZFn8DwGwg==",
+      "version": "4.1.1",
+      "resolved": "https://registry.npmjs.org/webpack-dev-server/-/webpack-dev-server-4.1.1.tgz",
+      "integrity": "sha512-Kl1mnCEw8Cy1Kw173gCxLIB242LfPKEOj9WoKhKz/MbryZTNrILzOJTk8kiczw/YUEPzn3gcltCQv6hDsLudRg==",
       "dependencies": {
-        "ansi-html": "^0.0.7",
+        "ansi-html-community": "^0.0.8",
         "bonjour": "^3.5.0",
         "chokidar": "^3.5.1",
+        "colorette": "^1.2.2",
         "compression": "^1.7.4",
         "connect-history-api-fallback": "^1.6.0",
         "del": "^6.0.0",
         "express": "^4.17.1",
-        "find-cache-dir": "^3.3.1",
         "graceful-fs": "^4.2.6",
         "html-entities": "^2.3.2",
-        "http-proxy-middleware": "^1.3.1",
+        "http-proxy-middleware": "^2.0.0",
         "internal-ip": "^6.2.0",
-        "ipaddr.js": "^2.0.0",
-        "is-absolute-url": "^3.0.3",
-        "killable": "^1.0.1",
-        "open": "^7.4.2",
+        "ipaddr.js": "^2.0.1",
+        "open": "^8.0.9",
         "p-retry": "^4.5.0",
         "portfinder": "^1.0.28",
-        "schema-utils": "^3.0.0",
+        "schema-utils": "^3.1.0",
         "selfsigned": "^1.10.11",
         "serve-index": "^1.9.1",
         "sockjs": "^0.3.21",
         "spdy": "^4.0.2",
-        "strip-ansi": "^6.0.0",
+        "strip-ansi": "^7.0.0",
         "url": "^0.11.0",
-        "webpack-dev-middleware": "^4.1.0",
-        "ws": "^7.4.5"
+        "webpack-dev-middleware": "^5.0.0",
+        "ws": "^8.1.0"
       },
       "bin": {
         "webpack-dev-server": "bin/webpack-dev-server.js"
@@ -8290,7 +8343,7 @@
         "node": ">= 12.13.0"
       },
       "peerDependencies": {
-        "webpack": "^4.0.0 || ^5.0.0"
+        "webpack": "^4.37.0 || ^5.0.0"
       },
       "peerDependenciesMeta": {
         "webpack-cli": {
@@ -8298,12 +8351,37 @@
         }
       }
     },
-    "node_modules/laravel-mix/node_modules/ws": {
-      "version": "7.5.3",
-      "resolved": "https://registry.npmjs.org/ws/-/ws-7.5.3.tgz",
-      "integrity": "sha512-kQ/dHIzuLrS6Je9+uv81ueZomEwH0qVYstcAQ4/Z93K8zeko9gtAbttJWzoC5ukqXY1PpoouV3+VSOqEAFt5wg==",
+    "node_modules/laravel-mix/node_modules/webpack-dev-server/node_modules/ansi-regex": {
+      "version": "6.0.1",
+      "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-6.0.1.tgz",
+      "integrity": "sha512-n5M855fKb2SsfMIiFFoVrABHJC8QtHwVx+mHWP3QcEqBHYienj5dHSgjbxtC0WEZXYt4wcD6zrQElDPhFuZgfA==",
       "engines": {
-        "node": ">=8.3.0"
+        "node": ">=12"
+      },
+      "funding": {
+        "url": "https://github.com/chalk/ansi-regex?sponsor=1"
+      }
+    },
+    "node_modules/laravel-mix/node_modules/webpack-dev-server/node_modules/strip-ansi": {
+      "version": "7.0.1",
+      "resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-7.0.1.tgz",
+      "integrity": "sha512-cXNxvT8dFNRVfhVME3JAe98mkXDYN2O1l7jmcwMnOslDeESg1rF/OZMtK0nRAhiari1unG5cD4jG3rapUAkLbw==",
+      "dependencies": {
+        "ansi-regex": "^6.0.1"
+      },
+      "engines": {
+        "node": ">=12"
+      },
+      "funding": {
+        "url": "https://github.com/chalk/strip-ansi?sponsor=1"
+      }
+    },
+    "node_modules/laravel-mix/node_modules/ws": {
+      "version": "8.4.0",
+      "resolved": "https://registry.npmjs.org/ws/-/ws-8.4.0.tgz",
+      "integrity": "sha512-IHVsKe2pjajSUIl4KYMQOdlyliovpEPquKkqbwswulszzI7r0SfQrxnXdWAEqOlDCLrVSJzo+O1hAwdog2sKSQ==",
+      "engines": {
+        "node": ">=10.0.0"
       },
       "peerDependencies": {
         "bufferutil": "^4.0.1",
@@ -8521,17 +8599,6 @@
         "semver": "bin/semver.js"
       }
     },
-    "node_modules/map-age-cleaner": {
-      "version": "0.1.3",
-      "resolved": "https://registry.npmjs.org/map-age-cleaner/-/map-age-cleaner-0.1.3.tgz",
-      "integrity": "sha512-bJzx6nMoP6PDLPBFmg7+xRKeFZvFboMrGlxmNj9ClvX53KrmvM5bXFXEWjbz4cz1AFn+jWJ9z/DJSz7hrs0w3w==",
-      "dependencies": {
-        "p-defer": "^1.0.0"
-      },
-      "engines": {
-        "node": ">=6"
-      }
-    },
     "node_modules/map-cache": {
       "version": "0.2.2",
       "resolved": "https://registry.npmjs.org/map-cache/-/map-cache-0.2.2.tgz",
@@ -8601,33 +8668,10 @@
         "node": ">= 0.6"
       }
     },
-    "node_modules/mem": {
-      "version": "8.1.1",
-      "resolved": "https://registry.npmjs.org/mem/-/mem-8.1.1.tgz",
-      "integrity": "sha512-qFCFUDs7U3b8mBDPyz5EToEKoAkgCzqquIgi9nkkR9bixxOVOre+09lbuH7+9Kn2NFpm56M3GUWVbU2hQgdACA==",
-      "dependencies": {
-        "map-age-cleaner": "^0.1.3",
-        "mimic-fn": "^3.1.0"
-      },
-      "engines": {
-        "node": ">=10"
-      },
-      "funding": {
-        "url": "https://github.com/sindresorhus/mem?sponsor=1"
-      }
-    },
-    "node_modules/mem/node_modules/mimic-fn": {
-      "version": "3.1.0",
-      "resolved": "https://registry.npmjs.org/mimic-fn/-/mimic-fn-3.1.0.tgz",
-      "integrity": "sha512-Ysbi9uYW9hFyfrThdDEQuykN4Ey6BuwPD2kpI5ES/nFTDn/98yxYNLZJcgUAKPT/mcrLLKaGzJR9YVxJrIdASQ==",
-      "engines": {
-        "node": ">=8"
-      }
-    },
     "node_modules/memfs": {
-      "version": "3.2.2",
-      "resolved": "https://registry.npmjs.org/memfs/-/memfs-3.2.2.tgz",
-      "integrity": "sha512-RE0CwmIM3CEvpcdK3rZ19BC4E6hv9kADkMN5rPduRak58cNArWLi/9jFLsa4rhsjfVxMP3v0jO7FHXq7SvFY5Q==",
+      "version": "3.4.1",
+      "resolved": "https://registry.npmjs.org/memfs/-/memfs-3.4.1.tgz",
+      "integrity": "sha512-1c9VPVvW5P7I85c35zAdEr1TD5+F11IToIHIlrVIcflfnzPkJa0ZoYEoEdYDP8KgPFoSZ/opDrUsAoZWym3mtw==",
       "dependencies": {
         "fs-monkey": "1.0.3"
       },
@@ -9555,14 +9599,6 @@
         "node": ">=0.10.0"
       }
     },
-    "node_modules/p-defer": {
-      "version": "1.0.0",
-      "resolved": "https://registry.npmjs.org/p-defer/-/p-defer-1.0.0.tgz",
-      "integrity": "sha1-n26xgvbJqozXQwBKfU+WsZaw+ww=",
-      "engines": {
-        "node": ">=4"
-      }
-    },
     "node_modules/p-event": {
       "version": "4.2.0",
       "resolved": "https://registry.npmjs.org/p-event/-/p-event-4.2.0.tgz",
@@ -11332,6 +11368,14 @@
         "node": ">=0.10.0"
       }
     },
+    "node_modules/require-from-string": {
+      "version": "2.0.2",
+      "resolved": "https://registry.npmjs.org/require-from-string/-/require-from-string-2.0.2.tgz",
+      "integrity": "sha512-Xf0nWe6RseziFMu+Ap9biiUbmplq6S9/p+7w7YXP/JBHhrUDDUhwa+vANyubuqfZWTveU//DYVGsDG7RKL/vEw==",
+      "engines": {
+        "node": ">=0.10.0"
+      }
+    },
     "node_modules/require-main-filename": {
       "version": "2.0.0",
       "resolved": "https://registry.npmjs.org/require-main-filename/-/require-main-filename-2.0.0.tgz",
@@ -11656,9 +11700,9 @@
       "integrity": "sha512-1JeB87s6oN/TDxQQYCvS5EFoQyvV6eYMZZ0AeA4tdFDYWN3BAGZ8npr17UBFddU0lgAt3H0yjX3X6/ekOj1yjw=="
     },
     "node_modules/selfsigned": {
-      "version": "1.10.11",
-      "resolved": "https://registry.npmjs.org/selfsigned/-/selfsigned-1.10.11.tgz",
-      "integrity": "sha512-aVmbPOfViZqOZPgRBT0+3u4yZFHpmnIghLMlAcb5/xhp5ZtB/RVnKhz5vl2M32CLXAqR4kha9zfhNg0Lf/sxKA==",
+      "version": "1.10.14",
+      "resolved": "https://registry.npmjs.org/selfsigned/-/selfsigned-1.10.14.tgz",
+      "integrity": "sha512-lkjaiAye+wBZDCBsu5BGi0XiLRxeUlsGod5ZP924CRSEoGuZAw/f7y9RKu28rwTfiHVhdavhB0qH0INV6P1lEA==",
       "dependencies": {
         "node-forge": "^0.10.0"
       }
@@ -13653,19 +13697,18 @@
       }
     },
     "node_modules/webpack-dev-middleware": {
-      "version": "4.3.0",
-      "resolved": "https://registry.npmjs.org/webpack-dev-middleware/-/webpack-dev-middleware-4.3.0.tgz",
-      "integrity": "sha512-PjwyVY95/bhBh6VUqt6z4THplYcsvQ8YNNBTBM873xLVmw8FLeALn0qurHbs9EmcfhzQis/eoqypSnZeuUz26w==",
+      "version": "5.3.0",
+      "resolved": "https://registry.npmjs.org/webpack-dev-middleware/-/webpack-dev-middleware-5.3.0.tgz",
+      "integrity": "sha512-MouJz+rXAm9B1OTOYaJnn6rtD/lWZPy2ufQCH3BPs8Rloh/Du6Jze4p7AeLYHkVi0giJnYLaSGDC7S+GM9arhg==",
       "dependencies": {
-        "colorette": "^1.2.2",
-        "mem": "^8.1.1",
+        "colorette": "^2.0.10",
         "memfs": "^3.2.2",
-        "mime-types": "^2.1.30",
+        "mime-types": "^2.1.31",
         "range-parser": "^1.2.1",
-        "schema-utils": "^3.0.0"
+        "schema-utils": "^4.0.0"
       },
       "engines": {
-        "node": ">= v10.23.3"
+        "node": ">= 12.13.0"
       },
       "funding": {
         "type": "opencollective",
@@ -13675,17 +13718,54 @@
         "webpack": "^4.0.0 || ^5.0.0"
       }
     },
-    "node_modules/webpack-dev-middleware/node_modules/schema-utils": {
-      "version": "3.1.1",
-      "resolved": "https://registry.npmjs.org/schema-utils/-/schema-utils-3.1.1.tgz",
-      "integrity": "sha512-Y5PQxS4ITlC+EahLuXaY86TXfR7Dc5lw294alXOq86JAHCihAIZfqv8nNCWvaEJvaC51uN9hbLGeV0cFBdH+Fw==",
+    "node_modules/webpack-dev-middleware/node_modules/ajv": {
+      "version": "8.8.2",
+      "resolved": "https://registry.npmjs.org/ajv/-/ajv-8.8.2.tgz",
+      "integrity": "sha512-x9VuX+R/jcFj1DHo/fCp99esgGDWiHENrKxaCENuCxpoMCmAt/COCGVDwA7kleEpEzJjDnvh3yGoOuLu0Dtllw==",
       "dependencies": {
-        "@types/json-schema": "^7.0.8",
-        "ajv": "^6.12.5",
-        "ajv-keywords": "^3.5.2"
+        "fast-deep-equal": "^3.1.1",
+        "json-schema-traverse": "^1.0.0",
+        "require-from-string": "^2.0.2",
+        "uri-js": "^4.2.2"
+      },
+      "funding": {
+        "type": "github",
+        "url": "https://github.com/sponsors/epoberezkin"
+      }
+    },
+    "node_modules/webpack-dev-middleware/node_modules/ajv-keywords": {
+      "version": "5.1.0",
+      "resolved": "https://registry.npmjs.org/ajv-keywords/-/ajv-keywords-5.1.0.tgz",
+      "integrity": "sha512-YCS/JNFAUyr5vAuhk1DWm1CBxRHW9LbJ2ozWeemrIqpbsqKjHVxYPyi5GC0rjZIT5JxJ3virVTS8wk4i/Z+krw==",
+      "dependencies": {
+        "fast-deep-equal": "^3.1.3"
+      },
+      "peerDependencies": {
+        "ajv": "^8.8.2"
+      }
+    },
+    "node_modules/webpack-dev-middleware/node_modules/colorette": {
+      "version": "2.0.16",
+      "resolved": "https://registry.npmjs.org/colorette/-/colorette-2.0.16.tgz",
+      "integrity": "sha512-hUewv7oMjCp+wkBv5Rm0v87eJhq4woh5rSR+42YSQJKecCqgIqNkZ6lAlQms/BwHPJA5NKMRlpxPRv0n8HQW6g=="
+    },
+    "node_modules/webpack-dev-middleware/node_modules/json-schema-traverse": {
+      "version": "1.0.0",
+      "resolved": "https://registry.npmjs.org/json-schema-traverse/-/json-schema-traverse-1.0.0.tgz",
+      "integrity": "sha512-NM8/P9n3XjXhIZn1lLhkFaACTOURQXjWhV4BA/RnOv8xvgqtqpAX9IO4mRQxSx1Rlo4tqzeqb0sOlruaOy3dug=="
+    },
+    "node_modules/webpack-dev-middleware/node_modules/schema-utils": {
+      "version": "4.0.0",
+      "resolved": "https://registry.npmjs.org/schema-utils/-/schema-utils-4.0.0.tgz",
+      "integrity": "sha512-1edyXKgh6XnJsJSQ8mKWXnN/BVaIbFMLpouRUrXgVq7WYne5kw3MW7UPhO44uRXQSIpTSXoJbmrR2X0w9kUTyg==",
+      "dependencies": {
+        "@types/json-schema": "^7.0.9",
+        "ajv": "^8.8.0",
+        "ajv-formats": "^2.1.1",
+        "ajv-keywords": "^5.0.0"
       },
       "engines": {
-        "node": ">= 10.13.0"
+        "node": ">= 12.13.0"
       },
       "funding": {
         "type": "opencollective",
@@ -15421,9 +15501,9 @@
       }
     },
     "@types/http-proxy": {
-      "version": "1.17.7",
-      "resolved": "https://registry.npmjs.org/@types/http-proxy/-/http-proxy-1.17.7.tgz",
-      "integrity": "sha512-9hdj6iXH64tHSLTY+Vt2eYOGzSogC+JQ2H7bdPWkuh7KXP5qLllWx++t+K9Wk556c3dkDdPws/SpMRi0sdCT1w==",
+      "version": "1.17.8",
+      "resolved": "https://registry.npmjs.org/@types/http-proxy/-/http-proxy-1.17.8.tgz",
+      "integrity": "sha512-5kPLG5BKpWYkw/LVOGWpiq3nEVqxiN32rTgI53Sk12/xHFQ2rG3ehI9IO+O3W2QoKeyB92dJkoka8SUm6BX1pA==",
       "requires": {
         "@types/node": "*"
       }
@@ -15470,9 +15550,9 @@
       }
     },
     "@types/json-schema": {
-      "version": "7.0.8",
-      "resolved": "https://registry.npmjs.org/@types/json-schema/-/json-schema-7.0.8.tgz",
-      "integrity": "sha512-YSBPTLTVm2e2OoQIDYx8HaeWJ5tTToLH67kXR7zYNGupXMEHa2++G8k+DczX2cFVgalypqtyZIcU19AFcmOpmg=="
+      "version": "7.0.9",
+      "resolved": "https://registry.npmjs.org/@types/json-schema/-/json-schema-7.0.9.tgz",
+      "integrity": "sha512-qcUXuemtEu+E5wZSJHNxUXeCZhAfXKQ41D+duX+VYPde7xyEVZci+/oXKJL13tnRs9lR2pr4fod59GT6/X1/yQ=="
     },
     "@types/minimatch": {
       "version": "3.0.5",
@@ -15687,6 +15767,32 @@
         "uri-js": "^4.2.2"
       }
     },
+    "ajv-formats": {
+      "version": "2.1.1",
+      "resolved": "https://registry.npmjs.org/ajv-formats/-/ajv-formats-2.1.1.tgz",
+      "integrity": "sha512-Wx0Kx52hxE7C18hkMEggYlEifqWZtYaRgouJor+WMdPnQyEK13vgEWyVNup7SoeeoLMsr4kf5h6dOW11I15MUA==",
+      "requires": {
+        "ajv": "^8.0.0"
+      },
+      "dependencies": {
+        "ajv": {
+          "version": "8.8.2",
+          "resolved": "https://registry.npmjs.org/ajv/-/ajv-8.8.2.tgz",
+          "integrity": "sha512-x9VuX+R/jcFj1DHo/fCp99esgGDWiHENrKxaCENuCxpoMCmAt/COCGVDwA7kleEpEzJjDnvh3yGoOuLu0Dtllw==",
+          "requires": {
+            "fast-deep-equal": "^3.1.1",
+            "json-schema-traverse": "^1.0.0",
+            "require-from-string": "^2.0.2",
+            "uri-js": "^4.2.2"
+          }
+        },
+        "json-schema-traverse": {
+          "version": "1.0.0",
+          "resolved": "https://registry.npmjs.org/json-schema-traverse/-/json-schema-traverse-1.0.0.tgz",
+          "integrity": "sha512-NM8/P9n3XjXhIZn1lLhkFaACTOURQXjWhV4BA/RnOv8xvgqtqpAX9IO4mRQxSx1Rlo4tqzeqb0sOlruaOy3dug=="
+        }
+      }
+    },
     "ajv-keywords": {
       "version": "3.5.2",
       "resolved": "https://registry.npmjs.org/ajv-keywords/-/ajv-keywords-3.5.2.tgz",
@@ -15718,10 +15824,10 @@
         }
       }
     },
-    "ansi-html": {
-      "version": "0.0.7",
-      "resolved": "https://registry.npmjs.org/ansi-html/-/ansi-html-0.0.7.tgz",
-      "integrity": "sha1-gTWEAhliqenm/QOflA0S9WynhZ4="
+    "ansi-html-community": {
+      "version": "0.0.8",
+      "resolved": "https://registry.npmjs.org/ansi-html-community/-/ansi-html-community-0.0.8.tgz",
+      "integrity": "sha512-1APHAyr3+PCamwNw3bXCPp4HFLONZt/yIH0sZp0/469KWNTEy+qN5jQ3GVX6DMZ1UXAi34yVwtTeaG/HpBuuzw=="
     },
     "ansi-regex": {
       "version": "4.1.0",
@@ -17210,6 +17316,11 @@
         "execa": "^5.0.0"
       }
     },
+    "define-lazy-prop": {
+      "version": "2.0.0",
+      "resolved": "https://registry.npmjs.org/define-lazy-prop/-/define-lazy-prop-2.0.0.tgz",
+      "integrity": "sha512-Ds09qNh8yw3khSjiJjiUInaGX9xlqZDY7JVryGxdxV7NPeuqQfplOpQ66yJFZut3jLa5zOwkXw1g9EI2uKh4Og=="
+    },
     "define-properties": {
       "version": "1.1.3",
       "resolved": "https://registry.npmjs.org/define-properties/-/define-properties-1.1.3.tgz",
@@ -18881,6 +18992,14 @@
       "resolved": "https://registry.npmjs.org/has-symbols/-/has-symbols-1.0.2.tgz",
       "integrity": "sha512-chXa79rL/UC2KlX17jo3vRGz0azaWEx5tGqZg5pO3NUyEJVB17dMruQlzCCOfUvElghKcm5194+BCRvi2Rv/Gw=="
     },
+    "has-tostringtag": {
+      "version": "1.0.0",
+      "resolved": "https://registry.npmjs.org/has-tostringtag/-/has-tostringtag-1.0.0.tgz",
+      "integrity": "sha512-kFjcSNhnlGV1kyoGk7OXKSawH5JOb/LzUc5w9B02hOTO0dfFRjbHQKvg1d6cf3HbeUmtU9VbbV3qzZ2Teh97WQ==",
+      "requires": {
+        "has-symbols": "^1.0.2"
+      }
+    },
     "has-value": {
       "version": "1.0.0",
       "resolved": "https://registry.npmjs.org/has-value/-/has-value-1.0.0.tgz",
@@ -19637,11 +19756,12 @@
       }
     },
     "is-arguments": {
-      "version": "1.1.0",
-      "resolved": "https://registry.npmjs.org/is-arguments/-/is-arguments-1.1.0.tgz",
-      "integrity": "sha512-1Ij4lOMPl/xB5kBDn7I+b2ttPMKa8szhEIrXDuXQD/oe3HJLTLhqhgGspwgyGd6MOywBUqVvYicF72lkgDnIHg==",
+      "version": "1.1.1",
+      "resolved": "https://registry.npmjs.org/is-arguments/-/is-arguments-1.1.1.tgz",
+      "integrity": "sha512-8Q7EARjzEnKpt/PCD7e1cgUS0a6X8u5tdSiMqXhojOdoV9TsMsiO+9VLC5vAmO8N7/GmXn7yjR8qnA6bVAEzfA==",
       "requires": {
-        "call-bind": "^1.0.0"
+        "call-bind": "^1.0.2",
+        "has-tostringtag": "^1.0.0"
       }
     },
     "is-arrayish": {
@@ -20041,11 +20161,6 @@
       "resolved": "https://registry.npmjs.org/junk/-/junk-3.1.0.tgz",
       "integrity": "sha512-pBxcB3LFc8QVgdggvZWyeys+hnrNWg4OcZIU/1X59k5jQdLBlCsYGRQaz234SqoRLTCgMH00fY0xRJH+F9METQ=="
     },
-    "killable": {
-      "version": "1.0.1",
-      "resolved": "https://registry.npmjs.org/killable/-/killable-1.0.1.tgz",
-      "integrity": "sha512-LzqtLKlUwirEUyl/nicirVmNiPvYs7l5n8wOPP7fyJVpUPkvCnW/vuiXGpylGUlnPDnB7311rARzAt3Mhswpjg=="
-    },
     "kind-of": {
       "version": "3.2.2",
       "resolved": "https://registry.npmjs.org/kind-of/-/kind-of-3.2.2.tgz",
@@ -20075,9 +20190,9 @@
       }
     },
     "laravel-mix": {
-      "version": "6.0.25",
-      "resolved": "https://registry.npmjs.org/laravel-mix/-/laravel-mix-6.0.25.tgz",
-      "integrity": "sha512-SDpLGUnXJ8g0rvtiLljSTJSR6awj86M2Jd3MhbtT32TCgwXdtajVLF7Mv2blsPLixGHtynwZgi+UFlYQbquPLg==",
+      "version": "6.0.30",
+      "resolved": "https://registry.npmjs.org/laravel-mix/-/laravel-mix-6.0.30.tgz",
+      "integrity": "sha512-Y5EjdPVEqVMgnglzJvDuDEpUa2EouutS4ySrukZkBWh2EPPYM1iszu8TItvQ2J08N5BPIrYWh8McUbTwq6tcrQ==",
       "requires": {
         "@babel/core": "^7.14.5",
         "@babel/plugin-proposal-object-rest-spread": "^7.14.5",
@@ -20124,7 +20239,7 @@
         "vue-style-loader": "^4.1.3",
         "webpack": "^5.38.1",
         "webpack-cli": "^4.7.2",
-        "webpack-dev-server": "4.0.0-beta.3",
+        "webpack-dev-server": "4.1.1",
         "webpack-merge": "^5.8.0",
         "webpack-notifier": "^1.13.0",
         "webpackbar": "^5.0.0-3",
@@ -20152,9 +20267,9 @@
           "requires": {}
         },
         "ansi-regex": {
-          "version": "5.0.0",
-          "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-5.0.0.tgz",
-          "integrity": "sha512-bY6fj56OUQ0hU1KjFNDQuJFezqKdrAyFdIevADiqrWHwSlbmBNMHp5ak2f40Pm8JTFyM2mqxkG6ngkHO11f/lg=="
+          "version": "5.0.1",
+          "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-5.0.1.tgz",
+          "integrity": "sha512-quJQXlTSUGL2LH9SUXo8VwsY4soanhgo6LNSm84E1LBcE8s3O0wpdiRzyR9z/ZZJMlMWv37qOOb9pdJlMUEKFQ=="
         },
         "ansi-styles": {
           "version": "4.3.0",
@@ -20222,9 +20337,9 @@
           "integrity": "sha512-EykJT/Q1KjTWctppgIAgfSO0tKVuZUjhgMr17kqTumMl6Afv3EISleU7qZUzoXDFTAHTDC4NOoG/ZxU3EvlMPQ=="
         },
         "http-proxy-middleware": {
-          "version": "1.3.1",
-          "resolved": "https://registry.npmjs.org/http-proxy-middleware/-/http-proxy-middleware-1.3.1.tgz",
-          "integrity": "sha512-13eVVDYS4z79w7f1+NPllJtOQFx/FdUW4btIvVRMaRlUY9VGstAbo5MOhLEuUgZFRHn3x50ufn25zkj/boZnEg==",
+          "version": "2.0.1",
+          "resolved": "https://registry.npmjs.org/http-proxy-middleware/-/http-proxy-middleware-2.0.1.tgz",
+          "integrity": "sha512-cfaXRVoZxSed/BmkA7SwBVNI9Kj7HFltaE5rqYOub5kWzWZ+gofV2koVN1j2rMW7pEfSSlCHGJ31xmuyFyfLOg==",
           "requires": {
             "@types/http-proxy": "^1.17.5",
             "http-proxy": "^1.18.1",
@@ -20275,12 +20390,13 @@
           }
         },
         "open": {
-          "version": "7.4.2",
-          "resolved": "https://registry.npmjs.org/open/-/open-7.4.2.tgz",
-          "integrity": "sha512-MVHddDVweXZF3awtlAS+6pgKLlm/JgxZ90+/NBurBoQctVOOB/zDdVjcyPzQ+0laDGbsWgrRkflI65sQeOgT9Q==",
+          "version": "8.4.0",
+          "resolved": "https://registry.npmjs.org/open/-/open-8.4.0.tgz",
+          "integrity": "sha512-XgFPPM+B28FtCCgSb9I+s9szOC1vZRSwgWsRUA5ylIxRTgKozqjOCrVOqGsYABPYK5qnfqClxZTFBa8PKt2v6Q==",
           "requires": {
-            "is-docker": "^2.0.0",
-            "is-wsl": "^2.1.1"
+            "define-lazy-prop": "^2.0.0",
+            "is-docker": "^2.1.1",
+            "is-wsl": "^2.2.0"
           }
         },
         "p-limit": {
@@ -20349,11 +20465,11 @@
           }
         },
         "strip-ansi": {
-          "version": "6.0.0",
-          "resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-6.0.0.tgz",
-          "integrity": "sha512-AuvKTrTfQNYNIctbR1K/YGTR1756GycPsg7b9bdV9Duqur4gv6aKqHXah67Z8ImS7WEz5QVcOtlfW2rZEugt6w==",
+          "version": "6.0.1",
+          "resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-6.0.1.tgz",
+          "integrity": "sha512-Y38VPSHcqkFrCpFnQ9vuSXmquuv5oXOKpGeT6aGrr3o3Gc9AlVa6JBfUSOCnbxGGZF+/0ooI7KrPuUSztUdU5A==",
           "requires": {
-            "ansi-regex": "^5.0.0"
+            "ansi-regex": "^5.0.1"
           }
         },
         "supports-color": {
@@ -20393,43 +20509,56 @@
           }
         },
         "webpack-dev-server": {
-          "version": "4.0.0-beta.3",
-          "resolved": "https://registry.npmjs.org/webpack-dev-server/-/webpack-dev-server-4.0.0-beta.3.tgz",
-          "integrity": "sha512-Ud7ieH15No/KiSdRuzk+2k+S4gSCR/N7m4hJhesDbKQEZy3P+NPXTXfsimNOZvbVX2TRuIEFB+VdLZFn8DwGwg==",
+          "version": "4.1.1",
+          "resolved": "https://registry.npmjs.org/webpack-dev-server/-/webpack-dev-server-4.1.1.tgz",
+          "integrity": "sha512-Kl1mnCEw8Cy1Kw173gCxLIB242LfPKEOj9WoKhKz/MbryZTNrILzOJTk8kiczw/YUEPzn3gcltCQv6hDsLudRg==",
           "requires": {
-            "ansi-html": "^0.0.7",
+            "ansi-html-community": "^0.0.8",
             "bonjour": "^3.5.0",
             "chokidar": "^3.5.1",
+            "colorette": "^1.2.2",
             "compression": "^1.7.4",
             "connect-history-api-fallback": "^1.6.0",
             "del": "^6.0.0",
             "express": "^4.17.1",
-            "find-cache-dir": "^3.3.1",
             "graceful-fs": "^4.2.6",
             "html-entities": "^2.3.2",
-            "http-proxy-middleware": "^1.3.1",
+            "http-proxy-middleware": "^2.0.0",
             "internal-ip": "^6.2.0",
-            "ipaddr.js": "^2.0.0",
-            "is-absolute-url": "^3.0.3",
-            "killable": "^1.0.1",
-            "open": "^7.4.2",
+            "ipaddr.js": "^2.0.1",
+            "open": "^8.0.9",
             "p-retry": "^4.5.0",
             "portfinder": "^1.0.28",
-            "schema-utils": "^3.0.0",
+            "schema-utils": "^3.1.0",
             "selfsigned": "^1.10.11",
             "serve-index": "^1.9.1",
             "sockjs": "^0.3.21",
             "spdy": "^4.0.2",
-            "strip-ansi": "^6.0.0",
+            "strip-ansi": "^7.0.0",
             "url": "^0.11.0",
-            "webpack-dev-middleware": "^4.1.0",
-            "ws": "^7.4.5"
+            "webpack-dev-middleware": "^5.0.0",
+            "ws": "^8.1.0"
+          },
+          "dependencies": {
+            "ansi-regex": {
+              "version": "6.0.1",
+              "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-6.0.1.tgz",
+              "integrity": "sha512-n5M855fKb2SsfMIiFFoVrABHJC8QtHwVx+mHWP3QcEqBHYienj5dHSgjbxtC0WEZXYt4wcD6zrQElDPhFuZgfA=="
+            },
+            "strip-ansi": {
+              "version": "7.0.1",
+              "resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-7.0.1.tgz",
+              "integrity": "sha512-cXNxvT8dFNRVfhVME3JAe98mkXDYN2O1l7jmcwMnOslDeESg1rF/OZMtK0nRAhiari1unG5cD4jG3rapUAkLbw==",
+              "requires": {
+                "ansi-regex": "^6.0.1"
+              }
+            }
           }
         },
         "ws": {
-          "version": "7.5.3",
-          "resolved": "https://registry.npmjs.org/ws/-/ws-7.5.3.tgz",
-          "integrity": "sha512-kQ/dHIzuLrS6Je9+uv81ueZomEwH0qVYstcAQ4/Z93K8zeko9gtAbttJWzoC5ukqXY1PpoouV3+VSOqEAFt5wg==",
+          "version": "8.4.0",
+          "resolved": "https://registry.npmjs.org/ws/-/ws-8.4.0.tgz",
+          "integrity": "sha512-IHVsKe2pjajSUIl4KYMQOdlyliovpEPquKkqbwswulszzI7r0SfQrxnXdWAEqOlDCLrVSJzo+O1hAwdog2sKSQ==",
           "requires": {}
         }
       }
@@ -20605,14 +20734,6 @@
         }
       }
     },
-    "map-age-cleaner": {
-      "version": "0.1.3",
-      "resolved": "https://registry.npmjs.org/map-age-cleaner/-/map-age-cleaner-0.1.3.tgz",
-      "integrity": "sha512-bJzx6nMoP6PDLPBFmg7+xRKeFZvFboMrGlxmNj9ClvX53KrmvM5bXFXEWjbz4cz1AFn+jWJ9z/DJSz7hrs0w3w==",
-      "requires": {
-        "p-defer": "^1.0.0"
-      }
-    },
     "map-cache": {
       "version": "0.2.2",
       "resolved": "https://registry.npmjs.org/map-cache/-/map-cache-0.2.2.tgz",
@@ -20667,26 +20788,10 @@
       "resolved": "https://registry.npmjs.org/media-typer/-/media-typer-0.3.0.tgz",
       "integrity": "sha1-hxDXrwqmJvj/+hzgAWhUUmMlV0g="
     },
-    "mem": {
-      "version": "8.1.1",
-      "resolved": "https://registry.npmjs.org/mem/-/mem-8.1.1.tgz",
-      "integrity": "sha512-qFCFUDs7U3b8mBDPyz5EToEKoAkgCzqquIgi9nkkR9bixxOVOre+09lbuH7+9Kn2NFpm56M3GUWVbU2hQgdACA==",
-      "requires": {
-        "map-age-cleaner": "^0.1.3",
-        "mimic-fn": "^3.1.0"
-      },
-      "dependencies": {
-        "mimic-fn": {
-          "version": "3.1.0",
-          "resolved": "https://registry.npmjs.org/mimic-fn/-/mimic-fn-3.1.0.tgz",
-          "integrity": "sha512-Ysbi9uYW9hFyfrThdDEQuykN4Ey6BuwPD2kpI5ES/nFTDn/98yxYNLZJcgUAKPT/mcrLLKaGzJR9YVxJrIdASQ=="
-        }
-      }
-    },
     "memfs": {
-      "version": "3.2.2",
-      "resolved": "https://registry.npmjs.org/memfs/-/memfs-3.2.2.tgz",
-      "integrity": "sha512-RE0CwmIM3CEvpcdK3rZ19BC4E6hv9kADkMN5rPduRak58cNArWLi/9jFLsa4rhsjfVxMP3v0jO7FHXq7SvFY5Q==",
+      "version": "3.4.1",
+      "resolved": "https://registry.npmjs.org/memfs/-/memfs-3.4.1.tgz",
+      "integrity": "sha512-1c9VPVvW5P7I85c35zAdEr1TD5+F11IToIHIlrVIcflfnzPkJa0ZoYEoEdYDP8KgPFoSZ/opDrUsAoZWym3mtw==",
       "requires": {
         "fs-monkey": "1.0.3"
       }
@@ -21405,11 +21510,6 @@
       "integrity": "sha1-u+Z0BseaqFxc/sdm/lc0VV36EnQ=",
       "dev": true
     },
-    "p-defer": {
-      "version": "1.0.0",
-      "resolved": "https://registry.npmjs.org/p-defer/-/p-defer-1.0.0.tgz",
-      "integrity": "sha1-n26xgvbJqozXQwBKfU+WsZaw+ww="
-    },
     "p-event": {
       "version": "4.2.0",
       "resolved": "https://registry.npmjs.org/p-event/-/p-event-4.2.0.tgz",
@@ -22695,6 +22795,11 @@
       "resolved": "https://registry.npmjs.org/require-directory/-/require-directory-2.1.1.tgz",
       "integrity": "sha1-jGStX9MNqxyXbiNE/+f3kqam30I="
     },
+    "require-from-string": {
+      "version": "2.0.2",
+      "resolved": "https://registry.npmjs.org/require-from-string/-/require-from-string-2.0.2.tgz",
+      "integrity": "sha512-Xf0nWe6RseziFMu+Ap9biiUbmplq6S9/p+7w7YXP/JBHhrUDDUhwa+vANyubuqfZWTveU//DYVGsDG7RKL/vEw=="
+    },
     "require-main-filename": {
       "version": "2.0.0",
       "resolved": "https://registry.npmjs.org/require-main-filename/-/require-main-filename-2.0.0.tgz",
@@ -22924,9 +23029,9 @@
       "integrity": "sha512-1JeB87s6oN/TDxQQYCvS5EFoQyvV6eYMZZ0AeA4tdFDYWN3BAGZ8npr17UBFddU0lgAt3H0yjX3X6/ekOj1yjw=="
     },
     "selfsigned": {
-      "version": "1.10.11",
-      "resolved": "https://registry.npmjs.org/selfsigned/-/selfsigned-1.10.11.tgz",
-      "integrity": "sha512-aVmbPOfViZqOZPgRBT0+3u4yZFHpmnIghLMlAcb5/xhp5ZtB/RVnKhz5vl2M32CLXAqR4kha9zfhNg0Lf/sxKA==",
+      "version": "1.10.14",
+      "resolved": "https://registry.npmjs.org/selfsigned/-/selfsigned-1.10.14.tgz",
+      "integrity": "sha512-lkjaiAye+wBZDCBsu5BGi0XiLRxeUlsGod5ZP924CRSEoGuZAw/f7y9RKu28rwTfiHVhdavhB0qH0INV6P1lEA==",
       "requires": {
         "node-forge": "^0.10.0"
       }
@@ -24577,26 +24682,55 @@
       }
     },
     "webpack-dev-middleware": {
-      "version": "4.3.0",
-      "resolved": "https://registry.npmjs.org/webpack-dev-middleware/-/webpack-dev-middleware-4.3.0.tgz",
-      "integrity": "sha512-PjwyVY95/bhBh6VUqt6z4THplYcsvQ8YNNBTBM873xLVmw8FLeALn0qurHbs9EmcfhzQis/eoqypSnZeuUz26w==",
+      "version": "5.3.0",
+      "resolved": "https://registry.npmjs.org/webpack-dev-middleware/-/webpack-dev-middleware-5.3.0.tgz",
+      "integrity": "sha512-MouJz+rXAm9B1OTOYaJnn6rtD/lWZPy2ufQCH3BPs8Rloh/Du6Jze4p7AeLYHkVi0giJnYLaSGDC7S+GM9arhg==",
       "requires": {
-        "colorette": "^1.2.2",
-        "mem": "^8.1.1",
+        "colorette": "^2.0.10",
         "memfs": "^3.2.2",
-        "mime-types": "^2.1.30",
+        "mime-types": "^2.1.31",
         "range-parser": "^1.2.1",
-        "schema-utils": "^3.0.0"
+        "schema-utils": "^4.0.0"
       },
       "dependencies": {
-        "schema-utils": {
-          "version": "3.1.1",
-          "resolved": "https://registry.npmjs.org/schema-utils/-/schema-utils-3.1.1.tgz",
-          "integrity": "sha512-Y5PQxS4ITlC+EahLuXaY86TXfR7Dc5lw294alXOq86JAHCihAIZfqv8nNCWvaEJvaC51uN9hbLGeV0cFBdH+Fw==",
+        "ajv": {
+          "version": "8.8.2",
+          "resolved": "https://registry.npmjs.org/ajv/-/ajv-8.8.2.tgz",
+          "integrity": "sha512-x9VuX+R/jcFj1DHo/fCp99esgGDWiHENrKxaCENuCxpoMCmAt/COCGVDwA7kleEpEzJjDnvh3yGoOuLu0Dtllw==",
           "requires": {
-            "@types/json-schema": "^7.0.8",
-            "ajv": "^6.12.5",
-            "ajv-keywords": "^3.5.2"
+            "fast-deep-equal": "^3.1.1",
+            "json-schema-traverse": "^1.0.0",
+            "require-from-string": "^2.0.2",
+            "uri-js": "^4.2.2"
+          }
+        },
+        "ajv-keywords": {
+          "version": "5.1.0",
+          "resolved": "https://registry.npmjs.org/ajv-keywords/-/ajv-keywords-5.1.0.tgz",
+          "integrity": "sha512-YCS/JNFAUyr5vAuhk1DWm1CBxRHW9LbJ2ozWeemrIqpbsqKjHVxYPyi5GC0rjZIT5JxJ3virVTS8wk4i/Z+krw==",
+          "requires": {
+            "fast-deep-equal": "^3.1.3"
+          }
+        },
+        "colorette": {
+          "version": "2.0.16",
+          "resolved": "https://registry.npmjs.org/colorette/-/colorette-2.0.16.tgz",
+          "integrity": "sha512-hUewv7oMjCp+wkBv5Rm0v87eJhq4woh5rSR+42YSQJKecCqgIqNkZ6lAlQms/BwHPJA5NKMRlpxPRv0n8HQW6g=="
+        },
+        "json-schema-traverse": {
+          "version": "1.0.0",
+          "resolved": "https://registry.npmjs.org/json-schema-traverse/-/json-schema-traverse-1.0.0.tgz",
+          "integrity": "sha512-NM8/P9n3XjXhIZn1lLhkFaACTOURQXjWhV4BA/RnOv8xvgqtqpAX9IO4mRQxSx1Rlo4tqzeqb0sOlruaOy3dug=="
+        },
+        "schema-utils": {
+          "version": "4.0.0",
+          "resolved": "https://registry.npmjs.org/schema-utils/-/schema-utils-4.0.0.tgz",
+          "integrity": "sha512-1edyXKgh6XnJsJSQ8mKWXnN/BVaIbFMLpouRUrXgVq7WYne5kw3MW7UPhO44uRXQSIpTSXoJbmrR2X0w9kUTyg==",
+          "requires": {
+            "@types/json-schema": "^7.0.9",
+            "ajv": "^8.8.0",
+            "ajv-formats": "^2.1.1",
+            "ajv-keywords": "^5.0.0"
           }
         }
       }

package.json

@@ -27,7 +27,7 @@
     "jquery": "^3.5.1",
     "jquery-pjax": "~2.0",
     "js-yaml": "^3.14.0",
-    "laravel-mix": "^6.0.25",
+    "laravel-mix": "^6.0.30",
     "leaflet": "^1.3.4",
     "leaflet-ajax": "2.1.0",
     "leaflet-providers": "1.0.*",

resources/views/admin/aircraft/fields.blade.php

@@ -5,7 +5,7 @@
          Subfleet and Status
       </h6>
       <div class="form-container-body row">
-        <div class="form-group col-sm-4">
+        <div class="form-group col-sm-3">
           {{ Form::label('subfleet_id', 'Subfleet:') }}
           {{ Form::select('subfleet_id', $subfleets, $subfleet_id ?? null, [
               'class' => 'form-control select2',
@@ -15,17 +15,21 @@
           <p class="text-danger">{{ $errors->first('subfleet_id') }}</p>
         </div>
 
-        <div class="form-group col-sm-4">
+        <div class="form-group col-sm-3">
           {{ Form::label('status', 'Status:') }}
           {{ Form::select('status', $statuses, null, ['class' => 'form-control select2', 'placeholder' => 'Select Status']) }}
           <p class="text-danger">{{ $errors->first('subfleet_id') }}</p>
         </div>
 
-        <div class="form-group col-sm-4">
+        <div class="form-group col-sm-3">
+          {{ Form::label('hub_id', 'Hub:') }}
+          {{ Form::select('hub_id', $hubs, null, ['class' => 'form-control select2']) }}
+          <p class="text-danger">{{ $errors->first('hub_id') }}</p>
+        </div>
+
+        <div class="form-group col-sm-3">
           {{ Form::label('airport_id', 'Location:') }}
-          {{ Form::select('airport_id', $airports, null, [
-              'class' => 'form-control select2'
-              ]) }}
+          {{ Form::select('airport_id', $airports, null, ['class' => 'form-control select2']) }}
           <p class="text-danger">{{ $errors->first('airport_id') }}</p>
         </div>
       </div>

resources/views/admin/aircraft/table.blade.php

@@ -3,6 +3,7 @@
   <th>Name</th>
   <th style="text-align: center;">Registration</th>
   <th>Subfleet</th>
+  <th style="text-align: center;">Hub</th>
   <th style="text-align: center;">Location</th>
   <th style="text-align: center;">Hours</th>
   <th style="text-align: center;">Active</th>
@@ -22,6 +23,7 @@
           -
         @endif
       </td>
+      <td style="text-align: center;">{{ $ac->hub_id }}</td>
       <td style="text-align: center;">{{ $ac->airport_id }}</td>
       <td style="text-align: center;">
         @minutestotime($ac->flight_time)

resources/views/admin/awards/edit.blade.php

@@ -1,5 +1,5 @@
 @extends('admin.app')
-@section('title', "Edit \"$award->title\" Award")
+@section('title', "Edit \"$award->name\" Award")
 @section('content')
   <div class="card border-blue-bottom">
     <div class="content">

resources/views/admin/awards/fields.blade.php

@@ -18,17 +18,13 @@
     <p class="text-danger">{{ $errors->first('name') }}</p>
   </div>
 
-
   <div class="form-group col-sm-6">
     {!! Form::label('image', 'Image:') !!}
     <div class="callout callout-info">
       <i class="icon fa fa-info">&nbsp;&nbsp;</i>
       This is the image of the award. Be creative!
     </div>
-    {!! Form::text('image_url', null, [
-            'class' => 'form-control',
-            'placeholder' => 'Enter the url of the image location'
-        ]) !!}
+    {!! Form::text('image_url', null, ['class' => 'form-control', 'placeholder' => 'Enter the url of the image location']) !!}
     <p class="text-danger">{{ $errors->first('image_url') }}</p>
   </div>
 </div>
@@ -47,29 +43,31 @@
   <div class="form-group col-sm-6">
     <div>
       {{ Form::label('ref_model', 'Award Class:') }}
-      {{ Form::select('ref_model', $award_classes, null , [
-          'class' => 'form-control select2',
-          'id' => 'award_class_select',
-      ]) }}
+      {{ Form::select('ref_model', $award_classes, null, ['class' => 'form-control select2', 'id' => 'award_class_select']) }}
       <p class="text-danger">{{ $errors->first('ref_model') }}</p>
     </div>
-
     <div>
       {{ Form::label('ref_model_params', 'Award Class parameters') }}
       {{ Form::text('ref_model_params', null, ['class' => 'form-control']) }}
       <p class="text-danger">{{ $errors->first('ref_model_params') }}</p>
-
-      <p id="ref_model_param_description">
-
-      </p>
+      <p id="ref_model_param_description"></p>
     </div>
-
   </div>
 </div>
 
 <div class="row">
-  <!-- Submit Field -->
-  <div class="form-group col-sm-12">
+  {{-- Active/Deactive Checkbox --}}
+  <div class="form-group col-sm-6 text-left">
+    <div class="checkbox">
+      <label class="checkbox-inline">
+        {{ Form::label('active', 'Active: ') }}
+        {{ Form::hidden('active', false) }}
+        {{ Form::checkbox('active') }}
+      </label>
+    </div>
+  </div>
+  {{-- Form Actions --}}
+  <div class="form-group col-sm-6">
     <div class="pull-right">
       {!! Form::button('Save', ['type' => 'submit', 'class' => 'btn btn-success']) !!}
       <a href="{!! route('admin.awards.index') !!}" class="btn btn-warn">Cancel</a>

resources/views/admin/awards/table.blade.php

@@ -1,40 +1,47 @@
 <table class="table table-hover table-responsive" id="awards-table">
   <thead>
-  <th>Name</th>
-  <th>Description</th>
-  <th>Image</th>
-  <th class="text-right">Action</th>
+    <th>Name</th>
+    <th>Description</th>
+    <th>Image</th>
+    <th class="text-center">Active</th>
+    <th class="text-right">Action</th>
   </thead>
   <tbody>
-  @foreach($awards as $award)
-    <tr>
-      <td>
-        <a href="{{ route('admin.awards.edit', [$award->id]) }}">
-          {{ $award->name }}</a>
-      </td>
-      <td>{{ $award->description }}</td>
-      <td>
-
-        @if($award->image_url)
-          <img src="{{ $award->image_url }}" name="{{ $award->name }}" alt="No Image Available" style="height: 100px"/>
-        @else
-          -
-        @endif
-      </td>
-      <td class="text-right">
-        {{ Form::open(['route' => ['admin.awards.destroy', $award->id], 'method' => 'delete']) }}
-        <a href="{{ route('admin.awards.edit', [$award->id]) }}" class='btn btn-sm btn-success btn-icon'>
-          <i class="fas fa-pencil-alt"></i></a>
-
-        {{ Form::button('<i class="fa fa-times"></i>', [
-                'type' => 'submit',
-                'class' => 'btn btn-sm btn-danger btn-icon',
-                'onclick' => "return confirm('Are you sure you want to delete this award?')"
-        ]) }}
-
-        {{ Form::close() }}
-      </td>
-    </tr>
-  @endforeach
+    @foreach($awards->sortby('name', SORT_NATURAL) as $award)
+      <tr>
+        <td>
+          <a href="{{ route('admin.awards.edit', [$award->id]) }}">{{ $award->name }}</a>
+        </td>
+        <td>
+          {{ $award->description }}
+        </td>
+        <td>
+          @if($award->image_url)
+            <img src="{{ $award->image_url }}" name="{{ $award->name }}" alt="No Image Available" style="height: 100px"/>
+          @else
+            -
+          @endif
+        </td>
+        <td class="text-center">
+          @if($award->active)
+            <i class="fas fa-check-circle fa-2x text-success"></i>
+          @else 
+            <i class="fas fa-times-circle fa-2x text-danger"></i>
+          @endif
+        </td>
+        <td class="text-right">
+          {{ Form::open(['route' => ['admin.awards.destroy', $award->id], 'method' => 'delete']) }}
+          <a href="{{ route('admin.awards.edit', [$award->id]) }}" class='btn btn-sm btn-success btn-icon'>
+            <i class="fas fa-pencil-alt"></i>
+          </a>
+          {{ Form::button('<i class="fa fa-times"></i>', [
+                  'type' => 'submit',
+                  'class' => 'btn btn-sm btn-danger btn-icon',
+                  'onclick' => "return confirm('Are you sure you want to delete this award?')"
+          ]) }}
+          {{ Form::close() }}
+        </td>
+      </tr>
+    @endforeach
   </tbody>
-</table>
+</table>

resources/views/admin/flights/index.blade.php

@@ -2,8 +2,15 @@
 @section('title', 'Flights')
 
 @section('actions')
-  <li><a href="{{ route('admin.flights.export') }}"><i class="ti-plus"></i>Export to CSV</a></li>
-  <li><a href="{{ route('admin.flights.import') }}"><i class="ti-plus"></i>Import from CSV</a></li>
+  <li>
+    <a href="{{ route('admin.flights.export') }}@if(request()->get('airline_id')){{ '?airline_id='.request()->get('airline_id') }}@endif">
+      <i class="ti-plus"></i>
+      Export to CSV @if(request()->get('airline_id')) (Selected Airline) @endif
+    </a>
+  </li>
+  <li>
+    <a href="{{ route('admin.flights.import') }}"><i class="ti-plus"></i>Import from CSV</a>
+  </li>
   <li>
     <a href="{{ route('admin.flights.create') }}">
       <i class="ti-plus"></i>

resources/views/admin/menu.blade.php

@@ -62,6 +62,10 @@
       <li><a href="{{ url('/admin/ranks') }}"><i class="pe-7s-graph1"></i>ranks</a></li>
       @endability
 
+      @ability('admin', 'typeratings')
+      <li><a href="{{ url('/admin/typeratings') }}"><i class="pe-7s-plane"></i>type ratings</a></li>
+      @endability
+
       @ability('admin', 'awards')
       <li><a href="{!! url('/admin/awards') !!}"><i class="pe-7s-diamond"></i>awards</a></li>
       @endability

resources/views/admin/subfleets/edit.blade.php

@@ -16,6 +16,12 @@
     </div>
   </div>
 
+  <div class="card border-blue-bottom">
+    <div class="content">
+      @include('admin.subfleets.type_ratings')
+    </div>
+  </div>
+
   <div class="card border-blue-bottom">
     <div class="content">
       @include('admin.subfleets.fares')

resources/views/admin/subfleets/script.blade.php

@@ -114,6 +114,12 @@
         $.pjax.submit(event, '#subfleet_ranks_wrapper', {push: false});
       });
 
+      $(document).on('submit', 'form.modify_typerating', function (event) {
+        event.preventDefault();
+        console.log(event);
+        $.pjax.submit(event, '#subfleet_typeratings_wrapper', {push: false});
+      });
+
       $(document).on('submit', 'form.modify_expense', function (event) {
         event.preventDefault();
         console.log(event);

resources/views/admin/subfleets/table.blade.php

@@ -4,6 +4,7 @@
     <th>Name</th>
     <th>Airline</th>
     <th>Type</th>
+    <th>Hub</th>
     <th>Aircraft</th>
     <th></th>
     </thead>
@@ -17,6 +18,7 @@
         </td>
         <td>{{ optional($subfleet->airline)->name }}</td>
         <td>{{ $subfleet->type }}</td>
+        <td>{{ $subfleet->hub_id }}</td>
         <td>{{ $subfleet->aircraft->count() }}</td>
         <td class="text-right">
           {{ Form::open(['route' => ['admin.subfleets.destroy', $subfleet->id], 'method' => 'delete']) }}

resources/views/admin/subfleets/type_ratings.blade.php

@@ -0,0 +1,45 @@
+<div id="subfleet_typeratings_wrapper" class="dataTables_wrapper form-inline dt-bootstrap">
+  <div class="header">
+    <h3>type ratings</h3>
+    @component('admin.components.info')
+      These type ratings are allowed to fly aircraft in this subfleet.
+    @endcomponent
+  </div>
+  <br/>
+  <table id="subfleet_ranks" class="table table-hover">
+    @if(count($subfleet->typeratings))
+      <thead>
+        <tr>
+          <th>Type</th>
+          <th>Name</th>
+          <th></th>
+        </tr>
+      </thead>
+    @endif
+    <tbody>
+      @foreach($subfleet->typeratings as $tr)
+        <tr>
+          <td class="sorting_1">{{ $tr->type }}</td>
+          <td>{{ $tr->name }}</td>
+          <td style="text-align: right; width:3%;">
+            {{ Form::open(['url' => '/admin/subfleets/'.$subfleet->id.'/typeratings', 'method' => 'delete', 'class' => 'modify_typerating']) }}
+            {{ Form::hidden('typerating_id', $tr->id) }}
+            {{ Form::button('<i class="fa fa-times"></i>', ['type' => 'submit', 'class' => 'btn btn-sm btn-danger btn-icon']) }}
+            {{ Form::close() }}
+          </td>
+        </tr>
+      @endforeach
+    </tbody>
+  </table>
+  <hr/>
+  <div class="row">
+    <div class="col-xs-12">
+      <div class="text-right">
+        {{ Form::open(['url' => '/admin/subfleets/'.$subfleet->id.'/typeratings', 'method' => 'post', 'class' => 'modify_typerating form-inline']) }}
+        {{ Form::select('typerating_id', $avail_ratings, null, ['placeholder' => 'Select Type Rating', 'class' => 'ac-fare-dropdown form-control input-lg select2']) }}
+        {{ Form::button('<i class="glyphicon glyphicon-plus"></i> add', ['type' => 'submit', 'class' => 'btn btn-success btn-s']) }}
+        {{ Form::close() }}
+      </div>
+    </div>
+  </div>
+</div>

resources/views/admin/typeratings/create.blade.php

@@ -0,0 +1,12 @@
+@extends('admin.app')
+@section('title', 'Add Type Rating')
+@section('content')
+  <div class="card border-blue-bottom">
+    <div class="content">
+      {{ Form::open(['route' => 'admin.typeratings.store', 'class' => 'add_typerating', 'method'=>'POST', 'autocomplete' => false]) }}
+      @include('admin.typeratings.fields')
+      {{ Form::close() }}
+    </div>
+  </div>
+@endsection
+@include('admin.typeratings.scripts')

resources/views/admin/typeratings/edit.blade.php

@@ -0,0 +1,26 @@
+@extends('admin.app')
+@section('title', 'Edit '.$typerating->name)
+@section('content')
+  <div class="card border-blue-bottom">
+    <div class="content">
+      {{ Form::model($typerating, ['route' => ['admin.typeratings.update', $typerating->id], 'method' => 'patch', 'autocomplete' => false]) }}
+      @include('admin.typeratings.fields')
+      {{ Form::close() }}
+    </div>
+  </div>
+
+  <div class="card border-blue-bottom">
+    <div class="content">
+      <div class="header">
+        <h3>Subfleets</h3>
+        @component('admin.components.info')
+          These are the subfleets this type rating is allowed to use.
+        @endcomponent
+      </div>
+      <div class="row">
+        @include('admin.typeratings.subfleets')
+      </div>
+    </div>
+  </div>
+@endsection
+@include('admin.typeratings.scripts')

resources/views/admin/typeratings/fields.blade.php

@@ -0,0 +1,42 @@
+<div class="row">
+  <div class="form-group col-sm-7">
+    {{ Form::label('name', 'Name:') }}
+    {{ Form::text('name', null, ['class' => 'form-control']) }}
+    <p class="text-danger">{{ $errors->first('name') }}</p>
+  </div>
+  <div class="form-group col-sm-5">
+    {{ Form::label('type', 'Type Code:') }}
+    {{ Form::text('type', null, ['class' => 'form-control']) }}
+    <p class="text-danger">{{ $errors->first('type') }}</p>
+  </div>
+</div>
+
+<div class="row">
+  <div class="form-group col-sm-7">
+    {{ Form::label('description', 'Description:') }}
+    {{ Form::text('description', null, ['class' => 'form-control']) }}
+    <p class="text-danger">{{ $errors->first('description') }}</p>
+  </div>
+  <div class="form-group col-sm-5">
+    {{ Form::label('image_url', 'Image Link:') }}
+    {{ Form::text('image_url', null, ['class' => 'form-control']) }}
+    <p class="text-danger">{{ $errors->first('image_url') }}</p>
+  </div>
+</div>
+
+<div class="row">
+  <div class="form-group col-sm-3">
+    <div class="checkbox">
+      <label class="checkbox-inline">
+        {{ Form::label('active', 'Active:') }}
+        {{ Form::hidden('active', false) }}
+        {{ Form::checkbox('active') }}
+      </label>
+    </div>
+  </div>
+  <div class="col-sm-9">
+    <div class="text-right">
+      {{ Form::button('Save', ['type' => 'submit', 'class' => 'btn btn-success']) }}
+    </div>
+  </div>
+</div>

resources/views/admin/typeratings/index.blade.php

@@ -0,0 +1,18 @@
+@extends('admin.app')
+@section('title', 'Type Ratings')
+@section('actions')
+  <li>
+    <a href="{{ route('admin.typeratings.create') }}">
+      <i class="ti-plus"></i>
+      Add New
+    </a>
+  </li>
+@endsection
+
+@section('content')
+  <div class="card border-blue-bottom">
+    <div class="content">
+      @include('admin.typeratings.table')
+    </div>
+  </div>
+@endsection

resources/views/admin/typeratings/scripts.blade.php

@@ -0,0 +1,48 @@
+@section('scripts')
+  <script>
+    function setEditable() {
+
+      const token = $('meta[name="csrf-token"]').attr('content');
+      const api_key = $('meta[name="api-key"]').attr('content');
+
+      @if(isset($typerating))
+      $('#subfleets-table a').editable({
+        type: 'text',
+        mode: 'inline',
+        emptytext: 'inherited',
+        url: '{{ url('/admin/typerating/'.$typerating->id.'/subfleets') }}',
+        title: 'Enter override value',
+        ajaxOptions: {
+          type: 'put',
+          headers: {
+            'x-api-key': api_key,
+            'X-CSRF-TOKEN': token,
+          }
+        },
+        params: function (params) {
+          return {
+            subfleet_id: params.pk,
+            name: params.name,
+            value: params.value
+          }
+        }
+      });
+      @endif
+    }
+
+    $(document).ready(function () {
+
+      setEditable();
+
+      $(document).on('submit', 'form.pjax_form', function (event) {
+        event.preventDefault();
+        $.pjax.submit(event, '#typerating_subfleet_wrapper', {push: false});
+      });
+
+      $(document).on('pjax:complete', function () {
+        initPlugins();
+        setEditable();
+      });
+    });
+  </script>
+@endsection

resources/views/admin/typeratings/show.blade.php

@@ -0,0 +1,17 @@
+@extends('admin.app')
+
+@section('content')
+  <section class="content-header">
+    <h1>{{ $typerating->name }}</h1>
+  </section>
+  <div class="content">
+    <div class="box box-primary">
+      <div class="box-body">
+        <div class="row" style="padding-left: 20px">
+          @include('admin.typerating.show_fields')
+        </div>
+      </div>
+    </div>
+  </div>
+@endsection
+@include('admin.typerating.scripts')

resources/views/admin/typeratings/show_fields.blade.php

@@ -0,0 +1,42 @@
+<!-- Id Field -->
+<div class="form-group">
+  {{ Form::label('id', 'Id:') }}
+  <p>{{ $typerating->id }}</p>
+</div>
+
+<!-- Name Field -->
+<div class="form-group">
+  {{ Form::label('name', 'Name:') }}
+  <p>{{ $typerating->name }}</p>
+</div>
+
+<!-- Type Code Field -->
+<div class="form-group">
+  {{ Form::label('type', 'Type Code:') }}
+  <p>{{ $typerating->type }}</p>
+</div>
+
+<!-- Description Field -->
+<div class="form-group">
+  {{ Form::label('description', 'Description:') }}
+  <p>{{ $typerating->description }}</p>
+</div>
+
+<!-- Image URL Field -->
+<div class="form-group">
+  {{ Form::label('image_url', 'Image URL:') }}
+  <p>{{ $typerating->image_url }}</p>
+</div>
+
+<!-- Created At Field -->
+<div class="form-group">
+  {{ Form::label('created_at', 'Created At:') }}
+  <p>{{ show_datetime($typerating->created_at) }}</p>
+</div>
+
+<!-- Updated At Field -->
+<div class="form-group">
+  {{ Form::label('updated_at', 'Updated At:') }}
+  <p>{{ show_datetime($typerating->updated_at) }}</p>
+</div>
+

resources/views/admin/typeratings/subfleets.blade.php

@@ -0,0 +1,54 @@
+<div id="typerating_subfleet_wrapper" class="dataTables_wrapper form-inline dt-bootstrap col-lg-12">
+  @if(count($typerating->subfleets) === 0)
+    @include('admin.common.none_added', ['type' => 'subfleets'])
+  @endif
+
+  <table class="table table-responsive" id="subfleets-table">
+    @if(count($typerating->subfleets))
+      <thead>
+      <th>Airline</th>
+      <th>Name</th>
+      <th style="text-align: center;">Actions</th>
+      </thead>
+    @endif
+    <tbody>
+    @foreach($typerating->subfleets as $sf)
+      <tr>
+        <td>{{ $sf->airline->name }}</td>
+        <td>{{ $sf->name.' ('.$sf->type.')' }}</td>
+        <td style="width: 10%; text-align: center;" class="form-inline">
+          {{ Form::open(['url' => '/admin/typeratings/'.$typerating->id.'/subfleets', 'method' => 'delete', 'class' => 'pjax_form']) }}
+          {{ Form::hidden('subfleet_id', $sf->id) }}
+          <div class='btn-group'>
+            {{ Form::button('<i class="fa fa-times"></i>',
+                             ['type' => 'submit',
+                              'class' => 'btn btn-sm btn-danger btn-icon'])
+              }}
+          </div>
+          {{ Form::close() }}
+        </td>
+      </tr>
+    @endforeach
+    </tbody>
+  </table>
+  <hr/>
+  <div class="row">
+    <div class="col-lg-12">
+      <div class="input-group input-group-lg pull-right">
+        {{ Form::open(['url' => url('/admin/typeratings/'.$typerating->id.'/subfleets'),
+                        'method' => 'post',
+                        'class' => 'pjax_form form-inline'
+                        ])
+        }}
+        {{ Form::select('subfleet_id', $avail_subfleets, null, [
+                'placeholder' => 'Select Subfleet',
+                'class' => 'select2 form-control input-lg'])
+        }}
+        {{ Form::button('<i class="fa fa-plus"></i> Add',
+                         ['type' => 'submit',
+                          'class' => 'btn btn-success btn-small']) }}
+        {{ Form::close() }}
+      </div>
+    </div>
+  </div>
+</div>

resources/views/admin/typeratings/table.blade.php

@@ -0,0 +1,26 @@
+<div id="typeratings_table_wrapper">
+  <table class="table table-hover table-responsive">
+    <thead>
+      <th>Type Code</th>
+      <th>Name</th>
+      <th>Description</th>
+      <th></th>
+    </thead>
+    <tbody>
+      @foreach($typeratings as $typerating)
+        <tr>
+          <td><a href="{{ route('admin.typeratings.edit', [$typerating->id]) }}">{{ $typerating->type }}</a></td>
+          <td>{{ $typerating->name }}</td>
+          <td>{{ $typerating->description }}</td>
+          <td class="text-right">
+            {{ Form::open(['route' => ['admin.typeratings.destroy', $typerating->id], 'method' => 'delete']) }}
+            <a href="{{ route('admin.typeratings.edit', [$typerating->id]) }}" class='btn btn-sm btn-success btn-icon'>
+              <i class="fas fa-pencil-alt"></i></a>
+            {{ Form::button('<i class="fa fa-times"></i>', ['type' => 'submit', 'class' => 'btn btn-sm btn-danger btn-icon', 'onclick' => "return confirm('Are you sure?')"]) }}
+            {{ Form::close() }}
+          </td>
+        </tr>
+      @endforeach
+    </tbody>
+  </table>
+</div>

resources/views/admin/users/edit.blade.php

@@ -9,6 +9,15 @@
     </div>
   </div>
 
+  <div class="card border-blue-bottom">
+    <div class="content">
+      <div class="header">
+        <h3>Type Ratings</h3>
+      </div>
+      @include('admin.users.type_ratings')
+    </div>
+  </div>
+
   <div class="card border-blue-bottom">
     <div class="content">
       <div class="header">
@@ -34,3 +43,4 @@
     </div>
   </div>
 @endsection
+@include('admin.users.script')

resources/views/admin/users/script.blade.php

@@ -0,0 +1,25 @@
+@section('scripts')
+  <script>
+    function setEditable() {
+
+      const token = $('meta[name="csrf-token"]').attr('content');
+      const api_key = $('meta[name="api-key"]').attr('content');
+    }
+
+    $(document).ready(function () {
+
+      setEditable();
+
+      $(document).on('submit', 'form.modify_typerating', function (event) {
+        event.preventDefault();
+        console.log(event);
+        $.pjax.submit(event, '#user_typeratings_wrapper', {push: false});
+      });
+
+      $(document).on('pjax:complete', function () {
+        initPlugins();
+        setEditable();
+      });
+    });
+  </script>
+@endsection

resources/views/admin/users/type_ratings.blade.php

@@ -0,0 +1,38 @@
+<div id="user_typeratings_wrapper" class="dataTables_wrapper form-inline dt-bootstrap">
+  <table id="user_typeratings" class="table table-hover">
+    @if(count($user->typeratings))
+      <thead>
+        <tr>
+          <th>Type</th>
+          <th>Name</th>
+          <th></th>
+        </tr>
+      </thead>
+    @endif
+    <tbody>
+      @foreach($user->typeratings as $tr)
+        <tr>
+          <td class="sorting_1">{{ $tr->type }}</td>
+          <td>{{ $tr->name }}</td>
+          <td style="text-align: right; width:3%;">
+            {{ Form::open(['url' => '/admin/users/'.$user->id.'/typeratings', 'method' => 'delete', 'class' => 'modify_typerating']) }}
+            {{ Form::hidden('typerating_id', $tr->id) }}
+            {{ Form::button('<i class="fa fa-times"></i>', ['type' => 'submit', 'class' => 'btn btn-sm btn-danger btn-icon']) }}
+            {{ Form::close() }}
+          </td>
+        </tr>
+      @endforeach
+    </tbody>
+  </table>
+  <hr/>
+  <div class="row">
+    <div class="col-xs-12">
+      <div class="text-right">
+        {{ Form::open(['url' => '/admin/users/'.$user->id.'/typeratings', 'method' => 'post', 'class' => 'modify_typerating form-inline']) }}
+        {{ Form::select('typerating_id', $avail_ratings, null, ['placeholder' => 'Select Type Rating', 'class' => 'ac-fare-dropdown form-control input-lg select2']) }}
+        {{ Form::button('<i class="glyphicon glyphicon-plus"></i> add', ['type' => 'submit', 'class' => 'btn btn-success btn-s']) }}
+        {{ Form::close() }}
+      </div>
+    </div>
+  </div>
+</div>

resources/views/layouts/default/widgets/live_map.blade.php

@@ -114,6 +114,7 @@ and being mindful of the rivets bindings
       center: ['{{ $center[0] }}', '{{ $center[1] }}'],
       zoom: '{{ $zoom }}',
       aircraft_icon: '{!! public_asset('/assets/img/acars/aircraft.png') !!}',
+      refresh_interval: {{ setting('acars.update_interval', 60) }},
       units: '{{ setting('units.distance') }}',
       leafletOptions: {
         scrollWheelZoom: false,

resources/views/layouts/default/widgets/weather.blade.php

@@ -14,7 +14,7 @@ https://api.checkwx.com/#metar-decoded
       <td>@lang('widgets.weather.wind')</td>
       <td>
         @if($metar['wind_speed'] < '1') Calm @else {{ $metar['wind_speed'] }} kts @lang('common.from') {{ $metar['wind_direction_label'] }} ({{ $metar['wind_direction']}}&deg;) @endif
-				@if($metar['wind_gust_speed']) @lang('widgets.weather.guststo') {{ $metar['wind_gust_speed'] }} @endif
+        @if($metar['wind_gust_speed']) @lang('widgets.weather.guststo') {{ $metar['wind_gust_speed'] }} @endif
       </td>
     </tr>
     @if($metar['visibility'])
@@ -24,58 +24,62 @@ https://api.checkwx.com/#metar-decoded
      </tr>
     @endif
     @if($metar['runways_visual_range'])
-		 <tr>
-			<td>Runway Visual Range</td>
-			<td>
-			  @foreach($metar['runways_visual_range'] as $rvr)
-			    <b>RWY{{ $rvr['runway'] }}</b>; {{ $rvr['report'] }}<br>
-			  @endforeach
-			</td>
-		 </tr>
-		@endif
-    @if($metar['present_weather_report'] <> 'Dry')
-		 <tr>
-			<td>Phenomena</td>
-			<td>{{ $metar['present_weather_report'] }}</td>
-		 </tr>
-		@endif
+     <tr>
+      <td>Runway Visual Range</td>
+      <td>
+        @foreach($metar['runways_visual_range'] as $rvr)
+          <b>RWY{{ $rvr['runway'] }}</b>; {{ $rvr['report'] }}<br>
+        @endforeach
+      </td>
+     </tr>
+    @endif
+    @if($metar['present_weather_report'] && $metar['present_weather_report'] <> 'Dry')
+     <tr>
+      <td>Phenomena</td>
+      <td>{{ $metar['present_weather_report'] }}</td>
+     </tr>
+    @endif
     @if($metar['clouds'] || $metar['cavok'])
-		 <tr>
-			<td>@lang('widgets.weather.clouds')</td>
-			<td>
-				@if($unit_alt === 'ft') {{ $metar['clouds_report_ft'] }} @else {{ $metar['clouds_report'] }} @endif 
-				@if($metar['cavok'] == 1) Ceiling and Visibility OK @endif
-			</td>
-		 </tr>
-		@endif
-    <tr>
-			<td>@lang('widgets.weather.temp')</td>
-			<td>
-        @if($metar['temperature'][$unit_temp]) {{ $metar['temperature'][$unit_temp] }} @else 0 @endif &deg;{{strtoupper($unit_temp)}}
-				@if($metar['dew_point']), @lang('widgets.weather.dewpoint') @if($metar['dew_point'][$unit_temp]) {{ $metar['dew_point'][$unit_temp] }} @else 0 @endif &deg;{{strtoupper($unit_temp)}} @endif 
-				@if($metar['humidity']), @lang('widgets.weather.humidity') {{ $metar['humidity'] }}%  @endif
-			</td>
-		</tr>
-    <tr>
-      <td>@lang('widgets.weather.barometer')</td>
-      <td>{{ number_format($metar['barometer']['hPa']) }} hPa / {{ number_format($metar['barometer']['inHg'], 2) }} inHg</td>
-    </tr>
+     <tr>
+      <td>@lang('widgets.weather.clouds')</td>
+      <td>
+        @if($unit_alt === 'ft') {{ $metar['clouds_report_ft'] }} @else {{ $metar['clouds_report'] }} @endif 
+        @if($metar['cavok'] == 1) Ceiling and Visibility OK @endif
+      </td>
+     </tr>
+    @endif
+    @if($metar['temperature'])
+      <tr>
+        <td>@lang('widgets.weather.temp')</td>
+        <td>
+          @if($metar['temperature'][$unit_temp]) {{ $metar['temperature'][$unit_temp] }} @else 0 @endif &deg;{{strtoupper($unit_temp)}}
+          @if($metar['dew_point']), @lang('widgets.weather.dewpoint') @if($metar['dew_point'][$unit_temp]) {{ $metar['dew_point'][$unit_temp] }} @else 0 @endif &deg;{{strtoupper($unit_temp)}} @endif 
+          @if($metar['humidity']), @lang('widgets.weather.humidity') {{ $metar['humidity'] }}%  @endif
+        </td>
+      </tr>
+    @endif
+    @if($metar['barometer'])
+      <tr>
+        <td>@lang('widgets.weather.barometer')</td>
+        <td>{{ number_format($metar['barometer']['hPa']) }} hPa / {{ number_format($metar['barometer']['inHg'], 2) }} inHg</td>
+      </tr>
+    @endif
     @if($metar['recent_weather_report'])
-		 <tr>
-			<td>Recent Phenomena</td>
-			<td>{{ $metar['recent_weather_report'] }}</td>
-		 </tr>
-		@endif
-		@if($metar['runways_report'])
-		 <tr>
-			<td>Runway Condition</td>
-			<td>
-			  @foreach($metar['runways_report'] as $runway)
-			    <b>RWY{{ $runway['runway'] }}</b>; {{ $runway['report'] }}<br>
-			  @endforeach
-			</td>
-		 </tr>	
-		@endif
+     <tr>
+      <td>Recent Phenomena</td>
+      <td>{{ $metar['recent_weather_report'] }}</td>
+     </tr>
+    @endif
+    @if($metar['runways_report'])
+     <tr>
+      <td>Runway Condition</td>
+      <td>
+        @foreach($metar['runways_report'] as $runway)
+          <b>RWY{{ $runway['runway'] }}</b>; {{ $runway['report'] }}<br>
+        @endforeach
+      </td>
+     </tr>	
+    @endif
     @if($metar['remarks'])
       <tr>
         <td>@lang('widgets.weather.remarks')</td>

tests/VersionTest.php

@@ -38,7 +38,7 @@ class VersionTest extends TestCase
 
             $this->assertTrue(
                 $versionSvc->isGreaterThan($newVersion, $currentVersion),
-                "{$newVersion} not greater than ${currentVersion}"
+                "$newVersion not greater than $currentVersion"
             );
         }
     }

tests/data/aircraft-update.csv

@@ -1,3 +1,3 @@
-subfleet,iata, icao,airport_id, name,registration,hex_code,mtow,zfw,status
-A32X,A320,320,,A320-211,N309US,,,,S
-74X,747 400, ,,,
+subfleet,iata,icao,hub_id,airport_id,name,registration,hex_code,mtow,zfw,status
+A32X,A320,320,,,A320-211,N309US,,,,S
+74X,747 400,, ,,,

tests/data/aircraft.csv

@@ -1,3 +1,3 @@
-subfleet,iata, icao,airport_id, name,registration,hex_code,mtow,zfw,status
-A32X,A320,320,,A320-211,N309US,,,,A
-74X,747 400,, ,,
+subfleet,iata,icao,hub_id,airport_id,name,registration,hex_code,mtow,zfw,status
+A32X,A320,320,,,A320-211,N309US,,,,A
+74X,747 400,,, ,,

tests/data/aircraft_empty_cols.csv

@@ -1,3 +1,3 @@
-subfleet,iata, icao,airport_id, name,registration,hex_code,mtow,zfw,status
-A32X,A320-211,,N309US,,,
- , B744-GE,, N304,,,
+subfleet,iata,icao,hub_id,airport_id,name,registration,hex_code,mtow,zfw,status
+A32X,A320-211,,,N309US,,,
+ , B744-GE,,, N304,,,