From 9332f642841607ec9589ab41c3b0de31b95e2822 Mon Sep 17 00:00:00 2001 From: Nabeel Shahzad Date: Fri, 11 May 2018 13:53:24 -0500 Subject: [PATCH] Cleanup admin pirep form and read-only state --- app/Models/Pirep.php | 2 +- resources/views/admin/pireps/fares.blade.php | 2 +- resources/views/admin/pireps/fields.blade.php | 339 ++++++++++-------- 3 files changed, 186 insertions(+), 157 deletions(-) diff --git a/app/Models/Pirep.php b/app/Models/Pirep.php index 2bffd4f8..eac0b0d7 100644 --- a/app/Models/Pirep.php +++ b/app/Models/Pirep.php @@ -128,7 +128,7 @@ class Pirep extends Model public static $read_only_states = [ PirepState::ACCEPTED, PirepState::REJECTED, - PirepState::PENDING, + //PirepState::PENDING, PirepState::CANCELLED, ]; diff --git a/resources/views/admin/pireps/fares.blade.php b/resources/views/admin/pireps/fares.blade.php index 2c973bf3..3bf523de 100644 --- a/resources/views/admin/pireps/fares.blade.php +++ b/resources/views/admin/pireps/fares.blade.php @@ -1,7 +1,7 @@ @if($aircraft) - + diff --git a/resources/views/admin/pireps/fields.blade.php b/resources/views/admin/pireps/fields.blade.php index 4998ec33..e8cbba88 100644 --- a/resources/views/admin/pireps/fields.blade.php +++ b/resources/views/admin/pireps/fields.blade.php @@ -8,161 +8,181 @@ @endif
-
- {{ Form::label('flight_number', 'Flight Number/Route Code/Leg') }} - @if($pirep->read_only) -

{{ $pirep->ident }} - {{ Form::hidden('flight_number') }} - {{ Form::hidden('flight_code') }} - {{ Form::hidden('flight_leg') }} -

- @else -
-
- {{ Form::text('flight_number', null, [ - 'placeholder' => 'Flight Number', - 'class' => 'form-control']) }} -

{{ $errors->first('flight_number') }}

-
-
- {{ Form::text('route_code', null, [ - 'placeholder' => 'Code (optional)', - 'class' => 'form-control']) }} -

{{ $errors->first('route_code') }}

-
-
- {{ Form::text('route_leg', null, [ - 'placeholder' => 'Leg (optional)', - 'class' => 'form-control']) }} -

{{ $errors->first('route_leg') }}

-
-
- @endif -
-
- {{ Form::label('flight_type', 'Flight Type') }} - {{ Form::select('flight_type', - \App\Models\Enums\FlightType::select(), - null, [ - 'class' => 'form-control select2', - 'readonly' => $pirep->read_only - ]) - }} -

{{ $errors->first('flight_type') }}

-
-
-

Filed Via:

- {{ PirepSource::label($pirep->source) }} - @if(filled($pirep->source_name)) - ({{ $pirep->source_name }}) - @endif -
-
-
-
- {{ Form::label('airline_id', 'Airline') }} - @if($pirep->read_only) -

{{ $pirep->airline->name }}

- {{ Form::hidden('airline_id') }} - @else - {{ Form::select('airline_id', $airlines_list, null, [ - 'class' => 'form-control select2', - 'readonly' => $pirep->read_only]) }} -

{{ $errors->first('airline_id') }}

- @endif -
-
- {{ Form::label('aircraft_id', 'Aircraft:') }} - @if($pirep->read_only) -

{{ $pirep->aircraft->name }}

- {{ Form::hidden('aircraft_id') }} - @else - {{ Form::select('aircraft_id', $aircraft_list, null, [ - 'id' => 'aircraft_select', - 'class' => 'form-control select2', - 'readonly' => $pirep->read_only - ]) }} -

{{ $errors->first('aircraft_id') }}

- @endif -
-
- {{ Form::label('dpt_airport_id', 'Departure Airport:') }} - @if($pirep->read_only) -

{{ $pirep->dpt_airport->id }} - {{ $pirep->dpt_airport->name }}

- {{ Form::hidden('dpt_airport_id') }} - @else - {{ Form::select('dpt_airport_id', $airports_list, null, [ - 'class' => 'form-control select2', - 'readonly' => $pirep->read_only]) }} -

{{ $errors->first('dpt_airport_id') }}

- @endif -
+
+
+
+  Flight Information +
+
-
- {{ Form::label('arr_airport_id', 'Arrival Airport:') }} - @if($pirep->read_only) -

{{ $pirep->arr_airport->id }} - {{ $pirep->arr_airport->name }}

- {{ Form::hidden('arr_airport_id') }} - @else - {{ Form::select('arr_airport_id', $airports_list, null, ['class' => 'form-control select2']) }} -

{{ $errors->first('arr_airport_id') }}

- @endif -
-
-
- -
- {{ Form::label('flight_time', 'Flight Time (hours & minutes):') }} - @if($pirep->read_only) -

- {{ $pirep->hours }} hours, {{ $pirep->minutes }} minutes - {{ Form::hidden('hours') }} - {{ Form::hidden('minutes') }} -

- @else -
-
- {{ Form::number('hours', null, [ - 'class' => 'form-control', - 'placeholder' => 'hours', - 'readonly' => $pirep->read_only]) }} +
+ {{ Form::label('flight_number', 'Flight Number/Route Code/Leg') }} + @if($pirep->read_only) +

{{ $pirep->ident }} + {{ Form::hidden('flight_number') }} + {{ Form::hidden('flight_code') }} + {{ Form::hidden('flight_leg') }} +

+ @else +
+
+ {{ Form::text('flight_number', null, [ + 'placeholder' => 'Flight Number', + 'class' => 'form-control']) }} +

{{ $errors->first('flight_number') }}

+
+
+ {{ Form::text('route_code', null, [ + 'placeholder' => 'Code (optional)', + 'class' => 'form-control']) }} +

{{ $errors->first('route_code') }}

+
+
+ {{ Form::text('route_leg', null, [ + 'placeholder' => 'Leg (optional)', + 'class' => 'form-control']) }} +

{{ $errors->first('route_leg') }}

+
+
+ @endif
-
- {{ Form::number('minutes', null, [ - 'class' => 'form-control', - 'placeholder' => 'minutes', - 'readonly' => $pirep->read_only]) }} +
+ {{ Form::label('flight_type', 'Flight Type') }} + {{ Form::select('flight_type', + \App\Models\Enums\FlightType::select(), + null, [ + 'class' => 'form-control select2', + 'readonly' => $pirep->read_only + ]) + }} +

{{ $errors->first('flight_type') }}

+
+
+

Filed Via:

+ {{ PirepSource::label($pirep->source) }} + @if(filled($pirep->source_name)) + ({{ $pirep->source_name }}) + @endif
-

{{ $errors->first('hours') }}

-

{{ $errors->first('minutes') }}

-
- @endif -
- - -
- {{ Form::label('level', 'Flight Level:') }} -
-
- {{ Form::number('level', null, ['class' => 'form-control', 'min' => 0]) }} -

{{ $errors->first('level') }}

- -
- {{ Form::label('route', 'Route:') }} - {{ Form::textarea('route', null, ['class' => 'form-control']) }} -

{{ $errors->first('route') }}

-
+
+
+
+  Flight Information +
+
+
+ {{ Form::label('airline_id', 'Airline') }} + @if($pirep->read_only) +

{{ $pirep->airline->name }}

+ {{ Form::hidden('airline_id') }} + @else + {{ Form::select('airline_id', $airlines_list, null, [ + 'class' => 'form-control select2', + 'readonly' => $pirep->read_only]) }} +

{{ $errors->first('airline_id') }}

+ @endif +
+
+ {{ Form::label('aircraft_id', 'Aircraft:') }} + @if($pirep->read_only) +

{{ $pirep->aircraft->name }}

+ {{ Form::hidden('aircraft_id') }} + @else + {{ Form::select('aircraft_id', $aircraft_list, null, [ + 'id' => 'aircraft_select', + 'class' => 'form-control select2', + 'readonly' => $pirep->read_only + ]) }} +

{{ $errors->first('aircraft_id') }}

+ @endif +
+
+ {{ Form::label('dpt_airport_id', 'Departure Airport:') }} + @if($pirep->read_only) +

{{ $pirep->dpt_airport->id }} - {{ $pirep->dpt_airport->name }}

+ {{ Form::hidden('dpt_airport_id') }} + @else + {{ Form::select('dpt_airport_id', $airports_list, null, [ + 'class' => 'form-control select2', + 'readonly' => $pirep->read_only]) }} +

{{ $errors->first('dpt_airport_id') }}

+ @endif +
- -
- {{ Form::label('notes', 'Notes:') }} - {{ Form::textarea('notes', null, ['class' => 'form-control']) }} -

{{ $errors->first('notes') }}

+
+ {{ Form::label('arr_airport_id', 'Arrival Airport:') }} + @if($pirep->read_only) +

{{ $pirep->arr_airport->id }} - {{ $pirep->arr_airport->name }}

+ {{ Form::hidden('arr_airport_id') }} + @else + {{ Form::select('arr_airport_id', $airports_list, null, ['class' => 'form-control select2']) }} +

{{ $errors->first('arr_airport_id') }}

+ @endif +
+ + + +
+ {{ Form::label('flight_time', 'Flight Time (hours & minutes):') }} + @if($pirep->read_only) +

+ {{ $pirep->hours }} hours, {{ $pirep->minutes }} minutes + {{ Form::hidden('hours') }} + {{ Form::hidden('minutes') }} +

+ @else +
+
+ {{ Form::number('hours', null, [ + 'class' => 'form-control', + 'placeholder' => 'hours', + 'readonly' => $pirep->read_only]) }} +
+
+ {{ Form::number('minutes', null, [ + 'class' => 'form-control', + 'placeholder' => 'minutes', + 'readonly' => $pirep->read_only]) }} +
+

{{ $errors->first('hours') }}

+

{{ $errors->first('minutes') }}

+
+ @endif +
+ + +
+ {{ Form::label('level', 'Flight Level:') }} +
+
+ {{ Form::number('level', null, ['class' => 'form-control', 'min' => 0]) }} +

{{ $errors->first('level') }}

+
+
+
+ + + +
+ {{ Form::label('route', 'Route:') }} + {{ Form::textarea('route', null, ['class' => 'form-control']) }} +

{{ $errors->first('route') }}

+
+ + +
+ {{ Form::label('notes', 'Notes:') }} + {{ Form::textarea('notes', null, ['class' => 'form-control']) }} +

{{ $errors->first('notes') }}

+
+ +
+
@@ -171,11 +191,15 @@ --}}
-
-

fares

- {{-- You don't want to change this ID unless you don't want the fares form to work :) --}} -
- @include('admin.pireps.fares') +
+
+  fares +
+
+
+ @include('admin.pireps.fares') +
+
@@ -186,10 +210,15 @@
-
-

field values

- {{-- You don't want to change this ID unless you don't want the fares form to work :) --}} - @include('admin.pireps.field_values') +
+
+  fields +
+
+ {{-- You don't want to change this ID unless you don't want the fares form to work :) --}} + @include('admin.pireps.field_values') +
+
Fare Count