From 101b3261f51e88b3df36f080e77b1c0c29bae135 Mon Sep 17 00:00:00 2001
From: Nabeel S <nabeelio@users.noreply.github.com>
Date: Fri, 22 Jan 2021 09:02:15 -0500
Subject: [PATCH] Move loadmin/max into the controller (#1003)

---
 app/Http/Controllers/Frontend/SimBriefController.php | 12 ++++++++++++
 .../layouts/default/flights/simbrief_form.blade.php  |  9 ---------
 2 files changed, 12 insertions(+), 9 deletions(-)

diff --git a/app/Http/Controllers/Frontend/SimBriefController.php b/app/Http/Controllers/Frontend/SimBriefController.php
index 33bdd8e4..610f74f5 100644
--- a/app/Http/Controllers/Frontend/SimBriefController.php
+++ b/app/Http/Controllers/Frontend/SimBriefController.php
@@ -100,12 +100,24 @@ class SimBriefController
             ]);
         }
 
+        // Get the correct load factors
+        $lfactor = $flight->load_factor ?? setting('flights.default_load_factor');
+        $lfactorv = $flight->load_factor_variance ?? setting('flights.load_factor_variance');
+
+        $loadmin = $lfactor - $lfactorv;
+        $loadmin = $loadmin < 0 ? 0 : $loadmin;
+
+        $loadmax = $lfactor + $lfactorv;
+        $loadmax = $loadmax > 100 ? 100 : $loadmax;
+
         // Show the main simbrief form
         return view('flights.simbrief_form', [
             'flight'     => $flight,
             'aircraft'   => $aircraft,
             'subfleets'  => $subfleets,
             'pax_weight' => $pax_weight,
+            'loadmin'    => $loadmin,
+            'loadmax'    => $loadmax,
         ]);
     }
 
diff --git a/resources/views/layouts/default/flights/simbrief_form.blade.php b/resources/views/layouts/default/flights/simbrief_form.blade.php
index 4f96d875..2c110fba 100644
--- a/resources/views/layouts/default/flights/simbrief_form.blade.php
+++ b/resources/views/layouts/default/flights/simbrief_form.blade.php
@@ -2,15 +2,6 @@
 @section('title', 'SimBrief Flight Planning')
 
 @section('content')
-  @php
-    if($flight->load_factor) { $lfactor = $flight->load_factor ;} else { $lfactor = setting('flights.default_load_factor') ;}
-    if($flight->load_factor_variance) { $lfactorv = $flight->load_factor_variance ;} else { $lfactorv = setting('flights.load_factor_variance') ;}
-    $loadmin = $lfactor - $lfactorv ;
-    $loadmax = $lfactor + $lfactorv ;
-    if($loadmin < 0) { $loadmin = 0; }
-    if($loadmax > 100) { $loadmax = 100; }
-  @endphp
-  
   @foreach($aircraft as $acdetails)
     @php
       $simbrieftype = $acdetails->icao ;