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

added a few columns for scheduling, styling in admin

Browse Source
This commit is contained in:
Nabeel Shahzad
2018-04-08 20:51:27 -05:00
parent f842e86885
commit 86d28aafd6
14 changed files with 219 additions and 128 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -24,13 +24,16 @@ class CreateFlightTables extends Migration
$table->string('alt_airport_id', 5)->nullable();
$table->string('dpt_time', 10)->nullable();
$table->string('arr_time', 10)->nullable();
$table->unsignedTinyInteger('days')->nullable();
$table->unsignedInteger('level')->nullable()->default(0);
$table->unsignedDecimal('distance')->nullable()->default(0.0);
$table->unsignedInteger('flight_time')->nullable();
$table->char('flight_type', 1)->default(FlightType::SCHED_PAX);
$table->text('route')->nullable();
$table->text('notes')->nullable();
$table->boolean('scheduled')->default(false)->nullable();
$table->unsignedTinyInteger('days')->nullable();
$table->date('start_date')->nullable();
$table->date('end_date')->nullable();
$table->boolean('has_bid')->default(false);
$table->boolean('active')->default(true);
$table->timestamps();

35
public/assets/admin/css/vendor.css
View File

@@ -13258,7 +13258,7 @@ input {
}
.form-control + .form-control-feedback {
border-radius: 6px;
border-radius: 3px;
font-size: 14px;
margin-top: -7px;
position: absolute;
@@ -13294,7 +13294,7 @@ input {
.input-group-addon {
background-color: #fffcf5;
border: medium none;
border-radius: 4px;
border-radius: 2px;
}
.has-success .input-group-addon,
@@ -13434,7 +13434,7 @@ textarea.form-control {
.alert[data-notify="container"] {
padding: 10px 10px 10px 20px;
border-radius: 4px;
border-radius: 2px;
}
.alert.alert-with-icon {
@@ -14125,7 +14125,7 @@ textarea.form-control {
-webkit-box-shadow: 0 2px 2px rgba(204, 197, 185, 0.5);
box-shadow: 0 2px 2px rgba(204, 197, 185, 0.5);
background-color: #FFFFFF;
color: #252422;
color: #2c2c2c;
margin-bottom: 20px;
position: relative;
z-index: 1;
@@ -14189,7 +14189,6 @@ textarea.form-control {
.card label {
font-size: 14px;
font-weight: 400;
color: #9A9A9A;
text-transform: capitalize;
margin-bottom: 0px;
}
@@ -14209,7 +14208,7 @@ textarea.form-control {
.card .title {
margin: 0;
color: #252422;
color: #2c2c2c;
font-weight: 300;
}
@@ -14286,7 +14285,7 @@ textarea.form-control {
}
.card .alert {
border-radius: 4px;
border-radius: 2px;
position: relative;
}
@@ -16069,6 +16068,28 @@ fieldset[disabled] .card .btn-neutral.active {
}
}
.form-container {
border: 0;
border-radius: 2px;
display: inline-block;
position: relative;
overflow: hidden;
width: 100%;
margin-bottom: 20px;
font-weight: bold;
text-transform: uppercase;
}
.form-container h6 {
font-size: 15px;
padding: 7px;
background-color: rgba(222, 222, 222, 0.3);
}
.form-container .form-container-body {
padding: 8px;
}
/*
* Licensing: http://www.pixeden.com/icon-fonts/stroke-7-icon-font-set
*/

35
public/assets/admin/css/vendor.min.css vendored
View File

@@ -1379,7 +1379,7 @@ input {
}
.form-control + .form-control-feedback {
border-radius: 6px;
border-radius: 3px;
font-size: 14px;
margin-top: -7px;
position: absolute;
@@ -1415,7 +1415,7 @@ input {
.input-group-addon {
background-color: #fffcf5;
border: medium none;
border-radius: 4px;
border-radius: 2px;
}
.has-success .input-group-addon,
@@ -1555,7 +1555,7 @@ textarea.form-control {
.alert[data-notify="container"] {
padding: 10px 10px 10px 20px;
border-radius: 4px;
border-radius: 2px;
}
.alert.alert-with-icon {
@@ -2246,7 +2246,7 @@ textarea.form-control {
-webkit-box-shadow: 0 2px 2px rgba(204, 197, 185, 0.5);
box-shadow: 0 2px 2px rgba(204, 197, 185, 0.5);
background-color: #FFFFFF;
color: #252422;
color: #2c2c2c;
margin-bottom: 20px;
position: relative;
z-index: 1;
@@ -2310,7 +2310,6 @@ textarea.form-control {
.card label {
font-size: 14px;
font-weight: 400;
color: #9A9A9A;
text-transform: capitalize;
margin-bottom: 0px;
}
@@ -2330,7 +2329,7 @@ textarea.form-control {
.card .title {
margin: 0;
color: #252422;
color: #2c2c2c;
font-weight: 300;
}
@@ -2407,7 +2406,7 @@ textarea.form-control {
}
.card .alert {
border-radius: 4px;
border-radius: 2px;
position: relative;
}
@@ -4190,6 +4189,28 @@ fieldset[disabled] .card .btn-neutral.active {
}
}
.form-container {
border: 0;
border-radius: 2px;
display: inline-block;
position: relative;
overflow: hidden;
width: 100%;
margin-bottom: 20px;
font-weight: bold;
text-transform: uppercase;
}
.form-container h6 {
font-size: 15px;
padding: 7px;
background-color: rgba(222, 222, 222, 0.3);
}
.form-container .form-container-body {
padding: 8px;
}
/*
* Licensing: http://www.pixeden.com/icon-fonts/stroke-7-icon-font-set
*/

4
public/mix-manifest.json
View File

@@ -1,7 +1,7 @@
{
"/assets/frontend/js/app.js": "/assets/frontend/js/app.js?id=3d5b0dff38050f6b5e0b",
"/assets/frontend/css/now-ui-kit.css": "/assets/frontend/css/now-ui-kit.css?id=a64d6e004c25bd2720b2",
"/assets/admin/css/vendor.min.css": "/assets/admin/css/vendor.min.css?id=a11d81c6bf8d7a548c86",
"/assets/admin/css/vendor.min.css": "/assets/admin/css/vendor.min.css?id=61da6b300cd04cca6799",
"/assets/admin/js/app.js": "/assets/admin/js/app.js?id=926a7c24ec36533523e3",
"/assets/installer/js/app.js": "/assets/installer/js/app.js?id=c65781eda730445d666e",
"/assets/fonts/glyphicons-halflings-regular.woff2": "/assets/fonts/glyphicons-halflings-regular.woff2?id=b5b5055c6d812c0f9f0d",
@@ -9,7 +9,7 @@
"/assets/admin/img/clear.png": "/assets/admin/img/clear.png?id=0e92f4c3efc6988a3c96",
"/assets/admin/img/loading.gif": "/assets/admin/img/loading.gif?id=90a4b76b4f11558691f6",
"/assets/global/js/jquery.js": "/assets/global/js/jquery.js?id=6a07da9fae934baf3f74",
"/assets/admin/css/vendor.css": "/assets/admin/css/vendor.css?id=d996fcb13fe42a360434",
"/assets/admin/css/vendor.css": "/assets/admin/css/vendor.css?id=7453fe9b5675cd1d759c",
"/assets/admin/js/vendor.js": "/assets/admin/js/vendor.js?id=aa7db4bedfe23409f625",
"/assets/admin/css/blue.png": "/assets/admin/css/blue.png?id=753a3c0dec86d3a38d9c",
"/assets/admin/css/blue@2x.png": "/assets/admin/css/blue@2x.png?id=97da23d47b838cbd4bef",

3
resources/sass/admin/paper-dashboard.scss
View File

@@ -34,12 +34,11 @@
@import "paper/navbars";
@import "paper/footers";
// Fancy Stuff
@import "paper/dropdown";
@import "paper/cards";
@import "paper/chartist";
@import "paper/responsive";
@import "paper/form-container";
$pe-7s-font-path: "../../fonts" !default;
@import "../../../node_modules/pe7-icon/dist/scss/pe-icon-7-stroke";

2
resources/sass/admin/paper/_cards.scss
View File

@@ -61,7 +61,7 @@
label{
font-size: $font-size-base;
font-weight: $font-weight-normal;
color: $dark-gray;
//color: $dark-gray;
text-transform: capitalize;
margin-bottom: 0px;
i{

21
resources/sass/admin/paper/_form-container.scss Normal file
View File

@@ -0,0 +1,21 @@
.form-container {
border: 0;
border-radius: 2px;
display: inline-block;
position: relative;
overflow: hidden;
width: 100%;
margin-bottom: 20px;
font-weight: bold;
text-transform: uppercase;
h6 {
font-size: 15px;
padding: 7px;
background-color: rgba(222, 222, 222, 0.3);
}
.form-container-body {
padding: 8px;
}
}

8
resources/sass/admin/paper/_variables.scss
View File

@@ -149,9 +149,9 @@ $margin-bottom: 0 0 10px 0 !default;
$border: 1px solid !default;
$border-radius-extra-small: 0.125rem !default;
$border-radius-tiny: 0.1875rem !default;
$border-radius-small: 3px !default;
$border-radius-base: 4px !default;
$border-radius-large: 6px !default;
$border-radius-small: 0.1875px !default;
$border-radius-base: 2px !default;
$border-radius-large: 3px !default;
$border-radius-extreme: 6px !default;
$border-radius-large-top: $border-radius-large $border-radius-large 0 0 !default;
@@ -276,7 +276,7 @@ $sidebar-width: calc(100% - 260px) !default;
$medium-dark-gray: #AAAAAA !default;
//variables used in cards
$card-black-color: #252422 !default;
$card-black-color: #2c2c2c !default;
$card-muted-color: #ccc5b9 !default;

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

@@ -1,98 +1,122 @@
<!-- Airline Id Field -->
<div class="row">
<div class="form-group col-sm-3">
{{ Form::label('airline_id', 'Airline:') }}&nbsp;<span class="required">*</span>
{{ Form::select('airline_id', $airlines, null , ['class' => 'form-control select2']) }}
<p class="text-danger">{{ $errors->first('airline_id') }}</p>
</div>
<div class="col-12">
<div class="form-container">
<h6><i class="fas fa-info-circle"></i>
&nbsp;Flight Information
</h6>
<div class="form-container-body">
<div class="row">
<div class="form-group col-sm-3">
{{ Form::label('airline_id', 'Airline:') }}&nbsp;<span
class="required">*</span>
{{ Form::select('airline_id', $airlines, null , ['class' => 'form-control select2']) }}
<p class="text-danger">{{ $errors->first('airline_id') }}</p>
</div>
<!-- Flight Number Field -->
<div class="form-group col-sm-3">
{{ Form::label('flight_number', 'Flight Number:') }}&nbsp;<span class="required">*</span>
{{ Form::text('flight_number', null, ['class' => 'form-control']) }}
<p class="text-danger">{{ $errors->first('flight_number') }}</p>
</div>
<!-- Flight Number Field -->
<div class="form-group col-sm-3">
{{ Form::label('flight_number', 'Flight Number:') }}&nbsp;<span
class="required">*</span>
{{ Form::text('flight_number', null, ['class' => 'form-control']) }}
<p class="text-danger">{{ $errors->first('flight_number') }}</p>
</div>
<!-- Route Code Field -->
<div class="form-group col-sm-3">
{{ Form::label('route_code', 'Route Code:') }}
{{ Form::text('route_code', null, ['class'=>'form-control', 'placeholder'=>'optional']) }}
<p class="text-danger">{{ $errors->first('route_code') }}</p>
</div>
<!-- Route Code Field -->
<div class="form-group col-sm-3">
{{ Form::label('route_code', 'Route Code:') }}
{{ Form::text('route_code', null, ['class'=>'form-control', 'placeholder'=>'optional']) }}
<p class="text-danger">{{ $errors->first('route_code') }}</p>
</div>
<!-- Route Leg Field -->
<div class="form-group col-sm-3">
{{ Form::label('route_leg', 'Route Leg:') }}
{{ Form::text('route_leg', null, ['class'=>'form-control', 'placeholder'=>'optional']) }}
<p class="text-danger">{{ $errors->first('route_leg') }}</p>
<!-- Route Leg Field -->
<div class="form-group col-sm-3">
{{ Form::label('route_leg', 'Route Leg:') }}
{{ Form::text('route_leg', null, ['class'=>'form-control', 'placeholder'=>'optional']) }}
<p class="text-danger">{{ $errors->first('route_leg') }}</p>
</div>
</div>
</div>
</div>
</div>
</div>
<div class="row">
<div class="form-group col-md-12" style="text-align: center;">
<span style="margin-right: 20px;">
{{ Form::label('days[]', 'Monday') }}
{{ Form::checkbox(
'days[]',
\App\Models\Enums\Days::MONDAY,
in_mask($days, \App\Models\Enums\Days::MONDAY),
['class' => 'form-control icheck']
) }}
</span>
<span style="margin-right: 20px;">
{{ Form::label('days[]', 'Tuesday') }}
{{ Form::checkbox(
'days[]',
\App\Models\Enums\Days::TUESDAY,
in_mask($days, \App\Models\Enums\Days::TUESDAY),
['class' => 'form-control icheck']
) }}
</span>
<span style="margin-right: 20px;">
{{ Form::label('days[]', 'Wednesday') }}
{{ Form::checkbox(
'days[]',
\App\Models\Enums\Days::WEDNESDAY,
in_mask($days, \App\Models\Enums\Days::WEDNESDAY),
['class' => 'form-control icheck']
) }}
</span>
<span style="margin-right: 20px;">
{{ Form::label('days[]', 'Thursday') }}
{{ Form::checkbox(
'days[]',
\App\Models\Enums\Days::THURSDAY,
in_mask($days, \App\Models\Enums\Days::THURSDAY),
['class' => 'form-control icheck']
) }}
</span>
<span style="margin-right: 20px;">
{{ Form::label('days[]', 'Friday') }}
{{ Form::checkbox(
'days[]',
\App\Models\Enums\Days::FRIDAY,
in_mask($days, \App\Models\Enums\Days::FRIDAY),
['class' => 'form-control icheck']
) }}
</span>
<span style="margin-right: 20px;">
{{ Form::label('days[]', 'Saturday') }}
{{ Form::checkbox(
'days[]',
\App\Models\Enums\Days::SATURDAY,
in_mask($days, \App\Models\Enums\Days::SATURDAY),
['class' => 'form-control icheck']
) }}
</span>
<span>
{{ Form::label('days[]', 'Sunday') }}
{{ Form::checkbox(
'days[]',
\App\Models\Enums\Days::SUNDAY,
in_mask($days, \App\Models\Enums\Days::SUNDAY),
['class' => 'form-control icheck']
) }}
</span>
<div class="col-12">
<div class="form-container">
<h6><i class="fas fa-clock"></i>
&nbsp;Scheduling
</h6>
<div class="form-container-body">
<div class="row">
<div class="form-group col-md-12" style="text-align: center;">
<span style="margin-right: 20px;">
{{ Form::label('days[]', 'Monday') }}
{{ Form::checkbox(
'days[]',
\App\Models\Enums\Days::MONDAY,
in_mask($days, \App\Models\Enums\Days::MONDAY),
['class' => 'form-control icheck']
) }}
</span>
<span style="margin-right: 20px;">
{{ Form::label('days[]', 'Tuesday') }}
{{ Form::checkbox(
'days[]',
\App\Models\Enums\Days::TUESDAY,
in_mask($days, \App\Models\Enums\Days::TUESDAY),
['class' => 'form-control icheck']
) }}
</span>
<span style="margin-right: 20px;">
{{ Form::label('days[]', 'Wednesday') }}
{{ Form::checkbox(
'days[]',
\App\Models\Enums\Days::WEDNESDAY,
in_mask($days, \App\Models\Enums\Days::WEDNESDAY),
['class' => 'form-control icheck']
) }}
</span>
<span style="margin-right: 20px;">
{{ Form::label('days[]', 'Thursday') }}
{{ Form::checkbox(
'days[]',
\App\Models\Enums\Days::THURSDAY,
in_mask($days, \App\Models\Enums\Days::THURSDAY),
['class' => 'form-control icheck']
) }}
</span>
<span style="margin-right: 20px;">
{{ Form::label('days[]', 'Friday') }}
{{ Form::checkbox(
'days[]',
\App\Models\Enums\Days::FRIDAY,
in_mask($days, \App\Models\Enums\Days::FRIDAY),
['class' => 'form-control icheck']
) }}
</span>
<span style="margin-right: 20px;">
{{ Form::label('days[]', 'Saturday') }}
{{ Form::checkbox(
'days[]',
\App\Models\Enums\Days::SATURDAY,
in_mask($days, \App\Models\Enums\Days::SATURDAY),
['class' => 'form-control icheck']
) }}
</span>
<span>
{{ Form::label('days[]', 'Sunday') }}
{{ Form::checkbox(
'days[]',
\App\Models\Enums\Days::SUNDAY,
in_mask($days, \App\Models\Enums\Days::SUNDAY),
['class' => 'form-control icheck']
) }}
</span>
</div>
</div>
</div>
</div>
</div>
</div>

24
resources/views/layouts/default/downloads/index.blade.php
View File

@@ -5,19 +5,23 @@
@include('flash::message')
<div class="row">
<div class="row-sm-12">
<h2 class="description">Downloads</h2>
<h2>Downloads</h2>
</div>
</div>
@foreach($grouped_files as $group => $files)
<div class="row" style="margin-bottom: 40px;">
<div class="col-12">
<h4 class="description">{{ $group }}</h4>
</div>
@if(!$grouped_files || \count($grouped_files) === 0)
<div class="jumbotron text-center">There are no downloads!</div>
@else
@foreach($grouped_files as $group => $files)
<div class="row" style="margin-bottom: 40px;">
<div class="col-12">
<h4 class="description">{{ $group }}</h4>
</div>
<div class="col-12">
@include('downloads.table', ['files' => $files])
<div class="col-12">
@include('downloads.table', ['files' => $files])
</div>
</div>
</div>
@endforeach
@endforeach
@endif
@endsection

2
resources/views/layouts/default/flights/index.blade.php
View File

@@ -5,7 +5,7 @@
<div class="row">
@include('flash::message')
<div class="col-md-9">
<h2 class="description">{{ $title ?? 'Flights' }}</h2>
<h2>{{ $title ?? 'Flights' }}</h2>
@include('flights.table')
</div>
<div class="col-md-3">

2
resources/views/layouts/default/pireps/index.blade.php
View File

@@ -9,7 +9,7 @@
style="margin-top: -10px;margin-bottom: 5px"
href="{{ route('frontend.pireps.create') }}">File New PIREP</a>
</div>
<h2 class="description">pilot reports</h2>
<h2>Pilot Reports</h2>
@include('flash::message')
@include('pireps.table')
</div>

6
resources/views/layouts/default/users/index.blade.php
View File

@@ -4,13 +4,13 @@
@section('content')
<div class="row">
<div class="col-md-12">
<h2 class="description">pilots</h2>
@include("users.table")
<h2>Pilots</h2>
@include('users.table')
</div>
</div>
<div class="row">
<div class="col-12 text-center">
{{ $users->links("pagination.default") }}
{{ $users->links('pagination.default') }}
</div>
</div>
@endsection

4
resources/views/layouts/default/widgets/live_map.blade.php
View File

@@ -1,6 +1,5 @@
<div class="row">
<div class="col-md-12">
<h2 class="description">Current Flights</h2>
<div class="box-body">
<div id="map" style="width: {{ $config['width'] }}; height: {{ $config['height'] }}"></div>
</div>
@@ -11,9 +10,8 @@
<div id="flights_table" class="row">
<div class="col-md-12">
<h3 class="description">flights</h3>
@if(!filled($pireps))
<div class="text-center">There are no flights</div>
<div class="jumbotron text-center">There are no flights</div>
@endif
<table class="table">
@foreach($pireps as $pirep)