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

7.0.0-beta3 Release (#541)

Browse Source 
* 391 Notification refactorings (#441)

* Refactor notifications to allow easier plugins

* Notification refactoring

* Formatting

* Move news to NewsService; cleanup of events

* More refactoring; added send email out for news item and the template

* Formatting

* Formatting

* Fix missing newsRepo (#445)

* Refactor and add importer to Installer module #443 (#444)

* Refactor and add importer to Installer module #443

* Refactor for finances to use in import

* Import groups into roles

* Formatting

* Formatting

* Add interface in installer for import

* Notes about importing

* Check for installer folder

* Formatting

* Fix pirep->user mapping

* Unused import

* Formatting

* Replace importer with AJAX powered; better error handling #443 (#447)

* Replace importer with AJAX powered; better error handling #443

* Formatting

* Fix command line importer

* Remove bootstrap cache (#448)

* Cleanup the bootstrap/cache directory when packaging

* Fix removal of bootstrap cache

* Formatting

* Stricter checks on ACARS API data (#451)

* Stricter checks on ACARS API data

* More checks

* Fix for flight_number check forcing to exist

* Allow nullable on flight_id

* Avoid proc_open use #455 (#456)

* Use PhpExecutableFinder() closes #457 #458 (#460)

* Use DateTimeZone instead of int for creating datetime

closes #461

* Fix CSV imports giving Storage class not found #454 (#462)

* Fix CSV imports giving Storage class not found #454

* Update yarn files for security alert

* Add PHP 7.4 support (#464)

* Add PHP 7.4 to build matrix

* DB fix

* YAML parser fix in test data

* Show versions

* Package updates

* Track used ICAOs

* 7.4 METAR parsing fix

* METAR parser fix

* Formatting

* Add meters to response units

* Call instance for unit conversion

* Return value

* Catch exception for unknown quantity

* Comment fix

* Formatting

* METAR parsing fixes on PHP 7.4

* Package updates

* More random airport ID

* More random airport ID

* Properly disable toolbar

* Semver written out to version file

* Use dev as default identifier

* Fix BindingResolutionError when debug toolbar isn't present (#465)

* Fix BindingResolutionError when debug toolbar isn't present

* Formatting

* Split the importer module out from the installer module (#468)

* Split the importer module out from the installer module

* Cleanup of unused imports

* Move updater into separate module #453

* Remove unused imports/formatting

* Disable the install and importer modules at the end of the setup

* Unused imports; update IJ style

* test explicit stage for php+mysql

* add more to matrix

* Add different MariaDB versions

* undo

* Cleanup Model doc

* Pilots cannot use the dashboard or flights without admin rights (#481)

* Use auth middleware instead of specific groups for logged in state

* Auth check for admin access

* Check user admin access for updates

* Formatting

* Allow nullable field and calculate distance if nulled for flight import #478 (#482)

* Check for no roles being attached #480 (#483)

* Return the flight fares if there are no subfleet fares #488 (#489)

* Return the flight fares if there are no subfleet fares #488

* Formatting

* Formatting

* Account for units when entering fuel amounts #493

* Search for ICAO not working properly (#496)

* /flights and /flights/search direct to the same endpoint

* Properly set the distance/planned_distance on save (#497)

* 491 Installation Error (#495)

* Disable CSRF token

* Add error handling around looking up the theme and set a default

* Note about logs in issue template

* Formatting

* Fix GeoService errors when viewing PIREP #498 (#499)

* Add new command to export a specific PIREP for debugging (#501)

* Set a default model value for airports on PIREP (#500)

* Set a default model value for airports on PIREP

* Fix airport icao reference

* Default airport models

* Catch broader exception writing out config files #491

* style

* Add reference to docs on doc site (#502)

* Properly create/update rows importing #486 (#503)

* Add base Dockerfile for Dockerhub builds (#504)

* New subfleet not being attached to an airline on import #479 (#505)

* Fix subfleet not being attached to an airline on creation in import #479

* Call airline name with optional() around subfleet

* Minor cleanup

* Search flights by subfleet #484 (#506)

* API level search of flights #484

* Add Subfleet to flights page for search

* Make the fuel used optional (#512)

* Add make to Docker container

* Add getRootDomain() to Utils (#514)

* Show admin dropdown for admin-access ability (#515)

* Show admin dropdown for admin-access ability closes #509

* Formatting

* Check user permissions on the routes #508 (#516)

* Check user permissions on the routes #508

* Formatting

* Return default value on exception for setting()

* Correct text for no subfleets #507 (#518)

* Add a public_url() helper #513 (#519)

* Reduce number of queries for update check (#520)

* Try to clear caches before updating (#522)

* Try to clear caches before updating

* Add clear-compiled to maintenance cache list

* Formatting

* Set PIREPs page to public (#526)

Set PIREPs page to public

* Fix live and route map errors #527 (#528)

* Add menu bar for mobile (#529)

* Format all blade templates to 2 spaces #530 (#531)

* Fix PIREP edit endpoint closes #533 (#534)

* Fix import during flight cron #532 (#535)

* PIREPS resource except for show (#536)

* Use optional() around the airport fields (#537)

* Use optional() around the airport fields

* Add null-coalesce around full_name

* Add link to download ACARS config from profile (#539)

* Add link to download ACARS config from profile

* Formatting

* Update xml config file template (#540)
This commit is contained in:
Nabeel S
2020-02-08 13:29:34 -05:00
committed by GitHub
parent a335ed8e9b
commit 073e48c396
515 changed files with 13939 additions and 10717 deletions
Download Patch File Download Diff File Expand all files Collapse all files

24
resources/views/admin/subfleets/create.blade.php
View File

@@ -1,17 +1,17 @@
@extends('admin.app')
@section('title', 'Add Subfleet')
@section('content')
<div class="card border-blue-bottom">
<div class="content">
@if(!filled($airlines))
<p class="text-center">
You must add an airline before you can add a subfleet!
</p>
@else
{{ Form::open(['route' => 'admin.subfleets.store']) }}
@include('admin.subfleets.fields')
{{ Form::close() }}
@endif
</div>
<div class="card border-blue-bottom">
<div class="content">
@if(!filled($airlines))
<p class="text-center">
You must add an airline before you can add a subfleet!
</p>
@else
{{ Form::open(['route' => 'admin.subfleets.store']) }}
@include('admin.subfleets.fields')
{{ Form::close() }}
@endif
</div>
</div>
@endsection

54
resources/views/admin/subfleets/edit.blade.php
View File

@@ -2,36 +2,36 @@
@section('title', "Edit $subfleet->name")
@section('content')
<div class="card border-blue-bottom">
<div class="content">
{{ Form::model($subfleet, ['route' => ['admin.subfleets.update', $subfleet->id], 'method' => 'patch']) }}
@include('admin.subfleets.fields')
{{ Form::close() }}
</div>
</div>
<div class="card border-blue-bottom">
<div class="content">
{{ Form::model($subfleet, ['route' => ['admin.subfleets.update', $subfleet->id], 'method' => 'patch']) }}
@include('admin.subfleets.fields')
{{ Form::close() }}
</div>
</div>
<div class="card border-blue-bottom">
<div class="content">
@include('admin.subfleets.ranks')
</div>
</div>
<div class="card border-blue-bottom">
<div class="content">
@include('admin.subfleets.ranks')
</div>
</div>
<div class="card border-blue-bottom">
<div class="content">
@include('admin.subfleets.fares')
</div>
</div>
<div class="card border-blue-bottom">
<div class="content">
@include('admin.subfleets.fares')
</div>
</div>
<div class="card border-blue-bottom">
<div class="content">
@include('admin.subfleets.expenses')
</div>
</div>
<div class="card border-blue-bottom">
<div class="content">
@include('admin.subfleets.expenses')
</div>
</div>
<div class="card border-blue-bottom">
<div class="content">
@include('admin.common.file_upload', ['model' => $subfleet])
</div>
</div>
<div class="card border-blue-bottom">
<div class="content">
@include('admin.common.file_upload', ['model' => $subfleet])
</div>
</div>
@endsection
@include('admin.subfleets.script')

138
resources/views/admin/subfleets/expenses.blade.php
View File

@@ -1,73 +1,73 @@
<div id="subfleet-expenses-wrapper" class="col-12">
<div class="header">
<h3>expenses</h3>
@component('admin.components.info')
These expenses are only applied to this subfleet
@endcomponent
</div>
<br/>
<table class="table table-responsive" id="subfleet-expenses">
@if(count($subfleet->expenses))
<thead>
<th>Name</th>
<th>Cost&nbsp;<span class="small">{{ currency(config('phpvms.currency')) }}</span></th>
<th>Type</th>
<th></th>
</thead>
@endif
<tbody>
@foreach($subfleet->expenses as $expense)
<tr>
<td>
<p>
<a class="text" href="#" data-pk="{{ $expense->id }}"
data-name="name">{{ $expense->name }}</a>
</p>
</td>
<td>
<p>
<a class="text" href="#" data-pk="{{ $expense->id }}"
data-name="amount">{{ $expense->amount }}</a>
</p>
</td>
<td>
<p>
<a href="#"
class="dropdown"
data-pk="{{ $expense->id }}"
data-name="type">{{ \App\Models\Enums\ExpenseType::label($expense->type) }}</a>
</p>
</td>
<td align="right">
{{ Form::open(['url' => url('/admin/subfleets/'.$subfleet->id.'/expenses'),
'method' => 'delete', 'class' => 'modify_expense form-inline']) }}
{{ Form::hidden('expense_id', $expense->id) }}
{{ Form::button('<i class="fa fa-times"></i>', ['type' => 'submit',
'class' => 'btn btn-sm btn-danger btn-icon',
'onclick' => "return confirm('Are you sure?')",
]) }}
{{ Form::close() }}
</td>
</tr>
@endforeach
</tbody>
</table>
<hr/>
<div class="row">
<div class="col-sm-12">
<div class="text-right">
{{ Form::open(['url' => url('/admin/subfleets/'.$subfleet->id.'/expenses'),
'method' => 'post', 'class' => 'modify_expense form-inline']) }}
{{ Form::text('name', null, ['class' => 'form-control input-sm', 'placeholder' => 'Name']) }}
{{ Form::number('amount', null, ['class' => 'form-control input-sm', 'placeholder' => 'Amount', 'step' => '0.01']) }}
{{ Form::select('type', \App\Models\Enums\ExpenseType::select(), null, ['class' => 'select2']) }}
{{ Form::button('<i class="fa fa-plus"></i> Add', ['type' => 'submit',
'class' => 'btn btn-success btn-small']) }}
{{ Form::close() }}
<div class="header">
<h3>expenses</h3>
@component('admin.components.info')
These expenses are only applied to this subfleet
@endcomponent
</div>
<br/>
<table class="table table-responsive" id="subfleet-expenses">
@if(count($subfleet->expenses))
<thead>
<th>Name</th>
<th>Cost&nbsp;<span class="small">{{ currency(config('phpvms.currency')) }}</span></th>
<th>Type</th>
<th></th>
</thead>
@endif
<tbody>
@foreach($subfleet->expenses as $expense)
<tr>
<td>
<p>
<a class="text" href="#" data-pk="{{ $expense->id }}"
data-name="name">{{ $expense->name }}</a>
</p>
</td>
<td>
<p>
<a class="text" href="#" data-pk="{{ $expense->id }}"
data-name="amount">{{ $expense->amount }}</a>
</p>
</td>
<td>
<p>
<a href="#"
class="dropdown"
data-pk="{{ $expense->id }}"
data-name="type">{{ \App\Models\Enums\ExpenseType::label($expense->type) }}</a>
</p>
</td>
<td align="right">
{{ Form::open(['url' => url('/admin/subfleets/'.$subfleet->id.'/expenses'),
'method' => 'delete', 'class' => 'modify_expense form-inline']) }}
{{ Form::hidden('expense_id', $expense->id) }}
{{ Form::button('<i class="fa fa-times"></i>', ['type' => 'submit',
'class' => 'btn btn-sm btn-danger btn-icon',
'onclick' => "return confirm('Are you sure?')",
]) }}
{{ Form::close() }}
</td>
</tr>
@endforeach
</tbody>
</table>
<hr/>
<div class="row">
<div class="col-sm-12">
<div class="text-right">
{{ Form::open(['url' => url('/admin/subfleets/'.$subfleet->id.'/expenses'),
'method' => 'post', 'class' => 'modify_expense form-inline']) }}
{{ Form::text('name', null, ['class' => 'form-control input-sm', 'placeholder' => 'Name']) }}
{{ Form::number('amount', null, ['class' => 'form-control input-sm', 'placeholder' => 'Amount', 'step' => '0.01']) }}
{{ Form::select('type', \App\Models\Enums\ExpenseType::select(), null, ['class' => 'select2']) }}
{{ Form::button('<i class="fa fa-plus"></i> Add', ['type' => 'submit',
'class' => 'btn btn-success btn-small']) }}
{{ Form::close() }}
<p class="text-danger">{{ $errors->first('name') }}</p>
<p class="text-danger">{{ $errors->first('amount') }}</p>
</div>
</div>
<p class="text-danger">{{ $errors->first('name') }}</p>
<p class="text-danger">{{ $errors->first('amount') }}</p>
</div>
</div>
</div>
</div>

146
resources/views/admin/subfleets/fares.blade.php
View File

@@ -1,76 +1,76 @@
<div id="aircraft_fares_wrapper" class="dataTables_wrapper form-inline dt-bootstrap">
<div class="header">
<h3>fares</h3>
@component('admin.components.info')
Fares assigned to the current subfleet. These can be overridden,
otherwise, the value used is the default, which comes from the fare.
The pay can be set as a fixed amount, or a percentage of the default rate
@endcomponent
</div>
<br />
<table id="aircraft_fares" class="table table-hover">
@if(count($subfleet->fares))
<thead>
<tr>
<th>Name</th>
<th style="text-align: center;">Code</th>
<th style="text-align: center;">Capacity (default)</th>
<th style="text-align: center;">Price (default)</th>
<th style="text-align: center;">Cost (default)</th>
<th></th>
</tr>
</thead>
@endif
<tbody>
@foreach($subfleet->fares as $atf)
<tr>
<td class="sorting_1">{{ $atf->name }}</td>
<td style="text-align: center;">{{ $atf->code }}</td>
<td style="text-align: center;">
<a href="#" data-pk="{{ $atf->id }}" data-name="capacity">{{ $atf->pivot->capacity }}</a>
<span class="small background-color-grey-light">({{ $atf->capacity }})</span>
</td>
<td style="text-align: center;">
<a href="#" data-pk="{{ $atf->id }}" data-name="price">{{ $atf->pivot->price }}</a>
<span class="small background-color-grey-light">({{ $atf->price }})</span></td>
<td style="text-align: center;">
<a href="#" data-pk="{{ $atf->id }}" data-name="cost">{{ $atf->pivot->cost }}</a>
<span class="small background-color-grey-light">({{ $atf->cost}})</span></td>
<td style="text-align: right; width:3%;">
{{ Form::open(['url' => '/admin/subfleets/'.$subfleet->id.'/fares',
'method' => 'delete',
'class' => 'rm_fare'
])
}}
{{ Form::hidden('fare_id', $atf->id) }}
{{ Form::button('<i class="fa fa-times"></i>',
['type' => 'submit',
'class' => 'btn btn-sm btn-danger btn-icon']) }}
{{ Form::close() }}
</td>
</tr>
@endforeach
</tbody>
</table>
<hr />
<div class="row">
<div class="col-xs-12">
<div class="text-right">
{{ Form::open(['url' => '/admin/subfleets/'.$subfleet->id.'/fares',
'method' => 'post',
'class' => 'rm_fare form-inline'
])
}}
{{ Form::select('fare_id', $avail_fares, null, [
'placeholder' => 'Select Fare',
'class' => 'ac-fare-dropdown form-control input-lg select2',
])
}}
{{ Form::button('<i class="glyphicon glyphicon-plus"></i> add',
['type' => 'submit',
'class' => 'btn btn-success btn-s']) }}
{{ Form::close() }}
</div>
</div>
<div class="header">
<h3>fares</h3>
@component('admin.components.info')
Fares assigned to the current subfleet. These can be overridden,
otherwise, the value used is the default, which comes from the fare.
The pay can be set as a fixed amount, or a percentage of the default rate
@endcomponent
</div>
<br/>
<table id="aircraft_fares" class="table table-hover">
@if(count($subfleet->fares))
<thead>
<tr>
<th>Name</th>
<th style="text-align: center;">Code</th>
<th style="text-align: center;">Capacity (default)</th>
<th style="text-align: center;">Price (default)</th>
<th style="text-align: center;">Cost (default)</th>
<th></th>
</tr>
</thead>
@endif
<tbody>
@foreach($subfleet->fares as $atf)
<tr>
<td class="sorting_1">{{ $atf->name }}</td>
<td style="text-align: center;">{{ $atf->code }}</td>
<td style="text-align: center;">
<a href="#" data-pk="{{ $atf->id }}" data-name="capacity">{{ $atf->pivot->capacity }}</a>
<span class="small background-color-grey-light">({{ $atf->capacity }})</span>
</td>
<td style="text-align: center;">
<a href="#" data-pk="{{ $atf->id }}" data-name="price">{{ $atf->pivot->price }}</a>
<span class="small background-color-grey-light">({{ $atf->price }})</span></td>
<td style="text-align: center;">
<a href="#" data-pk="{{ $atf->id }}" data-name="cost">{{ $atf->pivot->cost }}</a>
<span class="small background-color-grey-light">({{ $atf->cost}})</span></td>
<td style="text-align: right; width:3%;">
{{ Form::open(['url' => '/admin/subfleets/'.$subfleet->id.'/fares',
'method' => 'delete',
'class' => 'rm_fare'
])
}}
{{ Form::hidden('fare_id', $atf->id) }}
{{ Form::button('<i class="fa fa-times"></i>',
['type' => 'submit',
'class' => 'btn btn-sm btn-danger btn-icon']) }}
{{ Form::close() }}
</td>
</tr>
@endforeach
</tbody>
</table>
<hr/>
<div class="row">
<div class="col-xs-12">
<div class="text-right">
{{ Form::open(['url' => '/admin/subfleets/'.$subfleet->id.'/fares',
'method' => 'post',
'class' => 'rm_fare form-inline'
])
}}
{{ Form::select('fare_id', $avail_fares, null, [
'placeholder' => 'Select Fare',
'class' => 'ac-fare-dropdown form-control input-lg select2',
])
}}
{{ Form::button('<i class="glyphicon glyphicon-plus"></i> add',
['type' => 'submit',
'class' => 'btn btn-success btn-s']) }}
{{ Form::close() }}
</div>
</div>
</div>
</div>

108
resources/views/admin/subfleets/fields.blade.php
View File

@@ -1,73 +1,73 @@
<div class="row">
<div class="col-sm-12">
@component('admin.components.info')
Subfleets are aircraft groups. The "type" is a short name. Airlines always
group aircraft together by feature, so 737s with winglets might have a type of
"B.738-WL". You can create as many as you want, you need at least one, though.
<div class="col-sm-12">
@component('admin.components.info')
Subfleets are aircraft groups. The "type" is a short name. Airlines always
group aircraft together by feature, so 737s with winglets might have a type of
"B.738-WL". You can create as many as you want, you need at least one, though.
Read more about subfleets <a
href="http://docs.phpvms.net/concepts/basics#subfleets-and-aircraft"
target="_new">here</a>.
Read more about subfleets <a
href="http://docs.phpvms.net/concepts/basics#subfleets-and-aircraft"
target="_new">here</a>.
@endcomponent
</div>
@endcomponent
</div>
<div class="form-group col-sm-4">
{{ Form::label('airline_id', 'Airline:') }}
{{ Form::select('airline_id', $airlines, null , ['class' => 'form-control select2']) }}
<p class="text-danger">{{ $errors->first('airline_id') }}</p>
</div>
<div class="form-group col-sm-4">
{{ Form::label('airline_id', 'Airline:') }}
{{ Form::select('airline_id', $airlines, null , ['class' => 'form-control select2']) }}
<p class="text-danger">{{ $errors->first('airline_id') }}</p>
</div>
<div class="form-group col-sm-4">
{{ Form::label('type', 'Type:') }}
{{ Form::text('type', null, ['class' => 'form-control']) }}
<p class="text-danger">{{ $errors->first('type') }}</p>
</div>
<div class="form-group col-sm-4">
{{ Form::label('type', 'Type:') }}
{{ Form::text('type', null, ['class' => 'form-control']) }}
<p class="text-danger">{{ $errors->first('type') }}</p>
</div>
<div class="form-group col-sm-4">
{{ Form::label('name', 'Name:') }}
{{ Form::text('name', null, ['class' => 'form-control']) }}
<p class="text-danger">{{ $errors->first('name') }}</p>
</div>
<div class="form-group col-sm-4">
{{ Form::label('name', 'Name:') }}
{{ Form::text('name', null, ['class' => 'form-control']) }}
<p class="text-danger">{{ $errors->first('name') }}</p>
</div>
</div>
<div class="row">
<div class="form-group col-sm-3">
{{ Form::label('cost_block_hour', 'Cost Per Hour:') }}
{{ Form::number('cost_block_hour', null , ['class' => 'form-control', 'step' => '0.01']) }}
<p class="text-danger">{{ $errors->first('cost_block_hour') }}</p>
</div>
<div class="form-group col-sm-3">
{{ Form::label('cost_block_hour', 'Cost Per Hour:') }}
{{ Form::number('cost_block_hour', null , ['class' => 'form-control', 'step' => '0.01']) }}
<p class="text-danger">{{ $errors->first('cost_block_hour') }}</p>
</div>
<div class="form-group col-sm-3">
{{ Form::label('cost_delay_minute', 'Cost Delay Per Minute:') }}
{{ Form::number('cost_delay_minute', null , ['class' => 'form-control', 'step' => '0.01']) }}
<p class="text-danger">{{ $errors->first('cost_delay_minute') }}</p>
</div>
<div class="form-group col-sm-3">
{{ Form::label('cost_delay_minute', 'Cost Delay Per Minute:') }}
{{ Form::number('cost_delay_minute', null , ['class' => 'form-control', 'step' => '0.01']) }}
<p class="text-danger">{{ $errors->first('cost_delay_minute') }}</p>
</div>
<div class="form-group col-sm-3">
{{ Form::label('fuel_type', 'Fuel Type:') }}
{{ Form::select('fuel_type', $fuel_types, null , ['class' => 'form-control select2']) }}
<p class="text-danger">{{ $errors->first('fuel_type') }}</p>
</div>
<div class="form-group col-sm-3">
{{ Form::label('fuel_type', 'Fuel Type:') }}
{{ Form::select('fuel_type', $fuel_types, null , ['class' => 'form-control select2']) }}
<p class="text-danger">{{ $errors->first('fuel_type') }}</p>
</div>
<div class="form-group col-sm-3">
{{ Form::label('ground_handling_multiplier', 'Ground Handling Multiplier:') }}
{{ Form::text('ground_handling_multiplier', null, ['class' => 'form-control']) }}
<p class="text-danger">{{ $errors->first('ground_handling_multiplier') }}</p>
<div class="form-group col-sm-3">
{{ Form::label('ground_handling_multiplier', 'Ground Handling Multiplier:') }}
{{ Form::text('ground_handling_multiplier', null, ['class' => 'form-control']) }}
<p class="text-danger">{{ $errors->first('ground_handling_multiplier') }}</p>
@component('admin.components.info')
This is the multiplier of the airport ground-handling cost to charge for
aircraft in this subfleet, as a percentage. Defaults to 100.
@endcomponent
</div>
@component('admin.components.info')
This is the multiplier of the airport ground-handling cost to charge for
aircraft in this subfleet, as a percentage. Defaults to 100.
@endcomponent
</div>
</div>
<div class="row">
<div class="form-group col-sm-12">
<div class="pull-right">
{{ Form::button('Save', ['type' => 'submit', 'class' => 'btn btn-success']) }}
<a href="{{ route('admin.subfleets.index') }}" class="btn btn-default">Cancel</a>
</div>
<div class="form-group col-sm-12">
<div class="pull-right">
{{ Form::button('Save', ['type' => 'submit', 'class' => 'btn btn-success']) }}
<a href="{{ route('admin.subfleets.index') }}" class="btn btn-default">Cancel</a>
</div>
</div>
</div>

2
resources/views/admin/subfleets/import.blade.php
View File

@@ -1,5 +1,5 @@
@extends('admin.app')
@section('title', 'Import Subfleets')
@section('content')
@include('admin.common.import', ['route' => 'admin.subfleets.import'])
@include('admin.common.import', ['route' => 'admin.subfleets.import'])
@endsection

16
resources/views/admin/subfleets/index.blade.php
View File

@@ -2,16 +2,16 @@
@section('title', 'Subfleets')
@section('actions')
<li><a href="{{ route('admin.subfleets.export') }}"><i class="ti-plus"></i>Export to CSV</a>
<li><a href="{{ route('admin.subfleets.import') }}"><i class="ti-plus"></i>Import from CSV</a></li>
<li><a href="{{ route('admin.subfleets.create') }}"><i class="ti-plus"></i>Add New Subfleet</a></li>
<li><a href="{{ route('admin.subfleets.export') }}"><i class="ti-plus"></i>Export to CSV</a>
<li><a href="{{ route('admin.subfleets.import') }}"><i class="ti-plus"></i>Import from CSV</a></li>
<li><a href="{{ route('admin.subfleets.create') }}"><i class="ti-plus"></i>Add New Subfleet</a></li>
@endsection
@section('content')
<div class="card border-blue-bottom">
<div class="content">
@include('admin.flash.message')
@include('admin.subfleets.table')
</div>
<div class="card border-blue-bottom">
<div class="content">
@include('admin.flash.message')
@include('admin.subfleets.table')
</div>
</div>
@endsection

140
resources/views/admin/subfleets/ranks.blade.php
View File

@@ -1,74 +1,74 @@
<div id="subfleet_ranks_wrapper" class="dataTables_wrapper form-inline dt-bootstrap">
<div class="header">
<h3>ranks</h3>
@component('admin.components.info')
These ranks are allowed to fly aircraft in this subfleet. The pay can be
set as a fixed amount, or a percentage of the rank's base payrate
@endcomponent
</div>
<br />
<table id="subfleet_ranks" class="table table-hover">
@if(count($subfleet->ranks))
<thead>
<tr>
<th>Name</th>
<th style="text-align: center;">Base rate</th>
<th style="text-align: center;">ACARS pay</th>
<th style="text-align: center;">Manual pay</th>
<th></th>
</tr>
</thead>
@endif
<tbody>
@foreach($subfleet->ranks as $rank)
<tr>
<td class="sorting_1">{{ $rank->name }}</td>
<td style="text-align: center;">{{ $rank->base_pay_rate ?: '-' }}</td>
<td style="text-align: center;">
<a href="#" data-pk="{{ $rank->id }}"
data-name="acars_pay">{{ $rank->pivot->acars_pay }}</a>
</td>
<td style="text-align: center;">
<a href="#" data-pk="{{ $rank->id }}"
data-name="manual_pay">{{ $rank->pivot->manual_pay }}</a>
</td>
<td style="text-align: right; width:3%;">
{{ Form::open(['url' => '/admin/subfleets/'.$subfleet->id.'/ranks',
'method' => 'delete',
'class' => 'modify_rank'])
}}
{{ Form::hidden('rank_id', $rank->id) }}
{{ Form::button('<i class="fa fa-times"></i>',
['type' => 'submit',
'class' => 'btn btn-sm btn-danger btn-icon']) }}
{{ Form::close() }}
</td>
</tr>
@endforeach
</tbody>
</table>
<hr />
<div class="row">
<div class="col-xs-12">
<div class="text-right">
{{ Form::open(['url' => '/admin/subfleets/'.$subfleet->id.'/ranks',
'method' => 'post',
'class' => 'modify_rank form-inline'])
}}
{{ Form::select('rank_id', $avail_ranks, null, [
'placeholder' => 'Select Rank',
'class' => 'ac-fare-dropdown form-control input-lg select2',
])
}}
{{ Form::button('<i class="glyphicon glyphicon-plus"></i> add',
['type' => 'submit',
'class' => 'btn btn-success btn-s']) }}
{{ Form::close() }}
</div>
</div>
<div class="header">
<h3>ranks</h3>
@component('admin.components.info')
These ranks are allowed to fly aircraft in this subfleet. The pay can be
set as a fixed amount, or a percentage of the rank's base payrate
@endcomponent
</div>
<br/>
<table id="subfleet_ranks" class="table table-hover">
@if(count($subfleet->ranks))
<thead>
<tr>
<th>Name</th>
<th style="text-align: center;">Base rate</th>
<th style="text-align: center;">ACARS pay</th>
<th style="text-align: center;">Manual pay</th>
<th></th>
</tr>
</thead>
@endif
<tbody>
@foreach($subfleet->ranks as $rank)
<tr>
<td class="sorting_1">{{ $rank->name }}</td>
<td style="text-align: center;">{{ $rank->base_pay_rate ?: '-' }}</td>
<td style="text-align: center;">
<a href="#" data-pk="{{ $rank->id }}"
data-name="acars_pay">{{ $rank->pivot->acars_pay }}</a>
</td>
<td style="text-align: center;">
<a href="#" data-pk="{{ $rank->id }}"
data-name="manual_pay">{{ $rank->pivot->manual_pay }}</a>
</td>
<td style="text-align: right; width:3%;">
{{ Form::open(['url' => '/admin/subfleets/'.$subfleet->id.'/ranks',
'method' => 'delete',
'class' => 'modify_rank'])
}}
{{ Form::hidden('rank_id', $rank->id) }}
{{ Form::button('<i class="fa fa-times"></i>',
['type' => 'submit',
'class' => 'btn btn-sm btn-danger btn-icon']) }}
{{ Form::close() }}
</td>
</tr>
@endforeach
</tbody>
</table>
<hr/>
<div class="row">
<div class="col-xs-12">
<div class="text-right">
{{ Form::open(['url' => '/admin/subfleets/'.$subfleet->id.'/ranks',
'method' => 'post',
'class' => 'modify_rank form-inline'])
}}
{{ Form::select('rank_id', $avail_ranks, null, [
'placeholder' => 'Select Rank',
'class' => 'ac-fare-dropdown form-control input-lg select2',
])
}}
{{ Form::button('<i class="glyphicon glyphicon-plus"></i> add',
['type' => 'submit',
'class' => 'btn btn-success btn-s']) }}
{{ Form::close() }}
</div>
</div>
</div>
</div>
{{--</div></div>--}}

138
resources/views/admin/subfleets/script.blade.php
View File

@@ -1,129 +1,129 @@
@section('scripts')
<script>
function setEditable() {
<script>
function setEditable() {
const token = $('meta[name="csrf-token"]').attr('content');
const api_key = $('meta[name="api-key"]').attr('content');
const token = $('meta[name="csrf-token"]').attr('content');
const api_key = $('meta[name="api-key"]').attr('content');
$('#aircraft_fares a').editable({
$('#aircraft_fares a').editable({
type: 'text',
mode: 'inline',
emptytext: 'inherited',
url: '{{ url('/admin/subfleets/'.$subfleet->id.'/fares') }}',
title: 'Enter override value',
ajaxOptions: {
type: 'post',
headers: {
'x-api-key': api_key,
'X-CSRF-TOKEN': token,
}
type: 'post',
headers: {
'x-api-key': api_key,
'X-CSRF-TOKEN': token,
}
},
params: function (params) {
return {
_method: 'put',
fare_id: params.pk,
name: params.name,
value: params.value
}
return {
_method: 'put',
fare_id: params.pk,
name: params.name,
value: params.value
}
}
});
});
$('#subfleet_ranks a').editable({
$('#subfleet_ranks a').editable({
type: 'text',
mode: 'inline',
emptytext: 'inherited',
url: '{{ url('/admin/subfleets/'.$subfleet->id.'/ranks') }}',
title: 'Enter override value',
ajaxOptions: {
type: 'post',
headers: {
'x-api-key': api_key,
'X-CSRF-TOKEN': token,
}
type: 'post',
headers: {
'x-api-key': api_key,
'X-CSRF-TOKEN': token,
}
},
params: function (params) {
return {
_method: 'put',
rank_id: params.pk,
name: params.name,
value: params.value
}
return {
_method: 'put',
rank_id: params.pk,
name: params.name,
value: params.value
}
}
});
});
$('#subfleet-expenses a.text').editable({
$('#subfleet-expenses a.text').editable({
emptytext: '0',
url: '{{ url('/admin/subfleets/'.$subfleet->id.'/expenses') }}',
title: 'Enter override value',
ajaxOptions: {
type: 'post',
headers: {
'x-api-key': api_key,
'X-CSRF-TOKEN': token,
}
type: 'post',
headers: {
'x-api-key': api_key,
'X-CSRF-TOKEN': token,
}
},
params: function (params) {
return {
_method: 'put',
expense_id: params.pk,
name: params.name,
value: params.value
}
return {
_method: 'put',
expense_id: params.pk,
name: params.name,
value: params.value
}
}
});
});
$('#subfleet-expenses a.dropdown').editable({
$('#subfleet-expenses a.dropdown').editable({
type: 'select',
emptytext: '0',
source: {!! json_encode(list_to_editable(\App\Models\Enums\ExpenseType::select())) !!},
url: '{{ url('/admin/subfleets/'.$subfleet->id.'/expenses') }}',
title: 'Enter override value',
ajaxOptions: {
type: 'post',
headers: {
'x-api-key': api_key,
'X-CSRF-TOKEN': token,
}
type: 'post',
headers: {
'x-api-key': api_key,
'X-CSRF-TOKEN': token,
}
},
params: function (params) {
console.log(params);
return {
_method: 'put',
expense_id: params.pk,
name: params.name,
value: params.value
}
console.log(params);
return {
_method: 'put',
expense_id: params.pk,
name: params.name,
value: params.value
}
}
});
}
});
}
$(document).ready(function() {
$(document).ready(function () {
setEditable();
setEditable();
$(document).on('submit', 'form.rm_fare', function(event) {
$(document).on('submit', 'form.rm_fare', function (event) {
event.preventDefault();
console.log(event);
$.pjax.submit(event, '#aircraft_fares_wrapper', {push: false});
setEditable();
});
});
$(document).on('submit', 'form.modify_rank', function (event) {
$(document).on('submit', 'form.modify_rank', function (event) {
event.preventDefault();
console.log(event);
$.pjax.submit(event, '#subfleet_ranks_wrapper', {push: false});
});
});
$(document).on('submit', 'form.modify_expense', function (event) {
$(document).on('submit', 'form.modify_expense', function (event) {
event.preventDefault();
console.log(event);
$.pjax.submit(event, '#subfleet-expenses-wrapper', {push: false});
});
});
$(document).on('pjax:complete', function() {
$(document).on('pjax:complete', function () {
initPlugins();
setEditable();
});
});
});
</script>
</script>
@endsection

26
resources/views/admin/subfleets/show.blade.php
View File

@@ -2,22 +2,22 @@
@section('title', "$subfleet->name")
@section('content')
<div class="card border-blue-bottom">
<div class="content">
@include('admin.subfleets.show_fields')
</div>
<div class="card border-blue-bottom">
<div class="content">
@include('admin.subfleets.show_fields')
</div>
</div>
<div class="card border-blue-bottom">
<div class="content">
<h3>fares</h3>
@component('admin.components.info')
Fares assigned to the current subfleet. These can be overridden,
otherwise, the value used is the default, which comes from the fare.
@endcomponent
<div class="card border-blue-bottom">
<div class="content">
<h3>fares</h3>
@component('admin.components.info')
Fares assigned to the current subfleet. These can be overridden,
otherwise, the value used is the default, which comes from the fare.
@endcomponent
@include('admin.subfleets.fares')
</div>
@include('admin.subfleets.fares')
</div>
</div>
@endsection
@include('admin.subfleets.script')

20
resources/views/admin/subfleets/show_fields.blade.php
View File

@@ -1,31 +1,31 @@
<!-- Id Field -->
<!-- Airline Id Field -->
<div class="form-group">
{{ Form::label('airline_id', 'Airline Id:') }}
<p>{{ $subfleet->airline->name }}</p>
{{ Form::label('airline_id', 'Airline Id:') }}
<p>{{ $subfleet->airline->name }}</p>
</div>
<!-- Name Field -->
<div class="form-group">
{{ Form::label('name', 'Name:') }}
<p>{{ $subfleet->name }}</p>
{{ Form::label('name', 'Name:') }}
<p>{{ $subfleet->name }}</p>
</div>
<!-- Type Field -->
<div class="form-group">
{{ Form::label('type', 'Type:') }}
<p>{{ $subfleet->type }}</p>
{{ Form::label('type', 'Type:') }}
<p>{{ $subfleet->type }}</p>
</div>
<!-- Created At Field -->
<div class="form-group">
{{ Form::label('created_at', 'Created At:') }}
<p>{{ show_datetime($subfleet->created_at) }}</p>
{{ Form::label('created_at', 'Created At:') }}
<p>{{ show_datetime($subfleet->created_at) }}</p>
</div>
<!-- Updated At Field -->
<div class="form-group">
{{ Form::label('updated_at', 'Updated At:') }}
<p>{{ show_datetime($subfleet->updated_at) }}</p>
{{ Form::label('updated_at', 'Updated At:') }}
<p>{{ show_datetime($subfleet->updated_at) }}</p>
</div>

52
resources/views/admin/subfleets/table.blade.php
View File

@@ -1,36 +1,36 @@
<div class="content table-responsive table-full-width">
<table class="table table-hover table-responsive" id="subfleets-table">
<table class="table table-hover table-responsive" id="subfleets-table">
<thead>
<th>Name</th>
<th>Airline</th>
<th>Type</th>
<th>Aircraft</th>
<th></th>
<th>Name</th>
<th>Airline</th>
<th>Type</th>
<th>Aircraft</th>
<th></th>
</thead>
<tbody>
@foreach($subfleets as $subfleet)
<tr>
<td>
<a href="{{ route('admin.aircraft.index') }}?subfleet={{$subfleet->id}}">
{{ $subfleet->name }}
</a>
</td>
<td>{{ $subfleet->airline->name }}</td>
<td>{{ $subfleet->type }}</td>
<td>{{ $subfleet->aircraft->count() }}</td>
<td class="text-right">
{{ Form::open(['route' => ['admin.subfleets.destroy', $subfleet->id], 'method' => 'delete']) }}
<tr>
<td>
<a href="{{ route('admin.aircraft.index') }}?subfleet={{$subfleet->id}}">
{{ $subfleet->name }}
</a>
</td>
<td>{{ optional($subfleet->airline)->name }}</td>
<td>{{ $subfleet->type }}</td>
<td>{{ $subfleet->aircraft->count() }}</td>
<td class="text-right">
{{ Form::open(['route' => ['admin.subfleets.destroy', $subfleet->id], 'method' => 'delete']) }}
<a href="{{ route('admin.subfleets.edit', [$subfleet->id]) }}" class='btn btn-sm btn-success btn-icon'>
<i class="fas fa-pencil-alt"></i></a>
<a href="{{ route('admin.subfleets.edit', [$subfleet->id]) }}" class='btn btn-sm btn-success btn-icon'>
<i class="fas fa-pencil-alt"></i></a>
{{ Form::button('<i class="fa fa-times"></i>',
['type' => 'submit', 'class' => 'btn btn-sm btn-danger btn-icon',
'onclick' => "return confirm('Are you sure?')"]) }}
{{ Form::close() }}
</td>
</tr>
{{ Form::button('<i class="fa fa-times"></i>',
['type' => 'submit', 'class' => 'btn btn-sm btn-danger btn-icon',
'onclick' => "return confirm('Are you sure?')"]) }}
{{ Form::close() }}
</td>
</tr>
@endforeach
</tbody>
</table>
</table>
</div>