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

Split rank pay rate into separate rates for acars and manual flights

Browse Source
This commit is contained in:
Nabeel Shahzad
2018-02-27 14:29:45 -06:00
parent 81b867fa20
commit dfa6d6da51
6 changed files with 54 additions and 19 deletions
Download Patch File Download Diff File Expand all files Collapse all files

33
resources/views/admin/ranks/fields.blade.php
View File

@@ -13,22 +13,33 @@
</div>
</div>
<div class="row">
<div class="form-group col-md-6">
{!! Form::label('base_pay_rate', 'Base Pay Rate:') !!}
{!! Form::number('base_pay_rate', null, ['min' => 0, 'class' => 'form-control']) !!}
<p class="text-danger">{{ $errors->first('base_pay_rate') }}</p>
@component('admin.components.info')
This is the base rate of pay, per-flight hour, for this rank.
This can be adjusted via a multiplier on the subfleet.
@endcomponent
</div>
<!-- Hours Field -->
<div class="form-group col-sm-6">
<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']) !!}
<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']) !!}
<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">
<!-- Auto Approve Acars Field -->

4
resources/views/admin/ranks/table.blade.php
View File

@@ -2,7 +2,7 @@
<table class="table table-hover table-responsive">
<thead>
<th>Name</th>
<th>Hours</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>
@@ -12,7 +12,7 @@
@foreach($ranks as $rank)
<tr>
<td><a href="{!! route('admin.ranks.edit', [$rank->id]) !!}">{!! $rank->name !!}</a></td>
<td>{!! $rank->hours !!}</td>
<td class="text-center">{!! $rank->hours !!}</td>
<td class="text-center">
@if($rank->auto_approve_acars == 1)
<span class="label label-success">Yes</span>