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 fb6f0a3c..bdfec0c0 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 @@ -23,6 +23,7 @@ class CreatePirepTables extends Migration $table->string('flight_number', 10)->nullable(); $table->string('route_code', 5)->nullable(); $table->string('route_leg', 5)->nullable(); + $table->char('flight_type', 1)->default(FlightType::SCHED_PAX); $table->string('dpt_airport_id', 5); $table->string('arr_airport_id', 5); $table->unsignedInteger('level')->nullable(); @@ -39,9 +40,10 @@ class CreatePirepTables extends Migration $table->text('notes')->nullable(); $table->unsignedTinyInteger('source')->nullable()->default(0); $table->string('source_name', 25)->nullable(); - $table->char('flight_type', 1)->default(FlightType::SCHED_PAX); $table->tinyInteger('state')->default(PirepState::PENDING); $table->tinyInteger('status')->default(PirepStatus::SCHEDULED); + $table->dateTime('block_off_time')->nullable(); + $table->dateTime('block_on_time')->nullable(); $table->timestamps(); $table->primary('id'); diff --git a/app/Models/Pirep.php b/app/Models/Pirep.php index 301a9007..3facba7b 100644 --- a/app/Models/Pirep.php +++ b/app/Models/Pirep.php @@ -68,6 +68,8 @@ class Pirep extends Model 'flight_type', 'state', 'status', + 'block_off_time', + 'block_on_time', 'created_at', 'updated_at', ]; @@ -87,9 +89,10 @@ class Pirep extends Model 'fuel_used' => 'float', 'landing_rate' => 'float', 'source' => 'integer', - 'flight_type' => 'integer', 'state' => 'integer', 'status' => 'integer', + 'block_off_time' => 'datetime', + 'block_on_time' => 'datetime', ]; public static $rules = [ diff --git a/public/assets/frontend/css/now-ui-kit.css b/public/assets/frontend/css/now-ui-kit.css index 7c28603e..62feb2a4 100644 --- a/public/assets/frontend/css/now-ui-kit.css +++ b/public/assets/frontend/css/now-ui-kit.css @@ -2719,7 +2719,6 @@ h3, .h3 { h4, .h4 { font-size: 1.714em; line-height: 1.45em; - margin-top: 30px; margin-bottom: 15px; } diff --git a/public/assets/installer/css/vendor.css b/public/assets/installer/css/vendor.css index afda8895..0c037ad3 100644 --- a/public/assets/installer/css/vendor.css +++ b/public/assets/installer/css/vendor.css @@ -9520,7 +9520,6 @@ h3, .h3 { h4, .h4 { font-size: 1.714em; line-height: 1.45em; - margin-top: 30px; margin-bottom: 15px; } diff --git a/public/mix-manifest.json b/public/mix-manifest.json index c8ca27ed..8511d2e2 100644 --- a/public/mix-manifest.json +++ b/public/mix-manifest.json @@ -1,6 +1,6 @@ { "/assets/frontend/js/app.js": "/assets/frontend/js/app.js?id=373465bdf8c91ab66596", - "/assets/frontend/css/now-ui-kit.css": "/assets/frontend/css/now-ui-kit.css?id=9923ce002ceafb1d740a", + "/assets/frontend/css/now-ui-kit.css": "/assets/frontend/css/now-ui-kit.css?id=dae9f7e5d10b71e28486", "/assets/admin/css/vendor.min.css": "/assets/admin/css/vendor.min.css?id=a11d81c6bf8d7a548c86", "/assets/admin/js/app.js": "/assets/admin/js/app.js?id=7cc40ba818ed0f94c3fb", "/assets/installer/js/app.js": "/assets/installer/js/app.js?id=c65781eda730445d666e", @@ -15,6 +15,6 @@ "/assets/admin/css/blue@2x.png": "/assets/admin/css/blue@2x.png?id=97da23d47b838cbd4bef", "/assets/global/js/vendor.js": "/assets/global/js/vendor.js?id=6436d215691e8f38eb12", "/assets/global/css/vendor.css": "/assets/global/css/vendor.css?id=115d5c4f2370ae94a962", - "/assets/installer/css/vendor.css": "/assets/installer/css/vendor.css?id=81f225b61b069fa804fa", + "/assets/installer/css/vendor.css": "/assets/installer/css/vendor.css?id=affe665b10baf5ba6905", "/assets/installer/js/vendor.js": "/assets/installer/js/vendor.js?id=01249af00bd2c1267e15" } \ No newline at end of file diff --git a/resources/sass/now-ui/now-ui-kit/_typography.scss b/resources/sass/now-ui/now-ui-kit/_typography.scss index 7b2ebdeb..89ee13a7 100755 --- a/resources/sass/now-ui/now-ui-kit/_typography.scss +++ b/resources/sass/now-ui/now-ui-kit/_typography.scss @@ -39,7 +39,7 @@ h3, .h3{ h4, .h4{ font-size: $font-size-h4; line-height: 1.45em; - margin-top: $margin-base-vertical * 2; + //margin-top: $margin-base-vertical * 2; margin-bottom: $margin-base-vertical; & + .category, diff --git a/resources/views/admin/pireps/fields.blade.php b/resources/views/admin/pireps/fields.blade.php index 2e1cb1e1..dee2bfe6 100644 --- a/resources/views/admin/pireps/fields.blade.php +++ b/resources/views/admin/pireps/fields.blade.php @@ -39,7 +39,18 @@ @endif -
+
+ {{ Form::label('flight_type', 'Flight Type') }} + {{ Form::select('flight_type', + \App\Models\Enums\FlightType::select(), + null, [ + 'class' => 'form-control select2', + 'readonly' => $read_only + ]) + }} +

{{ $errors->first('flight_type') }}

+
+

Filed Via:

{{ PirepSource::label($pirep->source) }} @if(filled($pirep->source_name)) diff --git a/resources/views/layouts/default/app.blade.php b/resources/views/layouts/default/app.blade.php index 0154d8fc..76429d70 100644 --- a/resources/views/layouts/default/app.blade.php +++ b/resources/views/layouts/default/app.blade.php @@ -12,7 +12,6 @@ {{-- End the required lines block --}} - diff --git a/resources/views/layouts/default/pireps/fields.blade.php b/resources/views/layouts/default/pireps/fields.blade.php index abd50bf9..0b38a5a0 100644 --- a/resources/views/layouts/default/pireps/fields.blade.php +++ b/resources/views/layouts/default/pireps/fields.blade.php @@ -94,6 +94,27 @@ flight reports that have been filed. You've been warned! + + Flight Type + + @if($read_only) +

{{ \App\Models\Enums\FlightType::label($pirep->flight_type) }}

+ {{ Form::hidden('flight_type') }} + @else +
+ {{ Form::select('flight_type', + \App\Models\Enums\FlightType::select(), + null, [ + 'class' => 'custom-select select2', + 'readonly' => $read_only + ]) + }} +
+

{{ $errors->first('flight_type') }}

+ @endif + + + Origin Airport diff --git a/resources/views/layouts/default/pireps/map.blade.php b/resources/views/layouts/default/pireps/map.blade.php index 77f12418..c7fae8fa 100644 --- a/resources/views/layouts/default/pireps/map.blade.php +++ b/resources/views/layouts/default/pireps/map.blade.php @@ -1,6 +1,6 @@
-

flight map

+

flight map

diff --git a/resources/views/layouts/default/pireps/show.blade.php b/resources/views/layouts/default/pireps/show.blade.php index 89911671..fff8faf7 100644 --- a/resources/views/layouts/default/pireps/show.blade.php +++ b/resources/views/layouts/default/pireps/show.blade.php @@ -3,13 +3,14 @@ @section('content')
-
+

{{ $pirep->ident }}

-
+
+

flight info

@@ -40,6 +41,11 @@ + + + + +
Status
Flight Type{{ \App\Models\Enums\FlightType::label($pirep->flight_type) }}
Flight Time @@ -70,20 +76,18 @@
-
- {{-- - Show the fields that have been entered - --}} +
+ {{-- + Show the fields that have been entered + --}} - @if(count($pirep->fields) > 0) -
-
-

fields

+ @if(count($pirep->fields) > 0) +

fields

- - + + @foreach($pirep->fields as $field) @@ -94,9 +98,9 @@ @endforeach
NameValueNameValue
-
+ @endif
- @endif +
{{-- Show the fares that have been entered @@ -104,8 +108,8 @@ @if(count($pirep->fares) > 0)
-
-

fares

+
+

fares

@@ -124,7 +128,7 @@ @endif - @include("pireps.map") + @include('pireps.map') @if(count($pirep->acars_logs) > 0)

Class