Fixes (#435)

* 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

resources/js/common.js

@@ -3,8 +3,10 @@ const rivets = require('rivets');
 
 /**
  * Generic formatter to prepend
+ *
  * @param value
  * @param prepend
+ *
  * @returns {*}
  */
 rivets.formatters.prepend = function (value, prepend) {
@@ -13,7 +15,9 @@ rivets.formatters.prepend = function (value, prepend) {
 
 /**
  * Format minutes into HHh MMm
+ *
  * @param value
+ *
  * @returns {string}
  */
 rivets.formatters.time_hm = function (value) {
@@ -26,6 +30,7 @@ rivets.formatters.time_hm = function (value) {
  *
  * @param value
  * @param len
+ *
  * @returns {boolean}
  */
 rivets.formatters.gt = (value, len) => value.length > len;
@@ -34,6 +39,7 @@ rivets.formatters.gt = (value, len) => value.length > len;
  *
  * @param value
  * @param len
+ *
  * @returns {boolean}
  */
 rivets.formatters.lt = (value, len) => value.length < len;
@@ -42,6 +48,15 @@ rivets.formatters.lt = (value, len) => value.length < len;
  *
  * @param value
  * @param len
+ *
  * @returns {boolean}
  */
 rivets.formatters.eq = (value, len) => value.length > len;
+
+/**
+ * Use a default value if value is null or blank
+ *
+ * @param value Value to use
+ * @param def   Default value to use if value is null
+ */
+rivets.formatters.fallback = (value, def) => value || def;

resources/views/layouts/default/pireps/fields.blade.php

@@ -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>

resources/views/layouts/default/widgets/live_map.blade.php

@@ -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>