* Add flight level field to PIREP field closes #401

* Default value for distance 0 closes #400

* Block airline deletion if assets exist #367

* Formatting

* Move some of the base exception classes

* Fix skin references to use settings table

* Set default for theme name if setting is wrong
This commit is contained in:
Nabeel S
2019-11-19 10:06:07 -05:00
committed by GitHub
parent c643833496
commit 3ec64c989b
39 changed files with 237 additions and 117 deletions

View File

@@ -95,7 +95,7 @@ flight reports that have been filed. You've been warned!
</div>
<div class="row">
<div class="col-3">
<div class="col-6">
{{ Form::label('hours', __('flights.flighttime')) }}
@if(!empty($pirep) && $pirep->read_only)
<p>
@@ -124,6 +124,22 @@ flight reports that have been filed. You've been warned!
<p class="text-danger">{{ $errors->first('minutes') }}</p>
@endif
</div>
<div class="col-6">
{{ Form::label('level', __('flights.level')) }} ({{config('phpvms.internal_units.altitude')}})
@if(!empty($pirep) && $pirep->read_only)
<p>{{ $pirep->level }}</p>
@else
<div class="input-group input-group-sm form-group">
{{ Form::number('level', null, [
'class' => 'form-control',
'min' => '0',
'step' => '0.01',
'readonly' => (!empty($pirep) && $pirep->read_only),
]) }}
</div>
<p class="text-danger">{{ $errors->first('level') }}</p>
@endif
</div>
</div>
</div>
</div>

View File

@@ -98,8 +98,8 @@ and being mindful of the rivets bindings
<td>{ pirep.aircraft.name }</td>
<td>{ pirep.position.altitude }</td>
<td>{ pirep.position.gs }</td>
<td>{ pirep.position.distance.{{setting('units.distance')}} } /
{ pirep.planned_distance.{{setting('units.distance')}} }
<td>{ pirep.position.distance.{{setting('units.distance')}} | fallback 0 } /
{ pirep.planned_distance.{{setting('units.distance')}} | fallback 0 }
</td>
<td>{ pirep.status_text }</td>
</tr>