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

Setting which filters out aircraft not at the departure airport #171

Browse Source
This commit is contained in:
Nabeel Shahzad
2018-02-09 15:07:34 -06:00
parent 13b4a3854b
commit 9b55a9691f
5 changed files with 53 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
app/Database/migrations/2017_06_07_014930_create_settings_table.php
View File

@@ -132,7 +132,6 @@ class CreateSettingsTable extends Migration
'name' => 'PIREP duplicate time check',
'group' => 'pireps',
'value' => 10,
'default' => 10,
'type' => 'int',
'description' => 'The time in minutes to check for a duplicate PIREP',
]);
@@ -141,7 +140,6 @@ class CreateSettingsTable extends Migration
'name' => 'Hide Cancelled PIREPs',
'group' => 'pireps',
'value' => true,
'default' => true,
'type' => 'boolean',
'description' => 'Hide any cancelled PIREPs in the front-end',
]);
@@ -150,11 +148,18 @@ class CreateSettingsTable extends Migration
'name' => 'Restrict Aircraft to Ranks',
'group' => 'pireps',
'value' => true,
'default' => true,
'type' => 'boolean',
'description' => 'Aircraft that can be flown are restricted to a user\'s rank',
]);
$this->addSetting('pireps.only_aircraft_at_dep_airport', [
'name' => 'Restrict Aircraft At Departure',
'group' => 'pireps',
'value' => false,
'type' => 'boolean',
'description' => 'Only allow aircraft that are at the departure airport',
]);
/**
* PILOTS
*/

1
app/Models/Migrations/Migration.php
View File

@@ -90,6 +90,7 @@ class Migration extends MigrationBase
'name' => $attrs['name'],
'group' => $group,
'value' => $attrs['value'],
'default' => $attrs['value'],
'type' => $attrs['type'],
'description' => $attrs['description'],
];

35
app/Services/FlightService.php
View File

@@ -8,6 +8,7 @@
namespace App\Services;
use function foo\func;
use Log;
use App\Models\Flight;
@@ -31,16 +32,38 @@ class FlightService extends BaseService
*/
public function filterSubfleets($user, $flight)
{
$subfleets = $flight->subfleets;
/**
* Only allow aircraft that the user has access to in their rank
*/
if (setting('pireps.restrict_aircraft_to_rank', false)) {
$allowed_subfleets = $this->userSvc->getAllowableSubfleets($user)->pluck('id');
$flight->subfleets = $flight->subfleets->filter(
function ($subfleet, $item) use ($allowed_subfleets) {
if ($allowed_subfleets->contains($subfleet->id)) {
return true;
}
});
$subfleets = $subfleets->filter(function ($subfleet, $i) use ($allowed_subfleets) {
if ($allowed_subfleets->contains($subfleet->id)) {
return true;
}
});
}
/**
* Only allow aircraft that are at the current departure airport
*/
if(setting('pireps.only_aircraft_at_dep_airport', false)) {
foreach($subfleets as $subfleet) {
$subfleet->aircraft = $subfleet->aircraft->filter(
function ($aircraft, $i) use ($flight) {
if ($aircraft->airport_id === $flight->dpt_airport_id) {
return true;
}
}
);
}
}
$flight->subfleets = $subfleets;
return $flight;
}