phpvms/phpvms
phpvms/phpvms
1
0
Fork 0
Code Issues Pull Requests 1 Actions 1 Packages Releases Activity

[8.x] feat(flights): split settings into 'only allow flights from current' and 'only show flights from current' (#2110)

Browse Source 
* feat(flights): split settings into 'only allow flights from current' and 'only show flights from current'

* fix(flights): only show actions button if pilot is allowd to fly the flight

---------

Co-authored-by: Nabeel S. <99736+nabeelio@users.noreply.github.com>
This commit is contained in:
Arthur Parienté 2025-10-21 18:19:00 +02:00 committed by GitHub
parent aaf45b5e41
commit 5c839c5e2a
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
4 changed files with 68 additions and 59 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
app/Http/Controllers/Frontend/FlightController.php
View File

@ -72,7 +72,7 @@ class FlightController extends Controller
}
// default restrictions on the flights shown. Handle search differently
if (setting('pilots.only_flights_from_current')) {
if (setting('pilots.only_show_flights_from_current')) {
$where['dpt_airport_id'] = $user->curr_airport_id;
}

11
database/seeders/settings.yml
View File

@ -453,12 +453,19 @@
type: boolean
description: 'Pilots can only select hubs as their home airport'
- key: pilots.only_flights_from_current
name: 'Flights from Current'
name: 'Only allow flights from Current'
group: pilots
value: false
options: ''
type: boolean
description: 'Only show/allow flights from their current location'
description: 'Only allow flights from their current location'
- key: pilots.only_show_flights_from_current
name: 'Only show flights from Current'
group: pilots
value: false
options: ''
type: boolean
description: 'Only show flights from their current location'
- key: pilots.auto_leave_days
name: 'Pilot to ON LEAVE days'
group: pilots

62
resources/views/layouts/beta/flights/table.blade.php
View File

@ -91,38 +91,40 @@
</div>
<div class="row">
<div class="col-sm-12 text-right">
@if ($acars_plugin)
@if (isset($saved[$flight->id]))
<a href="vmsacars:bid/{{ $saved[$flight->id] }}" class="btn btn-sm btn-outline-primary">Load in vmsACARS</a>
@else
<a href="vmsacars:flight/{{ $flight->id }}" class="btn btn-sm btn-outline-primary">Load in vmsACARS</a>
@endif
@endif
<!-- Simbrief enabled -->
@if ($simbrief !== false)
<!-- If this flight has a briefing, show the link to view it-->
@if ($flight->simbrief && $flight->simbrief->user_id === $user->id)
<a href="{{ route('frontend.simbrief.briefing', $flight->simbrief->id) }}"
class="btn btn-sm btn-outline-primary">
View Simbrief Flight Plan
</a>
@else
<!-- Show button if the bids-only is disable, or if bids-only is enabled, they've saved it -->
@if ($simbrief_bids === false || ($simbrief_bids === true && isset($saved[$flight->id])))
@php
$aircraft_id = isset($saved[$flight->id]) ? App\Models\Bid::find($saved[$flight->id])->aircraft_id : null;
@endphp
<a href="{{ route('frontend.simbrief.generate') }}?flight_id={{ $flight->id }}@if($aircraft_id)&aircraft_id={{ $aircraft_id }} @endif"
class="btn btn-sm btn-outline-primary">
Create Simbrief Flight Plan
</a>
@if (!setting('pilots.only_flights_from_current') || $flight->dpt_airport_id === $user->current_airport->icao)
@if ($acars_plugin)
@if (isset($saved[$flight->id]))
<a href="vmsacars:bid/{{ $saved[$flight->id] }}" class="btn btn-sm btn-outline-primary">Load in vmsACARS</a>
@else
<a href="vmsacars:flight/{{ $flight->id }}" class="btn btn-sm btn-outline-primary">Load in vmsACARS</a>
@endif
@endif
@endif
<!-- Simbrief enabled -->
@if ($simbrief !== false)
<!-- If this flight has a briefing, show the link to view it-->
@if ($flight->simbrief && $flight->simbrief->user_id === $user->id)
<a href="{{ route('frontend.simbrief.briefing', $flight->simbrief->id) }}"
class="btn btn-sm btn-outline-primary">
View Simbrief Flight Plan
</a>
@else
<!-- Show button if the bids-only is disable, or if bids-only is enabled, they've saved it -->
@if ($simbrief_bids === false || ($simbrief_bids === true && isset($saved[$flight->id])))
@php
$aircraft_id = isset($saved[$flight->id]) ? App\Models\Bid::find($saved[$flight->id])->aircraft_id : null;
@endphp
<a href="{{ route('frontend.simbrief.generate') }}?flight_id={{ $flight->id }}@if($aircraft_id)&aircraft_id={{ $aircraft_id }} @endif"
class="btn btn-sm btn-outline-primary">
Create Simbrief Flight Plan
</a>
@endif
@endif
@endif
<a href="{{ route('frontend.pireps.create') }}?flight_id={{ $flight->id }}"
class="btn btn-sm btn-outline-info">
{{ __('pireps.newpirep') }}
</a>
@endif
<a href="{{ route('frontend.pireps.create') }}?flight_id={{ $flight->id }}"
class="btn btn-sm btn-outline-info">
{{ __('pireps.newpirep') }}
</a>
</div>
</div>
</div>

52
resources/views/layouts/seven/flights/table.blade.php
View File

@ -102,38 +102,38 @@
<a class="btn btn-sm btn-primary" href="{{ route('frontend.flights.show', [$flight->id]) }}">
{{ __('flights.viewflight') }}
</a>
@if ($acars_plugin)
@if (!setting('pilots.only_flights_from_current') || $flight->dpt_airport_id === $user->current_airport->icao)
@if ($acars_plugin)
@if (isset($saved[$flight->id]))
<a href="vmsacars:bid/{{ $saved[$flight->id] }}" class="btn btn-sm btn-primary">Load in
vmsACARS</a>
<a href="vmsacars:bid/{{ $saved[$flight->id] }}" class="btn btn-sm btn-primary">Load in
vmsACARS</a>
@else
<a href="vmsacars:flight/{{ $flight->id }}" class="btn btn-sm btn-primary">Load in vmsACARS</a>
<a href="vmsacars:flight/{{ $flight->id }}" class="btn btn-sm btn-primary">Load in vmsACARS</a>
@endif
@endif
@if ($simbrief !== false)
@endif
@if ($simbrief !== false)
@if ($flight->simbrief && $flight->simbrief->user_id === $user->id)
<a href="{{ route('frontend.simbrief.briefing', $flight->simbrief->id) }}"
class="btn btn-sm btn-primary">
{{ __('flights.viewsimbrief') }}
</a>
<a href="{{ route('frontend.simbrief.briefing', $flight->simbrief->id) }}"
class="btn btn-sm btn-primary">
{{ __('flights.viewsimbrief') }}
</a>
@else
@if ($simbrief_bids === false || ($simbrief_bids === true && isset($saved[$flight->id])))
@php
$aircraft_id = isset($saved[$flight->id])
? App\Models\Bid::find($saved[$flight->id])->aircraft_id
: null;
@endphp
<a href="{{ route('frontend.simbrief.generate') }}?flight_id={{ $flight->id }}@if ($aircraft_id) &aircraft_id={{ $aircraft_id }} @endif"
class="btn btn-sm btn-primary">
{{ __('flights.createsimbrief') }}
</a>
@endif
@if ($simbrief_bids === false || ($simbrief_bids === true && isset($saved[$flight->id])))
@php
$aircraft_id = isset($saved[$flight->id])
? App\Models\Bid::find($saved[$flight->id])->aircraft_id
: null;
@endphp
<a href="{{ route('frontend.simbrief.generate') }}?flight_id={{ $flight->id }}@if ($aircraft_id) &aircraft_id={{ $aircraft_id }} @endif"
class="btn btn-sm btn-primary">
{{ __('flights.createsimbrief') }}
</a>
@endif
@endif
@endif
<a href="{{ route('frontend.pireps.create') }}?flight_id={{ $flight->id }}" class="btn btn-sm btn-info">
{{ __('pireps.newpirep') }}
</a>
@if (!setting('pilots.only_flights_from_current') || $flight->dpt_airport_id == $user->current_airport->icao)
@endif
<a href="{{ route('frontend.pireps.create') }}?flight_id={{ $flight->id }}" class="btn btn-sm btn-info">
{{ __('pireps.newpirep') }}
</a>
<button
class="btn btn-sm save_flight
{{ isset($saved[$flight->id]) ? 'btn-danger' : 'btn-success' }}"