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

Move loadmin/max into the controller (#1003)

Browse Source
This commit is contained in:
Nabeel S
2021-01-22 09:02:15 -05:00
committed by GitHub
parent fb0027b140
commit 101b3261f5
2 changed files with 12 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
app/Http/Controllers/Frontend/SimBriefController.php
View File

@@ -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 // Show the main simbrief form
return view('flights.simbrief_form', [ return view('flights.simbrief_form', [
'flight' => $flight, 'flight' => $flight,
'aircraft' => $aircraft, 'aircraft' => $aircraft,
'subfleets' => $subfleets, 'subfleets' => $subfleets,
'pax_weight' => $pax_weight, 'pax_weight' => $pax_weight,
'loadmin' => $loadmin,
'loadmax' => $loadmax,
]); ]);
} }

9
resources/views/layouts/default/flights/simbrief_form.blade.php
View File

@@ -2,15 +2,6 @@
@section('title', 'SimBrief Flight Planning') @section('title', 'SimBrief Flight Planning')
@section('content') @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) @foreach($aircraft as $acdetails)
@php @php
$simbrieftype = $acdetails->icao ; $simbrieftype = $acdetails->icao ;