Field cleanup and some field details

app/Http/Controllers/Admin/RankController.php

@@ -2,14 +2,16 @@
 
 namespace App\Http\Controllers\Admin;
 
+use Cache;
+use Flash;
+use Response;
+use Illuminate\Http\Request;
+use Prettus\Repository\Criteria\RequestCriteria;
+
 use App\Http\Requests\CreateRankRequest;
 use App\Http\Requests\UpdateRankRequest;
 use App\Repositories\RankRepository;
 use App\Repositories\SubfleetRepository;
-use Illuminate\Http\Request;
-use Flash;
-use Prettus\Repository\Criteria\RequestCriteria;
-use Response;
 
 class RankController extends BaseController
 {
@@ -19,8 +21,7 @@ class RankController extends BaseController
     public function __construct(
         RankRepository $rankingRepo,
         SubfleetRepository $subfleetRepo
-    )
-    {
+    ) {
         $this->rankRepository = $rankingRepo;
         $this->subfleetRepo = $subfleetRepo;
     }

app/Http/Controllers/Admin/SubfleetController.php

@@ -2,19 +2,20 @@
 
 namespace App\Http\Controllers\Admin;
 
-use App\Http\Requests;
-use App\Models\Airline;
-use App\Models\Subfleet;
-use App\Http\Requests\CreateSubfleetRequest;
-use App\Http\Requests\UpdateSubfleetRequest;
-use App\Models\Fare;
-use App\Repositories\FareRepository;
-use App\Repositories\SubfleetRepository;
 use Illuminate\Http\Request;
 use Flash;
 use Prettus\Repository\Criteria\RequestCriteria;
 use Response;
 
+use App\Models\Enums\FuelType;
+
+use App\Models\Airline;
+use App\Models\Subfleet;
+use App\Http\Requests\CreateSubfleetRequest;
+use App\Http\Requests\UpdateSubfleetRequest;
+use App\Repositories\FareRepository;
+use App\Repositories\SubfleetRepository;
+
 class SubfleetController extends BaseController
 {
     /** @var  SubfleetRepository */
@@ -34,19 +35,6 @@ class SubfleetController extends BaseController
         $this->fareRepo = $fareRepo;
     }
 
-    /**
-     * @return array
-     */
-    protected function getFuelTypes()
-    {
-        $retval = [];
-        foreach (config('enums.fuel_types') as $fuel_type => $value) {
-            $retval[$value] = $fuel_type;
-        }
-
-        return $retval;
-    }
-
     /**
      * Get all the fares that haven't been assigned to a given subfleet
      */
@@ -67,9 +55,9 @@ class SubfleetController extends BaseController
 
     /**
      * Display a listing of the Subfleet.
-     *
      * @param Request $request
      * @return Response
+     * @throws \Prettus\Repository\Exceptions\RepositoryException
      */
     public function index(Request $request)
     {
@@ -90,7 +78,7 @@ class SubfleetController extends BaseController
     {
         return view('admin.subfleets.create', [
             'airlines' => Airline::all()->pluck('name', 'id'),
-            'fuel_types' => $this->getFuelTypes(),
+            'fuel_types' => FuelType::labels(),
         ]);
     }
 
@@ -152,9 +140,9 @@ class SubfleetController extends BaseController
         $avail_fares = $this->getAvailFares($subfleet);
         return view('admin.subfleets.edit', [
             'airlines' => Airline::all()->pluck('name', 'id'),
-            'fuel_types' => $this->getFuelTypes(),
-            'avail_fares' => $avail_fares,
-            'subfleet' => $subfleet,
+            'fuel_types'    => FuelType::labels(),
+            'avail_fares'   => $avail_fares,
+            'subfleet'      => $subfleet,
         ]);
     }
 

app/Models/Enums/EnumBase.php

@@ -41,4 +41,21 @@ class EnumBase
 
         return $labels;
     }
+
+    /**
+     * Select box
+     */
+    public static function select($add_blank=false)
+    {
+        $labels = [];
+        if($add_blank) {
+            $labels[] = '';
+        }
+
+        foreach (static::$labels as $key => $label) {
+            $labels[$key] = trans($label);
+        }
+
+        return $labels;
+    }
 }

app/Models/Enums/FuelType.php

@@ -0,0 +1,16 @@
+<?php
+
+namespace App\Models\Enums;
+
+class FuelType extends EnumBase {
+
+    const LOW_LEAD  = 0;
+    const JET_A     = 1;
+    const MOGAS     = 2;
+
+    protected static $labels = [
+        FuelType::LOW_LEAD  => '100LL',
+        FuelType::JET_A     => 'JET A',
+        FuelType::MOGAS     => 'MOGAS',
+    ];
+}

app/Repositories/AcarsRepository.php

@@ -34,10 +34,6 @@ class AcarsRepository extends BaseRepository //implements CacheableInterface
         return Pirep::with(['airline', 'position'])
                 ->where(['state' => PirepState::IN_PROGRESS])
                 ->get();
-
-        /*return Pirep::with(['acars' => function($q) {
-            return $q->limit(1);
-        }])->where(['state' => PirepState::IN_PROGRESS])->get();*/
     }
 
     /**

public/assets/admin/css/admin.css

@@ -85,3 +85,10 @@
 .table-upgrade td:nth-child(3) {
     text-align: center;
 }
+
+span.required {
+    color: #c12e2a;
+    font-weight: 400;
+    font-size: 120%;
+    vertical-align: sub;
+}

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

@@ -1,22 +1,12 @@
 @extends('admin.app')
 @section('title', 'Add Aircraft')
 @section('content')
-    <section class="content-header">
-        <h1>Aircraft</h1>
-    </section>
-    <div class="content">
+    <div class="card border-blue-bottom">
+        <div class="content">
         @include('admin.flash.message')
-        <div class="box box-primary">
-
-            <div class="box-body">
-                <div class="row">
-                    {!! Form::open(['route' => 'admin.aircraft.store']) !!}
-
-                        @include('admin.aircraft.fields')
-
-                    {!! Form::close() !!}
-                </div>
-            </div>
+        {!! Form::open(['route' => 'admin.aircraft.store']) !!}
+            @include('admin.aircraft.fields')
+        {!! Form::close() !!}
         </div>
     </div>
 @endsection

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

@@ -1,41 +1,44 @@
 <div class="row">
-<!-- Name Field -->
-<div class="form-group col-sm-6">
-    {!! Form::label('name', 'Name:') !!}
-    {!! Form::text('name', null, ['class' => 'form-control']) !!}
-</div>
+    <!-- Name Field -->
+    <div class="form-group col-sm-6">
+        {!! Form::label('name', 'Name:') !!} <span class="required">*</span>
+        {!! Form::text('name', null, ['class' => 'form-control']) !!}
+    </div>
 
-<div class="form-group col-sm-6">
-    {!! Form::label('subfleet_id', 'Subfleet:') !!}
-    {!! Form::select('subfleet_id', $subfleets, null, ['class' => 'form-control select2', 'placeholder' => 'Select Subfleet']) !!}
-</div>
+    <div class="form-group col-sm-6">
+        {!! Form::label('subfleet_id', 'Subfleet:') !!}
+        {!! Form::select('subfleet_id', $subfleets, null, ['class' => 'form-control select2', 'placeholder' => 'Select Subfleet']) !!}
+    </div>
 
-<!-- Registration Field -->
-<div class="form-group col-sm-6">
-    {!! Form::label('registration', 'Registration:') !!}
-    {!! Form::text('registration', null, ['class' => 'form-control']) !!}
 </div>
+<div class="row">
+    <!-- Registration Field -->
+    <div class="form-group col-sm-6">
+        {!! Form::label('registration', 'Registration:') !!}
+        {!! Form::text('registration', null, ['class' => 'form-control']) !!}
+    </div>
 
-<!-- Tail Number Field -->
-<div class="form-group col-sm-6">
-    {!! Form::label('tail_number', 'Tail Number:') !!}
-    {!! Form::text('tail_number', null, ['class' => 'form-control']) !!}
-</div>
-
-<!-- Active Field -->
-<div class="form-group col-12">
-    {!! Form::label('active', 'Active:') !!}
-    <label class="checkbox-inline">
-        {!! Form::hidden('active', 0, false) !!}
-        {!! Form::checkbox('active', 1, null) !!}
-    </label>
-</div>
-
-<!-- Submit Field -->
-<div class="form-group col-sm-12">
-    <div class="pull-right">
-        {!! Form::submit('Save', ['class' => 'btn btn-primary']) !!}
-        <a href="{!! route('admin.aircraft.index') !!}" class="btn btn-default">Cancel</a>
+    <!-- Tail Number Field -->
+    <div class="form-group col-sm-6">
+        {!! Form::label('tail_number', 'Tail Number:') !!}
+        {!! Form::text('tail_number', null, ['class' => 'form-control']) !!}
     </div>
 </div>
+<div class="row">
+    <!-- Active Field -->
+    <div class="form-group col-12">
+        {!! Form::label('active', 'Active:') !!}
+        <label class="checkbox-inline">
+            {!! Form::hidden('active', 0, false) !!}
+            {!! Form::checkbox('active', 1, null) !!}
+        </label>
+    </div>
+
+    <!-- Submit Field -->
+    <div class="form-group col-sm-12">
+        <div class="pull-right">
+            {!! Form::submit('Save', ['class' => 'btn btn-primary']) !!}
+            <a href="{!! route('admin.aircraft.index') !!}" class="btn btn-default">Cancel</a>
+        </div>
+    </div>
 </div>

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

@@ -1,31 +1,64 @@
+<div class="row">
+    <div class="col-md-12">
+        <div class="callout callout-success">
+        When a fare is assigned to a subfleet, the price, cost and capacity can be overridden,
+        so you can create default values that will apply to most of your subfleets, and change
+        them where they will differ.
+        </div>
+        <br />
+    </div>
+</div>
 <div class="row">
 <div class="form-group col-sm-6">
     {!! Form::label('code', 'Code:') !!}
+    <div class="callout callout-info">
+        <i class="icon fa fa-info">&nbsp;&nbsp;</i>
+        How this fare class will show up on a ticket
+    </div>
     {!! Form::text('code', null, ['class' => 'form-control']) !!}
 </div>
 
 <div class="form-group col-sm-6">
     {!! Form::label('name', 'Name:') !!}
+    <div class="callout callout-info">
+        <i class="icon fa fa-info">&nbsp;&nbsp;</i>
+        The fare class name, E.g, "Economy" or "First"
+    </div>
     {!! Form::text('name', null, ['class' => 'form-control']) !!}
 </div>
 
 <div class="form-group col-sm-6">
     {!! Form::label('price', 'Price:') !!}
+    <div class="callout callout-info">
+        <i class="icon fa fa-info">&nbsp;&nbsp;</i>
+        This is the price of a ticket for a passenger
+    </div>
     {!! Form::text('price', null, ['class' => 'form-control']) !!}
 </div>
 
 <div class="form-group col-sm-6">
     {!! Form::label('cost', 'Cost:') !!}
+    <div class="callout callout-info">
+        <i class="icon fa fa-info">&nbsp;&nbsp;</i>
+        The operating cost
+    </div>
     {!! Form::text('cost', null, ['class' => 'form-control']) !!}
 </div>
 
 <div class="form-group col-sm-6">
     {!! Form::label('capacity', 'Capacity:') !!}
+    <div class="callout callout-info">
+        <i class="icon fa fa-info">&nbsp;&nbsp;</i>
+        The number of seats available in this class.
+    </div>
     {!! Form::text('capacity', null, ['class' => 'form-control']) !!}
 </div>
 
 <div class="form-group col-sm-6">
     {!! Form::label('notes', 'Notes:') !!}
+    <div class="callout callout-info">
+        &nbsp;
+    </div>
     {!! Form::text('notes', null, ['class' => 'form-control']) !!}
 </div>
 

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

@@ -17,7 +17,7 @@
     <p>{!! $subfleet->type !!}</p>
 </div>
 
-<!-- Fuel Type Field -->
+{{--<!-- Fuel Type Field -->
 <div class="form-group">
     {!! Form::label('fuel_type', 'Fuel Type:') !!}
     <p>
@@ -31,7 +31,7 @@
         -
     @endif
     </p>
-</div>
+</div>--}}
 
 <!-- Created At Field -->
 <div class="form-group">

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

@@ -4,7 +4,7 @@
         <th>Airline</th>
         <th>Name</th>
         <th>Type</th>
-        <th>Fuel Type</th>
+        {{--<th>Fuel Type</th>--}}
         <th></th>
     </thead>
     <tbody>
@@ -13,7 +13,7 @@
             <td>{!! $subfleet->airline->name !!}</td>
             <td>{!! $subfleet->name !!}</td>
             <td>{!! $subfleet->type !!}</td>
-            <td>
+            {{--<td>
                 @if($subfleet->fuel_type === config('enums.fuel_types.100LL'))
                     100LL
                 @elseif($subfleet->fuel_type === config('enums.fuel_types.JETA'))
@@ -23,7 +23,7 @@
                 @else
                     -
                 @endif
-            </td>
+            </td>--}}
             <td class="text-right">
                 {!! Form::open(['route' => ['admin.subfleets.destroy', $subfleet->id], 'method' => 'delete']) !!}