7.0.0-beta3 Release (#541)
* 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
@@ -1,12 +1,12 @@
|
||||
@extends('admin.app')
|
||||
@section('Add Rank')
|
||||
@section('content')
|
||||
<div class="card border-blue-bottom">
|
||||
<div class="card border-blue-bottom">
|
||||
<div class="content">
|
||||
{{ Form::open(['route' => 'admin.ranks.store', 'class' => 'add_rank', 'method'=>'POST']) }}
|
||||
@include('admin.ranks.fields')
|
||||
{{ Form::close() }}
|
||||
{{ Form::open(['route' => 'admin.ranks.store', 'class' => 'add_rank', 'method'=>'POST']) }}
|
||||
@include('admin.ranks.fields')
|
||||
{{ Form::close() }}
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
@endsection
|
||||
@include('admin.ranks.scripts')
|
||||
|
||||
@@ -1,27 +1,27 @@
|
||||
@extends('admin.app')
|
||||
@section('title', "Edit \"$rank->name\"")
|
||||
@section('content')
|
||||
<div class="card border-blue-bottom">
|
||||
<div class="content">
|
||||
{{ Form::model($rank, ['route' => ['admin.ranks.update', $rank->id], 'method' => 'patch']) }}
|
||||
@include('admin.ranks.fields')
|
||||
{{ Form::close() }}
|
||||
</div>
|
||||
</div>
|
||||
|
||||
<div class="card border-blue-bottom">
|
||||
<div class="card border-blue-bottom">
|
||||
<div class="content">
|
||||
<div class="header">
|
||||
<h3>subfleets</h3>
|
||||
@component('admin.components.info')
|
||||
These are the subfleets this rank is allowed to use. The pay can be
|
||||
set as a fixed amount, or a percentage of the rank's base payrate above
|
||||
@endcomponent
|
||||
</div>
|
||||
<div class="row">
|
||||
@include('admin.ranks.subfleets')
|
||||
</div>
|
||||
{{ Form::model($rank, ['route' => ['admin.ranks.update', $rank->id], 'method' => 'patch']) }}
|
||||
@include('admin.ranks.fields')
|
||||
{{ Form::close() }}
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
|
||||
<div class="card border-blue-bottom">
|
||||
<div class="content">
|
||||
<div class="header">
|
||||
<h3>subfleets</h3>
|
||||
@component('admin.components.info')
|
||||
These are the subfleets this rank is allowed to use. The pay can be
|
||||
set as a fixed amount, or a percentage of the rank's base payrate above
|
||||
@endcomponent
|
||||
</div>
|
||||
<div class="row">
|
||||
@include('admin.ranks.subfleets')
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
@endsection
|
||||
@include('admin.ranks.scripts')
|
||||
|
||||
@@ -1,111 +1,111 @@
|
||||
<div class="row">
|
||||
<!-- Name Field -->
|
||||
<div class="form-group col-sm-6">
|
||||
{{ Form::label('name', 'Name:') }}
|
||||
{{ Form::text('name', null, ['class' => 'form-control']) }}
|
||||
<p class="text-danger">{{ $errors->first('name') }}</p>
|
||||
</div>
|
||||
<!-- Name Field -->
|
||||
<div class="form-group col-sm-6">
|
||||
{{ 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-md-6">
|
||||
{{ Form::label('image_url', 'Image Link:') }}
|
||||
{{ Form::text('image_url', null, ['class' => 'form-control']) }}
|
||||
<p class="text-danger">{{ $errors->first('image_url') }}</p>
|
||||
</div>
|
||||
<div class="form-group col-md-6">
|
||||
{{ Form::label('image_url', 'Image Link:') }}
|
||||
{{ Form::text('image_url', null, ['class' => 'form-control']) }}
|
||||
<p class="text-danger">{{ $errors->first('image_url') }}</p>
|
||||
</div>
|
||||
</div>
|
||||
<div class="row">
|
||||
<!-- Hours Field -->
|
||||
<div class="form-group col-sm-4">
|
||||
{{ Form::label('hours', 'Hours:') }}
|
||||
{{ Form::number('hours', null, ['class' => 'form-control']) }}
|
||||
<p class="text-danger">{{ $errors->first('hours') }}</p>
|
||||
</div>
|
||||
<!-- Hours Field -->
|
||||
<div class="form-group col-sm-4">
|
||||
{{ Form::label('hours', 'Hours:') }}
|
||||
{{ Form::number('hours', null, ['class' => 'form-control']) }}
|
||||
<p class="text-danger">{{ $errors->first('hours') }}</p>
|
||||
</div>
|
||||
|
||||
<div class="form-group col-md-4">
|
||||
{{ Form::label('acars_base_pay_rate', 'ACARS Base Pay Rate:') }}
|
||||
{{ Form::number('acars_base_pay_rate', null, ['min' => 0, 'class' => 'form-control', 'step' => '0.01']) }}
|
||||
<p class="text-danger">{{ $errors->first('acars_base_pay_rate') }}</p>
|
||||
@component('admin.components.info')
|
||||
Base rate, per-flight hour, for ACARS PIREPs.
|
||||
Can be adjusted via a multiplier on the subfleet.
|
||||
@endcomponent
|
||||
</div>
|
||||
<div class="form-group col-md-4">
|
||||
{{ Form::label('acars_base_pay_rate', 'ACARS Base Pay Rate:') }}
|
||||
{{ Form::number('acars_base_pay_rate', null, ['min' => 0, 'class' => 'form-control', 'step' => '0.01']) }}
|
||||
<p class="text-danger">{{ $errors->first('acars_base_pay_rate') }}</p>
|
||||
@component('admin.components.info')
|
||||
Base rate, per-flight hour, for ACARS PIREPs.
|
||||
Can be adjusted via a multiplier on the subfleet.
|
||||
@endcomponent
|
||||
</div>
|
||||
|
||||
<div class="form-group col-md-4">
|
||||
{{ Form::label('manual_base_pay_rate', 'Manual Base Pay Rate:') }}
|
||||
{{ Form::number('manual_base_pay_rate', null, ['min' => 0, 'class' => 'form-control', 'step' => '0.01']) }}
|
||||
<p class="text-danger">{{ $errors->first('manual_base_pay_rate') }}</p>
|
||||
@component('admin.components.info')
|
||||
Base rate, per-flight hour, for manually-filed PIREPs.
|
||||
Can be adjusted via a multiplier on the subfleet.
|
||||
@endcomponent
|
||||
</div>
|
||||
<div class="form-group col-md-4">
|
||||
{{ Form::label('manual_base_pay_rate', 'Manual Base Pay Rate:') }}
|
||||
{{ Form::number('manual_base_pay_rate', null, ['min' => 0, 'class' => 'form-control', 'step' => '0.01']) }}
|
||||
<p class="text-danger">{{ $errors->first('manual_base_pay_rate') }}</p>
|
||||
@component('admin.components.info')
|
||||
Base rate, per-flight hour, for manually-filed PIREPs.
|
||||
Can be adjusted via a multiplier on the subfleet.
|
||||
@endcomponent
|
||||
</div>
|
||||
|
||||
</div>
|
||||
<div class="row">
|
||||
<div class="col-12">
|
||||
<div class="form-container">
|
||||
<h6><i class="fas fa-check-square"></i>
|
||||
Options
|
||||
</h6>
|
||||
<div class="form-container-body">
|
||||
<div class="row">
|
||||
<!-- Auto Approve Acars Field -->
|
||||
<div class="form-group col-sm-4">
|
||||
<div class="checkbox">
|
||||
<label class="checkbox-inline">
|
||||
{{ Form::hidden('auto_approve_acars', false) }}
|
||||
{{ Form::checkbox('auto_approve_acars') }}
|
||||
{{ Form::label('auto_approve_acars', 'Auto Approve ACARS PIREPs') }}
|
||||
</label>
|
||||
<div style="margin-left: 10px">
|
||||
@component('admin.components.info')
|
||||
PIREPS submitted through ACARS are automatically accepted
|
||||
@endcomponent
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
|
||||
<!-- Auto Approve Manual Field -->
|
||||
<div class="form-group col-sm-4">
|
||||
<div class="checkbox">
|
||||
<label class="checkbox-inline">
|
||||
{{ Form::hidden('auto_approve_manual', false) }}
|
||||
{{ Form::checkbox('auto_approve_manual') }}
|
||||
{{ Form::label('auto_approve_manual', 'Auto Approve Manual PIREPs') }}
|
||||
</label>
|
||||
<div style="margin-left: 10px">
|
||||
@component('admin.components.info')
|
||||
PIREPS submitted manually are automatically accepted
|
||||
@endcomponent
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
|
||||
<!-- Auto Promote Field -->
|
||||
<div class="form-group col-sm-4">
|
||||
<div class="checkbox">
|
||||
<label class="checkbox-inline">
|
||||
{{ Form::hidden('auto_promote', false) }}
|
||||
{{ Form::checkbox('auto_promote') }}
|
||||
{{ Form::label('auto_promote', 'Auto Promote') }}
|
||||
</label>
|
||||
<div style="margin-left: 10px">
|
||||
@component('admin.components.info')
|
||||
When a pilot reaches these hours, they'll be upgraded to this rank
|
||||
@endcomponent
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
<div class="col-12">
|
||||
<div class="form-container">
|
||||
<h6><i class="fas fa-check-square"></i>
|
||||
Options
|
||||
</h6>
|
||||
<div class="form-container-body">
|
||||
<div class="row">
|
||||
<!-- Auto Approve Acars Field -->
|
||||
<div class="form-group col-sm-4">
|
||||
<div class="checkbox">
|
||||
<label class="checkbox-inline">
|
||||
{{ Form::hidden('auto_approve_acars', false) }}
|
||||
{{ Form::checkbox('auto_approve_acars') }}
|
||||
{{ Form::label('auto_approve_acars', 'Auto Approve ACARS PIREPs') }}
|
||||
</label>
|
||||
<div style="margin-left: 10px">
|
||||
@component('admin.components.info')
|
||||
PIREPS submitted through ACARS are automatically accepted
|
||||
@endcomponent
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
|
||||
<!-- Auto Approve Manual Field -->
|
||||
<div class="form-group col-sm-4">
|
||||
<div class="checkbox">
|
||||
<label class="checkbox-inline">
|
||||
{{ Form::hidden('auto_approve_manual', false) }}
|
||||
{{ Form::checkbox('auto_approve_manual') }}
|
||||
{{ Form::label('auto_approve_manual', 'Auto Approve Manual PIREPs') }}
|
||||
</label>
|
||||
<div style="margin-left: 10px">
|
||||
@component('admin.components.info')
|
||||
PIREPS submitted manually are automatically accepted
|
||||
@endcomponent
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
|
||||
<!-- Auto Promote Field -->
|
||||
<div class="form-group col-sm-4">
|
||||
<div class="checkbox">
|
||||
<label class="checkbox-inline">
|
||||
{{ Form::hidden('auto_promote', false) }}
|
||||
{{ Form::checkbox('auto_promote') }}
|
||||
{{ Form::label('auto_promote', 'Auto Promote') }}
|
||||
</label>
|
||||
<div style="margin-left: 10px">
|
||||
@component('admin.components.info')
|
||||
When a pilot reaches these hours, they'll be upgraded to this rank
|
||||
@endcomponent
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
|
||||
<div class="row">
|
||||
<div class="col-sm-12">
|
||||
<div class="text-right">
|
||||
{{ Form::button('Save', ['type' => 'submit', 'class' => 'btn btn-success']) }}
|
||||
</div>
|
||||
<div class="col-sm-12">
|
||||
<div class="text-right">
|
||||
{{ Form::button('Save', ['type' => 'submit', 'class' => 'btn btn-success']) }}
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
|
||||
@@ -1,17 +1,17 @@
|
||||
@extends('admin.app')
|
||||
@section('title', 'Ranks')
|
||||
@section('actions')
|
||||
<li>
|
||||
<a href="{{ route('admin.ranks.create') }}">
|
||||
<i class="ti-plus"></i>
|
||||
Add New</a>
|
||||
</li>
|
||||
<li>
|
||||
<a href="{{ route('admin.ranks.create') }}">
|
||||
<i class="ti-plus"></i>
|
||||
Add New</a>
|
||||
</li>
|
||||
@endsection
|
||||
|
||||
@section('content')
|
||||
<div class="card border-blue-bottom">
|
||||
<div class="content">
|
||||
@include('admin.ranks.table')
|
||||
</div>
|
||||
<div class="card border-blue-bottom">
|
||||
<div class="content">
|
||||
@include('admin.ranks.table')
|
||||
</div>
|
||||
</div>
|
||||
@endsection
|
||||
|
||||
@@ -1,48 +1,48 @@
|
||||
@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');
|
||||
|
||||
@if(isset($rank))
|
||||
$('#subfleets-table a').editable({
|
||||
@if(isset($rank))
|
||||
$('#subfleets-table a').editable({
|
||||
type: 'text',
|
||||
mode: 'inline',
|
||||
emptytext: 'inherited',
|
||||
url: '{{ url('/admin/ranks/'.$rank->id.'/subfleets') }}',
|
||||
title: 'Enter override value',
|
||||
ajaxOptions: {
|
||||
type: 'put',
|
||||
headers: {
|
||||
'x-api-key': api_key,
|
||||
'X-CSRF-TOKEN': token,
|
||||
}
|
||||
type: 'put',
|
||||
headers: {
|
||||
'x-api-key': api_key,
|
||||
'X-CSRF-TOKEN': token,
|
||||
}
|
||||
},
|
||||
params: function (params) {
|
||||
return {
|
||||
subfleet_id: params.pk,
|
||||
name: params.name,
|
||||
value: params.value
|
||||
}
|
||||
return {
|
||||
subfleet_id: params.pk,
|
||||
name: params.name,
|
||||
value: params.value
|
||||
}
|
||||
}
|
||||
});
|
||||
@endif
|
||||
}
|
||||
});
|
||||
@endif
|
||||
}
|
||||
|
||||
$(document).ready(function () {
|
||||
$(document).ready(function () {
|
||||
|
||||
setEditable();
|
||||
setEditable();
|
||||
|
||||
$(document).on('submit', 'form.pjax_form', function (event) {
|
||||
$(document).on('submit', 'form.pjax_form', function (event) {
|
||||
event.preventDefault();
|
||||
$.pjax.submit(event, '#rank_subfleet_wrapper', {push: false});
|
||||
});
|
||||
});
|
||||
|
||||
$(document).on('pjax:complete', function () {
|
||||
$(document).on('pjax:complete', function () {
|
||||
initPlugins();
|
||||
setEditable();
|
||||
});
|
||||
});
|
||||
});
|
||||
</script>
|
||||
</script>
|
||||
@endsection
|
||||
|
||||
@@ -1,17 +1,17 @@
|
||||
@extends('admin.app')
|
||||
|
||||
@section('content')
|
||||
<section class="content-header">
|
||||
<h1>{{ $rank->name }}</h1>
|
||||
</section>
|
||||
<div class="content">
|
||||
<div class="box box-primary">
|
||||
<div class="box-body">
|
||||
<div class="row" style="padding-left: 20px">
|
||||
@include('admin.ranks.show_fields')
|
||||
</div>
|
||||
</div>
|
||||
<section class="content-header">
|
||||
<h1>{{ $rank->name }}</h1>
|
||||
</section>
|
||||
<div class="content">
|
||||
<div class="box box-primary">
|
||||
<div class="box-body">
|
||||
<div class="row" style="padding-left: 20px">
|
||||
@include('admin.ranks.show_fields')
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
@endsection
|
||||
@include('admin.ranks.scripts')
|
||||
|
||||
@@ -1,48 +1,48 @@
|
||||
<!-- Id Field -->
|
||||
<div class="form-group">
|
||||
{{ Form::label('id', 'Id:') }}
|
||||
<p>{{ $rank->id }}</p>
|
||||
{{ Form::label('id', 'Id:') }}
|
||||
<p>{{ $rank->id }}</p>
|
||||
</div>
|
||||
|
||||
<!-- Name Field -->
|
||||
<div class="form-group">
|
||||
{{ Form::label('name', 'Name:') }}
|
||||
<p>{{ $rank->name }}</p>
|
||||
{{ Form::label('name', 'Name:') }}
|
||||
<p>{{ $rank->name }}</p>
|
||||
</div>
|
||||
|
||||
<!-- Hours Field -->
|
||||
<div class="form-group">
|
||||
{{ Form::label('hours', 'Hours:') }}
|
||||
<p>{{ $rank->hours }}</p>
|
||||
{{ Form::label('hours', 'Hours:') }}
|
||||
<p>{{ $rank->hours }}</p>
|
||||
</div>
|
||||
|
||||
<!-- Auto Approve Acars Field -->
|
||||
<div class="form-group">
|
||||
{{ Form::label('auto_approve_acars', 'Auto Approve Acars:') }}
|
||||
<p>{{ $rank->auto_approve_acars }}</p>
|
||||
{{ Form::label('auto_approve_acars', 'Auto Approve Acars:') }}
|
||||
<p>{{ $rank->auto_approve_acars }}</p>
|
||||
</div>
|
||||
|
||||
<!-- Auto Approve Manual Field -->
|
||||
<div class="form-group">
|
||||
{{ Form::label('auto_approve_manual', 'Auto Approve Manual:') }}
|
||||
<p>{{ $rank->auto_approve_manual }}</p>
|
||||
{{ Form::label('auto_approve_manual', 'Auto Approve Manual:') }}
|
||||
<p>{{ $rank->auto_approve_manual }}</p>
|
||||
</div>
|
||||
|
||||
<!-- Auto Promote Field -->
|
||||
<div class="form-group">
|
||||
{{ Form::label('auto_promote', 'Auto Promote:') }}
|
||||
<p>{{ $rank->auto_promote }}</p>
|
||||
{{ Form::label('auto_promote', 'Auto Promote:') }}
|
||||
<p>{{ $rank->auto_promote }}</p>
|
||||
</div>
|
||||
|
||||
<!-- Created At Field -->
|
||||
<div class="form-group">
|
||||
{{ Form::label('created_at', 'Created At:') }}
|
||||
<p>{{ show_datetime($rank->created_at) }}</p>
|
||||
{{ Form::label('created_at', 'Created At:') }}
|
||||
<p>{{ show_datetime($rank->created_at) }}</p>
|
||||
</div>
|
||||
|
||||
<!-- Updated At Field -->
|
||||
<div class="form-group">
|
||||
{{ Form::label('updated_at', 'Updated At:') }}
|
||||
<p>{{ show_datetime($rank->updated_at) }}</p>
|
||||
{{ Form::label('updated_at', 'Updated At:') }}
|
||||
<p>{{ show_datetime($rank->updated_at) }}</p>
|
||||
</div>
|
||||
|
||||
|
||||
@@ -1,65 +1,65 @@
|
||||
<div id="rank_subfleet_wrapper" class="dataTables_wrapper form-inline dt-bootstrap col-lg-12">
|
||||
@if(count($rank->subfleets) === 0)
|
||||
@include('admin.common.none_added', ['type' => 'subfleets'])
|
||||
@if(count($rank->subfleets) === 0)
|
||||
@include('admin.common.none_added', ['type' => 'subfleets'])
|
||||
@endif
|
||||
|
||||
<table class="table table-responsive" id="subfleets-table">
|
||||
@if(count($rank->subfleets))
|
||||
<thead>
|
||||
<th>Airline</th>
|
||||
<th>Name</th>
|
||||
<th style="text-align: center;">ACARS Pay</th>
|
||||
<th style="text-align: center;">Manual Pay</th>
|
||||
<th style="text-align: center;">Actions</th>
|
||||
</thead>
|
||||
@endif
|
||||
<tbody>
|
||||
@foreach($rank->subfleets as $sf)
|
||||
<tr>
|
||||
<td>{{ $sf->airline->name }}</td>
|
||||
<td>{{ $sf->name }} ({{ $sf->type }})</td>
|
||||
<td style="text-align: center;">
|
||||
<a href="#" data-pk="{{ $sf->id }}"
|
||||
data-name="acars_pay">{{ $sf->pivot->acars_pay }}</a>
|
||||
</td>
|
||||
|
||||
<table class="table table-responsive" id="subfleets-table">
|
||||
@if(count($rank->subfleets))
|
||||
<thead>
|
||||
<th>Airline</th>
|
||||
<th>Name</th>
|
||||
<th style="text-align: center;">ACARS Pay</th>
|
||||
<th style="text-align: center;">Manual Pay</th>
|
||||
<th style="text-align: center;">Actions</th>
|
||||
</thead>
|
||||
@endif
|
||||
<tbody>
|
||||
@foreach($rank->subfleets as $sf)
|
||||
<tr>
|
||||
<td>{{ $sf->airline->name }}</td>
|
||||
<td>{{ $sf->name }} ({{ $sf->type }})</td>
|
||||
<td style="text-align: center;">
|
||||
<a href="#" data-pk="{{ $sf->id }}"
|
||||
data-name="acars_pay">{{ $sf->pivot->acars_pay }}</a>
|
||||
</td>
|
||||
|
||||
<td style="text-align: center;">
|
||||
<a href="#" data-pk="{{ $sf->id }}"
|
||||
data-name="manual_pay">{{ $sf->pivot->manual_pay }}</a>
|
||||
</td>
|
||||
<td style="width: 10%; text-align: center;" class="form-inline">
|
||||
{{ Form::open(['url' => '/admin/ranks/'.$rank->id.'/subfleets', 'method' => 'delete', 'class' => 'pjax_form']) }}
|
||||
{{ Form::hidden('subfleet_id', $sf->id) }}
|
||||
<div class='btn-group'>
|
||||
{{ Form::button('<i class="fa fa-times"></i>',
|
||||
['type' => 'submit',
|
||||
'class' => 'btn btn-sm btn-danger btn-icon'])
|
||||
}}
|
||||
</div>
|
||||
{{ Form::close() }}
|
||||
</td>
|
||||
</tr>
|
||||
@endforeach
|
||||
</tbody>
|
||||
</table>
|
||||
<hr />
|
||||
<div class="row">
|
||||
<div class="col-lg-12">
|
||||
<div class="input-group input-group-lg pull-right">
|
||||
{{ Form::open(['url' => url('/admin/ranks/'.$rank->id.'/subfleets'),
|
||||
'method' => 'post',
|
||||
'class' => 'pjax_form form-inline'
|
||||
])
|
||||
}}
|
||||
{{ Form::select('subfleet_id', $avail_subfleets, null, [
|
||||
'placeholder' => 'Select Subfleet',
|
||||
'class' => 'select2 form-control input-lg'])
|
||||
}}
|
||||
{{ Form::button('<i class="fa fa-plus"></i> Add',
|
||||
['type' => 'submit',
|
||||
'class' => 'btn btn-success btn-small']) }}
|
||||
{{ Form::close() }}
|
||||
</div>
|
||||
</div>
|
||||
<td style="text-align: center;">
|
||||
<a href="#" data-pk="{{ $sf->id }}"
|
||||
data-name="manual_pay">{{ $sf->pivot->manual_pay }}</a>
|
||||
</td>
|
||||
<td style="width: 10%; text-align: center;" class="form-inline">
|
||||
{{ Form::open(['url' => '/admin/ranks/'.$rank->id.'/subfleets', 'method' => 'delete', 'class' => 'pjax_form']) }}
|
||||
{{ Form::hidden('subfleet_id', $sf->id) }}
|
||||
<div class='btn-group'>
|
||||
{{ Form::button('<i class="fa fa-times"></i>',
|
||||
['type' => 'submit',
|
||||
'class' => 'btn btn-sm btn-danger btn-icon'])
|
||||
}}
|
||||
</div>
|
||||
{{ Form::close() }}
|
||||
</td>
|
||||
</tr>
|
||||
@endforeach
|
||||
</tbody>
|
||||
</table>
|
||||
<hr/>
|
||||
<div class="row">
|
||||
<div class="col-lg-12">
|
||||
<div class="input-group input-group-lg pull-right">
|
||||
{{ Form::open(['url' => url('/admin/ranks/'.$rank->id.'/subfleets'),
|
||||
'method' => 'post',
|
||||
'class' => 'pjax_form form-inline'
|
||||
])
|
||||
}}
|
||||
{{ Form::select('subfleet_id', $avail_subfleets, null, [
|
||||
'placeholder' => 'Select Subfleet',
|
||||
'class' => 'select2 form-control input-lg'])
|
||||
}}
|
||||
{{ Form::button('<i class="fa fa-plus"></i> Add',
|
||||
['type' => 'submit',
|
||||
'class' => 'btn btn-success btn-small']) }}
|
||||
{{ Form::close() }}
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
|
||||
@@ -1,48 +1,48 @@
|
||||
<div id="ranks_table_wrapper">
|
||||
<table class="table table-hover table-responsive">
|
||||
<thead>
|
||||
<th>Name</th>
|
||||
<th class="text-center">Hours</th>
|
||||
<th class="text-center">Auto Approve Acars</th>
|
||||
<th class="text-center">Auto Approve Manual</th>
|
||||
<th class="text-center">Auto Promote</th>
|
||||
<th></th>
|
||||
</thead>
|
||||
<tbody>
|
||||
@foreach($ranks as $rank)
|
||||
<tr>
|
||||
<td><a href="{{ route('admin.ranks.edit', [$rank->id]) }}">{{ $rank->name }}</a></td>
|
||||
<td class="text-center">{{ $rank->hours }}</td>
|
||||
<td class="text-center">
|
||||
@if($rank->auto_approve_acars)
|
||||
<span class="label label-success">Yes</span>
|
||||
@else
|
||||
<span class="label label-default">No</span>
|
||||
@endif
|
||||
</td>
|
||||
<td class="text-center">
|
||||
@if($rank->auto_approve_manual)
|
||||
<span class="label label-success">Yes</span>
|
||||
@else
|
||||
<span class="label label-default">No</span>
|
||||
@endif
|
||||
</td>
|
||||
<td class="text-center">
|
||||
@if($rank->auto_promote)
|
||||
<span class="label label-success">Yes</span>
|
||||
@else
|
||||
<span class="label label-default">No</span>
|
||||
@endif
|
||||
</td>
|
||||
<td class="text-right">
|
||||
{{ Form::open(['route' => ['admin.ranks.destroy', $rank->id], 'method' => 'delete']) }}
|
||||
<a href="{{ route('admin.ranks.edit', [$rank->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>
|
||||
@endforeach
|
||||
</tbody>
|
||||
</table>
|
||||
<table class="table table-hover table-responsive">
|
||||
<thead>
|
||||
<th>Name</th>
|
||||
<th class="text-center">Hours</th>
|
||||
<th class="text-center">Auto Approve Acars</th>
|
||||
<th class="text-center">Auto Approve Manual</th>
|
||||
<th class="text-center">Auto Promote</th>
|
||||
<th></th>
|
||||
</thead>
|
||||
<tbody>
|
||||
@foreach($ranks as $rank)
|
||||
<tr>
|
||||
<td><a href="{{ route('admin.ranks.edit', [$rank->id]) }}">{{ $rank->name }}</a></td>
|
||||
<td class="text-center">{{ $rank->hours }}</td>
|
||||
<td class="text-center">
|
||||
@if($rank->auto_approve_acars)
|
||||
<span class="label label-success">Yes</span>
|
||||
@else
|
||||
<span class="label label-default">No</span>
|
||||
@endif
|
||||
</td>
|
||||
<td class="text-center">
|
||||
@if($rank->auto_approve_manual)
|
||||
<span class="label label-success">Yes</span>
|
||||
@else
|
||||
<span class="label label-default">No</span>
|
||||
@endif
|
||||
</td>
|
||||
<td class="text-center">
|
||||
@if($rank->auto_promote)
|
||||
<span class="label label-success">Yes</span>
|
||||
@else
|
||||
<span class="label label-default">No</span>
|
||||
@endif
|
||||
</td>
|
||||
<td class="text-right">
|
||||
{{ Form::open(['route' => ['admin.ranks.destroy', $rank->id], 'method' => 'delete']) }}
|
||||
<a href="{{ route('admin.ranks.edit', [$rank->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>
|
||||
@endforeach
|
||||
</tbody>
|
||||
</table>
|
||||
</div>
|
||||
|
||||
Reference in New Issue
Block a user