Field and error message cleanup

app/Http/Controllers/Admin/FlightController.php

@@ -72,7 +72,7 @@ class FlightController extends BaseController
         return view('admin.flights.create', [
             'flight'   => null,
             'airlines' => $this->airlineRepo->selectBoxList(),
-            'airports' => $this->airportRepo->selectBoxList(),
+            'airports' => $this->airportRepo->selectBoxList(true, false),
         ]);
     }
 

app/Http/Controllers/Admin/PirepFieldController.php

@@ -31,7 +31,7 @@ class PirepFieldController extends BaseController
         $this->pirepFieldRepo->pushCriteria(new RequestCriteria($request));
         $fields = $this->pirepFieldRepo->all();
 
-        return view('admin.pirepFields.index', [
+        return view('admin.pirepfields.index', [
             'fields' => $fields,
         ]);
     }
@@ -43,7 +43,7 @@ class PirepFieldController extends BaseController
      */
     public function create()
     {
-        return view('admin.pirepFields.create');
+        return view('admin.pirepfields.create');
     }
 
     /**
@@ -60,7 +60,7 @@ class PirepFieldController extends BaseController
         $field = $this->pirepFieldRepo->create($input);
 
         Flash::success('PirepField saved successfully.');
-        return redirect(route('admin.pirepFields.index'));
+        return redirect(route('admin.pirepfields.index'));
     }
 
     /**
@@ -76,10 +76,10 @@ class PirepFieldController extends BaseController
 
         if (empty($field)) {
             Flash::error('PirepField not found');
-            return redirect(route('admin.pirepFields.index'));
+            return redirect(route('admin.pirepfields.index'));
         }
 
-        return view('admin.pirepFields.show', [
+        return view('admin.pirepfields.show', [
             'field' => $field,
         ]);
     }
@@ -97,10 +97,10 @@ class PirepFieldController extends BaseController
 
         if (empty($field)) {
             Flash::error('PirepField not found');
-            return redirect(route('admin.pirepFields.index'));
+            return redirect(route('admin.pirepfields.index'));
         }
 
-        return view('admin.pirepFields.edit', [
+        return view('admin.pirepfields.edit', [
             'field' => $field,
         ]);
     }
@@ -119,13 +119,13 @@ class PirepFieldController extends BaseController
 
         if (empty($field)) {
             Flash::error('PirepField not found');
-            return redirect(route('admin.pirepFields.index'));
+            return redirect(route('admin.pirepfields.index'));
         }
 
         $field = $this->pirepFieldRepo->update($request->all(), $id);
 
         Flash::success('PirepField updated successfully.');
-        return redirect(route('admin.pirepFields.index'));
+        return redirect(route('admin.pirepfields.index'));
     }
 
     /**
@@ -141,12 +141,12 @@ class PirepFieldController extends BaseController
 
         if (empty($field)) {
             Flash::error('PirepField not found');
-            return redirect(route('admin.pirepFields.index'));
+            return redirect(route('admin.pirepfields.index'));
         }
 
         $this->pirepFieldRepo->delete($id);
 
         Flash::success('PirepField deleted successfully.');
-        return redirect(route('admin.pirepFields.index'));
+        return redirect(route('admin.pirepfields.index'));
     }
 }

app/Models/Acars.php

@@ -7,9 +7,9 @@ use App\Models\Traits\HashId;
 class Acars extends BaseModel
 {
     use HashId;
-    public $incrementing = false;
 
     public $table = 'acars';
+    public $incrementing = false;
 
     public $fillable = [
         'pirep_id',
@@ -37,6 +37,10 @@ class Acars extends BaseModel
         'fuel_flow'     => 'float',
     ];
 
+    public static $rules = [
+        'pirep_id'  => 'required',
+    ];
+
     /**
      * FKs
      */

app/Models/Aircraft.php

@@ -6,8 +6,6 @@ class Aircraft extends BaseModel
 {
     public $table = 'aircraft';
 
-    protected $dates = ['deleted_at'];
-
     public $fillable = [
         'subfleet_id',
         'airport_id',

app/Models/Airline.php

@@ -34,9 +34,11 @@ class Airline extends BaseModel
      * @var array
      */
     public static $rules = [
-        'iata' => 'required|max:5',
-        'icao' => 'required|max:5',
-        'name' => 'required',
+        'country'   => 'nullable',
+        'iata'      => 'nullable|max:5',
+        'icao'      => 'required|max:5',
+        'logo'      => 'nullable',
+        'name'      => 'required',
     ];
 
     /**
@@ -46,4 +48,21 @@ class Airline extends BaseModel
         return $this->icao;
     }
 
+    protected static function boot()
+    {
+        parent::boot();
+
+        /**
+         * IATA and ICAO should be in all caps
+         */
+        static::creating(function (Airline $model) {
+            if (!empty($model->iata)) {
+                $model->iata = strtoupper($model->iata);
+            }
+
+            if (!empty($model->icao)) {
+                $model->icao = strtoupper($model->icao);
+            }
+        });
+    }
 }

app/Models/Airport.php

@@ -38,14 +38,12 @@ class Airport extends BaseModel
 
     /**
      * Validation rules
-     *
-     * @var array
      */
     public static $rules = [
-        'icao' => 'required',
-        'name' => 'required',
-        'lat' => 'required',
-        'lon' => 'required',
+        'icao' =>   'required',
+        'name' =>   'required',
+        'lat' =>    'required',
+        'lon' =>    'required',
     ];
 
     /**

app/Models/Setting.php

@@ -35,5 +35,4 @@ class Setting extends BaseModel
             }
         });
     }
-
 }