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

Refactoring of PIREP submission and field code #146

Browse Source
This commit is contained in:
Nabeel Shahzad
2018-01-23 15:48:30 -06:00
parent 341424ad7e
commit f9efa81bb4
19 changed files with 191 additions and 147 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
app/Http/Controllers/Admin/PirepFieldController.php
View File

@@ -22,9 +22,9 @@ class PirepFieldController extends BaseController
/**
* Display a listing of the PirepField.
*
* @param Request $request
* @return Response
* @throws \Prettus\Repository\Exceptions\RepositoryException
*/
public function index(Request $request)
{
@@ -38,7 +38,6 @@ class PirepFieldController extends BaseController
/**
* Show the form for creating a new PirepField.
*
* @return Response
*/
public function create()
@@ -48,9 +47,7 @@ class PirepFieldController extends BaseController
/**
* Store a newly created PirepField in storage.
*
* @param CreatePirepFieldRequest $request
*
* @return Response
* @throws \Prettus\Validator\Exceptions\ValidatorException
*/
@@ -67,9 +64,7 @@ class PirepFieldController extends BaseController
/**
* Display the specified PirepField.
*
* @param int $id
*
* @return Response
*/
public function show($id)
@@ -88,9 +83,7 @@ class PirepFieldController extends BaseController
/**
* Show the form for editing the specified PirepField.
*
* @param int $id
*
* @return Response
*/
public function edit($id)
@@ -130,9 +123,7 @@ class PirepFieldController extends BaseController
/**
* Remove the specified PirepField from storage.
*
* @param int $id
*
* @return Response
*/
public function destroy($id)

9
app/Http/Controllers/Api/PirepController.php
View File

@@ -2,7 +2,6 @@
namespace App\Http\Controllers\Api;
use App\Rules\Minutes;
use Log;
use Auth;
use Illuminate\Database\Eloquent\ModelNotFoundException;
@@ -78,8 +77,8 @@ class PirepController extends RestController
'flight_number' => 'required',
'route_code' => 'nullable',
'route_leg' => 'nullable',
'flight_time' => ['nullable', new Minutes],
'planned_flight_time' => ['nullable', new Minutes],
'flight_time' => ['nullable', 'integer'],
'planned_flight_time' => ['nullable', 'integer'],
'level' => 'required|integer',
'route' => 'nullable',
'notes' => 'nullable',
@@ -133,7 +132,7 @@ class PirepController extends RestController
$file_rules = [
# actual flight time is required
'flight_time' => ['required', new Minutes],
'flight_time' => ['required', 'integer'],
'flight_number' => 'nullable',
'dpt_airport_id' => 'nullable',
'arr_airport_id' => 'nullable',
@@ -142,7 +141,7 @@ class PirepController extends RestController
'flight_id' => 'nullable',
'route_code' => 'nullable',
'route_leg' => 'nullable',
'planned_flight_time' => ['nullable', new Minutes],
'planned_flight_time' => ['nullable', 'integer'],
'level' => 'nullable',
'route' => 'nullable',
'notes' => 'nullable',

55
app/Http/Controllers/Frontend/PirepController.php
View File

@@ -2,7 +2,9 @@
namespace App\Http\Controllers\Frontend;
use Log;
use App\Facades\Utils;
use App\Http\Requests\CreatePirepRequest;
use Illuminate\Support\Facades\Auth;
use Illuminate\Http\Request;
@@ -61,11 +63,15 @@ class PirepController extends Controller
* @param null $user
* @return array
*/
public function aircraftList($user=null)
public function aircraftList($user=null, $add_blank=false)
{
$aircraft = [];
$subfleets = $this->userSvc->getAllowableSubfleets($user);
if($add_blank) {
$aircraft[''] = '';
}
foreach ($subfleets as $subfleet) {
$tmp = [];
foreach ($subfleet->aircraft as $ac) {
@@ -107,49 +113,56 @@ class PirepController extends Controller
$user = Auth::user();
return $this->view('pireps.create', [
'aircraft' => $this->aircraftList($user),
'airports' => $this->airportRepo->selectBoxList(),
'airlines' => $this->airlineRepo->selectBoxList(),
'pirepfields' => $this->pirepFieldRepo->all(),
'fieldvalues' => [],
'airlines' => $this->airlineRepo->selectBoxList(true),
'aircraft' => $this->aircraftList($user, true),
'airports' => $this->airportRepo->selectBoxList(true),
'pirep_fields' => $this->pirepFieldRepo->all(),
'field_values' => [],
]);
}
public function store(Request $request)
/**
*
* @param CreatePirepRequest $request
* @return \Illuminate\Http\RedirectResponse|\Illuminate\Routing\Redirector
*/
public function store(CreatePirepRequest $request)
{
$pirep_fields = $request->all();
// Create the main PIREP
$pirep = new Pirep($pirep_fields);
$pirep = new Pirep($request->all());
$pirep->user_id = Auth::user()->id;
# Make sure this isn't a duplicate
$dupe_pirep = $this->pirepSvc->findDuplicate($pirep);
if ($dupe_pirep !== false) {
flash()->error('This PIREP has already been filed.');
return redirect(route('frontend.pireps.create'))->withInput();
}
// Any special fields
$pirep->pilot()->associate(Auth::user());
$pirep->flight_time = ((int) Utils::hoursToMinutes($request['hours']))
+ ((int) $request['minutes']);
// The custom fields from the form
$custom_fields = [];
foreach($pirep_fields as $field_name => $field_val)
{
if (strpos($field_name, 'field_') === false) {
$pirep_fields = $this->pirepFieldRepo->all();
foreach ($pirep_fields as $field) {
if(!$request->filled($field->slug)) {
continue;
}
$field_id = explode('field_', $field_name)[1];
$cfield = PirepField::find($field_id);
$custom_fields[] = [
'name' => $cfield->name,
'value' => $field_val,
'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);
$this->pirepSvc->saveRoute($pirep);
//Flash::success('PIREP submitted successfully!');
return redirect(route('frontend.pireps.index'));
return redirect(route('frontend.pireps.show', ['id' => $pirep->id]));
}
public function show($id)