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

Merge branch 'dev' of github.com:nabeelio/phpvms into dev

Browse Source
This commit is contained in:
Nabeel Shahzad
2019-08-06 07:39:41 -04:00
parent 3a97071fcf 753804b71b
commit 732a0c4088
40 changed files with 1766 additions and 565 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
README.md
View File

@@ -39,7 +39,7 @@ A full development environment can be brought up using Docker:
```bash ```bash
composer install composer install
npm install yarn install
docker-compose build docker-compose build
docker-compose up docker-compose up
``` ```
@@ -49,3 +49,13 @@ Then go to `http://localhost`. If you're using dnsmasq, the `app` container is l
``` ```
127.0.0.1 phpvms.test 127.0.0.1 phpvms.test
``` ```
## Building JS/CSS assets
Yarn is required, run:
```bash
make build-assets
```
This will build all of the assets according to the webpack file.

18
app/Console/Commands/DevInstall.php
View File

@@ -21,6 +21,14 @@ class DevInstall extends Command
'acars.yml', 'acars.yml',
]; ];
private $databaseSeeder;
public function __construct(\DatabaseSeeder $databaseSeeder)
{
parent::__construct();
$this->databaseSeeder = $databaseSeeder;
}
/** /**
* Run dev related commands * Run dev related commands
* *
@@ -45,16 +53,6 @@ class DevInstall extends Command
'--seed' => true, '--seed' => true,
]); ]);
//
//
$this->info('Importing sample data');
foreach ($this->yaml_imports as $yml) {
$this->call('phpvms:yaml-import', [
'files' => ['app/Database/seeds/'.$yml],
]);
}
$this->info('Done!'); $this->info('Done!');
} }

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

@@ -1,16 +1,16 @@
<?php <?php
use App\Contracts\Migration; use App\Contracts\Migration;
use App\Services\Installer\MigrationService; use App\Services\Installer\SeederService;
use Illuminate\Database\Schema\Blueprint; use Illuminate\Database\Schema\Blueprint;
class CreateSettingsTable extends Migration class CreateSettingsTable extends Migration
{ {
private $migrationSvc; private $seederSvc;
public function __construct() public function __construct()
{ {
$this->migrationSvc = new MigrationService(); $this->seederSvc = app(SeederService::class);
} }
/** /**
@@ -38,7 +38,7 @@ class CreateSettingsTable extends Migration
$table->timestamps(); $table->timestamps();
}); });
$this->migrationSvc->syncAllSettings(); $this->seederSvc->syncAllSettings();
} }
/** /**

15
app/Database/migrations/2017_06_21_165410_create_ranks_table.php
View File

@@ -28,21 +28,6 @@ class CreateRanksTable extends Migration
$table->unique('name'); $table->unique('name');
}); });
/**
* Initial required data...
*/
$ranks = [
[
'id' => 1,
'name' => 'New Pilot',
'hours' => 0,
'acars_base_pay_rate' => 50,
'manual_base_pay_rate' => 25,
],
];
$this->addData('ranks', $ranks);
} }
/** /**

39
app/Database/seeds/DatabaseSeeder.php
View File

@@ -1,19 +1,16 @@
<?php <?php
use App\Services\DatabaseService; use App\Services\Installer\SeederService;
use Illuminate\Database\Seeder; use Illuminate\Database\Seeder;
class DatabaseSeeder extends Seeder class DatabaseSeeder extends Seeder
{ {
private static $seed_mapper = [ private $seederService;
'local' => 'dev',
'qa' => 'dev',
'staging' => 'dev',
];
private static $always_seed = [ public function __construct()
'permissions', {
]; $this->seederService = app(SeederService::class);
}
/** /**
* Run the database seeds. * Run the database seeds.
@@ -22,28 +19,6 @@ class DatabaseSeeder extends Seeder
*/ */
public function run() public function run()
{ {
$env = App::environment(); $this->seederService->syncAllSeeds();
if (array_key_exists($env, self::$seed_mapper)) {
$env = self::$seed_mapper[$env];
}
Log::info('Seeding from environment '.$env);
$path = database_path('seeds/'.$env.'.yml');
if (!file_exists($path)) {
$path = database_path('seeds/prod.yml');
}
$svc = app(DatabaseService::class);
$svc->seed_from_yaml_file($path);
// Always seed/sync these
foreach (self::$always_seed as $file) {
Log::info('Importing '.$file);
$path = database_path('seeds/'.$file.'.yml');
if (file_exists($path)) {
$svc->seed_from_yaml_file($path);
}
}
} }
} }

55
app/Database/seeds/acars.yml
View File

@@ -1,55 +0,0 @@
acars:
- id: acars_1
pirep_id: pirepid_1
type: 1
nav_type: 2
name: TNV
lat: 30.28852
lon: -96.058239
created_at: now
updated_at: now
- id: acars_2
pirep_id: pirepid_1
type: 1
nav_type: 2
name: IAH
lat: 29.95691
lon: -95.345719
created_at: now
updated_at: now
- id: acars_3
pirep_id: pirepid_1
type: 1
nav_type: 2
name: LCH
lat: 30.14151
lon: -93.105569
created_at: now
updated_at: now
- id: acars_4
pirep_id: pirepid_1
type: 1
nav_type: 2
name: MEI
lat: 32.37843
lon: -88.804267
created_at: now
updated_at: now
- id: acars_5
pirep_id: pirepid_1
type: 1
nav_type: 2
name: ATL
lat: 33.62907
lon: -84.435064
created_at: now
updated_at: now
- id: acars_6
pirep_id: pirepid_1
type: 1
nav_type: 2
name: SIE
lat: 39.0955
lon: -74.800344
created_at: now
updated_at: now

57
app/Database/seeds/dev/acars.yml Normal file
View File

@@ -0,0 +1,57 @@
acars:
id_column: id
data:
- id: acars_1
pirep_id: pirepid_1
type: 1
nav_type: 2
name: TNV
lat: 30.28852
lon: -96.058239
created_at: now
updated_at: now
- id: acars_2
pirep_id: pirepid_1
type: 1
nav_type: 2
name: IAH
lat: 29.95691
lon: -95.345719
created_at: now
updated_at: now
- id: acars_3
pirep_id: pirepid_1
type: 1
nav_type: 2
name: LCH
lat: 30.14151
lon: -93.105569
created_at: now
updated_at: now
- id: acars_4
pirep_id: pirepid_1
type: 1
nav_type: 2
name: MEI
lat: 32.37843
lon: -88.804267
created_at: now
updated_at: now
- id: acars_5
pirep_id: pirepid_1
type: 1
nav_type: 2
name: ATL
lat: 33.62907
lon: -84.435064
created_at: now
updated_at: now
- id: acars_6
pirep_id: pirepid_1
type: 1
nav_type: 2
name: SIE
lat: 39.0955
lon: -74.800344
created_at: now
updated_at: now

0
app/Database/seeds/dev.yml → app/Database/seeds/dev/dev.yml
View File

0
app/Database/seeds/in_progress.yml → app/Database/seeds/dev/in_progress.yml
View File

26
app/Database/seeds/dev/ranks.yml Normal file
View File

@@ -0,0 +1,26 @@
ranks:
- id: 1
name: New Pilot
hours: 0
acars_base_pay_rate: 50
manual_base_pay_rate: 25
- id: 2
name: Junior First Officer
hours: 10
acars_base_pay_rate: 100
manual_base_pay_rate: 90
- id: 3
name: First Officer
hours: 15
acars_base_pay_rate: 250
manual_base_pay_rate: 200
auto_approve_acars: 1
auto_approve_manual: 1
- id: 4
name: Senior Captain
hours: 20
acars_base_pay_rate: 500
manual_base_pay_rate: 400
auto_approve_acars: 1
auto_approve_manual: 1
auto_promote: 0

47
app/Database/seeds/sample.yml → app/Database/seeds/dev/sample.yml
View File

@@ -1,17 +1,19 @@
airlines: #airlines:
- id: 1 # - id: 1
icao: VMS # icao: VMS
iata: VM # iata: VM
name: phpvms airlines # name: phpvms airlines
country: us # country: us
active: 1 # active: 1
created_at: now # created_at: now
updated_at: now # updated_at: now
roles: roles:
- name: fleet-only id_column: name
display_name: Edit Fleet data:
- name: fleet-only
display_name: Edit Fleet
users: users:
- id: 1 - id: 1
@@ -83,29 +85,6 @@ role_user:
role_id: 2 role_id: 2
user_type: App\Models\User user_type: App\Models\User
# ranks
ranks:
- id: 2
name: Junior First Officer
hours: 10
acars_base_pay_rate: 100
manual_base_pay_rate: 90
- id: 3
name: First Officer
hours: 15
acars_base_pay_rate: 250
manual_base_pay_rate: 200
auto_approve_acars: 1
auto_approve_manual: 1
- id: 4
name: Senior Captain
hours: 20
acars_base_pay_rate: 500
manual_base_pay_rate: 400
auto_approve_acars: 1
auto_approve_manual: 1
auto_promote: 0
awards: awards:
- id: 1 - id: 1
name: Pilot 50 flights name: Pilot 50 flights

79
app/Database/seeds/permissions.yml
View File

@@ -1,42 +1,41 @@
# All of the different permissions that can be assigned to roles # All of the different permissions that can be assigned to roles
--- ---
permissions: - name: admin-access
- name: admin-access display_name: Admin Access
display_name: Admin Access description: Access the admin panel
description: Access the admin panel - name: airlines
- name: airlines display_name: Airlines
display_name: Airlines description: Create/edit airlines
description: Create/edit airlines - name: airports
- name: airports display_name: Airports
display_name: Airports description: Create/edit airports
description: Create/edit airports - name: addons
- name: addons display_name: Addons
display_name: Addons description: Edit/view addons
description: Edit/view addons - name: awards
- name: awards display_name: Awards
display_name: Awards description: Create/edit award classes
description: Create/edit award classes - name: flights
- name: flights display_name: Flights
display_name: Flights description: Create/edit flights
description: Create/edit flights - name: fleet
- name: fleet display_name: Fleet
display_name: Fleet description: Create/edit subfleets and fleets
description: Create/edit subfleets and fleets - name: fares
- name: fares display_name: Fares
display_name: Fares description: Create/edit fares
description: Create/edit fares - name: finances
- name: finances display_name: Finances
display_name: Finances description: Create/view finance related items
description: Create/view finance related items - name: pireps
- name: pireps display_name: PIREPs
display_name: PIREPs description: Accept/reject/edit PIREPs
description: Accept/reject/edit PIREPs - name: ranks
- name: ranks display_name: Ranks
display_name: Ranks description: Create/edit ranks
description: Create/edit ranks - name: users
- name: users display_name: Users
display_name: Users description: Create/edit users
description: Create/edit users - name: settings
- name: settings display_name: Settings
display_name: Settings description: Edit VA settings
description: Edit VA settings

0
app/Database/seeds/prod.yml → app/Database/seeds/prod/prod.yml
View File

6
app/Database/seeds/prod/ranks.yml Normal file
View File

@@ -0,0 +1,6 @@
ranks:
- id: 1
name: New Pilot
hours: 0
acars_base_pay_rate: 50
manual_base_pay_rate: 25

36
app/Http/Controllers/Api/AcarsController.php
View File

@@ -15,10 +15,11 @@ use App\Models\Pirep;
use App\Repositories\AcarsRepository; use App\Repositories\AcarsRepository;
use App\Repositories\PirepRepository; use App\Repositories\PirepRepository;
use App\Services\GeoService; use App\Services\GeoService;
use Auth;
use Carbon\Carbon; use Carbon\Carbon;
use Illuminate\Database\QueryException;
use Illuminate\Http\Request; use Illuminate\Http\Request;
use Log; use Illuminate\Support\Facades\Auth;
use Illuminate\Support\Facades\Log;
/** /**
* Class AcarsController * Class AcarsController
@@ -157,10 +158,13 @@ class AcarsController extends Controller
} }
} }
$update = Acars::create($position); try {
$update->save(); $update = Acars::create($position);
$update->save();
$count++; $count++;
} catch (QueryException $ex) {
Log::info('Error on adding ACARS position: '.$ex->getMessage());
}
} }
// Change the PIREP status if it's as SCHEDULED before // Change the PIREP status if it's as SCHEDULED before
@@ -207,9 +211,13 @@ class AcarsController extends Controller
$log['created_at'] = Carbon::createFromTimeString($log['created_at']); $log['created_at'] = Carbon::createFromTimeString($log['created_at']);
} }
$acars = Acars::create($log); try {
$acars->save(); $acars = Acars::create($log);
$count++; $acars->save();
$count++;
} catch (QueryException $ex) {
Log::info('Error on adding ACARS position: '.$ex->getMessage());
}
} }
return $this->message($count.' logs added', $count); return $this->message($count.' logs added', $count);
@@ -250,9 +258,13 @@ class AcarsController extends Controller
$log['created_at'] = Carbon::createFromTimeString($log['created_at']); $log['created_at'] = Carbon::createFromTimeString($log['created_at']);
} }
$acars = Acars::create($log); try {
$acars->save(); $acars = Acars::create($log);
$count++; $acars->save();
$count++;
} catch (QueryException $ex) {
Log::info('Error on adding ACARS position: '.$ex->getMessage());
}
} }
return $this->message($count.' logs added', $count); return $this->message($count.' logs added', $count);

7
app/Http/Controllers/Frontend/AcarsController.php → app/Http/Controllers/Frontend/LiveMapController.php
View File

@@ -7,10 +7,7 @@ use App\Repositories\AcarsRepository;
use App\Services\GeoService; use App\Services\GeoService;
use Illuminate\Http\Request; use Illuminate\Http\Request;
/** class LiveMapController extends Controller
* Class AcarsController
*/
class AcarsController extends Controller
{ {
private $acarsRepo; private $acarsRepo;
private $geoSvc; private $geoSvc;
@@ -39,7 +36,7 @@ class AcarsController extends Controller
$pireps = $this->acarsRepo->getPositions(); $pireps = $this->acarsRepo->getPositions();
$positions = $this->geoSvc->getFeatureForLiveFlights($pireps); $positions = $this->geoSvc->getFeatureForLiveFlights($pireps);
return view('acars.index', [ return view('livemap.index', [
'pireps' => $pireps, 'pireps' => $pireps,
'positions' => $positions, 'positions' => $positions,
]); ]);

2
app/Http/Routes/web.php
View File

@@ -13,7 +13,7 @@ Route::group([
Route::get('users', 'UserController@index')->name('users.index'); Route::get('users', 'UserController@index')->name('users.index');
Route::get('pilots', 'UserController@index')->name('pilots.index'); Route::get('pilots', 'UserController@index')->name('pilots.index');
Route::get('livemap', 'AcarsController@index')->name('livemap.index'); Route::get('livemap', 'LiveMapController@index')->name('livemap.index');
}); });
/* /*

1
app/Models/Airport.php
View File

@@ -13,6 +13,7 @@ use App\Models\Traits\FilesTrait;
* @property string iata * @property string iata
* @property string icao * @property string icao
* @property string name * @property string name
* @property string full_name
* @property string location * @property string location
* @property string country * @property string country
* @property string timezone * @property string timezone

7
app/Models/Flight.php
View File

@@ -13,7 +13,7 @@ use Illuminate\Support\Collection;
* @property string id * @property string id
* @property mixed ident * @property mixed ident
* @property Airline airline * @property Airline airline
* @property int airline_id * @property int airline_id
* @property mixed flight_number * @property mixed flight_number
* @property mixed route_code * @property mixed route_code
* @property int route_leg * @property int route_leg
@@ -21,8 +21,9 @@ use Illuminate\Support\Collection;
* @property Collection field_values * @property Collection field_values
* @property Collection fares * @property Collection fares
* @property Collection subfleets * @property Collection subfleets
* @property int days * @property int days
* @property Airport dep_airport * @property string route
* @property Airport dpt_airport
* @property Airport arr_airport * @property Airport arr_airport
* @property Airport alt_airport * @property Airport alt_airport
* @property string dpt_airport_id * @property string dpt_airport_id

7
app/Services/GeoService.php
View File

@@ -12,9 +12,9 @@ use App\Repositories\AcarsRepository;
use App\Repositories\NavdataRepository; use App\Repositories\NavdataRepository;
use Illuminate\Database\Eloquent\ModelNotFoundException; use Illuminate\Database\Eloquent\ModelNotFoundException;
use Illuminate\Support\Collection; use Illuminate\Support\Collection;
use Illuminate\Support\Facades\Log;
use League\Geotools\Coordinate\Coordinate; use League\Geotools\Coordinate\Coordinate;
use League\Geotools\Geotools; use League\Geotools\Geotools;
use Log;
/** /**
* Class GeoService * Class GeoService
@@ -109,6 +109,7 @@ class GeoService extends Service
continue; continue;
} }
$point = null;
$size = \count($points); $size = \count($points);
if ($size === 0) { if ($size === 0) {
@@ -150,6 +151,10 @@ class GeoService extends Service
} }
} }
if ($point === null) {
continue;
}
$coords[] = $point; $coords[] = $point;
} }

154
app/Services/Installer/MigrationService.php
View File

@@ -3,17 +3,13 @@
namespace App\Services\Installer; namespace App\Services\Installer;
use App\Contracts\Service; use App\Contracts\Service;
use App\Models\Setting; use Illuminate\Support\Facades\App;
use DB; use Illuminate\Support\Facades\Artisan;
use Log; use Illuminate\Support\Facades\Log;
use Nwidart\Modules\Facades\Module; use Nwidart\Modules\Facades\Module;
use Symfony\Component\Yaml\Yaml;
class MigrationService extends Service class MigrationService extends Service
{ {
private $counters = [];
private $offsets = [];
protected function getMigrator() protected function getMigrator()
{ {
$m = app('migrator'); $m = app('migrator');
@@ -21,144 +17,6 @@ class MigrationService extends Service
return $m; return $m;
} }
/**
* Syncronize all of the seed files, run this after the migrations
* and on first install.
*/
public function syncAllSeeds(): void
{
$this->syncAllSettings();
$this->syncAllPermissions();
}
public function syncAllSettings(): void
{
$data = file_get_contents(database_path('/seeds/settings.yml'));
$yml = Yaml::parse($data);
foreach ($yml as $setting) {
if (\trim($setting['key']) === '') {
continue;
}
$this->addSetting($setting['key'], $setting);
}
}
public function syncAllPermissions(): void
{
$data = file_get_contents(database_path('/seeds/permissions.yml'));
$yml = Yaml::parse($data);
foreach ($yml as $perm) {
$count = DB::table('permissions')->where('name', $perm['name'])->count('name');
if ($count === 0) {
DB::table('permissions')->insert($perm);
} else {
DB::table('settings')
->where('name', $perm['name'])
->update($perm);
}
}
}
/**
* @param $key
* @param $attrs
*/
public function addSetting($key, $attrs): void
{
$id = Setting::formatKey($key);
$group = $attrs['group'];
$order = $this->getNextOrderNumber($group);
$attrs = array_merge(
[
'id' => $id,
'key' => $key,
'offset' => $this->offsets[$group],
'order' => $order,
'name' => '',
'group' => $group,
'value' => '',
'default' => $attrs['value'],
'options' => '',
'type' => 'hidden',
'description' => '',
],
$attrs
);
$count = DB::table('settings')->where('id', $id)->count('id');
if ($count === 0) {
DB::table('settings')->insert($attrs);
} else {
unset($attrs['value']); // Don't overwrite this
DB::table('settings')
->where('id', $id)
->update($attrs);
}
}
/**
* Dynamically figure out the offset and the start number for a group.
* This way we don't need to mess with how to order things
* When calling getNextOrderNumber(users) 31, will be returned, then 32, and so on
*
* @param $name
* @param null $offset
* @param int $start_offset
*/
private function addCounterGroup($name, $offset = null, $start_offset = 0): void
{
if ($offset === null) {
$group = DB::table('settings')
->where('group', $name)
->first();
if ($group === null) {
$offset = (int) DB::table('settings')->max('offset');
if ($offset === null) {
$offset = 0;
$start_offset = 1;
} else {
$offset += 100;
$start_offset = $offset + 1;
}
} else {
// Now find the number to start from
$start_offset = (int) DB::table('settings')->where('group', $name)->max('order');
if ($start_offset === null) {
$start_offset = $offset + 1;
} else {
$start_offset++;
}
$offset = $group->offset;
}
}
$this->counters[$name] = $start_offset;
$this->offsets[$name] = $offset;
}
/**
* Get the next increment number from a group
*
* @param $group
*
* @return int
*/
private function getNextOrderNumber($group): int
{
if (!\in_array($group, $this->counters, true)) {
$this->addCounterGroup($group);
}
$idx = $this->counters[$group];
$this->counters[$group]++;
return $idx;
}
/** /**
* Find all of the possible paths that migrations exist. * Find all of the possible paths that migrations exist.
* Include looking in all of the modules Database/migrations directories * Include looking in all of the modules Database/migrations directories
@@ -168,7 +26,7 @@ class MigrationService extends Service
public function getMigrationPaths(): array public function getMigrationPaths(): array
{ {
$paths = [ $paths = [
'core' => \App::databasePath().'/migrations', 'core' => App::databasePath().'/migrations',
]; ];
$modules = Module::allEnabled(); $modules = Module::allEnabled();
@@ -208,8 +66,8 @@ class MigrationService extends Service
{ {
$output = ''; $output = '';
\Artisan::call('migrate'); Artisan::call('migrate');
$output .= trim(\Artisan::output()); $output .= trim(Artisan::output());
return $output; return $output;
} }

197
app/Services/Installer/SeederService.php Normal file
View File

@@ -0,0 +1,197 @@
<?php
namespace App\Services\Installer;
use App\Contracts\Service;
use App\Models\Setting;
use App\Services\DatabaseService;
use Illuminate\Support\Facades\App;
use Illuminate\Support\Facades\DB;
use Illuminate\Support\Facades\Log;
use Illuminate\Support\Facades\Storage;
use Symfony\Component\Yaml\Yaml;
class SeederService extends Service
{
private $databaseSvc;
private $counters = [];
private $offsets = [];
private static $seed_mapper = [
'local' => 'dev',
'qa' => 'dev',
'staging' => 'dev',
];
public function __construct(DatabaseService $databaseSvc)
{
$this->databaseSvc = $databaseSvc;
}
/**
* Syncronize all of the seed files, run this after the migrations
* and on first install.
*/
public function syncAllSeeds(): void
{
$this->syncAllYamlFileSeeds();
$this->syncAllSettings();
$this->syncAllPermissions();
}
/**
* Read all of the YAML files from disk and seed them
*/
public function syncAllYamlFileSeeds(): void
{
Log::info('Running seeder');
$env = App::environment();
if (array_key_exists($env, self::$seed_mapper)) {
$env = self::$seed_mapper[$env];
}
// Gather all of the files to seed
collect()
->concat(Storage::disk('seeds')->files($env))
->map(function ($file) {
return database_path('seeds/'.$file);
})
->filter(function ($file) {
$info = pathinfo($file);
return $info['extension'] === 'yml';
})
->each(function ($file) {
Log::info('Seeding .'.$file);
$this->databaseSvc->seed_from_yaml_file($file);
});
}
public function syncAllSettings(): void
{
$data = file_get_contents(database_path('/seeds/settings.yml'));
$yml = Yaml::parse($data);
foreach ($yml as $setting) {
if (\trim($setting['key']) === '') {
continue;
}
$this->addSetting($setting['key'], $setting);
}
}
public function syncAllPermissions(): void
{
$data = file_get_contents(database_path('/seeds/permissions.yml'));
$yml = Yaml::parse($data);
foreach ($yml as $perm) {
$count = DB::table('permissions')->where('name', $perm['name'])->count('name');
if ($count === 0) {
DB::table('permissions')->insert($perm);
} else {
DB::table('permissions')
->where('name', $perm['name'])
->update($perm);
}
}
}
/**
* @param $key
* @param $attrs
*/
public function addSetting($key, $attrs): void
{
$id = Setting::formatKey($key);
$group = $attrs['group'];
$order = $this->getNextOrderNumber($group);
$attrs = array_merge(
[
'id' => $id,
'key' => $key,
'offset' => $this->offsets[$group],
'order' => $order,
'name' => '',
'group' => $group,
'value' => '',
'default' => $attrs['value'],
'options' => '',
'type' => 'hidden',
'description' => '',
],
$attrs
);
$count = DB::table('settings')->where('id', $id)->count('id');
if ($count === 0) {
DB::table('settings')->insert($attrs);
} else {
unset($attrs['value']); // Don't overwrite this
DB::table('settings')
->where('id', $id)
->update($attrs);
}
}
/**
* Dynamically figure out the offset and the start number for a group.
* This way we don't need to mess with how to order things
* When calling getNextOrderNumber(users) 31, will be returned, then 32, and so on
*
* @param $name
* @param null $offset
* @param int $start_offset
*/
private function addCounterGroup($name, $offset = null, $start_offset = 0): void
{
if ($offset === null) {
$group = DB::table('settings')
->where('group', $name)
->first();
if ($group === null) {
$offset = (int) DB::table('settings')->max('offset');
if ($offset === null) {
$offset = 0;
$start_offset = 1;
} else {
$offset += 100;
$start_offset = $offset + 1;
}
} else {
// Now find the number to start from
$start_offset = (int) DB::table('settings')->where('group', $name)->max('order');
if ($start_offset === null) {
$start_offset = $offset + 1;
} else {
$start_offset++;
}
$offset = $group->offset;
}
}
$this->counters[$name] = $start_offset;
$this->offsets[$name] = $offset;
}
/**
* Get the next increment number from a group
*
* @param $group
*
* @return int
*/
private function getNextOrderNumber($group): int
{
if (!\in_array($group, $this->counters, true)) {
$this->addCounterGroup($group);
}
$idx = $this->counters[$group];
$this->counters[$group]++;
return $idx;
}
}

3
app/Services/PirepService.php
View File

@@ -9,6 +9,7 @@ use App\Events\PirepRejected;
use App\Events\UserStateChanged; use App\Events\UserStateChanged;
use App\Events\UserStatsChanged; use App\Events\UserStatsChanged;
use App\Models\Acars; use App\Models\Acars;
use App\Models\Aircraft;
use App\Models\Bid; use App\Models\Bid;
use App\Models\Enums\AcarsType; use App\Models\Enums\AcarsType;
use App\Models\Enums\PirepSource; use App\Models\Enums\PirepSource;
@@ -338,7 +339,7 @@ class PirepService extends Service
Log::info('PIREP '.$pirep->id.' state change to ACCEPTED'); Log::info('PIREP '.$pirep->id.' state change to ACCEPTED');
// Update the aircraft // Update the aircraft
$pirep->aircraft->flight_time += $pirep->flight_time; $pirep->aircraft->flight_time = $pirep->aircraft->flight_time + $pirep->flight_time;
$pirep->aircraft->airport_id = $pirep->arr_airport_id; $pirep->aircraft->airport_id = $pirep->arr_airport_id;
$pirep->aircraft->landing_time = $pirep->updated_at; $pirep->aircraft->landing_time = $pirep->updated_at;
$pirep->aircraft->save(); $pirep->aircraft->save();

64
app/Support/Database.php
View File

@@ -5,7 +5,7 @@ namespace App\Support;
use Carbon\Carbon; use Carbon\Carbon;
use Illuminate\Database\QueryException; use Illuminate\Database\QueryException;
use Illuminate\Support\Facades\DB; use Illuminate\Support\Facades\DB;
use Log; use Illuminate\Support\Facades\Log;
use Symfony\Component\Yaml\Yaml; use Symfony\Component\Yaml\Yaml;
class Database class Database
@@ -48,12 +48,28 @@ class Database
return $imported; return $imported;
} }
foreach ($yml as $table => $rows) { foreach ($yml as $table => $data) {
$imported[$table] = 0; $imported[$table] = 0;
$id_column = 'id';
if (array_key_exists('id_column', $data)) {
$id_column = $data['id_column'];
}
$ignore_on_update = [];
if (array_key_exists('ignore_on_update', $data)) {
$ignore_on_update = $data['ignore_on_update'];
}
if (array_key_exists('data', $data)) {
$rows = $data['data'];
} else {
$rows = $data;
}
foreach ($rows as $row) { foreach ($rows as $row) {
try { try {
static::insert_row($table, $row); static::insert_row($table, $row, $id_column, $ignore_on_update);
} catch (QueryException $e) { } catch (QueryException $e) {
if ($ignore_errors) { if ($ignore_errors) {
continue; continue;
@@ -70,15 +86,21 @@ class Database
} }
/** /**
* @param $table * @param string $table
* @param $row * @param array $row
* * @param string $id_col The ID column to use for update/insert
* @throws \Exception * @param array $ignore_on_updates
* @param bool $ignore_errors
* *
* @return mixed * @return mixed
*/ */
public static function insert_row($table, $row) public static function insert_row(
{ $table,
$row,
$id_col = 'id',
$ignore_on_updates = [],
$ignore_errors = true
) {
// encrypt any password fields // encrypt any password fields
if (array_key_exists('password', $row)) { if (array_key_exists('password', $row)) {
$row['password'] = bcrypt($row['password']); $row['password'] = bcrypt($row['password']);
@@ -95,12 +117,30 @@ class Database
} }
} }
$count = 0;
if (array_key_exists($id_col, $row)) {
$count = DB::table($table)->where($id_col, $row[$id_col])->count($id_col);
}
try { try {
DB::table($table)->insert($row); if ($count > 0) {
foreach ($ignore_on_updates as $ignore_column) {
if (array_key_exists($ignore_column, $row)) {
unset($row[$ignore_column]);
}
}
DB::table($table)
->where($id_col, $row[$id_col])
->update($row);
} else {
DB::table($table)->insert($row);
}
} catch (QueryException $e) { } catch (QueryException $e) {
Log::error($e); Log::error($e);
if (!$ignore_errors) {
throw $e; throw $e;
}
} }
return $row; return $row;

5
config/filesystems.php
View File

@@ -13,6 +13,11 @@ return [
'root' => storage_path('app'), 'root' => storage_path('app'),
], ],
'seeds' => [
'driver' => 'local',
'root' => database_path('seeds'),
],
'public' => [ 'public' => [
'driver' => 'local', 'driver' => 'local',
'root' => public_path('uploads'), 'root' => public_path('uploads'),

11
modules/Installer/Http/Controllers/UpdaterController.php
View File

@@ -4,6 +4,7 @@ namespace Modules\Installer\Http\Controllers;
use App\Contracts\Controller; use App\Contracts\Controller;
use App\Services\Installer\MigrationService; use App\Services\Installer\MigrationService;
use App\Services\Installer\SeederService;
use function count; use function count;
use Illuminate\Http\Request; use Illuminate\Http\Request;
use Log; use Log;
@@ -16,15 +17,19 @@ use Log;
class UpdaterController extends Controller class UpdaterController extends Controller
{ {
private $migrationSvc; private $migrationSvc;
private $seederSvc;
/** /**
* UpdaterController constructor. * UpdaterController constructor.
* @param MigrationService $migrationSvc * @param MigrationService $migrationSvc
* @param SeederService $seederSvc
*/ */
public function __construct( public function __construct(
MigrationService $migrationSvc MigrationService $migrationSvc,
SeederService $seederSvc
) { ) {
$this->migrationSvc = $migrationSvc; $this->migrationSvc = $migrationSvc;
$this->seederSvc = $seederSvc;
} }
/** /**
@@ -66,12 +71,12 @@ class UpdaterController extends Controller
$migrations = $this->migrationSvc->migrationsAvailable(); $migrations = $this->migrationSvc->migrationsAvailable();
if(count($migrations) === 0) { if(count($migrations) === 0) {
$this->migrationSvc->syncAllSeeds(); $this->seederSvc->syncAllSeeds();
return view('installer::update/steps/step3-update-complete'); return view('installer::update/steps/step3-update-complete');
} }
$output = $this->migrationSvc->runAllMigrations(); $output = $this->migrationSvc->runAllMigrations();
$this->migrationSvc->syncAllSeeds(); $this->seederSvc->syncAllSeeds();
return view('installer::update/steps/step2-migrations-done', [ return view('installer::update/steps/step2-migrations-done', [
'console_output' => $output, 'console_output' => $output,

2
modules/Installer/Resources/views/update/steps/step1-update-available.blade.php
View File

@@ -3,7 +3,7 @@
@section('content') @section('content')
<h2>phpvms updater</h2> <h2>phpvms updater</h2>
<p>Updates have been found, click run to complete the update!.</p> <p>Click run to complete the update!.</p>
{{ Form::open(['route' => 'update.run_migrations', 'method' => 'post']) }} {{ Form::open(['route' => 'update.run_migrations', 'method' => 'post']) }}
<p style="text-align: right"> <p style="text-align: right">
{{ Form::submit('Run >>', ['class' => 'btn btn-success']) }} {{ Form::submit('Run >>', ['class' => 'btn btn-success']) }}

3
package.json
View File

@@ -24,6 +24,7 @@
"icheck": "~1.0", "icheck": "~1.0",
"jquery": "~3.4", "jquery": "~3.4",
"jquery-pjax": "~2.0", "jquery-pjax": "~2.0",
"js-yaml": "^3.13.1",
"laravel-mix": "^2.1.14", "laravel-mix": "^2.1.14",
"leaflet": "^1.3.4", "leaflet": "^1.3.4",
"leaflet-ajax": "2.1.0", "leaflet-ajax": "2.1.0",
@@ -48,6 +49,6 @@
"copy-webpack-plugin": "^4.6.0", "copy-webpack-plugin": "^4.6.0",
"tailwindcss": "^0.5.3", "tailwindcss": "^0.5.3",
"webpack-bundle-analyzer": "^3.3", "webpack-bundle-analyzer": "^3.3",
"webpack-dev-server": ">=3.1.11" "webpack-dev-server": "^3.1.11"
} }
} }

2
phpunit.xml
View File

@@ -23,7 +23,7 @@
</whitelist> </whitelist>
</filter> </filter>
<php> <php>
<env name="APP_ENV" value="test"/> <env name="APP_ENV" value="unittest"/>
<env name="APP_KEY" value="base64:ve66Z5Kt/zTN3p++0zOPu854PHfZkwJE5VuoFAlzHtI="/> <env name="APP_KEY" value="base64:ve66Z5Kt/zTN3p++0zOPu854PHfZkwJE5VuoFAlzHtI="/>
<env name="APP_DEBUG" value="true"/> <env name="APP_DEBUG" value="true"/>
<env name="APP_LOG_LEVEL" value="debug"/> <env name="APP_LOG_LEVEL" value="debug"/>

2
resources/stubs/installer/config.stub
View File

@@ -13,7 +13,7 @@ return [
'url' => '$SITE_URL$', 'url' => '$SITE_URL$',
# Don't forget to change these when live # Don't forget to change these when live
'env' => 'local', 'env' => 'prod',
'debug' => false, 'debug' => false,
], ],

12
resources/views/admin/pireps/fields.blade.php
View File

@@ -168,7 +168,11 @@
{{ Form::label('block_fuel', 'Block Fuel:') }} {{ Form::label('block_fuel', 'Block Fuel:') }}
<div class="row"> <div class="row">
<div class="col-sm-12"> <div class="col-sm-12">
{{ Form::number('block_fuel', null, ['class' => 'form-control', 'min' => 0]) }} {{ Form::number('block_fuel', null, [
'class' => 'form-control',
'min' => 0,
'step' => '0.01',
]) }}
<p class="text-danger">{{ $errors->first('block_fuel') }}</p> <p class="text-danger">{{ $errors->first('block_fuel') }}</p>
</div> </div>
</div> </div>
@@ -179,7 +183,11 @@
{{ Form::label('fuel_used', 'Fuel Used:') }} {{ Form::label('fuel_used', 'Fuel Used:') }}
<div class="row"> <div class="row">
<div class="col-sm-12"> <div class="col-sm-12">
{{ Form::number('fuel_used', null, ['class' => 'form-control', 'min' => 0]) }} {{ Form::number('fuel_used', null, [
'class' => 'form-control',
'min' => 0,
'step' => '0.01'
]) }}
<p class="text-danger">{{ $errors->first('fuel_used') }}</p> <p class="text-danger">{{ $errors->first('fuel_used') }}</p>
</div> </div>
</div> </div>

0
resources/views/layouts/default/acars/index.blade.php → resources/views/layouts/default/livemap/index.blade.php
View File

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

@@ -123,34 +123,6 @@ flight reports that have been filed. You've been warned!
<p class="text-danger">{{ $errors->first('minutes') }}</p> <p class="text-danger">{{ $errors->first('minutes') }}</p>
@endif @endif
</div> </div>
<div class="col-3">
{{--{{ Form::label('submitted_date', __('pireps.dateflown')) }}
{{ Form::text('submmitted_date', null, [
'placeholder' => __('pireps.departuredate'),
'class' => 'form-control',
'readonly' => $pirep->read_only]) }}--}}
</div>
<div class="col-3">
{{--{{ Form::label('departure_time', __('flights.departuretime')) }}
{{ Form::text('departure_time', null, [
'placeholder' => __('flights.departuretime'),
'class' => 'form-control',
'readonly' => $pirep->read_only]) }}--}}
</div>
<div class="col-3">
{{--{{ Form::label('arrival_time', __('flights.arrivaltime')) }}
{{ Form::text('arrival_time', null, [
'placeholder' => __('flights.arrivaltime'),
'class' => 'form-control',
'readonly' => $pirep->read_only]) }}--}}
</div>
</div> </div>
</div> </div>
</div> </div>
@@ -237,6 +209,7 @@ flight reports that have been filed. You've been warned!
{{ Form::number('block_fuel', null, [ {{ Form::number('block_fuel', null, [
'class' => 'form-control', 'class' => 'form-control',
'min' => '0', 'min' => '0',
'step' => '0.01',
'readonly' => (!empty($pirep) && $pirep->read_only), 'readonly' => (!empty($pirep) && $pirep->read_only),
]) }} ]) }}
</div> </div>
@@ -252,6 +225,7 @@ flight reports that have been filed. You've been warned!
{{ Form::number('fuel_used', null, [ {{ Form::number('fuel_used', null, [
'class' => 'form-control', 'class' => 'form-control',
'min' => '0', 'min' => '0',
'step' => '0.01',
'readonly' => (!empty($pirep) && $pirep->read_only), 'readonly' => (!empty($pirep) && $pirep->read_only),
]) }} ]) }}
</div> </div>

4
tests/ApiTest.php
View File

@@ -84,9 +84,7 @@ class ApiTest extends TestCase
$airlines = factory(App\Models\Airline::class, $size)->create(); $airlines = factory(App\Models\Airline::class, $size)->create();
$res = $this->get('/api/airlines'); $res = $this->get('/api/airlines');
$body = $res->json(); $this->assertTrue($res->isOk());
$this->assertCount($size, $body['data']);
$airline = $airlines->random(); $airline = $airlines->random();
$this->get('/api/airlines/'.$airline->id) $this->get('/api/airlines/'.$airline->id)

8
tests/AwardsTest.php
View File

@@ -1,6 +1,8 @@
<?php <?php
use App\Models\UserAward; use App\Models\UserAward;
use App\Services\AwardService;
use App\Services\PirepService;
class AwardsTest extends TestCase class AwardsTest extends TestCase
{ {
@@ -10,8 +12,10 @@ class AwardsTest extends TestCase
public function setUp(): void public function setUp(): void
{ {
parent::setUp(); parent::setUp();
$this->awardSvc = app(\App\Services\AwardService::class); $this->addData('base');
$this->pirepSvc = app(\App\Services\PirepService::class); $this->addData('fleet');
$this->awardSvc = app(AwardService::class);
$this->pirepSvc = app(PirepService::class);
} }
/** /**

1
tests/FinanceTest.php
View File

@@ -25,6 +25,7 @@ class FinanceTest extends TestCase
{ {
parent::setUp(); parent::setUp();
$this->addData('base'); $this->addData('base');
$this->addData('fleet');
$this->expenseRepo = app(ExpenseRepository::class); $this->expenseRepo = app(ExpenseRepository::class);
$this->fareSvc = app(FareService::class); $this->fareSvc = app(FareService::class);

10
tests/PIREPTest.php
View File

@@ -8,6 +8,7 @@ use App\Models\Pirep;
use App\Models\User; use App\Models\User;
use App\Repositories\SettingRepository; use App\Repositories\SettingRepository;
use App\Services\FlightService; use App\Services\FlightService;
use App\Services\PirepService;
use Carbon\Carbon; use Carbon\Carbon;
class PIREPTest extends TestCase class PIREPTest extends TestCase
@@ -19,8 +20,9 @@ class PIREPTest extends TestCase
{ {
parent::setUp(); parent::setUp();
$this->addData('base'); $this->addData('base');
$this->addData('fleet');
$this->pirepSvc = app('App\Services\PirepService'); $this->pirepSvc = app(PirepService::class);
$this->settingsRepo = app(SettingRepository::class); $this->settingsRepo = app(SettingRepository::class);
} }
@@ -195,7 +197,6 @@ class PIREPTest extends TestCase
public function testPilotStatsIncr() public function testPilotStatsIncr()
{ {
$user = factory(User::class)->create([ $user = factory(User::class)->create([
'airline_id' => 1,
'flights' => 0, 'flights' => 0,
'flight_time' => 0, 'flight_time' => 0,
'rank_id' => 1, 'rank_id' => 1,
@@ -203,8 +204,9 @@ class PIREPTest extends TestCase
// Submit two PIREPs // Submit two PIREPs
$pireps = factory(Pirep::class, 2)->create([ $pireps = factory(Pirep::class, 2)->create([
'airline_id' => 1, 'airline_id' => $user->airline_id,
'user_id' => $user->id, 'aircraft_id' => 1,
'user_id' => $user->id,
// 360min == 6 hours, rank should bump up // 360min == 6 hours, rank should bump up
'flight_time' => 360, 'flight_time' => 360,
]); ]);

22
tests/data/base.yml
View File

@@ -1,12 +1,12 @@
# #
#airlines: airlines:
# - id: 1 - id: 1
# icao: VMS icao: VMS
# iata: VM iata: VM
# name: phpvms airlines name: phpvms airlines
# active: 1 active: 1
# created_at: now created_at: now
# updated_at: now updated_at: now
users: users:
- id: 1 - id: 1
@@ -31,6 +31,12 @@ role_user:
user_type: App\Models\User user_type: App\Models\User
ranks: ranks:
- id: 1
name: New Pilot
hours: 0
acars_base_pay_rate: 50
manual_base_pay_rate: 25
- id: 2 - id: 2
name: Junior First Officer name: Junior First Officer
hours: 10 hours: 10

60
tests/data/fleet.yml Normal file
View File

@@ -0,0 +1,60 @@
subfleets:
- id: 1
airline_id: 1
name: 747-43X RB211-524G
type: 744-3X-RB211
cost_block_hour: 1000
ground_handling_multiplier: 200
- id: 2
airline_id: 1
name: 777-222ER GE90-76B
type: 772-22ER-GE90-76B
cost_block_hour: 500
ground_handling_multiplier: 150
- id: 3
airline_id: 1
name: 777-367 ER GE90-115B
type: 772-36ER-GE90-115B
cost_block_hour: 100
ground_handling_multiplier: 150
aircraft:
- id: 1
subfleet_id: 1
airport_id: KJFK
name: Boeing 747-438
registration: 001Z
status: A
- id: 2
subfleet_id: 2
airport_id: LGRP
name: Boeing 777-200
registration: C202
status: A
- id: 3
subfleet_id: 1
airport_id: KAUS
name: Boeing 747-412
registration: S2333
status: A
- id: 4
subfleet_id: 1
airport_id: KAUS
name: Boeing 747-436 RETIRED
registration:
status: R
subfleet_rank:
- rank_id: 1
subfleet_id: 1
- rank_id: 1
subfleet_id: 2
- rank_id: 1
subfleet_id: 3
- rank_id: 2
subfleet_id: 2
- rank_id: 2
subfleet_id: 3
- rank_id: 3
subfleet_id: 3

1319
yarn.lock
View File

File diff suppressed because it is too large Load Diff