From 0375bb420f79ae70af8a2c2e1584bcde6f621a01 Mon Sep 17 00:00:00 2001 From: Nabeel Shahzad Date: Tue, 19 Dec 2017 20:19:36 -0600 Subject: [PATCH] Major refactoring for PIREP statuses and states to accomodate ACARS/route data --- app/Database/factories/AirportFactory.php | 2 +- app/Database/factories/NavpointFactory.php | 15 ++++ app/Database/factories/PirepFactory.php | 6 +- .../2017_06_08_0000_create_users_table.php | 1 + ...017_06_11_135707_create_airports_table.php | 2 +- .../2017_06_28_195426_create_pirep_tables.php | 3 +- ...017_12_20_004147_create_navdata_tables.php | 47 +++++++++++ .../2017_12_20_005147_create_acars_tables.php | 50 +++++++++++ app/Database/seeds/dev.yml | 6 +- .../Controllers/Admin/PirepController.php | 7 +- .../Controllers/Frontend/PirepController.php | 3 +- app/Models/Acars.php | 10 +++ app/Models/Enums/Days.php | 28 +++++++ app/Models/Enums/EnumBase.php | 28 +++++++ app/Models/Enums/PirepSource.php | 22 +++++ app/Models/Enums/PirepState.php | 17 ++++ app/Models/Enums/PirepStatus.php | 27 ++++++ app/Models/Flight.php | 6 +- app/Models/Navpoint.php | 10 +++ app/Models/Pirep.php | 16 ++-- app/Providers/AppServiceProvider.php | 9 +- app/Services/PIREPService.php | 44 +++++----- config/app.php | 5 ++ config/enums.php | 21 ----- .../views/errors/already-installed.blade.php | 1 + .../views/admin/pireps/pirep_card.blade.php | 16 ++-- .../layouts/default/auth/login.blade.php | 2 +- .../default/auth/oldregister.blade.php | 82 ------------------- .../layouts/default/auth/register.blade.php | 2 +- .../layouts/default/auth/registered.blade.php | 3 +- .../layouts/default/dashboard/index.blade.php | 1 + .../layouts/default/flights/index.blade.php | 1 + .../layouts/default/pireps/create.blade.php | 2 +- .../layouts/default/pireps/index.blade.php | 2 +- .../layouts/default/pireps/show.blade.php | 6 +- .../layouts/default/pireps/table.blade.php | 4 +- .../layouts/default/profile/index.blade.php | 2 +- tests/PIREPTest.php | 13 ++- 38 files changed, 352 insertions(+), 170 deletions(-) create mode 100644 app/Database/factories/NavpointFactory.php create mode 100644 app/Database/migrations/2017_12_20_004147_create_navdata_tables.php create mode 100644 app/Database/migrations/2017_12_20_005147_create_acars_tables.php create mode 100644 app/Models/Acars.php create mode 100644 app/Models/Enums/Days.php create mode 100644 app/Models/Enums/EnumBase.php create mode 100644 app/Models/Enums/PirepSource.php create mode 100644 app/Models/Enums/PirepState.php create mode 100644 app/Models/Enums/PirepStatus.php create mode 100644 app/Models/Navpoint.php delete mode 100644 resources/views/layouts/default/auth/oldregister.blade.php diff --git a/app/Database/factories/AirportFactory.php b/app/Database/factories/AirportFactory.php index a5a55190..fef8fa8a 100644 --- a/app/Database/factories/AirportFactory.php +++ b/app/Database/factories/AirportFactory.php @@ -8,7 +8,7 @@ use Faker\Generator as Faker; $factory->define(App\Models\Airport::class, function (Faker $faker) { return [ 'id' => strtoupper($faker->unique()->text(5)), - 'icao' => function(array $apt) { return $apt['id']; }, + 'icao' => function(array $apt) { return substr($apt['id'],0, 4); }, 'iata' => function (array $apt) { return $apt['id']; }, 'name' => $faker->sentence(3), 'country' => $faker->country, diff --git a/app/Database/factories/NavpointFactory.php b/app/Database/factories/NavpointFactory.php new file mode 100644 index 00000000..918105b4 --- /dev/null +++ b/app/Database/factories/NavpointFactory.php @@ -0,0 +1,15 @@ +define(App\Models\Navpoint::class, function (Faker $faker) { + return [ + 'id' => $faker->unique()->numberBetween(10, 100000), + 'name' => $faker->unique()->text(10), + 'title' => $faker->unique()->text(25), + 'airway' => $faker->unique()->text(7), + 'lat' => $faker->latitude, + 'lon' => $faker->longitude, + 'freq' => $faker->randomFloat(2, 100, 1000), + ]; +}); diff --git a/app/Database/factories/PirepFactory.php b/app/Database/factories/PirepFactory.php index 99e17bb1..bdbcf46c 100644 --- a/app/Database/factories/PirepFactory.php +++ b/app/Database/factories/PirepFactory.php @@ -1,5 +1,7 @@ define(App\Models\Pirep::class, function (Faker $faker) use ($airlines 'flight_time' => $faker->randomFloat(2), 'route' => $faker->text(200), 'notes' => $faker->text(200), - 'source' => $faker->randomElement([0, 1]), # MANUAL/ACARS - 'status' => config('enums.pirep_status.PENDING'), //$faker->randomElement([-1, 0, 1]), # REJECTED/PENDING/ACCEPTED + 'source' => $faker->randomElement([PirepSource::MANUAL, PirepSource::ACARS]), + 'state' => PirepState::PENDING, //$faker->randomElement([-1, 0, 1]), # REJECTED/PENDING/ACCEPTED 'raw_data' => $raw_data ?: $raw_data = json_encode(['key' => 'value']), 'created_at' => $faker->dateTimeBetween('-1 week', 'now'), 'updated_at' => function(array $pirep) { diff --git a/app/Database/migrations/2017_06_08_0000_create_users_table.php b/app/Database/migrations/2017_06_08_0000_create_users_table.php index bb16dc68..e92e7cc8 100755 --- a/app/Database/migrations/2017_06_08_0000_create_users_table.php +++ b/app/Database/migrations/2017_06_08_0000_create_users_table.php @@ -29,6 +29,7 @@ class CreateUsersTable extends Migration $table->decimal('balance', 19)->nullable(); $table->string('timezone', 64)->nullable(); $table->unsignedTinyInteger('status')->default(0); + $table->unsignedTinyInteger('state')->default(0); $table->boolean('active')->nullable(); $table->rememberToken(); $table->timestamps(); diff --git a/app/Database/migrations/2017_06_11_135707_create_airports_table.php b/app/Database/migrations/2017_06_11_135707_create_airports_table.php index 03fc6999..36163363 100644 --- a/app/Database/migrations/2017_06_11_135707_create_airports_table.php +++ b/app/Database/migrations/2017_06_11_135707_create_airports_table.php @@ -10,7 +10,7 @@ class CreateAirportsTable extends Migration Schema::create('airports', function (Blueprint $table) { $table->string('id', 5)->primary(); $table->string('iata', 5)->nullable(); - $table->string('icao', 5); + $table->string('icao', 4); $table->string('name', 100); $table->string('location', 100)->nullable(); $table->string('country', 64)->nullable(); diff --git a/app/Database/migrations/2017_06_28_195426_create_pirep_tables.php b/app/Database/migrations/2017_06_28_195426_create_pirep_tables.php index 518c1458..37a3a90c 100644 --- a/app/Database/migrations/2017_06_28_195426_create_pirep_tables.php +++ b/app/Database/migrations/2017_06_28_195426_create_pirep_tables.php @@ -30,7 +30,8 @@ class CreatePirepTables extends Migration $table->string('route', 250)->nullable(); $table->string('notes', 250)->nullable(); $table->unsignedTinyInteger('source')->default(0); - $table->tinyInteger('status')->default(0); # -1 rejected, 0 pending, 1 accepted + $table->tinyInteger('state')->default(0); # -1 rejected, 0 pending, 1 accepted + #$table->tinyInteger('status')->default(0); # -1 rejected, 0 pending, 1 accepted $table->longText('raw_data')->nullable(); $table->timestamps(); $table->softDeletes(); diff --git a/app/Database/migrations/2017_12_20_004147_create_navdata_tables.php b/app/Database/migrations/2017_12_20_004147_create_navdata_tables.php new file mode 100644 index 00000000..fb7a1e49 --- /dev/null +++ b/app/Database/migrations/2017_12_20_004147_create_navdata_tables.php @@ -0,0 +1,47 @@ +bigIncrements('id'); + $table->string('name', 10); + $table->string('title', 25); + $table->string('airway', 7)->nullable(); + $table->string('airway_type', 1)->nullable(); + $table->bigInteger('seq')->nullable(); + $table->string('loc', 4)->nullable(); + $table->float('lat', 7, 4)->default(0.0); + $table->float('lon', 7, 4)->default(0.0); + $table->string('freq', 7); + $table->integer('type'); + + $table->index('name'); + $table->index('airway'); + }); + } + + /** + * Reverse the migrations. + * + * @return void + */ + public function down() + { + Schema::dropIfExists('navpoints'); + } +} diff --git a/app/Database/migrations/2017_12_20_005147_create_acars_tables.php b/app/Database/migrations/2017_12_20_005147_create_acars_tables.php new file mode 100644 index 00000000..9f2b1579 --- /dev/null +++ b/app/Database/migrations/2017_12_20_005147_create_acars_tables.php @@ -0,0 +1,50 @@ +bigIncrements('id'); + $table->string('acars_id', 12); + $table->string('name', 10)->nullable(); + $table->float('lat', 7, 4)->default(0.0); + $table->float('lon', 7, 4)->default(0.0); + + # TODO: More columns here for what might be required + + # polymorphic relation columns. + # parent_type can be flight, pirep or acars + # once + $table->unsignedBigInteger('parent_id'); + $table->string('parent_type'); + + $table->timestamps(); + + $table->index('created_at'); + }); + } + + /** + * Reverse the migrations. + * + * @return void + */ + public function down() + { + Schema::dropIfExists('acars'); + } +} diff --git a/app/Database/seeds/dev.yml b/app/Database/seeds/dev.yml index bb449a4b..89a70729 100644 --- a/app/Database/seeds/dev.yml +++ b/app/Database/seeds/dev.yml @@ -336,7 +336,7 @@ pireps: dpt_airport_id: KAUS arr_airport_id: KJFK flight_time: 180 # 6 hours - status: 0 + state: 0 route: PLMMR2 SPA Q22 BEARI FAK PHLBO3 notes: just a pilot report - id: pirepid_2 @@ -347,7 +347,7 @@ pireps: dpt_airport_id: KJFK arr_airport_id: KAUS flight_time: 180 # 6 hours - status: 0 + state: 0 route: PLMMR2 SPA Q22 BEARI FAK PHLBO3 notes: just a pilot report - id: pirepid_3 @@ -358,7 +358,7 @@ pireps: dpt_airport_id: KJFK arr_airport_id: KAUS flight_time: 180 # 6 hours - status: 0 + state: 0 route: PLMMR2 SPA Q22 BEARI FAK PHLBO3 notes: just a pilot report diff --git a/app/Http/Controllers/Admin/PirepController.php b/app/Http/Controllers/Admin/PirepController.php index e4157e61..7af6490a 100644 --- a/app/Http/Controllers/Admin/PirepController.php +++ b/app/Http/Controllers/Admin/PirepController.php @@ -4,6 +4,7 @@ namespace App\Http\Controllers\Admin; use App\Http\Requests\CreatePirepRequest; use App\Http\Requests\UpdatePirepRequest; +use App\Models\Enums\PirepState; use App\Repositories\AircraftRepository; use App\Repositories\AirlineRepository; use App\Repositories\AirportRepository; @@ -81,7 +82,7 @@ class PirepController extends BaseController $this->pirepRepo->pushCriteria($criterea); $pireps = $this->pirepRepo - ->findWhere(['status' => config('enums.pirep_status.PENDING')]) + ->findWhere(['status' => PirepState::PENDING]) ->orderBy('created_at', 'desc') ->paginate(); @@ -211,12 +212,12 @@ class PirepController extends BaseController */ public function status(Request $request) { - Log::info('PIREP status update call', [$request->toArray()]); + Log::info('PIREP state update call', [$request->toArray()]); $pirep = $this->pirepRepo->findWithoutFail($request->id); if($request->isMethod('post')) { $new_status = (int) $request->new_status; - $pirep = $this->pirepSvc->changeStatus($pirep, $new_status); + $pirep = $this->pirepSvc->changeState($pirep, $new_status); } $pirep->refresh(); diff --git a/app/Http/Controllers/Frontend/PirepController.php b/app/Http/Controllers/Frontend/PirepController.php index d303577b..eba2230b 100644 --- a/app/Http/Controllers/Frontend/PirepController.php +++ b/app/Http/Controllers/Frontend/PirepController.php @@ -3,6 +3,7 @@ namespace App\Http\Controllers\Frontend; use App\Facades\Utils; +use App\Models\Enums\PirepSource; use App\Repositories\Criteria\WhereCriteria; use App\Services\PIREPService; use Illuminate\Support\Facades\Auth; @@ -95,7 +96,7 @@ class PirepController extends Controller $custom_fields[] = [ 'name' => $cfield->name, 'value' => $field_val, - 'source' => config('enums.sources.MANUAL') + 'source' => PirepSource::MANUAL ]; } diff --git a/app/Models/Acars.php b/app/Models/Acars.php new file mode 100644 index 00000000..b3ff5e2f --- /dev/null +++ b/app/Models/Acars.php @@ -0,0 +1,10 @@ + 'Monday', + Days::TUESDAY => 'Tuesday', + Days::WEDNESDAY => 'Wednesday', + Days::THURSDAY => 'Thursday', + Days::FRIDAY => 'Friday', + Days::SATURDAY => 'Saturday', + Days::SUNDAY => 'Sunday', + ]; +} diff --git a/app/Models/Enums/EnumBase.php b/app/Models/Enums/EnumBase.php new file mode 100644 index 00000000..436c3dbb --- /dev/null +++ b/app/Models/Enums/EnumBase.php @@ -0,0 +1,28 @@ + 'Manual', + PirepSource::ACARS => 'ACARS', + ]; + +} diff --git a/app/Models/Enums/PirepState.php b/app/Models/Enums/PirepState.php new file mode 100644 index 00000000..1711fd72 --- /dev/null +++ b/app/Models/Enums/PirepState.php @@ -0,0 +1,17 @@ + 'Rejected', + PirepState::PENDING => 'Pending', + PirepState::ACCEPTED => 'Accepted', + ]; +} diff --git a/app/Models/Enums/PirepStatus.php b/app/Models/Enums/PirepStatus.php new file mode 100644 index 00000000..9eaf19d8 --- /dev/null +++ b/app/Models/Enums/PirepStatus.php @@ -0,0 +1,27 @@ + 'Prefiled', + PirepStatus::SCHEDULED => 'Scheduled', + PirepStatus::ENROUTE => 'Enroute', + PirepStatus::ARRIVED => 'Arrived', + ]; +} diff --git a/app/Models/Flight.php b/app/Models/Flight.php index c22a8455..c0e7742b 100644 --- a/app/Models/Flight.php +++ b/app/Models/Flight.php @@ -59,7 +59,11 @@ class Flight extends Model 'arr_airport_id' => 'required', ]; - public function getFlightIdIataAttribute($value) + /** + * Get the flight ident, e.,g JBU1900 + * @param $value + */ + public function getIdentAttribute() { } diff --git a/app/Models/Navpoint.php b/app/Models/Navpoint.php new file mode 100644 index 00000000..abf61008 --- /dev/null +++ b/app/Models/Navpoint.php @@ -0,0 +1,10 @@ + 'integer', 'fuel_used' => 'integer', 'source' => 'integer', + 'state' => 'integer', 'status' => 'integer', ]; @@ -60,19 +62,19 @@ class Pirep extends Model * * @var array */ - public static $rules - = [ - 'dpt_airport_id' => 'required', - 'arr_airport_id' => 'required', - ]; + public static $rules = [ + 'dpt_airport_id' => 'required', + 'arr_airport_id' => 'required', + ]; /** + * Get the flight ident, e.,g JBU1900 * @return string */ - public function getFlightId() + public function getIdentAttribute() { $flight_id = $this->airline->code; - if($this->flight_id) { + if ($this->flight_id) { $flight_id .= $this->flight->flight_number; } else { $flight_id .= $this->flight_number; diff --git a/app/Providers/AppServiceProvider.php b/app/Providers/AppServiceProvider.php index 1fc113ab..b25c1c3a 100755 --- a/app/Providers/AppServiceProvider.php +++ b/app/Providers/AppServiceProvider.php @@ -5,7 +5,9 @@ namespace App\Providers; use Illuminate\Support\Facades\Schema; use Illuminate\Support\ServiceProvider; use App\Repositories\SettingRepository; - +use Illuminate\Database\Eloquent\Relations\Relation; +use App\Models\Flight; +use App\Models\Pirep; class AppServiceProvider extends ServiceProvider { @@ -16,6 +18,11 @@ class AppServiceProvider extends ServiceProvider { Schema::defaultStringLength(191); + Relation::morphMap([ + 'flights' => Flight::class, + 'pireps' => Pirep::class, + ]); + $this->app->bind('setting', SettingRepository::class); //\VaCentral\VaCentral::setVaCentralUrl(config('phpvms.vacentral_api_url')); diff --git a/app/Services/PIREPService.php b/app/Services/PIREPService.php index 664148ea..5b85481f 100644 --- a/app/Services/PIREPService.php +++ b/app/Services/PIREPService.php @@ -2,6 +2,8 @@ namespace App\Services; +use App\Models\Enums\PirepSource; +use App\Models\Enums\PirepState; use App\Models\Pirep; use App\Models\PirepFieldValues; @@ -46,10 +48,10 @@ class PIREPService extends BaseService # Figure out what default state should be. Look at the default # behavior from the rank that the pilot is assigned to - if($pirep->source === config('enums.sources.ACARS')) { - $default_status = $pirep->pilot->rank->auto_approve_acars; + if($pirep->source === PirepSource::ACARS) { + $default_state = $pirep->pilot->rank->auto_approve_acars; } else { - $default_status = $pirep->pilot->rank->auto_approve_manual; + $default_state = $pirep->pilot->rank->auto_approve_manual; } $pirep->save(); @@ -68,12 +70,12 @@ class PIREPService extends BaseService event(new PirepFiled($pirep)); - if ($default_status === config('enums.pirep_status.ACCEPTED')) { + if ($default_state === PirepState::ACCEPTED) { $pirep = $this->accept($pirep); } # only update the pilot last state if they are accepted - if ($default_status === config('enums.pirep_status.ACCEPTED')) { + if ($default_state === PirepState::ACCEPTED) { $this->setPilotState($pirep); } @@ -82,24 +84,24 @@ class PIREPService extends BaseService /** * @param Pirep $pirep - * @param int $new_status + * @param int $new_state * @return Pirep */ - public function changeStatus(Pirep $pirep, int $new_status): Pirep + public function changeState(Pirep $pirep, int $new_state) { - Log::info('PIREP ' . $pirep->id . ' status change from '.$pirep->status.' to ' . $new_status); + Log::info('PIREP ' . $pirep->id . ' state change from '.$pirep->state.' to ' . $new_state); - if ($pirep->status === $new_status) { + if ($pirep->state === $new_state) { return $pirep; } /** * Move from a PENDING status into either ACCEPTED or REJECTED */ - if ($pirep->status === config('enums.pirep_status.PENDING')) { - if ($new_status === config('enums.pirep_status.ACCEPTED')) { + if ($pirep->state === PirepState::PENDING) { + if ($new_state === PirepState::ACCEPTED) { return $this->accept($pirep); - } elseif ($new_status === config('enums.pirep_status.REJECTED')) { + } elseif ($new_state === PirepState::REJECTED) { return $this->reject($pirep); } else { return $pirep; @@ -109,7 +111,7 @@ class PIREPService extends BaseService /* * Move from a ACCEPTED to REJECTED status */ - elseif ($pirep->status === config('enums.pirep_status.ACCEPTED')) { + elseif ($pirep->state === PirepState::ACCEPTED) { $pirep = $this->reject($pirep); return $pirep; } @@ -117,10 +119,12 @@ class PIREPService extends BaseService /** * Move from REJECTED to ACCEPTED */ - elseif ($pirep->status === config('enums.pirep_status.REJECTED')) { + elseif ($pirep->state === PirepState::REJECTED) { $pirep = $this->accept($pirep); return $pirep; } + + return $pirep->refresh(); } /** @@ -130,7 +134,7 @@ class PIREPService extends BaseService public function accept(Pirep $pirep): Pirep { # moving from a REJECTED state to ACCEPTED, reconcile statuses - if ($pirep->status === config('enums.pirep_status.ACCEPTED')) { + if ($pirep->state === PirepState::ACCEPTED) { return $pirep; } @@ -143,13 +147,13 @@ class PIREPService extends BaseService $pirep->pilot->refresh(); # Change the status - $pirep->status = config('enums.pirep_status.ACCEPTED'); + $pirep->state = PirepState::ACCEPTED; $pirep->save(); $pirep->refresh(); $this->setPilotState($pirep); - Log::info('PIREP '.$pirep->id.' status change to ACCEPTED'); + Log::info('PIREP '.$pirep->id.' state change to ACCEPTED'); event(new PirepAccepted($pirep)); @@ -164,7 +168,7 @@ class PIREPService extends BaseService { # If this was previously ACCEPTED, then reconcile the flight hours # that have already been counted, etc - if ($pirep->status === config('enums.pirep_status.ACCEPTED')) { + if ($pirep->state === PirepState::ACCEPTED) { $pilot = $pirep->pilot; $ft = $pirep->flight_time * -1; @@ -175,11 +179,11 @@ class PIREPService extends BaseService } # Change the status - $pirep->status = config('enums.pirep_status.REJECTED'); + $pirep->state = PirepState::REJECTED; $pirep->save(); $pirep->refresh(); - Log::info('PIREP ' . $pirep->id . ' status change to REJECTED'); + Log::info('PIREP ' . $pirep->id . ' state change to REJECTED'); event(new PirepRejected($pirep)); diff --git a/config/app.php b/config/app.php index dfcf3f91..3cd8671e 100755 --- a/config/app.php +++ b/config/app.php @@ -116,5 +116,10 @@ return [ 'Validator' => Illuminate\Support\Facades\Validator::class, 'View' => Illuminate\Support\Facades\View::class, 'Yaml' => Symfony\Component\Yaml\Yaml::class, + + + # ENUMS + 'PirepState' => App\Models\Enums\PirepState::class, + 'PirepStatus' => App\Models\Enums\PirepStatus::class, ], ]; diff --git a/config/enums.php b/config/enums.php index cd037042..b76c734f 100644 --- a/config/enums.php +++ b/config/enums.php @@ -17,32 +17,11 @@ return [ 'SUSPENDED' => 3, ], - 'sources' => [ - 'MANUAL' => 0, - 'ACARS' => 1, - ], - - 'pirep_status' => [ - 'PENDING' => 0, - 'ACCEPTED' => 1, - 'REJECTED' => -1, - ], - 'fuel_types' => [ '100LL' => 0, 'JETA' => 1, 'MOGAS' => 2, ], - 'days' => [ - 'MONDAY' => 1, - 'TUESDAY' => 2, - 'WEDNESDAY' => 4, - 'THURSDAY' => 8, - 'FRIDAY' => 16, - 'SATURDAY' => 32, - 'SUNDAY' => 64 - ], - ]; diff --git a/modules/Installer/Resources/views/errors/already-installed.blade.php b/modules/Installer/Resources/views/errors/already-installed.blade.php index 5977847d..b2941f47 100644 --- a/modules/Installer/Resources/views/errors/already-installed.blade.php +++ b/modules/Installer/Resources/views/errors/already-installed.blade.php @@ -7,5 +7,6 @@

{!! Form::submit('Go to your site >>', ['class' => 'btn btn-success']) !!}

+ {!! PirepState::REJECTED !!} {!! Form::close() !!} @endsection diff --git a/resources/views/admin/pireps/pirep_card.blade.php b/resources/views/admin/pireps/pirep_card.blade.php index ef744ffe..7eff3c76 100644 --- a/resources/views/admin/pireps/pirep_card.blade.php +++ b/resources/views/admin/pireps/pirep_card.blade.php @@ -10,9 +10,9 @@
- @if($pirep->status == config('enums.pirep_status.PENDING')) + @if($pirep->state == PirepState::PENDING)
Pending
- @elseif($pirep->status === config('enums.pirep_status.ACCEPTED')) + @elseif($pirep->state === PirepState::ACCEPTED)
Accepted
@else
Rejected
@@ -58,13 +58,13 @@
- @if($pirep->status == config('enums.pirep_status.PENDING') - || $pirep->status == config('enums.pirep_status.REJECTED')) + @if($pirep->state == PirepState::PENDING + || $pirep->state == PirepState::REJECTED) {!! Form::open(['url' => '/admin/pireps/'.$pirep->id.'/status', 'method' => 'post', 'name' => 'accept_'.$pirep->id, 'id' => $pirep->id.'_accept', 'pirep_id' => $pirep->id, - 'new_status' => config('enums.pirep_status.ACCEPTED'), + 'new_status' => PirepState::ACCEPTED, 'class' => 'pirep_submit_status']) !!} {!! Form::button('Accept', ['type' => 'submit', 'class' => 'btn btn-info']) !!} {!! Form::close() !!} @@ -72,13 +72,13 @@   - @if($pirep->status == config('enums.pirep_status.PENDING') - || $pirep->status == config('enums.pirep_status.ACCEPTED')) + @if($pirep->state == PirepState::PENDING + || $pirep->state == PirepState::ACCEPTED) {!! Form::open(['url' => '/admin/pireps/'.$pirep->id.'/status', 'method' => 'post', 'name' => 'reject_'.$pirep->id, 'id' => $pirep->id.'_reject', 'pirep_id' => $pirep->id, - 'new_status' => config('enums.pirep_status.REJECTED'), + 'new_status' => PirepState::REJECTED, 'class' => 'pirep_submit_status']) !!} {!! Form::button('Reject', ['type' => 'submit', 'class' => 'btn btn-danger']) !!} {!! Form::close() !!} diff --git a/resources/views/layouts/default/auth/login.blade.php b/resources/views/layouts/default/auth/login.blade.php index 61d3e4ce..3ddc6540 100644 --- a/resources/views/layouts/default/auth/login.blade.php +++ b/resources/views/layouts/default/auth/login.blade.php @@ -1,5 +1,5 @@ @extends('layouts.default.auth.layout') - +@section('title', 'log in') @section('content')
Status - @if($pirep->status == config('enums.pirep_status.PENDING')) + @if($pirep->state == PirepState::PENDING)
Pending
- @elseif($pirep->status === config('enums.pirep_status.ACCEPTED')) + @elseif($pirep->state === PirepState::ACCEPTED)
Accepted
@else
Rejected
diff --git a/resources/views/layouts/default/pireps/table.blade.php b/resources/views/layouts/default/pireps/table.blade.php index 8b51fd4e..04516fdd 100644 --- a/resources/views/layouts/default/pireps/table.blade.php +++ b/resources/views/layouts/default/pireps/table.blade.php @@ -14,9 +14,9 @@
- @if($pirep->status == config('enums.pirep_status.PENDING')) + @if($pirep->state == PirepState::PENDING)
Pending
- @elseif($pirep->status == config('enums.pirep_status.ACCEPTED')) + @elseif($pirep->state == PirepState::ACCEPTED)
Accepted
@else
Rejected
diff --git a/resources/views/layouts/default/profile/index.blade.php b/resources/views/layouts/default/profile/index.blade.php index 8525e351..ce5c7e3c 100644 --- a/resources/views/layouts/default/profile/index.blade.php +++ b/resources/views/layouts/default/profile/index.blade.php @@ -1,5 +1,5 @@ @extends('layouts.default.app') - +@section('title', 'profile') @section('content')
diff --git a/tests/PIREPTest.php b/tests/PIREPTest.php index 7f7f08c5..232c925d 100644 --- a/tests/PIREPTest.php +++ b/tests/PIREPTest.php @@ -1,5 +1,6 @@ pirepSvc->create($pirep, []); /** - * Check the initial status info + * Check the initial state info */ - $this->assertEquals($pirep->status, config('enums.pirep_status.PENDING')); + $this->assertEquals($pirep->state, PirepState::PENDING); /** * Now set the PIREP state to ACCEPTED @@ -39,7 +39,7 @@ class PIREPTest extends TestCase $original_flight_time = $pirep->pilot->flight_time ; $new_flight_time = $pirep->pilot->flight_time + $pirep->flight_time; - $this->pirepSvc->changeStatus($pirep, '1'); + $this->pirepSvc->changeState($pirep, PirepState::ACCEPTED); $this->assertEquals($new_pirep_count, $pirep->pilot->flights); $this->assertEquals($new_flight_time, $pirep->pilot->flight_time); $this->assertEquals($pirep->arr_airport_id, $pirep->pilot->curr_airport_id); @@ -50,10 +50,9 @@ class PIREPTest extends TestCase */ $new_pirep_count = $pirep->pilot->flights - 1; $new_flight_time = $pirep->pilot->flight_time - $pirep->flight_time; - $this->pirepSvc->changeStatus($pirep, config('enums.pirep_status.REJECTED')); + $this->pirepSvc->changeState($pirep, PirepState::REJECTED); $this->assertEquals($new_pirep_count, $pirep->pilot->flights); $this->assertEquals($new_flight_time, $pirep->pilot->flight_time); - //$this->assertEquals(1, $pirep->pilot->rank_id); $this->assertEquals($pirep->arr_airport_id, $pirep->pilot->curr_airport_id); } @@ -101,7 +100,7 @@ class PIREPTest extends TestCase $latest_pirep = Pirep::where('id', $pilot->last_pirep_id)->first(); # Make sure PIREP was auto updated - $this->assertEquals(config('enums.pirep_status.ACCEPTED'), $latest_pirep->status); + $this->assertEquals(PirepState::ACCEPTED, $latest_pirep->state); # Make sure latest PIREP was updated $this->assertNotEquals($last_pirep->id, $latest_pirep->id);