Cleanup admin pirep form and read-only state

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,
     ];
 

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

@@ -1,7 +1,7 @@
 @if($aircraft)
 <table class="table table-hover table-responsive">
     <thead>
-        <th></th>
+        <th>Fare</th>
         <th>Count</th>
     </thead>
     </thead>

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

@@ -8,161 +8,181 @@
    </div>
 @endif
 <div class="row">
-    <div class="form-group col-sm-6">
+    <div class="col-xl-12">
-        {{ Form::label('flight_number', 'Flight Number/Route Code/Leg') }}
+        <div class="form-container">
-        @if($pirep->read_only)
+            <h6><i class="fas fa-info-circle"></i>
-            <p>{{ $pirep->ident }}
+                &nbsp;Flight Information
-                {{ Form::hidden('flight_number') }}
+            </h6>
-                {{ Form::hidden('flight_code') }}
+            <div class="form-container-body">
-                {{ Form::hidden('flight_leg') }}
-            </p>
-        @else
-            <div class="row">
-                <div class="col-sm-4">
-                    {{ Form::text('flight_number', null, [
-                            'placeholder' => 'Flight Number',
-                            'class' => 'form-control']) }}
-                    <p class="text-danger">{{ $errors->first('flight_number') }}</p>
-                </div>
-                <div class="col-sm-4">
-                    {{ Form::text('route_code', null, [
-                            'placeholder' => 'Code (optional)',
-                            'class' => 'form-control']) }}
-                    <p class="text-danger">{{ $errors->first('route_code') }}</p>
-                </div>
-                <div class="col-sm-4">
-                    {{ Form::text('route_leg', null, [
-                            'placeholder' => 'Leg (optional)',
-                            'class' => 'form-control']) }}
-                    <p class="text-danger">{{ $errors->first('route_leg') }}</p>
-                </div>
-            </div>
-        @endif
-    </div>
-    <div class="form-group col-sm-3">
-        {{ Form::label('flight_type', 'Flight Type') }}
-        {{ Form::select('flight_type',
-            \App\Models\Enums\FlightType::select(),
-            null, [
-                'class' => 'form-control select2',
-                'readonly' => $pirep->read_only
-            ])
-        }}
-        <p class="text-danger">{{ $errors->first('flight_type') }}</p>
-    </div>
-    <div class="form-group col-sm-3">
-        <p class="description">Filed Via:</p>
-        {{ PirepSource::label($pirep->source) }}
-        @if(filled($pirep->source_name))
-            ({{ $pirep->source_name }})
-        @endif
-    </div>
-</div>
-<div class="row">
-    <div class="form-group col-sm-3">
-        {{ Form::label('airline_id', 'Airline') }}
-        @if($pirep->read_only)
-            <p>{{ $pirep->airline->name }}</p>
-            {{ Form::hidden('airline_id') }}
-        @else
-            {{ Form::select('airline_id', $airlines_list, null, [
-                    'class' => 'form-control select2',
-                    'readonly' => $pirep->read_only]) }}
-            <p class="text-danger">{{ $errors->first('airline_id') }}</p>
-        @endif
-    </div>
-    <div class="form-group col-sm-3">
-        {{ Form::label('aircraft_id', 'Aircraft:') }}
-        @if($pirep->read_only)
-            <p>{{ $pirep->aircraft->name }}</p>
-            {{ Form::hidden('aircraft_id') }}
-        @else
-            {{ Form::select('aircraft_id', $aircraft_list, null, [
-                    'id' => 'aircraft_select',
-                    'class' => 'form-control select2',
-                    'readonly' => $pirep->read_only
-                ]) }}
-            <p class="text-danger">{{ $errors->first('aircraft_id') }}</p>
-        @endif
-    </div>
-    <div class="form-group col-sm-3">
-        {{ Form::label('dpt_airport_id', 'Departure Airport:') }}
-        @if($pirep->read_only)
-            <p>{{ $pirep->dpt_airport->id }} - {{ $pirep->dpt_airport->name }}</p>
-            {{ Form::hidden('dpt_airport_id') }}
-        @else
-            {{ Form::select('dpt_airport_id', $airports_list, null, [
-                    'class' => 'form-control select2',
-                    'readonly' => $pirep->read_only]) }}
-            <p class="text-danger">{{ $errors->first('dpt_airport_id') }}</p>
-        @endif
-    </div>
 
-    <div class="form-group col-sm-3">
+                <div class="form-group col-sm-6">
-        {{ Form::label('arr_airport_id', 'Arrival Airport:') }}
+                    {{ Form::label('flight_number', 'Flight Number/Route Code/Leg') }}
-        @if($pirep->read_only)
+                    @if($pirep->read_only)
-            <p>{{ $pirep->arr_airport->id }} - {{ $pirep->arr_airport->name }}</p>
+                        <p>{{ $pirep->ident }}
-            {{ Form::hidden('arr_airport_id') }}
+                            {{ Form::hidden('flight_number') }}
-        @else
+                            {{ Form::hidden('flight_code') }}
-            {{ Form::select('arr_airport_id', $airports_list, null, ['class' => 'form-control select2']) }}
+                            {{ Form::hidden('flight_leg') }}
-            <p class="text-danger">{{ $errors->first('arr_airport_id') }}</p>
+                        </p>
-        @endif
+                    @else
-    </div>
+                        <div class="row">
-</div>
+                            <div class="col-sm-4">
-<div class="row">
+                                {{ Form::text('flight_number', null, [
-    <!-- Flight Time Field -->
+                                        'placeholder' => 'Flight Number',
-    <div class="form-group col-sm-6">
+                                        'class' => 'form-control']) }}
-        {{ Form::label('flight_time', 'Flight Time (hours & minutes):') }}
+                                <p class="text-danger">{{ $errors->first('flight_number') }}</p>
-        @if($pirep->read_only)
+                            </div>
-            <p>
+                            <div class="col-sm-4">
-                {{ $pirep->hours }} hours, {{ $pirep->minutes }} minutes
+                                {{ Form::text('route_code', null, [
-                {{ Form::hidden('hours') }}
+                                        'placeholder' => 'Code (optional)',
-                {{ Form::hidden('minutes') }}
+                                        'class' => 'form-control']) }}
-            </p>
+                                <p class="text-danger">{{ $errors->first('route_code') }}</p>
-        @else
+                            </div>
-            <div class="row">
+                            <div class="col-sm-4">
-                <div class="col-sm-6">
+                                {{ Form::text('route_leg', null, [
-                    {{ Form::number('hours', null, [
+                                        'placeholder' => 'Leg (optional)',
-                            'class' => 'form-control',
+                                        'class' => 'form-control']) }}
-                            'placeholder' => 'hours',
+                                <p class="text-danger">{{ $errors->first('route_leg') }}</p>
-                            'readonly' => $pirep->read_only]) }}
+                            </div>
+                        </div>
+                    @endif
                 </div>
-                <div class="col-sm-6">
+                <div class="form-group col-sm-3">
-                    {{ Form::number('minutes', null, [
+                    {{ Form::label('flight_type', 'Flight Type') }}
-                            'class' => 'form-control',
+                    {{ Form::select('flight_type',
-                            'placeholder' => 'minutes',
+                        \App\Models\Enums\FlightType::select(),
-                            'readonly' => $pirep->read_only]) }}
+                        null, [
+                            'class' => 'form-control select2',
+                            'readonly' => $pirep->read_only
+                        ])
+                    }}
+                    <p class="text-danger">{{ $errors->first('flight_type') }}</p>
+                </div>
+                <div class="form-group col-sm-3">
+                    <p class="description">Filed Via:</p>
+                    {{ PirepSource::label($pirep->source) }}
+                    @if(filled($pirep->source_name))
+                        ({{ $pirep->source_name }})
+                    @endif
                 </div>
-                <p class="text-danger">{{ $errors->first('hours') }}</p>
-                <p class="text-danger">{{ $errors->first('minutes') }}</p>
-            </div>
-        @endif
-    </div>
-
-    <!-- Level Field -->
-    <div class="form-group col-sm-6">
-        {{ Form::label('level', 'Flight Level:') }}
-        <div class="row">
-            <div class="col-sm-12">
-                {{ Form::number('level', null, ['class' => 'form-control', 'min' => 0]) }}
-                <p class="text-danger">{{ $errors->first('level') }}</p>
             </div>
         </div>
     </div>
 </div>
 <div class="row">
-    <!-- Route Field -->
+    <div class="col-xl-12">
-    <div class="form-group col-sm-6">
+        <div class="form-container">
-        {{ Form::label('route', 'Route:') }}
+            <h6><i class="fas fa-info-circle"></i>
-        {{ Form::textarea('route', null, ['class' => 'form-control']) }}
+                &nbsp;Flight Information
-        <p class="text-danger">{{ $errors->first('route') }}</p>
+            </h6>
-    </div>
+            <div class="form-container-body">
+                <div class="form-group col-sm-3">
+                    {{ Form::label('airline_id', 'Airline') }}
+                    @if($pirep->read_only)
+                        <p>{{ $pirep->airline->name }}</p>
+                        {{ Form::hidden('airline_id') }}
+                    @else
+                        {{ Form::select('airline_id', $airlines_list, null, [
+                                'class' => 'form-control select2',
+                                'readonly' => $pirep->read_only]) }}
+                        <p class="text-danger">{{ $errors->first('airline_id') }}</p>
+                    @endif
+                </div>
+                <div class="form-group col-sm-3">
+                    {{ Form::label('aircraft_id', 'Aircraft:') }}
+                    @if($pirep->read_only)
+                        <p>{{ $pirep->aircraft->name }}</p>
+                        {{ Form::hidden('aircraft_id') }}
+                    @else
+                        {{ Form::select('aircraft_id', $aircraft_list, null, [
+                                'id' => 'aircraft_select',
+                                'class' => 'form-control select2',
+                                'readonly' => $pirep->read_only
+                            ]) }}
+                        <p class="text-danger">{{ $errors->first('aircraft_id') }}</p>
+                    @endif
+                </div>
+                <div class="form-group col-sm-3">
+                    {{ Form::label('dpt_airport_id', 'Departure Airport:') }}
+                    @if($pirep->read_only)
+                        <p>{{ $pirep->dpt_airport->id }} - {{ $pirep->dpt_airport->name }}</p>
+                        {{ Form::hidden('dpt_airport_id') }}
+                    @else
+                        {{ Form::select('dpt_airport_id', $airports_list, null, [
+                                'class' => 'form-control select2',
+                                'readonly' => $pirep->read_only]) }}
+                        <p class="text-danger">{{ $errors->first('dpt_airport_id') }}</p>
+                    @endif
+                </div>
 
-    <!-- Notes Field -->
+                <div class="form-group col-sm-3">
-    <div class="form-group col-sm-6">
+                    {{ Form::label('arr_airport_id', 'Arrival Airport:') }}
-        {{ Form::label('notes', 'Notes:') }}
+                    @if($pirep->read_only)
-        {{ Form::textarea('notes', null, ['class' => 'form-control']) }}
+                        <p>{{ $pirep->arr_airport->id }} - {{ $pirep->arr_airport->name }}</p>
-        <p class="text-danger">{{ $errors->first('notes') }}</p>
+                        {{ Form::hidden('arr_airport_id') }}
+                    @else
+                        {{ Form::select('arr_airport_id', $airports_list, null, ['class' => 'form-control select2']) }}
+                        <p class="text-danger">{{ $errors->first('arr_airport_id') }}</p>
+                    @endif
+                </div>
+
+
+                <!-- Flight Time Field -->
+                <div class="form-group col-sm-6">
+                    {{ Form::label('flight_time', 'Flight Time (hours & minutes):') }}
+                    @if($pirep->read_only)
+                        <p>
+                            {{ $pirep->hours }} hours, {{ $pirep->minutes }} minutes
+                            {{ Form::hidden('hours') }}
+                            {{ Form::hidden('minutes') }}
+                        </p>
+                    @else
+                        <div class="row">
+                            <div class="col-sm-6">
+                                {{ Form::number('hours', null, [
+                                        'class' => 'form-control',
+                                        'placeholder' => 'hours',
+                                        'readonly' => $pirep->read_only]) }}
+                            </div>
+                            <div class="col-sm-6">
+                                {{ Form::number('minutes', null, [
+                                        'class' => 'form-control',
+                                        'placeholder' => 'minutes',
+                                        'readonly' => $pirep->read_only]) }}
+                            </div>
+                            <p class="text-danger">{{ $errors->first('hours') }}</p>
+                            <p class="text-danger">{{ $errors->first('minutes') }}</p>
+                        </div>
+                    @endif
+                </div>
+
+                <!-- Level Field -->
+                <div class="form-group col-sm-6">
+                    {{ Form::label('level', 'Flight Level:') }}
+                    <div class="row">
+                        <div class="col-sm-12">
+                            {{ Form::number('level', null, ['class' => 'form-control', 'min' => 0]) }}
+                            <p class="text-danger">{{ $errors->first('level') }}</p>
+                        </div>
+                    </div>
+                </div>
+
+
+                <!-- Route Field -->
+                <div class="form-group col-sm-6">
+                    {{ Form::label('route', 'Route:') }}
+                    {{ Form::textarea('route', null, ['class' => 'form-control']) }}
+                    <p class="text-danger">{{ $errors->first('route') }}</p>
+                </div>
+
+                <!-- Notes Field -->
+                <div class="form-group col-sm-6">
+                    {{ Form::label('notes', 'Notes:') }}
+                    {{ Form::textarea('notes', null, ['class' => 'form-control']) }}
+                    <p class="text-danger">{{ $errors->first('notes') }}</p>
+                </div>
+
+            </div>
+        </div>
     </div>
 </div>
 
@@ -171,11 +191,15 @@
 --}}
 <div class="row">
     <div class="col-sm-12">
-        <hr>
+        <div class="form-container">
-        <h3>fares</h3>
+            <h6><i class="fas fa-info-circle"></i>
-        {{-- You don't want to change this ID unless you don't want the fares form to work :) --}}
+                &nbsp;fares
-        <div id="fares_container">
+            </h6>
-            @include('admin.pireps.fares')
+            <div class="form-container-body">
+                <div id="fares_container">
+                    @include('admin.pireps.fares')
+                </div>
+            </div>
         </div>
     </div>
 </div>
@@ -186,10 +210,15 @@
 
 <div class="row">
     <div class="col-sm-12">
-        <hr>
+        <div class="form-container">
-        <h3>field values</h3>
+            <h6><i class="fas fa-info-circle"></i>
-        {{-- You don't want to change this ID unless you don't want the fares form to work :) --}}
+                &nbsp;fields
-        @include('admin.pireps.field_values')
+            </h6>
+            <div class="form-container-body">
+                {{-- You don't want to change this ID unless you don't want the fares form to work :) --}}
+                @include('admin.pireps.field_values')
+            </div>
+        </div>
     </div>
 </div>