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

Cleanup default value field migrations; flight fields

Browse Source
This commit is contained in:
Nabeel Shahzad 2018-01-23 21:58:13 -06:00
parent 9964eb63fb
commit cd61c999e7
13 changed files with 39 additions and 31 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
app/Database/migrations/2017_06_08_0000_create_users_table.php
View File

@ -26,11 +26,11 @@ class CreateUsersTable extends Migration
$table->string('curr_airport_id', 5)->nullable(); $table->string('curr_airport_id', 5)->nullable();
$table->string('last_pirep_id', 12)->nullable(); $table->string('last_pirep_id', 12)->nullable();
$table->unsignedBigInteger('flights')->default(0); $table->unsignedBigInteger('flights')->default(0);
$table->unsignedBigInteger('flight_time')->default(0); $table->unsignedBigInteger('flight_time')->nullable()->default(0);
$table->decimal('balance', 19)->nullable(); $table->decimal('balance', 19)->nullable();
$table->string('timezone', 64)->nullable(); $table->string('timezone', 64)->nullable();
$table->unsignedTinyInteger('status')->default(0); $table->unsignedTinyInteger('status')->nullable()->default(0);
$table->unsignedTinyInteger('state')->default(0); $table->unsignedTinyInteger('state')->nullable()->default(0);
$table->boolean('active')->nullable(); $table->boolean('active')->nullable();
$table->ipAddress('last_ip')->nullable(); $table->ipAddress('last_ip')->nullable();
$table->rememberToken(); $table->rememberToken();

4
app/Database/migrations/2017_06_08_191703_create_airlines_table.php
View File

@ -21,8 +21,8 @@ class CreateAirlinesTable extends Migration
$table->string('country', 2)->nullable(); $table->string('country', 2)->nullable();
$table->string('logo', 255)->nullable(); $table->string('logo', 255)->nullable();
$table->boolean('active')->default(true); $table->boolean('active')->default(true);
$table->unsignedBigInteger('total_flights')->default(0); $table->unsignedBigInteger('total_flights')->nullable()->default(0);
$table->unsignedBigInteger('total_time')->default(0); $table->unsignedBigInteger('total_time')->nullable()->default(0);
$table->timestamps(); $table->timestamps();
$table->index('icao'); $table->index('icao');

2
app/Database/migrations/2017_06_09_010621_create_aircrafts_table.php
View File

@ -19,7 +19,7 @@ class CreateAircraftsTable extends Migration
$table->string('name', 50); $table->string('name', 50);
$table->string('registration', 10)->nullable(); $table->string('registration', 10)->nullable();
$table->string('tail_number', 10)->nullable(); $table->string('tail_number', 10)->nullable();
$table->unsignedBigInteger('flight_time')->default(0); $table->unsignedBigInteger('flight_time')->nullable()->default(0);
$table->boolean('active')->default(true); $table->boolean('active')->default(true);
$table->unsignedTinyInteger('state')->default(AircraftState::PARKED); $table->unsignedTinyInteger('state')->default(AircraftState::PARKED);
$table->timestamps(); $table->timestamps();

6
app/Database/migrations/2017_06_10_040335_create_fares_table.php
View File

@ -17,9 +17,9 @@ class CreateFaresTable extends Migration
$table->increments('id'); $table->increments('id');
$table->string('code', 50); $table->string('code', 50);
$table->string('name', 50); $table->string('name', 50);
$table->unsignedDecimal('price', 19)->default(0.00); $table->unsignedDecimal('price', 19)->nullable()->default(0.00);
$table->unsignedDecimal('cost', 19)->default(0.00); $table->unsignedDecimal('cost', 19)->nullable()->default(0.00);
$table->unsignedInteger('capacity')->default(0); $table->unsignedInteger('capacity')->nullable()->default(0);
$table->string('notes')->nullable(); $table->string('notes')->nullable();
$table->boolean('active')->default(true); $table->boolean('active')->default(true);
$table->timestamps(); $table->timestamps();

10
app/Database/migrations/2017_06_11_135707_create_airports_table.php
View File

@ -16,11 +16,11 @@ class CreateAirportsTable extends Migration
$table->string('country', 64)->nullable(); $table->string('country', 64)->nullable();
$table->string('tz', 64)->nullable(); $table->string('tz', 64)->nullable();
$table->boolean('hub')->default(false); $table->boolean('hub')->default(false);
$table->unsignedDecimal('fuel_100ll_cost', 19)->default(0); $table->unsignedDecimal('fuel_100ll_cost', 19)->nullable()->default(0);
$table->unsignedDecimal('fuel_jeta_cost', 19)->default(0); $table->unsignedDecimal('fuel_jeta_cost', 19)->nullable()->default(0);
$table->unsignedDecimal('fuel_mogas_cost', 19)->default(0); $table->unsignedDecimal('fuel_mogas_cost', 19)->nullable()->default(0);
$table->float('lat', 7, 4)->default(0.0)->nullable(); $table->float('lat', 7, 4)->nullable()->default(0.0);
$table->float('lon', 7, 4)->default(0.0)->nullable(); $table->float('lon', 7, 4)->nullable()->default(0.0);
}); });
} }

4
app/Database/migrations/2017_06_17_214650_create_flight_tables.php
View File

@ -24,8 +24,8 @@ class CreateFlightTables extends Migration
$table->string('alt_airport_id', 5)->nullable(); $table->string('alt_airport_id', 5)->nullable();
$table->string('dpt_time', 10)->nullable(); $table->string('dpt_time', 10)->nullable();
$table->string('arr_time', 10)->nullable(); $table->string('arr_time', 10)->nullable();
$table->unsignedInteger('level')->default(0); $table->unsignedInteger('level')->nullable()->default(0);
$table->unsignedDecimal('distance', 19)->default(0.0); $table->unsignedDecimal('distance', 19)->nullable()->default(0.0);
$table->unsignedDecimal('flight_time', 19)->nullable(); $table->unsignedDecimal('flight_time', 19)->nullable();
$table->text('route')->nullable(); $table->text('route')->nullable();
$table->text('notes')->nullable(); $table->text('notes')->nullable();

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

@ -18,9 +18,9 @@ class CreateRanksTable extends Migration
$table->string('name', 50); $table->string('name', 50);
$table->string('image_link')->nullable(); $table->string('image_link')->nullable();
$table->unsignedInteger('hours')->default(0); $table->unsignedInteger('hours')->default(0);
$table->boolean('auto_approve_acars')->default(false); $table->boolean('auto_approve_acars')->nullable()->default(false);
$table->boolean('auto_approve_manual')->default(false); $table->boolean('auto_approve_manual')->nullable()->default(false);
$table->boolean('auto_promote')->default(true); $table->boolean('auto_promote')->nullable()->default(true);
$table->timestamps(); $table->timestamps();
$table->unique('name'); $table->unique('name');

4
app/Database/migrations/2017_06_28_195426_create_pirep_tables.php
View File

@ -35,7 +35,7 @@ class CreatePirepTables extends Migration
$table->unsignedDecimal('fuel_used', 19)->nullable(); $table->unsignedDecimal('fuel_used', 19)->nullable();
$table->text('route')->nullable(); $table->text('route')->nullable();
$table->text('notes')->nullable(); $table->text('notes')->nullable();
$table->unsignedTinyInteger('source')->default(0); $table->unsignedTinyInteger('source')->nullable()->default(0);
$table->tinyInteger('state')->default(PirepState::PENDING); $table->tinyInteger('state')->default(PirepState::PENDING);
$table->tinyInteger('status')->default(PirepStatus::SCHEDULED); $table->tinyInteger('status')->default(PirepStatus::SCHEDULED);
$table->longText('raw_data')->nullable(); $table->longText('raw_data')->nullable();
@ -85,7 +85,7 @@ class CreatePirepTables extends Migration
$table->bigIncrements('id'); $table->bigIncrements('id');
$table->string('name', 50); $table->string('name', 50);
$table->string('slug', 50)->nullable(); $table->string('slug', 50)->nullable();
$table->boolean('required')->default(false); $table->boolean('required')->nullable()->default(false);
}); });
Schema::create('pirep_field_values', function (Blueprint $table) { Schema::create('pirep_field_values', function (Blueprint $table) {

4
app/Database/migrations/2017_12_20_004147_create_navdata_tables.php
View File

@ -21,8 +21,8 @@ class CreateNavdataTables extends Migration
$table->string('id', 5); $table->string('id', 5);
$table->string('name', 24); $table->string('name', 24);
$table->unsignedInteger('type'); $table->unsignedInteger('type');
$table->float('lat', 7, 4)->default(0.0); $table->float('lat', 7, 4)->nullable()->default(0.0);
$table->float('lon', 7, 4)->default(0.0); $table->float('lon', 7, 4)->nullable()->default(0.0);
$table->string('freq', 7)->nullable(); $table->string('freq', 7)->nullable();
$table->primary(['id', 'name']); $table->primary(['id', 'name']);

4
app/Database/migrations/2017_12_20_005147_create_acars_tables.php
View File

@ -21,8 +21,8 @@ class CreateAcarsTables extends Migration
$table->unsignedInteger('order')->default(0); $table->unsignedInteger('order')->default(0);
$table->string('name')->nullable(); $table->string('name')->nullable();
$table->string('log')->nullable(); $table->string('log')->nullable();
$table->float('lat', 7, 4)->default(0.0); $table->float('lat', 7, 4)->nullable()->default(0.0);
$table->float('lon', 7, 4)->default(0.0); $table->float('lon', 7, 4)->nullable()->default(0.0);
$table->unsignedInteger('heading')->nullable(); $table->unsignedInteger('heading')->nullable();
$table->unsignedInteger('altitude')->nullable(); $table->unsignedInteger('altitude')->nullable();
$table->integer('vs')->nullable(); $table->integer('vs')->nullable();

12
app/Http/Resources/PirepComment.php
View File

@ -22,13 +22,13 @@ class PirepComment extends Resource
$user = $this->user; $user = $this->user;
return [ return [
'id' => $this->id, 'id' => $this->id,
'comment' => $this->comment, 'comment' => $this->comment,
'created_at' => $this->created_at, 'created_at' => $this->created_at,
'user' => [ 'user' => [
'id' => $user->id, 'id' => $user->id,
'pilot_id' => $user->pilot_id, 'pilot_id' => $user->pilot_id,
'name' => $user->name, 'name' => $user->name,
], ],
]; ];
} }

4
app/Models/Flight.php
View File

@ -40,9 +40,13 @@ class Flight extends BaseModel
]; ];
public static $rules = [ public static $rules = [
'airline_id' => 'required|exists:airlines,id',
'flight_number' => 'required', 'flight_number' => 'required',
'route_code' => 'nullable',
'route_leg' => 'nullable',
'dpt_airport_id' => 'required', 'dpt_airport_id' => 'required',
'arr_airport_id' => 'required', 'arr_airport_id' => 'required',
'level' => 'nullable',
]; ];
/** /**

4
resources/views/admin/flights/fields.blade.php
View File

@ -17,12 +17,14 @@
<div class="form-group col-sm-3"> <div class="form-group col-sm-3">
{!! Form::label('route_code', 'Route Code:') !!} {!! Form::label('route_code', 'Route Code:') !!}
{!! Form::text('route_code', null, ['class'=>'form-control', 'placeholder'=>'optional']) !!} {!! Form::text('route_code', null, ['class'=>'form-control', 'placeholder'=>'optional']) !!}
<p class="text-danger">{{ $errors->first('route_code') }}</p>
</div> </div>
<!-- Route Leg Field --> <!-- Route Leg Field -->
<div class="form-group col-sm-3"> <div class="form-group col-sm-3">
{!! Form::label('route_leg', 'Route Leg:') !!} {!! Form::label('route_leg', 'Route Leg:') !!}
{!! Form::text('route_leg', null, ['class'=>'form-control', 'placeholder'=>'optional']) !!} {!! Form::text('route_leg', null, ['class'=>'form-control', 'placeholder'=>'optional']) !!}
<p class="text-danger">{{ $errors->first('route_leg') }}</p>
</div> </div>
</div> </div>
@ -69,11 +71,13 @@ SAME ROW
<div class="form-group col-sm-3"> <div class="form-group col-sm-3">
{!! Form::label('distance', 'Distance:') !!} {!! Form::label('distance', 'Distance:') !!}
{!! Form::text('distance', null, ['class' => 'form-control']) !!} {!! Form::text('distance', null, ['class' => 'form-control']) !!}
<p class="text-danger">{{ $errors->first('distance') }}</p>
</div> </div>
<div class="form-group col-sm-3"> <div class="form-group col-sm-3">
{!! Form::label('level', 'Flight Level:') !!} {!! Form::label('level', 'Flight Level:') !!}
{!! Form::text('level', null, ['class' => 'form-control']) !!} {!! Form::text('level', null, ['class' => 'form-control']) !!}
<p class="text-danger">{{ $errors->first('level') }}</p>
</div> </div>
</div> </div>