Apply fixes from StyleCI
This commit is contained in:
committed by
StyleCI Bot
parent
20f46adbc4
commit
9596d88b48
@@ -2,7 +2,6 @@
|
||||
|
||||
namespace App\Http\Controllers\Frontend;
|
||||
|
||||
use App\Exceptions\UserNotAtAirport;
|
||||
use App\Facades\Utils;
|
||||
use App\Http\Requests\CreatePirepRequest;
|
||||
use App\Http\Requests\UpdatePirepRequest;
|
||||
@@ -30,22 +29,22 @@ use PirepStatus;
|
||||
|
||||
/**
|
||||
* Class PirepController
|
||||
* @package App\Http\Controllers\Frontend
|
||||
*/
|
||||
class PirepController extends Controller
|
||||
{
|
||||
private $aircraftRepo,
|
||||
$airlineRepo,
|
||||
$fareSvc,
|
||||
$geoSvc,
|
||||
$pirepRepo,
|
||||
$airportRepo,
|
||||
$pirepFieldRepo,
|
||||
$pirepSvc,
|
||||
$userSvc;
|
||||
private $aircraftRepo;
|
||||
private $airlineRepo;
|
||||
private $fareSvc;
|
||||
private $geoSvc;
|
||||
private $pirepRepo;
|
||||
private $airportRepo;
|
||||
private $pirepFieldRepo;
|
||||
private $pirepSvc;
|
||||
private $userSvc;
|
||||
|
||||
/**
|
||||
* PirepController constructor.
|
||||
*
|
||||
* @param AircraftRepository $aircraftRepo
|
||||
* @param AirlineRepository $airlineRepo
|
||||
* @param AirportRepository $airportRepo
|
||||
@@ -81,7 +80,10 @@ class PirepController extends Controller
|
||||
|
||||
/**
|
||||
* Dropdown with aircraft grouped by subfleet
|
||||
* @param null $user
|
||||
*
|
||||
* @param null $user
|
||||
* @param mixed $add_blank
|
||||
*
|
||||
* @return array
|
||||
*/
|
||||
public function aircraftList($user = null, $add_blank = false)
|
||||
@@ -107,6 +109,7 @@ class PirepController extends Controller
|
||||
|
||||
/**
|
||||
* Save any custom fields found
|
||||
*
|
||||
* @param Pirep $pirep
|
||||
* @param Request $request
|
||||
*/
|
||||
@@ -123,7 +126,7 @@ class PirepController extends Controller
|
||||
'name' => $field->name,
|
||||
'slug' => $field->slug,
|
||||
'value' => $request->input($field->slug),
|
||||
'source' => PirepSource::MANUAL
|
||||
'source' => PirepSource::MANUAL,
|
||||
];
|
||||
}
|
||||
|
||||
@@ -133,8 +136,10 @@ class PirepController extends Controller
|
||||
|
||||
/**
|
||||
* Save the fares that have been specified/saved
|
||||
*
|
||||
* @param Pirep $pirep
|
||||
* @param Request $request
|
||||
*
|
||||
* @throws \Exception
|
||||
*/
|
||||
protected function saveFares(Pirep $pirep, Request $request)
|
||||
@@ -163,8 +168,10 @@ class PirepController extends Controller
|
||||
|
||||
/**
|
||||
* @param Request $request
|
||||
* @return \Illuminate\Contracts\View\Factory|\Illuminate\View\View
|
||||
*
|
||||
* @throws \Prettus\Repository\Exceptions\RepositoryException
|
||||
*
|
||||
* @return \Illuminate\Contracts\View\Factory|\Illuminate\View\View
|
||||
*/
|
||||
public function index(Request $request)
|
||||
{
|
||||
@@ -184,6 +191,7 @@ class PirepController extends Controller
|
||||
|
||||
/**
|
||||
* @param $id
|
||||
*
|
||||
* @return mixed
|
||||
*/
|
||||
public function show($id)
|
||||
@@ -204,7 +212,9 @@ class PirepController extends Controller
|
||||
|
||||
/**
|
||||
* Return the fares form for a given aircraft
|
||||
*
|
||||
* @param Request $request
|
||||
*
|
||||
* @return \Illuminate\Contracts\View\Factory|\Illuminate\View\View
|
||||
*/
|
||||
public function fares(Request $request)
|
||||
@@ -220,6 +230,7 @@ class PirepController extends Controller
|
||||
|
||||
/**
|
||||
* Create a new flight report
|
||||
*
|
||||
* @return \Illuminate\Contracts\View\Factory|\Illuminate\View\View
|
||||
*/
|
||||
public function create()
|
||||
@@ -239,8 +250,10 @@ class PirepController extends Controller
|
||||
|
||||
/**
|
||||
* @param CreatePirepRequest $request
|
||||
* @return \Illuminate\Http\RedirectResponse|\Illuminate\Routing\Redirector
|
||||
*
|
||||
* @throws \Exception
|
||||
*
|
||||
* @return \Illuminate\Http\RedirectResponse|\Illuminate\Routing\Redirector
|
||||
*/
|
||||
public function store(CreatePirepRequest $request)
|
||||
{
|
||||
@@ -251,8 +264,8 @@ class PirepController extends Controller
|
||||
$attrs = $request->all();
|
||||
$attrs['submit'] = strtolower($attrs['submit']);
|
||||
|
||||
if($attrs['submit'] === 'submit') {
|
||||
# Are they allowed at this airport?
|
||||
if ($attrs['submit'] === 'submit') {
|
||||
// Are they allowed at this airport?
|
||||
if (setting('pilots.only_flights_from_current')
|
||||
&& Auth::user()->curr_airport_id !== $pirep->dpt_airport_id) {
|
||||
return $this->flashError(
|
||||
@@ -261,7 +274,7 @@ class PirepController extends Controller
|
||||
);
|
||||
}
|
||||
|
||||
# Can they fly this aircraft?
|
||||
// Can they fly this aircraft?
|
||||
if (setting('pireps.restrict_aircraft_to_rank', false)
|
||||
&& !$this->userSvc->aircraftAllowed(Auth::user(), $pirep->aircraft_id)) {
|
||||
return $this->flashError(
|
||||
@@ -270,7 +283,7 @@ class PirepController extends Controller
|
||||
);
|
||||
}
|
||||
|
||||
# is the aircraft in the right place?
|
||||
// is the aircraft in the right place?
|
||||
if (setting('pireps.only_aircraft_at_dpt_airport')
|
||||
&& $pirep->aircraft_id !== $pirep->dpt_airport_id) {
|
||||
return $this->flashError(
|
||||
@@ -279,7 +292,7 @@ class PirepController extends Controller
|
||||
);
|
||||
}
|
||||
|
||||
# Make sure this isn't a duplicate
|
||||
// Make sure this isn't a duplicate
|
||||
$dupe_pirep = $this->pirepSvc->findDuplicate($pirep);
|
||||
if ($dupe_pirep !== false) {
|
||||
return $this->flashError(
|
||||
@@ -305,13 +318,13 @@ class PirepController extends Controller
|
||||
// Depending on the button they selected, set an initial state
|
||||
// Can be saved as a draft or just submitted
|
||||
if ($attrs['submit'] === 'save') {
|
||||
if(!$pirep->read_only) {
|
||||
if (!$pirep->read_only) {
|
||||
$pirep->state = PirepState::DRAFT;
|
||||
}
|
||||
|
||||
$pirep->save();
|
||||
Flash::success('PIREP saved successfully.');
|
||||
} else if ($attrs['submit'] === 'submit') {
|
||||
} elseif ($attrs['submit'] === 'submit') {
|
||||
$this->pirepSvc->submit($pirep);
|
||||
Flash::success('PIREP submitted!');
|
||||
}
|
||||
@@ -321,7 +334,9 @@ class PirepController extends Controller
|
||||
|
||||
/**
|
||||
* Show the form for editing the specified Pirep.
|
||||
* @param int $id
|
||||
*
|
||||
* @param int $id
|
||||
*
|
||||
* @return mixed
|
||||
*/
|
||||
public function edit($id)
|
||||
@@ -332,16 +347,16 @@ class PirepController extends Controller
|
||||
return redirect(route('frontend.pireps.index'));
|
||||
}
|
||||
|
||||
# Eager load the subfleet and fares under it
|
||||
// Eager load the subfleet and fares under it
|
||||
$pirep->aircraft->load('subfleet.fares');
|
||||
|
||||
$time = new Time($pirep->flight_time);
|
||||
$pirep->hours = $time->hours;
|
||||
$pirep->minutes = $time->minutes;
|
||||
|
||||
# set the custom fields
|
||||
// set the custom fields
|
||||
foreach ($pirep->fields as $field) {
|
||||
if($field->slug == null) {
|
||||
if ($field->slug == null) {
|
||||
$field->slug = str_slug($field->name);
|
||||
}
|
||||
|
||||
@@ -349,7 +364,7 @@ class PirepController extends Controller
|
||||
$pirep->{$field_name} = $field->value;
|
||||
}
|
||||
|
||||
# set the fares
|
||||
// set the fares
|
||||
foreach ($pirep->fares as $fare) {
|
||||
$field_name = 'fare_'.$fare->fare_id;
|
||||
$pirep->{$field_name} = $fare->count;
|
||||
@@ -368,9 +383,11 @@ class PirepController extends Controller
|
||||
/**
|
||||
* @param $id
|
||||
* @param UpdatePirepRequest $request
|
||||
* @return \Illuminate\Http\RedirectResponse|\Illuminate\Routing\Redirector
|
||||
*
|
||||
* @throws \Prettus\Validator\Exceptions\ValidatorException
|
||||
* @throws \Exception
|
||||
*
|
||||
* @return \Illuminate\Http\RedirectResponse|\Illuminate\Routing\Redirector
|
||||
*/
|
||||
public function update($id, UpdatePirepRequest $request)
|
||||
{
|
||||
@@ -384,7 +401,7 @@ class PirepController extends Controller
|
||||
$attrs = $request->all();
|
||||
$attrs['submit'] = strtolower($attrs['submit']);
|
||||
|
||||
# Fix the time
|
||||
// Fix the time
|
||||
$attrs['flight_time'] = Time::init(
|
||||
$attrs['minutes'],
|
||||
$attrs['hours'])->getMinutes();
|
||||
@@ -399,12 +416,12 @@ class PirepController extends Controller
|
||||
$this->saveCustomFields($pirep, $request);
|
||||
$this->saveFares($pirep, $request);
|
||||
|
||||
if($attrs['submit'] === 'save') {
|
||||
if ($attrs['submit'] === 'save') {
|
||||
Flash::success('PIREP saved successfully.');
|
||||
} else if($attrs['submit'] === 'submit') {
|
||||
} elseif ($attrs['submit'] === 'submit') {
|
||||
$this->pirepSvc->submit($pirep);
|
||||
Flash::success('PIREP submitted!');
|
||||
} else if($attrs['submit'] === 'delete' || $attrs['submit'] === 'cancel') {
|
||||
} elseif ($attrs['submit'] === 'delete' || $attrs['submit'] === 'cancel') {
|
||||
$this->pirepRepo->update([
|
||||
'state' => PirepState::CANCELLED,
|
||||
'status' => PirepStatus::CANCELLED,
|
||||
@@ -419,8 +436,10 @@ class PirepController extends Controller
|
||||
|
||||
/**
|
||||
* Submit the PIREP
|
||||
*
|
||||
* @param $id
|
||||
* @param Request $request
|
||||
*
|
||||
* @return \Illuminate\Http\RedirectResponse|\Illuminate\Routing\Redirector
|
||||
*/
|
||||
public function submit($id, Request $request)
|
||||
|
||||
Reference in New Issue
Block a user