diff --git a/app/Http/Controllers/Admin/RankController.php b/app/Http/Controllers/Admin/RankController.php index 72b39654..d2491577 100644 --- a/app/Http/Controllers/Admin/RankController.php +++ b/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; } diff --git a/app/Http/Controllers/Admin/SubfleetController.php b/app/Http/Controllers/Admin/SubfleetController.php index 26497013..6f9bf895 100644 --- a/app/Http/Controllers/Admin/SubfleetController.php +++ b/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, ]); } diff --git a/app/Models/Enums/EnumBase.php b/app/Models/Enums/EnumBase.php index e09ce685..0b18404c 100644 --- a/app/Models/Enums/EnumBase.php +++ b/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; + } } diff --git a/app/Models/Enums/FuelType.php b/app/Models/Enums/FuelType.php new file mode 100644 index 00000000..355f6c49 --- /dev/null +++ b/app/Models/Enums/FuelType.php @@ -0,0 +1,16 @@ + '100LL', + FuelType::JET_A => 'JET A', + FuelType::MOGAS => 'MOGAS', + ]; +} diff --git a/app/Repositories/AcarsRepository.php b/app/Repositories/AcarsRepository.php index f4f3c6d1..3ed234ee 100644 --- a/app/Repositories/AcarsRepository.php +++ b/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();*/ } /** diff --git a/public/assets/admin/css/admin.css b/public/assets/admin/css/admin.css index 119611f7..d1b8df98 100644 --- a/public/assets/admin/css/admin.css +++ b/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; +} diff --git a/resources/views/admin/aircraft/create.blade.php b/resources/views/admin/aircraft/create.blade.php index c0111bec..10e451ec 100644 --- a/resources/views/admin/aircraft/create.blade.php +++ b/resources/views/admin/aircraft/create.blade.php @@ -1,22 +1,12 @@ @extends('admin.app') @section('title', 'Add Aircraft') @section('content') -
-

Aircraft

-
-
+
+
@include('admin.flash.message') -
- -
-
- {!! Form::open(['route' => 'admin.aircraft.store']) !!} - - @include('admin.aircraft.fields') - - {!! Form::close() !!} -
-
+ {!! Form::open(['route' => 'admin.aircraft.store']) !!} + @include('admin.aircraft.fields') + {!! Form::close() !!}
@endsection diff --git a/resources/views/admin/aircraft/fields.blade.php b/resources/views/admin/aircraft/fields.blade.php index aba32a0b..0fe2eed8 100644 --- a/resources/views/admin/aircraft/fields.blade.php +++ b/resources/views/admin/aircraft/fields.blade.php @@ -1,41 +1,44 @@
- -
- {!! Form::label('name', 'Name:') !!} - {!! Form::text('name', null, ['class' => 'form-control']) !!} -
+ +
+ {!! Form::label('name', 'Name:') !!} * + {!! Form::text('name', null, ['class' => 'form-control']) !!} +
-
- {!! Form::label('subfleet_id', 'Subfleet:') !!} - {!! Form::select('subfleet_id', $subfleets, null, ['class' => 'form-control select2', 'placeholder' => 'Select Subfleet']) !!} -
+
+ {!! Form::label('subfleet_id', 'Subfleet:') !!} + {!! Form::select('subfleet_id', $subfleets, null, ['class' => 'form-control select2', 'placeholder' => 'Select Subfleet']) !!} +
- -
- {!! Form::label('registration', 'Registration:') !!} - {!! Form::text('registration', null, ['class' => 'form-control']) !!}
+
+ +
+ {!! Form::label('registration', 'Registration:') !!} + {!! Form::text('registration', null, ['class' => 'form-control']) !!} +
- -
- {!! Form::label('tail_number', 'Tail Number:') !!} - {!! Form::text('tail_number', null, ['class' => 'form-control']) !!} -
- - -
- {!! Form::label('active', 'Active:') !!} - -
- - -
-
- {!! Form::submit('Save', ['class' => 'btn btn-primary']) !!} - Cancel + +
+ {!! Form::label('tail_number', 'Tail Number:') !!} + {!! Form::text('tail_number', null, ['class' => 'form-control']) !!}
+
+ +
+ {!! Form::label('active', 'Active:') !!} + +
+ + +
+
+ {!! Form::submit('Save', ['class' => 'btn btn-primary']) !!} + Cancel +
+
diff --git a/resources/views/admin/fares/fields.blade.php b/resources/views/admin/fares/fields.blade.php index 16adae19..9cb61ed8 100644 --- a/resources/views/admin/fares/fields.blade.php +++ b/resources/views/admin/fares/fields.blade.php @@ -1,31 +1,64 @@ +
+
+
+ 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. +
+
+
+
{!! Form::label('code', 'Code:') !!} +
+    + How this fare class will show up on a ticket +
{!! Form::text('code', null, ['class' => 'form-control']) !!}
{!! Form::label('name', 'Name:') !!} +
+    + The fare class name, E.g, "Economy" or "First" +
{!! Form::text('name', null, ['class' => 'form-control']) !!}
{!! Form::label('price', 'Price:') !!} +
+    + This is the price of a ticket for a passenger +
{!! Form::text('price', null, ['class' => 'form-control']) !!}
{!! Form::label('cost', 'Cost:') !!} +
+    + The operating cost +
{!! Form::text('cost', null, ['class' => 'form-control']) !!}
{!! Form::label('capacity', 'Capacity:') !!} +
+    + The number of seats available in this class. +
{!! Form::text('capacity', null, ['class' => 'form-control']) !!}
{!! Form::label('notes', 'Notes:') !!} +
+   +
{!! Form::text('notes', null, ['class' => 'form-control']) !!}
diff --git a/resources/views/admin/subfleets/show_fields.blade.php b/resources/views/admin/subfleets/show_fields.blade.php index 1ad1afd2..a2ebbdf2 100644 --- a/resources/views/admin/subfleets/show_fields.blade.php +++ b/resources/views/admin/subfleets/show_fields.blade.php @@ -17,7 +17,7 @@

{!! $subfleet->type !!}

- +{{--
{!! Form::label('fuel_type', 'Fuel Type:') !!}

@@ -31,7 +31,7 @@ - @endif

-
+
--}}
diff --git a/resources/views/admin/subfleets/table.blade.php b/resources/views/admin/subfleets/table.blade.php index 460a217c..357a4014 100644 --- a/resources/views/admin/subfleets/table.blade.php +++ b/resources/views/admin/subfleets/table.blade.php @@ -4,7 +4,7 @@ Airline Name Type - Fuel Type + {{--Fuel Type--}} @@ -13,7 +13,7 @@ {!! $subfleet->airline->name !!} {!! $subfleet->name !!} {!! $subfleet->type !!} - + {{-- @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 - + --}} {!! Form::open(['route' => ['admin.subfleets.destroy', $subfleet->id], 'method' => 'delete']) !!}