FGFS-4.1/phpvms
3
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

PIREP fields not showing up and blocking PIREP submission

Browse Source
This commit is contained in:
Nabeel Shahzad
2019-08-01 13:13:11 -04:00
parent f31d6a00ec
commit aa57997ff5
4 changed files with 14 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
app/Http/Controllers/Frontend/PirepController.php
View File

@@ -24,7 +24,7 @@ use Carbon\Carbon;
use Flash; use Flash;
use Illuminate\Http\Request; use Illuminate\Http\Request;
use Illuminate\Support\Facades\Auth; use Illuminate\Support\Facades\Auth;
use Log; use Illuminate\Support\Facades\Log;
use PirepStatus; use PirepStatus;
/** /**
@@ -269,6 +269,7 @@ class PirepController extends Controller
// Are they allowed at this airport? // Are they allowed at this airport?
if (setting('pilots.only_flights_from_current') if (setting('pilots.only_flights_from_current')
&& Auth::user()->curr_airport_id !== $pirep->dpt_airport_id) { && Auth::user()->curr_airport_id !== $pirep->dpt_airport_id) {
Log::info('Pilot '.Auth::user()->id.' not at departure airport, erroring out');
return $this->flashError( return $this->flashError(
'You are currently not at the departure airport!', 'You are currently not at the departure airport!',
'frontend.pireps.create' 'frontend.pireps.create'
@@ -278,6 +279,7 @@ class PirepController extends Controller
// Can they fly this aircraft? // Can they fly this aircraft?
if (setting('pireps.restrict_aircraft_to_rank', false) if (setting('pireps.restrict_aircraft_to_rank', false)
&& !$this->userSvc->aircraftAllowed(Auth::user(), $pirep->aircraft_id)) { && !$this->userSvc->aircraftAllowed(Auth::user(), $pirep->aircraft_id)) {
Log::info('Pilot ' . Auth::user()->id . ' not allowed to fly aircraft');
return $this->flashError( return $this->flashError(
'You are not allowed to fly this aircraft!', 'You are not allowed to fly this aircraft!',
'frontend.pireps.create' 'frontend.pireps.create'
@@ -288,6 +290,7 @@ class PirepController extends Controller
/* @noinspection NotOptimalIfConditionsInspection */ /* @noinspection NotOptimalIfConditionsInspection */
if (setting('pireps.only_aircraft_at_dpt_airport') if (setting('pireps.only_aircraft_at_dpt_airport')
&& $pirep->aircraft_id !== $pirep->dpt_airport_id) { && $pirep->aircraft_id !== $pirep->dpt_airport_id) {
Log::info('Aircraft ' . $pirep->aircraft_id . ' not at departure airport '.$pirep->dpt_airport_id.', erroring out');
return $this->flashError( return $this->flashError(
'This aircraft is not positioned at the departure airport!', 'This aircraft is not positioned at the departure airport!',
'frontend.pireps.create' 'frontend.pireps.create'
@@ -297,6 +300,7 @@ class PirepController extends Controller
// Make sure this isn't a duplicate // Make sure this isn't a duplicate
$dupe_pirep = $this->pirepSvc->findDuplicate($pirep); $dupe_pirep = $this->pirepSvc->findDuplicate($pirep);
if ($dupe_pirep !== false) { if ($dupe_pirep !== false) {
Log::info('Duplicate PIREP found');
return $this->flashError( return $this->flashError(
'This PIREP has already been filed.', 'This PIREP has already been filed.',
'frontend.pireps.create' 'frontend.pireps.create'

2
app/Http/Requests/CreatePirepRequest.php
View File

@@ -51,8 +51,6 @@ class CreatePirepRequest extends FormRequest
$field_rules[$field->slug] = $field->required ? 'required' : 'nullable'; $field_rules[$field->slug] = $field->required ? 'required' : 'nullable';
} }
Log::debug('createPirepFormRequest::rules', $field_rules);
return $field_rules; return $field_rules;
} }
} }

2
resources/views/layouts/default/flash/message.blade.php
View File

@@ -10,7 +10,7 @@
alert-{{ session('flash_notification.level') }} alert-{{ session('flash_notification.level') }}
{{ session()->has('flash_notification.important') ? 'alert-important' : '' }}"> {{ session()->has('flash_notification.important') ? 'alert-important' : '' }}">
@if(session()->has('flash_notification.important')) @if(session()->has('flash_notification.important'))
<button type="button"class="close" data-dismiss="alert">&times;</button> <button type="button" class="close" data-dismiss="alert">&times;</button>
@endif @endif
{{ session('flash_notification.message') }} {{ session('flash_notification.message') }}

15
resources/views/layouts/default/pireps/fields.blade.php
View File

@@ -303,20 +303,22 @@ flight reports that have been filed. You've been warned!
</div> </div>
</div> </div>
{{--
Write out the custom fields, and label if they're required
--}}
<div class="col-4"> <div class="col-4">
@if(isset($pirep) && $pirep->fields)
<div class="form-container"> <div class="form-container">
<h6><i class="fab fa-wpforms"></i> <h6><i class="fab fa-wpforms"></i>
&nbsp;{{ trans_choice('common.field', 2) }} &nbsp;{{ trans_choice('common.field', 2) }}
</h6> </h6>
<div class="form-container-body"> <div class="form-container-body">
{{-- @if(isset($pirep) && $pirep->fields)
Write out the custom fields, and label if they're required @each('pireps.custom_fields', $pirep->fields, 'field')
--}} @else
@each('pireps.custom_fields', $pirep->fields, 'field') @each('pireps.custom_fields', $pirep_fields, 'field')
@endif
</div> </div>
</div> </div>
@endif
</div> </div>
</div> </div>
<div class="row"> <div class="row">
@@ -352,5 +354,4 @@ flight reports that have been filed. You've been warned!
</div> </div>
</div> </div>
</div> </div>
</div> </div>