specify fares, js to dynamically change fare form; get applicable fares for the flight/pirep #125
This commit is contained in:
Nabeel Shahzad
@@ -5,20 +5,21 @@ namespace App\Http\Controllers\Frontend;
|
||||
use App\Facades\Utils;
|
||||
use App\Http\Controllers\Controller;
|
||||
use App\Http\Requests\CreatePirepRequest;
|
||||
use App\Models\Enums\AcarsType;
|
||||
use App\Http\Requests\UpdatePirepRequest;
|
||||
use App\Models\Enums\PirepSource;
|
||||
use App\Models\Enums\PirepState;
|
||||
use App\Models\Pirep;
|
||||
use App\Repositories\AcarsRepository;
|
||||
use App\Repositories\AircraftRepository;
|
||||
use App\Repositories\AirlineRepository;
|
||||
use App\Repositories\AirportRepository;
|
||||
use App\Repositories\Criteria\WhereCriteria;
|
||||
use App\Repositories\PirepFieldRepository;
|
||||
use App\Repositories\PirepRepository;
|
||||
use App\Repositories\SubfleetRepository;
|
||||
use App\Services\GeoService;
|
||||
use App\Services\PIREPService;
|
||||
use App\Services\UserService;
|
||||
use App\Support\Units\Time;
|
||||
use Flash;
|
||||
use Illuminate\Http\Request;
|
||||
use Illuminate\Support\Facades\Auth;
|
||||
use Log;
|
||||
@@ -26,40 +27,40 @@ use Log;
|
||||
|
||||
class PirepController extends Controller
|
||||
{
|
||||
private $airlineRepo,
|
||||
private $aircraftRepo,
|
||||
$airlineRepo,
|
||||
$pirepRepo,
|
||||
$airportRepo,
|
||||
$pirepFieldRepo,
|
||||
$geoSvc,
|
||||
$pirepSvc,
|
||||
$subfleetRepo,
|
||||
$userSvc;
|
||||
|
||||
/**
|
||||
* PirepController constructor.
|
||||
* @param AircraftRepository $aircraftRepo
|
||||
* @param AirlineRepository $airlineRepo
|
||||
* @param PirepRepository $pirepRepo
|
||||
* @param AirportRepository $airportRepo
|
||||
* @param PirepRepository $pirepRepo
|
||||
* @param PirepFieldRepository $pirepFieldRepo
|
||||
* @param GeoService $geoSvc
|
||||
* @param SubfleetRepository $subfleetRepo
|
||||
* @param PIREPService $pirepSvc
|
||||
* @param UserService $userSvc
|
||||
*/
|
||||
public function __construct(
|
||||
AircraftRepository $aircraftRepo,
|
||||
AirlineRepository $airlineRepo,
|
||||
PirepRepository $pirepRepo,
|
||||
AirportRepository $airportRepo,
|
||||
PirepRepository $pirepRepo,
|
||||
PirepFieldRepository $pirepFieldRepo,
|
||||
GeoService $geoSvc,
|
||||
SubfleetRepository $subfleetRepo,
|
||||
PIREPService $pirepSvc,
|
||||
UserService $userSvc
|
||||
) {
|
||||
$this->aircraftRepo = $aircraftRepo;
|
||||
$this->airlineRepo = $airlineRepo;
|
||||
$this->pirepRepo = $pirepRepo;
|
||||
$this->airportRepo = $airportRepo;
|
||||
$this->subfleetRepo = $subfleetRepo;
|
||||
$this->pirepFieldRepo = $pirepFieldRepo;
|
||||
|
||||
$this->geoSvc = $geoSvc;
|
||||
@@ -93,6 +94,58 @@ class PirepController extends Controller
|
||||
return $aircraft;
|
||||
}
|
||||
|
||||
/**
|
||||
* Save any custom fields found
|
||||
* @param Pirep $pirep
|
||||
* @param Request $request
|
||||
*/
|
||||
protected function saveCustomFields(Pirep $pirep, Request $request)
|
||||
{
|
||||
$custom_fields = [];
|
||||
$pirep_fields = $this->pirepFieldRepo->all();
|
||||
foreach ($pirep_fields as $field) {
|
||||
if (!$request->filled($field->slug)) {
|
||||
continue;
|
||||
}
|
||||
|
||||
$custom_fields[] = [
|
||||
'name' => $field->name,
|
||||
'value' => $request->input($field->slug),
|
||||
'source' => PirepSource::MANUAL
|
||||
];
|
||||
}
|
||||
|
||||
Log::info('PIREP Custom Fields', $custom_fields);
|
||||
$this->pirepSvc->updateCustomFields($pirep->id, $custom_fields);
|
||||
}
|
||||
|
||||
/**
|
||||
* Save the fares that have been specified/saved
|
||||
* @param Pirep $pirep
|
||||
* @param Request $request
|
||||
* @throws \Exception
|
||||
*/
|
||||
protected function saveFares(Pirep $pirep, Request $request)
|
||||
{
|
||||
$fares = [];
|
||||
foreach($pirep->aircraft->subfleet->fares as $fare) {
|
||||
|
||||
$field_name = 'fare_'.$fare->id;
|
||||
if(!$request->filled($field_name)) {
|
||||
$count = 0;
|
||||
} else {
|
||||
$count = $request->input($field_name);
|
||||
}
|
||||
|
||||
$fares[] = [
|
||||
'fare_id' => $fare->id,
|
||||
'count' => $count,
|
||||
];
|
||||
}
|
||||
|
||||
$this->pirepSvc->saveFares($pirep->id, $fares);
|
||||
}
|
||||
|
||||
/**
|
||||
* @param Request $request
|
||||
* @return \Illuminate\Contracts\View\Factory|\Illuminate\View\View
|
||||
@@ -114,14 +167,56 @@ class PirepController extends Controller
|
||||
]);
|
||||
}
|
||||
|
||||
/**
|
||||
* @param $id
|
||||
* @return mixed
|
||||
*/
|
||||
public function show($id)
|
||||
{
|
||||
$pirep = $this->pirepRepo->find($id);
|
||||
if (empty($pirep)) {
|
||||
Flash::error('Pirep not found');
|
||||
return redirect(route('frontend.pirep.index'));
|
||||
}
|
||||
|
||||
$map_features = $this->geoSvc->pirepGeoJson($pirep);
|
||||
|
||||
return $this->view('pireps.show', [
|
||||
'pirep' => $pirep,
|
||||
'map_features' => $map_features,
|
||||
]);
|
||||
}
|
||||
|
||||
/**
|
||||
* Return the fares form for a given aircraft
|
||||
* @param Request $request
|
||||
* @return \Illuminate\Contracts\View\Factory|\Illuminate\View\View
|
||||
*/
|
||||
public function fares(Request $request)
|
||||
{
|
||||
$aircraft_id = $request->input('aircraft_id');
|
||||
$aircraft = $this->aircraftRepo->find($aircraft_id);
|
||||
|
||||
return $this->view('pireps.fares', [
|
||||
'aircraft' => $aircraft,
|
||||
'read_only' => false,
|
||||
]);
|
||||
}
|
||||
|
||||
/**
|
||||
* Create a new flight report
|
||||
* @return \Illuminate\Contracts\View\Factory|\Illuminate\View\View
|
||||
*/
|
||||
public function create()
|
||||
{
|
||||
$user = Auth::user();
|
||||
|
||||
return $this->view('pireps.create', [
|
||||
'airlines' => $this->airlineRepo->selectBoxList(true),
|
||||
'aircraft' => $this->aircraftList($user, true),
|
||||
'airports' => $this->airportRepo->selectBoxList(true),
|
||||
'aircraft' => null,
|
||||
'read_only' => false,
|
||||
'airline_list' => $this->airlineRepo->selectBoxList(true),
|
||||
'aircraft_list' => $this->aircraftList($user, true),
|
||||
'airport_list' => $this->airportRepo->selectBoxList(true),
|
||||
'pirep_fields' => $this->pirepFieldRepo->all(),
|
||||
'field_values' => [],
|
||||
]);
|
||||
@@ -150,45 +245,92 @@ class PirepController extends Controller
|
||||
$minutes = (int) $request->input('minutes', 0);
|
||||
$pirep->flight_time = Utils::hoursToMinutes($hours) + $minutes;
|
||||
|
||||
// The custom fields from the form
|
||||
$custom_fields = [];
|
||||
$pirep_fields = $this->pirepFieldRepo->all();
|
||||
foreach ($pirep_fields as $field) {
|
||||
if(!$request->filled($field->slug)) {
|
||||
continue;
|
||||
}
|
||||
|
||||
$custom_fields[] = [
|
||||
'name' => $field->name,
|
||||
'value' => $request->input($field->slug),
|
||||
'source' => PirepSource::MANUAL
|
||||
];
|
||||
}
|
||||
|
||||
Log::info('PIREP Custom Fields', $custom_fields);
|
||||
$pirep = $this->pirepSvc->create($pirep, $custom_fields);
|
||||
$pirep = $this->pirepSvc->create($pirep);
|
||||
$this->saveCustomFields($pirep, $request);
|
||||
$this->saveFares($pirep, $request);
|
||||
$this->pirepSvc->saveRoute($pirep);
|
||||
|
||||
return redirect(route('frontend.pireps.show', ['id' => $pirep->id]));
|
||||
}
|
||||
|
||||
/**
|
||||
* @param $id
|
||||
* Show the form for editing the specified Pirep.
|
||||
* @param int $id
|
||||
* @return mixed
|
||||
*/
|
||||
public function show($id)
|
||||
public function edit($id)
|
||||
{
|
||||
$pirep = $this->pirepRepo->find($id);
|
||||
$pirep = $this->pirepRepo->findWithoutFail($id);
|
||||
if (empty($pirep)) {
|
||||
Flash::error('Pirep not found');
|
||||
return redirect(route('frontend.pirep.index'));
|
||||
return redirect(route('frontend.pireps.index'));
|
||||
}
|
||||
|
||||
$map_features = $this->geoSvc->pirepGeoJson($pirep);
|
||||
$time = new Time($pirep->flight_time);
|
||||
$pirep->hours = $time->hours;
|
||||
$pirep->minutes = $time->minutes;
|
||||
|
||||
return $this->view('pireps.show', [
|
||||
# Can we modify?
|
||||
$read_only = $pirep->state !== PirepState::PENDING;
|
||||
|
||||
# set the custom fields
|
||||
foreach($pirep->fields as $field) {
|
||||
$pirep->{$field->slug} = $field->value;
|
||||
}
|
||||
|
||||
# set the fares
|
||||
foreach($pirep->fares as $fare) {
|
||||
$field_name = 'fare_'.$fare->fare_id;
|
||||
$pirep->{$field_name} = $fare->count;
|
||||
}
|
||||
|
||||
return $this->view('pireps.edit', [
|
||||
'pirep' => $pirep,
|
||||
'map_features' => $map_features,
|
||||
'read_only' => $read_only,
|
||||
'aircraft' => $pirep->aircraft,
|
||||
'aircraft_list' => $this->aircraftList(),
|
||||
'airline_list' => $this->airlineRepo->selectBoxList(),
|
||||
'airport_list' => $this->airportRepo->selectBoxList(),
|
||||
'pirep_fields' => $this->pirepFieldRepo->all(),
|
||||
]);
|
||||
}
|
||||
|
||||
/**
|
||||
* @param $id
|
||||
* @param UpdatePirepRequest $request
|
||||
* @return \Illuminate\Http\RedirectResponse|\Illuminate\Routing\Redirector
|
||||
* @throws \Prettus\Validator\Exceptions\ValidatorException
|
||||
* @throws \Exception
|
||||
*/
|
||||
public function update($id, UpdatePirepRequest $request)
|
||||
{
|
||||
$pirep = $this->pirepRepo->findWithoutFail($id);
|
||||
|
||||
if (empty($pirep)) {
|
||||
Flash::error('Pirep not found');
|
||||
return redirect(route('admin.pireps.index'));
|
||||
}
|
||||
|
||||
$orig_route = $pirep->route;
|
||||
|
||||
$attrs = $request->all();
|
||||
|
||||
# Fix the time
|
||||
$attrs['flight_time'] = Time::init(
|
||||
$attrs['minutes'],
|
||||
$attrs['hours'])->getMinutes();
|
||||
|
||||
$pirep = $this->pirepRepo->update($attrs, $id);
|
||||
|
||||
// A route change in the PIREP, so update the saved points in the ACARS table
|
||||
if ($pirep->route !== $orig_route) {
|
||||
$this->pirepSvc->saveRoute($pirep);
|
||||
}
|
||||
|
||||
$this->saveCustomFields($pirep, $request);
|
||||
$this->saveFares($pirep, $request);
|
||||
|
||||
Flash::success('Pirep updated successfully.');
|
||||
return redirect(route('frontend.pireps.show', ['id' => $pirep->id]));
|
||||
}
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user