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

Apply fixes from StyleCI

Browse Source
This commit is contained in:
Nabeel Shahzad
2018-08-26 16:40:04 +00:00
committed by StyleCI Bot
parent 20f46adbc4
commit 9596d88b48
407 changed files with 4032 additions and 3286 deletions
Download Patch File Download Diff File Expand all files Collapse all files

49
app/Http/Controllers/Admin/AircraftController.php
View File

@@ -16,20 +16,19 @@ use App\Services\ImportService;
use Flash;
use Illuminate\Http\Request;
use Log;
use Prettus\Repository\Criteria\RequestCriteria;
use Storage;
/**
* Class AircraftController
* @package App\Http\Controllers\Admin
*/
class AircraftController extends Controller
{
private $aircraftRepo,
$importSvc;
private $aircraftRepo;
private $importSvc;
/**
* AircraftController constructor.
*
* @param AircraftRepository $aircraftRepo
* @param ImportService $importSvc
*/
@@ -43,16 +42,19 @@ class AircraftController extends Controller
/**
* Display a listing of the Aircraft.
*
* @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)
{
// If subfleet ID is passed part of the query string, then only
// show the aircraft that are in that subfleet
$w = [];
if($request->filled('subfleet')) {
if ($request->filled('subfleet')) {
$w['subfleet_id'] = $request->input('subfleet');
}
@@ -60,27 +62,30 @@ class AircraftController extends Controller
$aircraft = $aircraft->all();
return view('admin.aircraft.index', [
'aircraft' => $aircraft,
'aircraft' => $aircraft,
'subfleet_id' => $request->input('subfleet'),
]);
}
/**
* Show the form for creating a new Aircraft.
*
* @param Request $request
*
* @return \Illuminate\Contracts\View\Factory|\Illuminate\View\View
*/
public function create(Request $request)
{
return view('admin.aircraft.create', [
'subfleets' => Subfleet::all()->pluck('name', 'id'),
'statuses' => AircraftStatus::select(true),
'subfleet_id' => $request->query('subfleet')
'subfleets' => Subfleet::all()->pluck('name', 'id'),
'statuses' => AircraftStatus::select(true),
'subfleet_id' => $request->query('subfleet'),
]);
}
/**
* Store a newly created Aircraft in storage.
*
* @throws \Prettus\Validator\Exceptions\ValidatorException
*/
public function store(CreateAircraftRequest $request)
@@ -94,6 +99,8 @@ class AircraftController extends Controller
/**
* Display the specified Aircraft.
*
* @param mixed $id
*/
public function show($id)
{
@@ -111,6 +118,8 @@ class AircraftController extends Controller
/**
* Show the form for editing the specified Aircraft.
*
* @param mixed $id
*/
public function edit($id)
{
@@ -130,6 +139,9 @@ class AircraftController extends Controller
/**
* Update the specified Aircraft in storage.
*
* @param mixed $id
*
* @throws \Prettus\Validator\Exceptions\ValidatorException
*/
public function update($id, UpdateAircraftRequest $request)
@@ -150,6 +162,8 @@ class AircraftController extends Controller
/**
* Remove the specified Aircraft from storage.
*
* @param mixed $id
*/
public function destroy($id)
{
@@ -168,9 +182,12 @@ class AircraftController extends Controller
/**
* Run the aircraft exporter
*
* @param Request $request
* @return \Symfony\Component\HttpFoundation\BinaryFileResponse
*
* @throws \League\Csv\Exception
*
* @return \Symfony\Component\HttpFoundation\BinaryFileResponse
*/
public function export(Request $request)
{
@@ -187,8 +204,10 @@ class AircraftController extends Controller
/**
* @param Request $request
* @return \Illuminate\Contracts\View\Factory|\Illuminate\View\View
*
* @throws \Illuminate\Validation\ValidationException
*
* @return \Illuminate\Contracts\View\Factory|\Illuminate\View\View
*/
public function import(Request $request)
{
@@ -215,6 +234,7 @@ class AircraftController extends Controller
/**
* @param Aircraft|null $aircraft
*
* @return mixed
*/
protected function return_expenses_view(Aircraft $aircraft)
@@ -228,10 +248,13 @@ class AircraftController extends Controller
/**
* Operations for associating ranks to the subfleet
*
* @param $id
* @param Request $request
* @return \Illuminate\Contracts\View\Factory|\Illuminate\View\View
*
* @throws \Exception
*
* @return \Illuminate\Contracts\View\Factory|\Illuminate\View\View
*/
public function expenses($id, Request $request)
{

26
app/Http/Controllers/Admin/AirlinesController.php
View File

@@ -14,7 +14,6 @@ use Response;
/**
* Class AirlinesController
* @package App\Http\Controllers\Admin
*/
class AirlinesController extends Controller
{
@@ -22,14 +21,17 @@ class AirlinesController extends Controller
/**
* AirlinesController constructor.
*
* @param AirlineRepository $airlinesRepo
*/
public function __construct(AirlineRepository $airlinesRepo) {
public function __construct(AirlineRepository $airlinesRepo)
{
$this->airlineRepo = $airlinesRepo;
}
/**
* Display a listing of the Airlines.
*
* @throws \Prettus\Repository\Exceptions\RepositoryException
*/
public function index(Request $request)
@@ -54,6 +56,7 @@ class AirlinesController extends Controller
/**
* Store a newly created Airlines in storage.
*
* @throws \Prettus\Validator\Exceptions\ValidatorException
*/
public function store(CreateAirlineRequest $request)
@@ -67,7 +70,9 @@ class AirlinesController extends Controller
/**
* Display the specified Airlines.
* @param int $id
*
* @param int $id
*
* @return mixed
*/
public function show($id)
@@ -86,7 +91,9 @@ class AirlinesController extends Controller
/**
* Show the form for editing the specified Airlines.
* @param int $id
*
* @param int $id
*
* @return Response
*/
public function edit($id)
@@ -106,10 +113,13 @@ class AirlinesController extends Controller
/**
* Update the specified Airlines in storage.
* @param int $id
*
* @param int $id
* @param UpdateAirlineRequest $request
* @return Response
*
* @throws \Prettus\Validator\Exceptions\ValidatorException
*
* @return Response
*/
public function update($id, UpdateAirlineRequest $request)
{
@@ -128,7 +138,9 @@ class AirlinesController extends Controller
/**
* Remove the specified Airlines from storage.
* @param int $id
*
* @param int $id
*
* @return Response
*/
public function destroy($id)

53
app/Http/Controllers/Admin/AirportController.php
View File

@@ -21,12 +21,11 @@ use Storage;
/**
* Class AirportController
* @package App\Http\Controllers\Admin
*/
class AirportController extends Controller
{
private $airportRepo,
$importSvc;
private $airportRepo;
private $importSvc;
/**
* @param AirportRepository $airportRepo
@@ -42,9 +41,12 @@ class AirportController extends Controller
/**
* Display a listing of the Airport.
*
* @param Request $request
* @return Response
*
* @throws \Prettus\Repository\Exceptions\RepositoryException
*
* @return Response
*/
public function index(Request $request)
{
@@ -65,6 +67,7 @@ class AirportController extends Controller
/**
* Show the form for creating a new Airport.
*
* @return Response
*/
public function create()
@@ -76,9 +79,12 @@ class AirportController extends Controller
/**
* Store a newly created Airport in storage.
*
* @param CreateAirportRequest $request
* @return Response
*
* @throws \Prettus\Validator\Exceptions\ValidatorException
*
* @return Response
*/
public function store(CreateAirportRequest $request)
{
@@ -93,7 +99,9 @@ class AirportController extends Controller
/**
* Display the specified Airport.
* @param int $id
*
* @param int $id
*
* @return Response
*/
public function show($id)
@@ -112,7 +120,9 @@ class AirportController extends Controller
/**
* Show the form for editing the specified Airport.
* @param int $id
*
* @param int $id
*
* @return Response
*/
public function edit($id)
@@ -132,10 +142,13 @@ class AirportController extends Controller
/**
* Update the specified Airport in storage.
* @param int $id
*
* @param int $id
* @param UpdateAirportRequest $request
* @return Response
*
* @throws \Prettus\Validator\Exceptions\ValidatorException
*
* @return Response
*/
public function update($id, UpdateAirportRequest $request)
{
@@ -157,7 +170,9 @@ class AirportController extends Controller
/**
* Remove the specified Airport from storage.
* @param int $id
*
* @param int $id
*
* @return Response
*/
public function destroy($id)
@@ -177,9 +192,12 @@ class AirportController extends Controller
/**
* Run the airport exporter
*
* @param Request $request
* @return \Symfony\Component\HttpFoundation\BinaryFileResponse
*
* @throws \League\Csv\Exception
*
* @return \Symfony\Component\HttpFoundation\BinaryFileResponse
*/
public function export(Request $request)
{
@@ -195,10 +213,11 @@ class AirportController extends Controller
}
/**
*
* @param Request $request
* @return \Illuminate\Contracts\View\Factory|\Illuminate\View\View
*
* @throws \Illuminate\Validation\ValidationException
*
* @return \Illuminate\Contracts\View\Factory|\Illuminate\View\View
*/
public function import(Request $request)
{
@@ -225,6 +244,7 @@ class AirportController extends Controller
/**
* @param Airport $airport
*
* @return mixed
*/
protected function return_expenses_view(Airport $airport)
@@ -237,10 +257,13 @@ class AirportController extends Controller
/**
* Operations for associating ranks to the subfleet
*
* @param $id
* @param Request $request
* @return \Illuminate\Contracts\View\Factory|\Illuminate\View\View
*
* @throws \Exception
*
* @return \Illuminate\Contracts\View\Factory|\Illuminate\View\View
*/
public function expenses($id, Request $request)
{
@@ -273,7 +296,9 @@ class AirportController extends Controller
/**
* Set fuel prices for this airport
*
* @param Request $request
*
* @return mixed
*/
public function fuel(Request $request)

38
app/Http/Controllers/Admin/AwardController.php
View File

@@ -14,20 +14,20 @@ use Response;
class AwardController extends Controller
{
/** @var AwardRepository */
private $awardRepository,
$awardSvc;
/** @var AwardRepository */
private $awardRepository;
private $awardSvc;
/**
* AwardController constructor.
*
* @param AwardRepository $awardRepo
* @param AwardService $awardSvc
*/
public function __construct(
AwardRepository $awardRepo,
AwardService $awardSvc
)
{
) {
$this->awardRepository = $awardRepo;
$this->awardSvc = $awardSvc;
}
@@ -57,9 +57,12 @@ class AwardController extends Controller
/**
* Display a listing of the Fare.
*
* @param Request $request
* @return Response
*
* @throws \Prettus\Repository\Exceptions\RepositoryException
*
* @return Response
*/
public function index(Request $request)
{
@@ -73,6 +76,7 @@ class AwardController extends Controller
/**
* Show the form for creating a new Fare.
*
* @return Response
*/
public function create()
@@ -87,9 +91,12 @@ class AwardController extends Controller
/**
* Store a newly created Fare in storage.
*
* @param CreateAwardRequest $request
* @return Response
*
* @throws \Prettus\Validator\Exceptions\ValidatorException
*
* @return Response
*/
public function store(CreateAwardRequest $request)
{
@@ -102,7 +109,9 @@ class AwardController extends Controller
/**
* Display the specified Fare.
* @param int $id
*
* @param int $id
*
* @return Response
*/
public function show($id)
@@ -121,7 +130,9 @@ class AwardController extends Controller
/**
* Show the form for editing the specified award.
* @param int $id
*
* @param int $id
*
* @return Response
*/
public function edit($id)
@@ -144,10 +155,13 @@ class AwardController extends Controller
/**
* Update the specified award in storage.
* @param int $id
*
* @param int $id
* @param UpdateAwardRequest $request
* @return Response
*
* @throws \Prettus\Validator\Exceptions\ValidatorException
*
* @return Response
*/
public function update($id, UpdateAwardRequest $request)
{
@@ -167,7 +181,7 @@ class AwardController extends Controller
/**
* Remove the specified Fare from storage.
*
* @param int $id
* @param int $id
*
* @return Response
*/

14
app/Http/Controllers/Admin/DashboardController.php
View File

@@ -16,16 +16,16 @@ use vierbergenlars\SemVer\version as semver;
/**
* Class DashboardController
* @package App\Http\Controllers\Admin
*/
class DashboardController extends Controller
{
private $newsRepo,
$pirepRepo,
$userRepo;
private $newsRepo;
private $pirepRepo;
private $userRepo;
/**
* DashboardController constructor.
*
* @param NewsRepository $newsRepo
* @param PirepRepository $pirepRepo
* @param UserRepository $userRepo
@@ -44,6 +44,7 @@ class DashboardController extends Controller
* Check if a new version is available by checking the VERSION file from
* S3 and then using the semver library to do the comparison. Just show
* a session flash file on this page that'll get cleared right away
*
* @throws \RuntimeException
*/
protected function checkNewVersion()
@@ -63,6 +64,7 @@ class DashboardController extends Controller
/**
* Show the admin dashboard
*
* @throws \RuntimeException
*/
public function index(Request $request)
@@ -78,8 +80,10 @@ class DashboardController extends Controller
/**
* @param Request $request
* @return \Illuminate\Contracts\View\Factory|\Illuminate\View\View
*
* @throws \Prettus\Validator\Exceptions\ValidatorException
*
* @return \Illuminate\Contracts\View\Factory|\Illuminate\View\View
*/
public function news(Request $request)
{

51
app/Http/Controllers/Admin/ExpenseController.php
View File

@@ -19,16 +19,16 @@ use Storage;
/**
* Class ExpenseController
* @package App\Http\Controllers\Admin
*/
class ExpenseController extends Controller
{
private $airlineRepo,
$expenseRepo,
$importSvc;
private $airlineRepo;
private $expenseRepo;
private $importSvc;
/**
* expensesController constructor.
*
* @param AirlineRepository $airlineRepo
* @param ExpenseRepository $expenseRepo
* @param ImportService $importSvc
@@ -45,19 +45,22 @@ class ExpenseController extends Controller
/**
* Display a listing of the expenses.
*
* @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)
{
$this->expenseRepo->pushCriteria(new RequestCriteria($request));
$expenses = $this->expenseRepo->findWhere([
'ref_model' => Expense::class
'ref_model' => Expense::class,
]);
return view('admin.expenses.index', [
'expenses' => $expenses
'expenses' => $expenses,
]);
}
@@ -74,9 +77,12 @@ class ExpenseController extends Controller
/**
* Store a newly created expenses in storage.
*
* @param Request $request
* @return \Illuminate\Http\RedirectResponse|\Illuminate\Routing\Redirector
*
* @throws \Prettus\Validator\Exceptions\ValidatorException
*
* @return \Illuminate\Http\RedirectResponse|\Illuminate\Routing\Redirector
*/
public function store(Request $request)
{
@@ -91,7 +97,9 @@ class ExpenseController extends Controller
/**
* Display the specified expenses.
* @param int $id
*
* @param int $id
*
* @return mixed
*/
public function show($id)
@@ -111,7 +119,9 @@ class ExpenseController extends Controller
/**
* Show the form for editing the specified expenses.
* @param int $id
*
* @param int $id
*
* @return Response
*/
public function edit($id)
@@ -133,10 +143,13 @@ class ExpenseController extends Controller
/**
* Update the specified expenses in storage.
* @param int $id
*
* @param int $id
* @param Request $request
* @return Response
*
* @throws \Prettus\Validator\Exceptions\ValidatorException
*
* @return Response
*/
public function update($id, Request $request)
{
@@ -157,7 +170,9 @@ class ExpenseController extends Controller
/**
* Remove the specified expenses from storage.
* @param int $id
*
* @param int $id
*
* @return Response
*/
public function destroy($id)
@@ -177,9 +192,12 @@ class ExpenseController extends Controller
/**
* Run the airport exporter
*
* @param Request $request
* @return \Symfony\Component\HttpFoundation\BinaryFileResponse
*
* @throws \League\Csv\Exception
*
* @return \Symfony\Component\HttpFoundation\BinaryFileResponse
*/
public function export(Request $request)
{
@@ -195,10 +213,11 @@ class ExpenseController extends Controller
}
/**
*
* @param Request $request
* @return \Illuminate\Contracts\View\Factory|\Illuminate\View\View
*
* @throws \Illuminate\Validation\ValidationException
*
* @return \Illuminate\Contracts\View\Factory|\Illuminate\View\View
*/
public function import(Request $request)
{

45
app/Http/Controllers/Admin/FareController.php
View File

@@ -18,15 +18,15 @@ use Storage;
/**
* Class FareController
* @package App\Http\Controllers\Admin
*/
class FareController extends Controller
{
private $fareRepo,
$importSvc;
private $fareRepo;
private $importSvc;
/**
* FareController constructor.
*
* @param FareRepository $fareRepo
* @param ImportService $importSvc
*/
@@ -40,9 +40,12 @@ class FareController extends Controller
/**
* Display a listing of the Fare.
*
* @param Request $request
* @return Response
*
* @throws \Prettus\Repository\Exceptions\RepositoryException
*
* @return Response
*/
public function index(Request $request)
{
@@ -65,9 +68,12 @@ class FareController extends Controller
/**
* Store a newly created Fare in storage.
*
* @param CreateFareRequest $request
* @return Response
*
* @throws \Prettus\Validator\Exceptions\ValidatorException
*
* @return Response
*/
public function store(CreateFareRequest $request)
{
@@ -80,7 +86,9 @@ class FareController extends Controller
/**
* Display the specified Fare.
* @param int $id
*
* @param int $id
*
* @return Response
*/
public function show($id)
@@ -96,7 +104,9 @@ class FareController extends Controller
/**
* Show the form for editing the specified Fare.
* @param int $id
*
* @param int $id
*
* @return Response
*/
public function edit($id)
@@ -112,10 +122,13 @@ class FareController extends Controller
/**
* Update the specified Fare in storage.
* @param int $id
*
* @param int $id
* @param UpdateFareRequest $request
* @return Response
*
* @throws \Prettus\Validator\Exceptions\ValidatorException
*
* @return Response
*/
public function update($id, UpdateFareRequest $request)
{
@@ -133,7 +146,9 @@ class FareController extends Controller
/**
* Remove the specified Fare from storage.
* @param int $id
*
* @param int $id
*
* @return Response
*/
public function destroy($id)
@@ -152,9 +167,12 @@ class FareController extends Controller
/**
* Run the aircraft exporter
*
* @param Request $request
* @return \Symfony\Component\HttpFoundation\BinaryFileResponse
*
* @throws \League\Csv\Exception
*
* @return \Symfony\Component\HttpFoundation\BinaryFileResponse
*/
public function export(Request $request)
{
@@ -170,10 +188,11 @@ class FareController extends Controller
}
/**
*
* @param Request $request
* @return \Illuminate\Contracts\View\Factory|\Illuminate\View\View
*
* @throws \Illuminate\Validation\ValidationException
*
* @return \Illuminate\Contracts\View\Factory|\Illuminate\View\View
*/
public function import(Request $request)
{

14
app/Http/Controllers/Admin/FileController.php
View File

@@ -14,7 +14,6 @@ use Validator;
/**
* Class FileController
* @package App\Http\Controllers\Admin
*/
class FileController extends Controller
{
@@ -27,9 +26,12 @@ class FileController extends Controller
/**
* Store a newly file
*
* @param Request $request
* @return \Illuminate\Http\RedirectResponse|\Illuminate\Routing\Redirector
*
* @throws \Hashids\HashidsException
*
* @return \Illuminate\Http\RedirectResponse|\Illuminate\Routing\Redirector
*/
public function store(Request $request)
{
@@ -41,7 +43,7 @@ class FileController extends Controller
$validator = Validator::make($request->all(), [
'filename' => 'required',
'file_description' => 'nullable',
'file' => 'required|file'
'file' => 'required|file',
]);
if ($validator->fails()) {
@@ -50,7 +52,6 @@ class FileController extends Controller
Log::info('Uploading files', $attrs);
$file = $request->file('file');
$this->fileSvc->saveFile($file, 'files', [
'name' => $attrs['filename'],
@@ -65,9 +66,12 @@ class FileController extends Controller
/**
* Remove the file from storage.
*
* @param $id
* @return \Illuminate\Http\RedirectResponse|\Illuminate\Routing\Redirector
*
* @throws \Exception
*
* @return \Illuminate\Http\RedirectResponse|\Illuminate\Routing\Redirector
*/
public function destroy($id)
{

18
app/Http/Controllers/Admin/FinanceController.php
View File

@@ -13,14 +13,13 @@ use Illuminate\Http\Request;
/**
* Class FinanceController
* @package App\Http\Controllers\Admin
*/
class FinanceController extends Controller
{
private $airlineRepo;
/**
* @param AirlineRepository $airlineRepo
* @param AirlineRepository $airlineRepo
*/
public function __construct(
AirlineRepository $airlineRepo
@@ -30,10 +29,13 @@ class FinanceController extends Controller
/**
* Display the summation tables for a given month by airline
*
* @param Request $request
* @return mixed
*
* @throws \UnexpectedValueException
* @throws \InvalidArgumentException
*
* @return mixed
*/
public function index(Request $request)
{
@@ -48,15 +50,15 @@ class FinanceController extends Controller
$transaction_groups = [];
$airlines = $this->airlineRepo->orderBy('icao')->all();
# group by the airline
// group by the airline
foreach ($airlines as $airline) {
# Return all the transactions, grouped by the transaction group
// Return all the transactions, grouped by the transaction group
$transactions = JournalTransaction::groupBy('transaction_group', 'currency')
->selectRaw('transaction_group, currency,
SUM(credit) as sum_credits,
SUM(debit) as sum_debits')
->where([
'journal_id' => $airline->journal->id
'journal_id' => $airline->journal->id,
])
->whereBetween('created_at', $between, 'AND')
->orderBy('sum_credits', 'desc')
@@ -64,7 +66,7 @@ class FinanceController extends Controller
->orderBy('transaction_group', 'asc')
->get();
# Summate it so we can show it on the footer of the table
// Summate it so we can show it on the footer of the table
$sum_all_credits = 0;
$sum_all_debits = 0;
foreach ($transactions as $ta) {
@@ -89,6 +91,8 @@ class FinanceController extends Controller
/**
* Show a month
*
* @param mixed $id
*/
public function show($id)
{

83
app/Http/Controllers/Admin/FlightController.php
View File

@@ -30,22 +30,22 @@ use Storage;
/**
* Class FlightController
* @package App\Http\Controllers\Admin
*/
class FlightController extends Controller
{
private $airlineRepo,
$airportRepo,
$fareRepo,
$flightRepo,
$flightFieldRepo,
$fareSvc,
$flightSvc,
$importSvc,
$subfleetRepo;
private $airlineRepo;
private $airportRepo;
private $fareRepo;
private $flightRepo;
private $flightFieldRepo;
private $fareSvc;
private $flightSvc;
private $importSvc;
private $subfleetRepo;
/**
* FlightController constructor.
*
* @param AirlineRepository $airlineRepo
* @param AirportRepository $airportRepo
* @param FareRepository $fareRepo
@@ -80,6 +80,7 @@ class FlightController extends Controller
/**
* Save any custom fields found
*
* @param Flight $flight
* @param Request $request
*/
@@ -93,8 +94,8 @@ class FlightController extends Controller
}
$custom_fields[] = [
'name' => $field->name,
'value' => $request->input($field->slug)
'name' => $field->name,
'value' => $request->input($field->slug),
];
}
@@ -104,6 +105,7 @@ class FlightController extends Controller
/**
* @param $flight
*
* @return array
*/
protected function getAvailSubfleets($flight)
@@ -123,8 +125,10 @@ class FlightController 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)
{
@@ -142,6 +146,7 @@ class FlightController extends Controller
/**
* Show the form for creating a new Flight.
*
* @return Response
*/
public function create()
@@ -159,8 +164,10 @@ class FlightController extends Controller
/**
* @param CreateFlightRequest $request
* @return \Illuminate\Http\RedirectResponse|\Illuminate\Routing\Redirector
*
* @throws \Prettus\Validator\Exceptions\ValidatorException
*
* @return \Illuminate\Http\RedirectResponse|\Illuminate\Routing\Redirector
*/
public function store(CreateFlightRequest $request)
{
@@ -190,6 +197,7 @@ class FlightController extends Controller
/**
* @param $id
*
* @return mixed
*/
public function show($id)
@@ -212,6 +220,7 @@ class FlightController extends Controller
/**
* @param $id
*
* @return mixed
*/
public function edit($id)
@@ -244,8 +253,10 @@ class FlightController extends Controller
/**
* @param $id
* @param UpdateFlightRequest $request
* @return \Illuminate\Http\RedirectResponse|\Illuminate\Routing\Redirector
*
* @throws \Prettus\Validator\Exceptions\ValidatorException
*
* @return \Illuminate\Http\RedirectResponse|\Illuminate\Routing\Redirector
*/
public function update($id, UpdateFlightRequest $request)
{
@@ -258,11 +269,11 @@ class FlightController extends Controller
$input = $request->all();
# apply the updates here temporarily, don't save
# the repo->update() call will actually do it
// apply the updates here temporarily, don't save
// the repo->update() call will actually do it
$flight->fill($input);
if($this->flightSvc->isFlightDuplicate($flight)) {
if ($this->flightSvc->isFlightDuplicate($flight)) {
Flash::error('Duplicate flight with same number/code/leg found, please change to proceed');
return redirect()->back()->withInput($request->all());
}
@@ -285,8 +296,10 @@ class FlightController extends Controller
/**
* @param $id
* @return \Illuminate\Http\RedirectResponse|\Illuminate\Routing\Redirector
*
* @throws \Exception
*
* @return \Illuminate\Http\RedirectResponse|\Illuminate\Routing\Redirector
*/
public function destroy($id)
{
@@ -305,9 +318,12 @@ class FlightController extends Controller
/**
* Run the flight exporter
*
* @param Request $request
* @return \Symfony\Component\HttpFoundation\BinaryFileResponse
*
* @throws \League\Csv\Exception
*
* @return \Symfony\Component\HttpFoundation\BinaryFileResponse
*/
public function export(Request $request)
{
@@ -323,16 +339,17 @@ class FlightController extends Controller
}
/**
*
* @param Request $request
* @return \Illuminate\Contracts\View\Factory|\Illuminate\View\View
*
* @throws \Illuminate\Validation\ValidationException
*
* @return \Illuminate\Contracts\View\Factory|\Illuminate\View\View
*/
public function import(Request $request)
{
$logs = [
'success' => [],
'errors' => [],
'errors' => [],
];
if ($request->isMethod('post')) {
@@ -352,6 +369,7 @@ class FlightController extends Controller
/**
* @param $flight
*
* @return mixed
*/
protected function return_fields_view($flight)
@@ -366,6 +384,7 @@ class FlightController extends Controller
/**
* @param $flight_id
* @param Request $request
*
* @return mixed
*/
public function field_values($flight_id, Request $request)
@@ -388,11 +407,11 @@ class FlightController extends Controller
} elseif ($request->isMethod('put')) {
Log::info('Updating flight field, flight: '.$flight_id, $request->input());
$field = FlightFieldValue::where([
'name' => $request->input('name'),
'name' => $request->input('name'),
'flight_id' => $flight_id,
])->first();
if(!$field) {
if (!$field) {
Log::info('Field not found, creating new');
$field = new FlightFieldValue();
$field->name = $request->input('name');
@@ -401,11 +420,11 @@ class FlightController extends Controller
$field->flight_id = $flight_id;
$field->value = $request->input('value');
$field->save();
// update the field value
// update the field value
} // remove custom field from flight
elseif ($request->isMethod('delete')) {
Log::info('Deleting flight field, flight: '.$flight_id, $request->input());
if($flight_id && $request->input('field_id')) {
if ($flight_id && $request->input('field_id')) {
FlightFieldValue::destroy($request->input('field_id'));
}
}
@@ -415,6 +434,7 @@ class FlightController extends Controller
/**
* @param $flight
*
* @return \Illuminate\Contracts\View\Factory|\Illuminate\View\View
*/
protected function return_subfleet_view($flight)
@@ -430,6 +450,7 @@ class FlightController extends Controller
/**
* @param $id
* @param Request $request
*
* @return mixed
*/
public function subfleets($id, Request $request)
@@ -444,7 +465,7 @@ class FlightController extends Controller
// add aircraft to flight
$subfleet = $this->subfleetRepo->findWithoutFail($request->subfleet_id);
if(!$subfleet) {
if (!$subfleet) {
return $this->return_subfleet_view($flight);
}
@@ -460,6 +481,8 @@ class FlightController extends Controller
/**
* Get all the fares that haven't been assigned to a given subfleet
*
* @param mixed $flight
*/
protected function getAvailFares($flight)
{
@@ -475,6 +498,7 @@ class FlightController extends Controller
/**
* @param Flight $flight
*
* @return \Illuminate\Contracts\View\Factory|\Illuminate\View\View
*/
protected function return_fares_view(Flight $flight)
@@ -489,6 +513,7 @@ class FlightController extends Controller
/**
* @param Request $request
*
* @return \Illuminate\Contracts\View\Factory|\Illuminate\View\View
*/
public function fares(Request $request)
@@ -515,7 +540,7 @@ class FlightController extends Controller
'value' => 'nullable', // regex:/([\d%]*)/
]);
/**
/*
* update specific fare data
*/
if ($request->isMethod('post')) {

30
app/Http/Controllers/Admin/FlightFieldController.php
View File

@@ -11,7 +11,6 @@ use Response;
/**
* Class FlightFieldController
* @package App\Http\Controllers\Admin
*/
class FlightFieldController extends Controller
{
@@ -19,6 +18,7 @@ class FlightFieldController extends Controller
/**
* FlightFieldController constructor.
*
* @param FlightFieldRepository $flightFieldRepository
*/
public function __construct(
@@ -29,9 +29,12 @@ class FlightFieldController extends Controller
/**
* Display a listing of the FlightField.
*
* @param Request $request
* @return Response
*
* @throws \Prettus\Repository\Exceptions\RepositoryException
*
* @return Response
*/
public function index(Request $request)
{
@@ -45,6 +48,7 @@ class FlightFieldController extends Controller
/**
* Show the form for creating a new FlightField.
*
* @return Response
*/
public function create()
@@ -54,9 +58,12 @@ class FlightFieldController extends Controller
/**
* Store a newly created FlightField in storage.
*
* @param Request $request
* @return Response
*
* @throws \Prettus\Validator\Exceptions\ValidatorException
*
* @return Response
*/
public function store(Request $request)
{
@@ -71,7 +78,9 @@ class FlightFieldController extends Controller
/**
* Display the specified FlightField.
* @param int $id
*
* @param int $id
*
* @return Response
*/
public function show($id)
@@ -90,7 +99,9 @@ class FlightFieldController extends Controller
/**
* Show the form for editing the specified FlightField.
* @param int $id
*
* @param int $id
*
* @return Response
*/
public function edit($id)
@@ -109,10 +120,13 @@ class FlightFieldController extends Controller
/**
* Update the specified FlightField in storage.
*
* @param $id
* @param Request $request
* @return \Illuminate\Http\RedirectResponse|\Illuminate\Routing\Redirector
*
* @throws \Prettus\Validator\Exceptions\ValidatorException
*
* @return \Illuminate\Http\RedirectResponse|\Illuminate\Routing\Redirector
*/
public function update($id, Request $request)
{
@@ -133,7 +147,9 @@ class FlightFieldController extends Controller
/**
* Remove the specified FlightField from storage.
* @param int $id
*
* @param int $id
*
* @return Response
*/
public function destroy($id)

83
app/Http/Controllers/Admin/PirepController.php
View File

@@ -8,7 +8,6 @@ use App\Http\Requests\UpdatePirepRequest;
use App\Interfaces\Controller;
use App\Models\Enums\PirepSource;
use App\Models\Enums\PirepState;
use App\Models\Enums\PirepStatus;
use App\Models\Pirep;
use App\Models\PirepComment;
use App\Repositories\AircraftRepository;
@@ -31,23 +30,23 @@ use Response;
/**
* Class PirepController
* @package App\Http\Controllers\Admin
*/
class PirepController extends Controller
{
private $airportRepo,
$airlineRepo,
$aircraftRepo,
$fareSvc,
$journalRepo,
$pirepSvc,
$pirepRepo,
$pirepFieldRepo,
$subfleetRepo,
$userSvc;
private $airportRepo;
private $airlineRepo;
private $aircraftRepo;
private $fareSvc;
private $journalRepo;
private $pirepSvc;
private $pirepRepo;
private $pirepFieldRepo;
private $subfleetRepo;
private $userSvc;
/**
* PirepController constructor.
*
* @param AirportRepository $airportRepo
* @param AirlineRepository $airlineRepo
* @param AircraftRepository $aircraftRepo
@@ -85,7 +84,9 @@ class PirepController extends Controller
/**
* Dropdown with aircraft grouped by subfleet
*
* @param null $user
*
* @return array
*/
public function aircraftList($user = null)
@@ -112,6 +113,7 @@ class PirepController extends Controller
/**
* Save any custom fields found
*
* @param Pirep $pirep
* @param Request $request
*/
@@ -127,7 +129,7 @@ class PirepController extends Controller
$custom_fields[] = [
'name' => $field->name,
'value' => $request->input($field->slug),
'source' => PirepSource::MANUAL
'source' => PirepSource::MANUAL,
];
}
@@ -137,8 +139,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,7 +167,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)
@@ -182,8 +188,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)
{
@@ -194,19 +202,21 @@ class PirepController extends Controller
->whereNotInOrder('state', [
PirepState::CANCELLED,
PirepState::DRAFT,
PirepState::IN_PROGRESS
PirepState::IN_PROGRESS,
], 'created_at', 'desc')
->paginate();
return view('admin.pireps.index', [
'pireps' => $pireps
'pireps' => $pireps,
]);
}
/**
* @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 pending(Request $request)
{
@@ -219,12 +229,13 @@ class PirepController extends Controller
->paginate();
return view('admin.pireps.index', [
'pireps' => $pireps
'pireps' => $pireps,
]);
}
/**
* Show the form for creating a new Pirep.
*
* @return Response
*/
public function create()
@@ -238,9 +249,11 @@ class PirepController extends Controller
/**
* @param CreatePirepRequest $request
* @return \Illuminate\Http\RedirectResponse|\Illuminate\Routing\Redirector
*
* @throws \Prettus\Validator\Exceptions\ValidatorException
* @throws \Exception
*
* @return \Illuminate\Http\RedirectResponse|\Illuminate\Routing\Redirector
*/
public function store(CreatePirepRequest $request)
{
@@ -261,7 +274,9 @@ class PirepController extends Controller
/**
* Display the specified Pirep.
* @param int $id
*
* @param int $id
*
* @return Response
*/
public function show($id)
@@ -280,9 +295,12 @@ class PirepController extends Controller
/**
* Show the form for editing the specified Pirep.
* @param int $id
* @return Response
*
* @param int $id
*
* @throws \InvalidArgumentException
*
* @return Response
*/
public function edit($id)
{
@@ -296,13 +314,13 @@ class PirepController extends Controller
$pirep->hours = $time->hours;
$pirep->minutes = $time->minutes;
# set the custom fields
// set the custom fields
foreach ($pirep->fields as $field) {
$field_name = 'field_'.$field->slug;
$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;
@@ -323,9 +341,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)
{
@@ -341,7 +361,7 @@ class PirepController extends Controller
$attrs = $request->all();
# Fix the time
// Fix the time
$attrs['flight_time'] = Time::init(
$attrs['minutes'],
$attrs['hours'])->getMinutes();
@@ -362,7 +382,9 @@ class PirepController extends Controller
/**
* Remove the specified Pirep from storage.
* @param int $id
*
* @param int $id
*
* @return Response
*/
public function destroy($id)
@@ -382,7 +404,9 @@ class PirepController extends Controller
/**
* Change or update the PIREP status. Just return the new actionbar
*
* @param Request $request
*
* @return \Illuminate\View\View
*/
public function status(Request $request)
@@ -402,10 +426,13 @@ class PirepController extends Controller
/**
* Add a comment to the Pirep
*
* @param $id
* @param Request $request
* @return mixed
*
* @throws \Exception
*
* @return mixed
*/
public function comments($id, Request $request)
{

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

@@ -13,7 +13,6 @@ use Response;
/**
* Class PirepFieldController
* @package App\Http\Controllers\Admin
*/
class PirepFieldController extends Controller
{
@@ -21,6 +20,7 @@ class PirepFieldController extends Controller
/**
* PirepFieldController constructor.
*
* @param PirepFieldRepository $pirepFieldRepo
*/
public function __construct(
@@ -31,9 +31,12 @@ class PirepFieldController extends Controller
/**
* Display a listing of the PirepField.
*
* @param Request $request
* @return Response
*
* @throws \Prettus\Repository\Exceptions\RepositoryException
*
* @return Response
*/
public function index(Request $request)
{
@@ -47,6 +50,7 @@ class PirepFieldController extends Controller
/**
* Show the form for creating a new PirepField.
*
* @return Response
*/
public function create()
@@ -56,9 +60,12 @@ class PirepFieldController extends Controller
/**
* Store a newly created PirepField in storage.
*
* @param CreatePirepFieldRequest $request
* @return Response
*
* @throws \Prettus\Validator\Exceptions\ValidatorException
*
* @return Response
*/
public function store(CreatePirepFieldRequest $request)
{
@@ -75,7 +82,9 @@ class PirepFieldController extends Controller
/**
* Display the specified PirepField.
* @param int $id
*
* @param int $id
*
* @return Response
*/
public function show($id)
@@ -95,7 +104,9 @@ class PirepFieldController extends Controller
/**
* Show the form for editing the specified PirepField.
* @param int $id
*
* @param int $id
*
* @return Response
*/
public function edit($id)
@@ -115,6 +126,9 @@ class PirepFieldController extends Controller
/**
* Update the specified PirepField in storage.
*
* @param mixed $id
*
* @throws \Prettus\Validator\Exceptions\ValidatorException
*/
public function update($id, UpdatePirepFieldRequest $request)
@@ -139,7 +153,9 @@ class PirepFieldController extends Controller
/**
* Remove the specified PirepField from storage.
* @param int $id
*
* @param int $id
*
* @return Response
*/
public function destroy($id)

44
app/Http/Controllers/Admin/RankController.php
View File

@@ -16,16 +16,16 @@ use Response;
/**
* Class RankController
* @package App\Http\Controllers\Admin
*/
class RankController extends Controller
{
private $fleetSvc,
$rankRepository,
$subfleetRepo;
private $fleetSvc;
private $rankRepository;
private $subfleetRepo;
/**
* RankController constructor.
*
* @param FleetService $fleetSvc
* @param RankRepository $rankingRepo
* @param SubfleetRepository $subfleetRepo
@@ -42,7 +42,9 @@ class RankController extends Controller
/**
* Get the available subfleets for a rank
*
* @param $rank
*
* @return array
*/
protected function getAvailSubfleets($rank)
@@ -60,9 +62,12 @@ class RankController extends Controller
/**
* Display a listing of the Ranking.
*
* @param Request $request
* @return Response
*
* @throws \Prettus\Repository\Exceptions\RepositoryException
*
* @return Response
*/
public function index(Request $request)
{
@@ -86,9 +91,12 @@ class RankController extends Controller
/**
* Store a newly created Ranking in storage.
*
* @param CreateRankRequest $request
* @return Response
*
* @throws \Prettus\Validator\Exceptions\ValidatorException
*
* @return Response
*/
public function store(CreateRankRequest $request)
{
@@ -104,7 +112,9 @@ class RankController extends Controller
/**
* Display the specified Ranking.
* @param int $id
*
* @param int $id
*
* @return Response
*/
public function show($id)
@@ -118,13 +128,15 @@ class RankController extends Controller
}
return view('admin.ranks.show', [
'rank' => $rank
'rank' => $rank,
]);
}
/**
* Show the form for editing the specified Ranking.
* @param int $id
*
* @param int $id
*
* @return Response
*/
public function edit($id)
@@ -147,10 +159,13 @@ class RankController extends Controller
/**
* Update the specified Ranking in storage.
* @param int $id
*
* @param int $id
* @param UpdateRankRequest $request
* @return Response
*
* @throws \Prettus\Validator\Exceptions\ValidatorException
*
* @return Response
*/
public function update($id, UpdateRankRequest $request)
{
@@ -172,7 +187,9 @@ class RankController extends Controller
/**
* Remove the specified Ranking from storage.
* @param int $id
*
* @param int $id
*
* @return Response
*/
public function destroy($id)
@@ -194,6 +211,7 @@ class RankController extends Controller
/**
* @param $rank
*
* @return \Illuminate\Contracts\View\Factory|\Illuminate\View\View
*/
protected function return_subfleet_view($rank)
@@ -208,8 +226,10 @@ class RankController extends Controller
/**
* Subfleet operations on a rank
*
* @param $id
* @param Request $request
*
* @return mixed
*/
public function subfleets($id, Request $request)

3
app/Http/Controllers/Admin/SettingsController.php
View File

@@ -9,7 +9,6 @@ use Log;
/**
* Class SettingsController
* @package App\Http\Controllers\Admin
*/
class SettingsController extends Controller
{
@@ -28,7 +27,9 @@ class SettingsController extends Controller
/**
* Update the specified setting in storage.
*
* @param Request $request
*
* @return \Illuminate\Http\RedirectResponse|\Illuminate\Routing\Redirector
*/
public function update(Request $request)

79
app/Http/Controllers/Admin/SubfleetController.php
View File

@@ -27,20 +27,20 @@ use Storage;
/**
* Class SubfleetController
* @package App\Http\Controllers\Admin
*/
class SubfleetController extends Controller
{
private $aircraftRepo,
$fareRepo,
$fareSvc,
$fleetSvc,
$importSvc,
$rankRepo,
$subfleetRepo;
private $aircraftRepo;
private $fareRepo;
private $fareSvc;
private $fleetSvc;
private $importSvc;
private $rankRepo;
private $subfleetRepo;
/**
* SubfleetController constructor.
*
* @param AircraftRepository $aircraftRepo
* @param FleetService $fleetSvc
* @param FareRepository $fareRepo
@@ -69,7 +69,9 @@ class SubfleetController extends Controller
/**
* Get the ranks that are available to the subfleet
*
* @param $subfleet
*
* @return array
*/
protected function getAvailRanks($subfleet)
@@ -86,6 +88,8 @@ class SubfleetController extends Controller
/**
* Get all the fares that haven't been assigned to a given subfleet
*
* @param mixed $subfleet
*/
protected function getAvailFares($subfleet)
{
@@ -104,9 +108,12 @@ class SubfleetController extends Controller
/**
* Display a listing of the Subfleet.
*
* @param Request $request
* @return Response
*
* @throws \Prettus\Repository\Exceptions\RepositoryException
*
* @return Response
*/
public function index(Request $request)
{
@@ -120,6 +127,7 @@ class SubfleetController extends Controller
/**
* Show the form for creating a new Subfleet.
*
* @return Response
*/
public function create()
@@ -132,9 +140,12 @@ class SubfleetController extends Controller
/**
* Store a newly created Subfleet in storage.
*
* @param CreateSubfleetRequest $request
* @return Response
*
* @throws \Prettus\Validator\Exceptions\ValidatorException
*
* @return Response
*/
public function store(CreateSubfleetRequest $request)
{
@@ -147,7 +158,9 @@ class SubfleetController extends Controller
/**
* Display the specified Subfleet.
* @param int $id
*
* @param int $id
*
* @return Response
*/
public function show($id)
@@ -168,7 +181,9 @@ class SubfleetController extends Controller
/**
* Show the form for editing the specified Subfleet.
* @param int $id
*
* @param int $id
*
* @return Response
*/
public function edit($id)
@@ -194,10 +209,13 @@ class SubfleetController extends Controller
/**
* Update the specified Subfleet in storage.
* @param int $id
*
* @param int $id
* @param UpdateSubfleetRequest $request
* @return Response
*
* @throws \Prettus\Validator\Exceptions\ValidatorException
*
* @return Response
*/
public function update($id, UpdateSubfleetRequest $request)
{
@@ -216,7 +234,9 @@ class SubfleetController extends Controller
/**
* Remove the specified Subfleet from storage.
* @param int $id
*
* @param int $id
*
* @return Response
*/
public function destroy($id)
@@ -228,8 +248,8 @@ class SubfleetController extends Controller
return redirect(route('admin.subfleets.index'));
}
# Make sure no aircraft are assigned to this subfleet
# before trying to delete it, or else things might go boom
// Make sure no aircraft are assigned to this subfleet
// before trying to delete it, or else things might go boom
$aircraft = $this->aircraftRepo->findWhere(['subfleet_id' => $id], ['id']);
if ($aircraft->count() > 0) {
Flash::error('There are aircraft still assigned to this subfleet, you can\'t delete it!')->important();
@@ -244,7 +264,9 @@ class SubfleetController extends Controller
/**
* Run the subfleet exporter
*
* @param Request $request
*
* @return \Symfony\Component\HttpFoundation\BinaryFileResponse
*/
public function export(Request $request)
@@ -261,10 +283,11 @@ class SubfleetController extends Controller
}
/**
*
* @param Request $request
* @return \Illuminate\Contracts\View\Factory|\Illuminate\View\View
*
* @throws \Illuminate\Validation\ValidationException
*
* @return \Illuminate\Contracts\View\Factory|\Illuminate\View\View
*/
public function import(Request $request)
{
@@ -292,6 +315,7 @@ class SubfleetController extends Controller
/**
* @param Subfleet $subfleet
*
* @return \Illuminate\Contracts\View\Factory|\Illuminate\View\View
*/
protected function return_ranks_view(?Subfleet $subfleet)
@@ -307,6 +331,7 @@ class SubfleetController extends Controller
/**
* @param Subfleet $subfleet
*
* @return \Illuminate\Contracts\View\Factory|\Illuminate\View\View
*/
protected function return_fares_view(?Subfleet $subfleet)
@@ -322,8 +347,10 @@ class SubfleetController extends Controller
/**
* Operations for associating ranks to the subfleet
*
* @param $id
* @param Request $request
*
* @return \Illuminate\Contracts\View\Factory|\Illuminate\View\View
*/
public function ranks($id, Request $request)
@@ -337,7 +364,7 @@ class SubfleetController extends Controller
return $this->return_ranks_view($subfleet);
}
/**
/*
* update specific rank data
*/
if ($request->isMethod('post')) {
@@ -362,6 +389,7 @@ class SubfleetController extends Controller
/**
* @param Subfleet $subfleet
*
* @return \Illuminate\Contracts\View\Factory|\Illuminate\View\View
*/
protected function return_expenses_view(?Subfleet $subfleet)
@@ -374,10 +402,13 @@ class SubfleetController extends Controller
/**
* Operations for associating ranks to the subfleet
*
* @param $id
* @param Request $request
* @return \Illuminate\Contracts\View\Factory|\Illuminate\View\View
*
* @throws \Exception
*
* @return \Illuminate\Contracts\View\Factory|\Illuminate\View\View
*/
public function expenses($id, Request $request)
{
@@ -390,7 +421,7 @@ class SubfleetController extends Controller
return $this->return_expenses_view($subfleet);
}
/**
/*
* update specific rank data
*/
if ($request->isMethod('post')) {
@@ -413,8 +444,10 @@ class SubfleetController extends Controller
/**
* Operations on fares to the subfleet
*
* @param $id
* @param Request $request
*
* @return \Illuminate\Contracts\View\Factory|\Illuminate\View\View
*/
public function fares($id, Request $request)
@@ -428,7 +461,7 @@ class SubfleetController extends Controller
return $this->return_fares_view($subfleet);
}
/**
/*
* update specific fare data
*/
if ($request->isMethod('post')) {

45
app/Http/Controllers/Admin/UserController.php
View File

@@ -25,18 +25,18 @@ use Response;
/**
* Class UserController
* @package App\Http\Controllers\Admin
*/
class UserController extends Controller
{
private $airlineRepo,
$airportRepo,
$pirepRepo,
$userRepo,
$userSvc;
private $airlineRepo;
private $airportRepo;
private $pirepRepo;
private $userRepo;
private $userSvc;
/**
* UserController constructor.
*
* @param AirlineRepository $airlineRepo
* @param AirportRepository $airportRepo
* @param PirepRepository $pirepRepo
@@ -59,6 +59,7 @@ class UserController extends Controller
/**
* @param Request $request
*
* @return mixed
*/
public function index(Request $request)
@@ -78,6 +79,7 @@ class UserController extends Controller
/**
* Show the form for creating a new User.
*
* @return Response
*/
public function create()
@@ -99,9 +101,12 @@ class UserController extends Controller
/**
* Store a newly created User in storage.
*
* @param CreateUserRequest $request
* @return Response
*
* @throws \Prettus\Validator\Exceptions\ValidatorException
*
* @return Response
*/
public function store(CreateUserRequest $request)
{
@@ -114,7 +119,9 @@ class UserController extends Controller
/**
* Display the specified User.
* @param int $id
*
* @param int $id
*
* @return Response
*/
public function show($id)
@@ -148,7 +155,9 @@ class UserController extends Controller
/**
* Show the form for editing the specified User.
* @param int $id
*
* @param int $id
*
* @return Response
*/
public function edit($id)
@@ -165,7 +174,7 @@ class UserController extends Controller
->whereOrder(['user_id' => $id], 'created_at', 'desc')
->paginate();
$countries = collect((new \League\ISO3166\ISO3166)->all())
$countries = collect((new \League\ISO3166\ISO3166())->all())
->mapWithKeys(function ($item, $key) {
return [strtolower($item['alpha2']) => $item['name']];
});
@@ -187,10 +196,13 @@ class UserController extends Controller
/**
* Update the specified User in storage.
*
* @param int $id
* @param UpdateUserRequest $request
* @return Response
*
* @throws \Prettus\Validator\Exceptions\ValidatorException
*
* @return Response
*/
public function update($id, UpdateUserRequest $request)
{
@@ -211,7 +223,7 @@ class UserController extends Controller
if ($request->filled('avatar_upload')) {
/**
* @var $file \Illuminate\Http\UploadedFile
* @var $file \Illuminate\Http\UploadedFile
*/
$file = $request->file('avatar_upload');
$file_path = $file->storeAs(
@@ -223,7 +235,6 @@ class UserController extends Controller
$user->avatar = $file_path;
}
$original_user_state = $user->state;
$user = $this->userRepo->update($req_data, $id);
@@ -232,7 +243,7 @@ class UserController extends Controller
$this->userSvc->changeUserState($user, $original_user_state);
}
# Delete all of the roles and then re-attach the valid ones
// Delete all of the roles and then re-attach the valid ones
DB::table('role_user')->where('user_id', $id)->delete();
foreach ($request->input('roles') as $key => $value) {
$user->attachRole($value);
@@ -245,7 +256,9 @@ class UserController extends Controller
/**
* Remove the specified User from storage.
* @param int $id
*
* @param int $id
*
* @return Response
*/
public function destroy($id)
@@ -267,8 +280,10 @@ class UserController extends Controller
/**
* Regenerate the user's API key
*
* @param $id
* @param Request $request
*
* @return \Illuminate\Http\RedirectResponse|\Illuminate\Routing\Redirector
*/
public function regen_apikey($id, Request $request)

51
app/Http/Controllers/Api/AcarsController.php
View File

@@ -23,17 +23,17 @@ use Log;
/**
* Class AcarsController
* @package App\Http\Controllers\Api
*/
class AcarsController extends Controller
{
private $acarsRepo,
$geoSvc,
$pirepRepo,
$pirepSvc;
private $acarsRepo;
private $geoSvc;
private $pirepRepo;
private $pirepSvc;
/**
* AcarsController constructor.
*
* @param AcarsRepository $acarsRepo
* @param GeoService $geoSvc
* @param PirepRepository $pirepRepo
@@ -53,7 +53,9 @@ class AcarsController extends Controller
/**
* Check if a PIREP is cancelled
*
* @param $pirep
*
* @throws \App\Exceptions\PirepCancelled
*/
protected function checkCancelled(Pirep $pirep)
@@ -65,7 +67,9 @@ class AcarsController extends Controller
/**
* Return all of the flights (as points) in GeoJSON format
*
* @param Request $request
*
* @return mixed
*/
public function index(Request $request)
@@ -74,14 +78,16 @@ class AcarsController extends Controller
$positions = $this->geoSvc->getFeatureForLiveFlights($pireps);
return response(json_encode($positions), 200, [
'Content-type' => 'application/json'
'Content-type' => 'application/json',
]);
}
/**
* Return the GeoJSON for the ACARS line
*
* @param $pirep_id
* @param Request $request
*
* @return \Illuminate\Contracts\Routing\ResponseFactory
*/
public function acars_geojson($pirep_id, Request $request)
@@ -96,8 +102,10 @@ class AcarsController extends Controller
/**
* Return the routes for the ACARS line
*
* @param $id
* @param Request $request
*
* @return AcarsRouteResource
*/
public function acars_get($id, Request $request)
@@ -106,21 +114,24 @@ class AcarsController extends Controller
return new AcarsRouteResource(Acars::where([
'pirep_id' => $id,
'type' => AcarsType::FLIGHT_PATH
'type' => AcarsType::FLIGHT_PATH,
])->orderBy('sim_time', 'asc')->get());
}
/**
* Post ACARS updates for a PIREP
*
* @param $id
* @param PositionRequest $request
* @return \Illuminate\Http\JsonResponse
*
* @throws \App\Exceptions\PirepCancelled
* @throws \Symfony\Component\HttpKernel\Exception\BadRequestHttpException
*
* @return \Illuminate\Http\JsonResponse
*/
public function acars_store($id, PositionRequest $request)
{
# Check if the status is cancelled...
// Check if the status is cancelled...
$pirep = Pirep::find($id);
$this->checkCancelled($pirep);
@@ -146,10 +157,10 @@ class AcarsController extends Controller
$update = Acars::create($position);
$update->save();
++$count;
$count++;
}
# Change the PIREP status if it's as SCHEDULED before
// Change the PIREP status if it's as SCHEDULED before
if ($pirep->status === PirepStatus::INITIATED) {
$pirep->status = PirepStatus::AIRBORNE;
}
@@ -162,15 +173,18 @@ class AcarsController extends Controller
/**
* Post ACARS LOG update for a PIREP. These updates won't show up on the map
* But rather in a log file.
*
* @param $id
* @param LogRequest $request
* @return \Illuminate\Http\JsonResponse
*
* @throws \App\Exceptions\PirepCancelled
* @throws \Symfony\Component\HttpKernel\Exception\BadRequestHttpException
*
* @return \Illuminate\Http\JsonResponse
*/
public function acars_logs($id, LogRequest $request)
{
# Check if the status is cancelled...
// Check if the status is cancelled...
$pirep = Pirep::find($id);
$this->checkCancelled($pirep);
@@ -192,7 +206,7 @@ class AcarsController extends Controller
$acars = Acars::create($log);
$acars->save();
++$count;
$count++;
}
return $this->message($count.' logs added', $count);
@@ -201,15 +215,18 @@ class AcarsController extends Controller
/**
* Post ACARS LOG update for a PIREP. These updates won't show up on the map
* But rather in a log file.
*
* @param $id
* @param EventRequest $request
* @return \Illuminate\Http\JsonResponse
*
* @throws \App\Exceptions\PirepCancelled
* @throws \Symfony\Component\HttpKernel\Exception\BadRequestHttpException
*
* @return \Illuminate\Http\JsonResponse
*/
public function acars_events($id, EventRequest $request)
{
# Check if the status is cancelled...
// Check if the status is cancelled...
$pirep = Pirep::find($id);
$this->checkCancelled($pirep);
@@ -232,7 +249,7 @@ class AcarsController extends Controller
$acars = Acars::create($log);
$acars->save();
++$count;
$count++;
}
return $this->message($count.' logs added', $count);

8
app/Http/Controllers/Api/AirlineController.php
View File

@@ -9,7 +9,6 @@ use Illuminate\Http\Request;
/**
* Class AirlineController
* @package App\Http\Controllers\Api
*/
class AirlineController extends Controller
{
@@ -17,6 +16,7 @@ class AirlineController extends Controller
/**
* AirlineController constructor.
*
* @param AirlineRepository $airlineRepo
*/
public function __construct(
@@ -27,12 +27,14 @@ class AirlineController extends Controller
/**
* Return all the airlines, paginated
*
* @param Request $request
*
* @return mixed
*/
public function index(Request $request)
{
#$this->airlineRepo->pushCriteria(new RequestCriteria($request));
//$this->airlineRepo->pushCriteria(new RequestCriteria($request));
$airports = $this->airlineRepo
->whereOrder(['active' => true], 'name', 'asc')
->paginate();
@@ -42,7 +44,9 @@ class AirlineController extends Controller
/**
* Do a lookup, via vaCentral, for the airport information
*
* @param $id
*
* @return AirlineResource
*/
public function get($id)

8
app/Http/Controllers/Api/AirportController.php
View File

@@ -12,7 +12,6 @@ use VaCentral\Airport as AirportLookup;
/**
* Class AirportController
* @package App\Http\Controllers\Api
*/
class AirportController extends Controller
{
@@ -20,6 +19,7 @@ class AirportController extends Controller
/**
* AirportController constructor.
*
* @param AirportRepository $airportRepo
*/
public function __construct(
@@ -30,7 +30,9 @@ class AirportController extends Controller
/**
* Return all the airports, paginated
*
* @param Request $request
*
* @return mixed
*/
public function index(Request $request)
@@ -65,7 +67,9 @@ class AirportController extends Controller
/**
* Do a lookup, via vaCentral, for the airport information
*
* @param $id
*
* @return AirportResource
*/
public function get($id)
@@ -77,7 +81,9 @@ class AirportController extends Controller
/**
* Do a lookup, via vaCentral, for the airport information
*
* @param $id
*
* @return AirportResource
*/
public function lookup($id)

8
app/Http/Controllers/Api/FleetController.php
View File

@@ -11,15 +11,15 @@ use Illuminate\Http\Request;
/**
* Class FleetController
* @package App\Http\Controllers\Api
*/
class FleetController extends Controller
{
private $aircraftRepo,
$subfleetRepo;
private $aircraftRepo;
private $subfleetRepo;
/**
* FleetController constructor.
*
* @param AircraftRepository $aircraftRepo
* @param SubfleetRepository $subfleetRepo
*/
@@ -47,8 +47,10 @@ class FleetController extends Controller
/**
* Get a specific aircraft. Query string required to specify the tail
* /api/aircraft/XYZ?type=registration
*
* @param $id
* @param Request $request
*
* @return AircraftResource
*/
public function get_aircraft($id, Request $request)

16
app/Http/Controllers/Api/FlightController.php
View File

@@ -15,15 +15,15 @@ use Prettus\Repository\Exceptions\RepositoryException;
/**
* Class FlightController
* @package App\Http\Controllers\Api
*/
class FlightController extends Controller
{
private $flightRepo,
$flightSvc;
private $flightRepo;
private $flightSvc;
/**
* FlightController constructor.
*
* @param FlightRepository $flightRepo
* @param FlightService $flightSvc
*/
@@ -37,7 +37,9 @@ class FlightController extends Controller
/**
* Return all the flights, paginated
*
* @param Request $request
*
* @return \Illuminate\Http\Resources\Json\AnonymousResourceCollection
*/
public function index(Request $request)
@@ -49,7 +51,7 @@ class FlightController extends Controller
'visible' => true,
];
if(setting('pilots.restrict_to_company')) {
if (setting('pilots.restrict_to_company')) {
$where['airline_id'] = Auth::user()->airline_id;
}
if (setting('pilots.only_flights_from_current', false)) {
@@ -69,6 +71,7 @@ class FlightController extends Controller
/**
* @param $id
*
* @return FlightResource
*/
public function get($id)
@@ -81,6 +84,7 @@ class FlightController extends Controller
/**
* @param Request $request
*
* @return mixed
*/
public function search(Request $request)
@@ -93,7 +97,7 @@ class FlightController extends Controller
'visible' => true,
];
if(setting('pilots.restrict_to_company')) {
if (setting('pilots.restrict_to_company')) {
$where['airline_id'] = Auth::user()->airline_id;
}
if (setting('pilots.only_flights_from_current')) {
@@ -117,8 +121,10 @@ class FlightController extends Controller
/**
* Get a flight's route
*
* @param $id
* @param Request $request
*
* @return \Illuminate\Http\Resources\Json\AnonymousResourceCollection
*/
public function route($id, Request $request)

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

@@ -7,24 +7,25 @@ use App\Interfaces\Controller;
use App\Repositories\NewsRepository;
use Illuminate\Http\Request;
/**
* @package App\Http\Controllers\Api
*/
class NewsController extends Controller
{
private $newsRepo;
/**
* AirlineController constructor.
*
* @param NewsRepository $newsRepo
*/
public function __construct(NewsRepository $newsRepo) {
public function __construct(NewsRepository $newsRepo)
{
$this->newsRepo = $newsRepo;
}
/**
* Return all the airlines, paginated
*
* @param Request $request
*
* @return mixed
*/
public function index(Request $request)

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

@@ -40,20 +40,20 @@ use Log;
/**
* Class PirepController
* @package App\Http\Controllers\Api
*/
class PirepController extends Controller
{
private $acarsRepo,
$fareSvc,
$financeSvc,
$journalRepo,
$pirepRepo,
$pirepSvc,
$userSvc;
private $acarsRepo;
private $fareSvc;
private $financeSvc;
private $journalRepo;
private $pirepRepo;
private $pirepSvc;
private $userSvc;
/**
* PirepController constructor.
*
* @param AcarsRepository $acarsRepo
* @param FareService $fareSvc
* @param PirepFinanceService $financeSvc
@@ -82,7 +82,9 @@ class PirepController extends Controller
/**
* Parse any PIREP added in
*
* @param Request $request
*
* @return array|null|string
*/
protected function parsePirep(Request $request)
@@ -98,7 +100,9 @@ class PirepController extends Controller
/**
* Check if a PIREP is cancelled
*
* @param $pirep
*
* @throws \App\Exceptions\PirepCancelled
*/
protected function checkCancelled(Pirep $pirep)
@@ -132,8 +136,10 @@ class PirepController extends Controller
/**
* Save the fares
*
* @param $pirep
* @param Request $request
*
* @throws \Exception
*/
protected function updateFares($pirep, Request $request)
@@ -155,14 +161,15 @@ class PirepController extends Controller
/**
* Get all the active PIREPs
*
* @return mixed
*/
public function index()
{
$active = [];
$pireps = $this->acarsRepo->getPositions();
foreach($pireps as $pirep) {
if(!$pirep->position) {
foreach ($pireps as $pirep) {
if (!$pirep->position) {
continue;
}
@@ -174,6 +181,7 @@ class PirepController extends Controller
/**
* @param $pirep_id
*
* @return PirepResource
*/
public function get($pirep_id)
@@ -187,12 +195,14 @@ class PirepController extends Controller
* status, and whatever other statuses may be defined
*
* @param PrefileRequest $request
* @return PirepResource
*
* @throws \App\Exceptions\AircraftNotAtAirport
* @throws \App\Exceptions\UserNotAtAirport
* @throws \App\Exceptions\PirepCancelled
* @throws \App\Exceptions\AircraftPermissionDenied
* @throws \Exception
*
* @return PirepResource
*/
public function prefile(PrefileRequest $request)
{
@@ -211,28 +221,25 @@ class PirepController extends Controller
$pirep = new Pirep($attrs);
# See if this user is at the current airport
// See if this user is at the current airport
if (setting('pilots.only_flights_from_current')
&& $user->curr_airport_id !== $pirep->dpt_airport_id)
{
&& $user->curr_airport_id !== $pirep->dpt_airport_id) {
throw new UserNotAtAirport();
}
# See if this user is allowed to fly this aircraft
// See if this user is allowed to fly this aircraft
if (setting('pireps.restrict_aircraft_to_rank', false)
&& !$this->userSvc->aircraftAllowed($user, $pirep->aircraft_id))
{
&& !$this->userSvc->aircraftAllowed($user, $pirep->aircraft_id)) {
throw new AircraftPermissionDenied();
}
# See if this aircraft is at the departure airport
// See if this aircraft is at the departure airport
if (setting('pireps.only_aircraft_at_dpt_airport')
&& $pirep->aircraft_id !== $pirep->dpt_airport_id)
{
&& $pirep->aircraft_id !== $pirep->dpt_airport_id) {
throw new AircraftNotAtAirport();
}
# Find if there's a duplicate, if so, let's work on that
// Find if there's a duplicate, if so, let's work on that
$dupe_pirep = $this->pirepSvc->findDuplicate($pirep);
if ($dupe_pirep !== false) {
$pirep = $dupe_pirep;
@@ -240,7 +247,7 @@ class PirepController extends Controller
}
// Default to a scheduled passenger flight
if(!array_key_exists('flight_type', $attrs)) {
if (!array_key_exists('flight_type', $attrs)) {
$attrs['flight_type'] = 'J';
}
@@ -262,11 +269,13 @@ class PirepController extends Controller
*
* @param $pirep_id
* @param UpdateRequest $request
* @return PirepResource
*
* @throws \App\Exceptions\PirepCancelled
* @throws \App\Exceptions\AircraftPermissionDenied
* @throws \Prettus\Validator\Exceptions\ValidatorException
* @throws \Exception
*
* @return PirepResource
*/
public function update($pirep_id, UpdateRequest $request)
{
@@ -280,7 +289,7 @@ class PirepController extends Controller
$attrs = $this->parsePirep($request);
$attrs['user_id'] = Auth::id();
# If aircraft is being changed, see if this user is allowed to fly this aircraft
// If aircraft is being changed, see if this user is allowed to fly this aircraft
if (array_key_exists('aircraft_id', $attrs)
&& setting('pireps.restrict_aircraft_to_rank', false)
) {
@@ -299,13 +308,16 @@ class PirepController extends Controller
/**
* File the PIREP
*
* @param $pirep_id
* @param FileRequest $request
* @return PirepResource
*
* @throws \App\Exceptions\PirepCancelled
* @throws \App\Exceptions\AircraftPermissionDenied
* @throws \Illuminate\Database\Eloquent\ModelNotFoundException
* @throws \Exception
*
* @return PirepResource
*/
public function file($pirep_id, FileRequest $request)
{
@@ -313,13 +325,13 @@ class PirepController extends Controller
$user = Auth::user();
# Check if the status is cancelled...
// Check if the status is cancelled...
$pirep = Pirep::find($pirep_id);
$this->checkCancelled($pirep);
$attrs = $this->parsePirep($request);
# If aircraft is being changed, see if this user is allowed to fly this aircraft
// If aircraft is being changed, see if this user is allowed to fly this aircraft
if (array_key_exists('aircraft_id', $attrs)
&& setting('pireps.restrict_aircraft_to_rank', false)
) {
@@ -343,9 +355,9 @@ class PirepController extends Controller
Log::error($e);
}
# See if there there is any route data posted
# If there isn't, then just write the route data from the
# route that's been posted from the PIREP
// See if there there is any route data posted
// If there isn't, then just write the route data from the
// route that's been posted from the PIREP
$w = ['pirep_id' => $pirep->id, 'type' => AcarsType::ROUTE];
$count = Acars::where($w)->count(['id']);
if ($count === 0) {
@@ -357,10 +369,13 @@ class PirepController extends Controller
/**
* Cancel the PIREP
*
* @param $pirep_id
* @param Request $request
* @return PirepResource
*
* @throws \Prettus\Validator\Exceptions\ValidatorException
*
* @return PirepResource
*/
public function cancel($pirep_id, Request $request)
{
@@ -376,7 +391,9 @@ class PirepController extends Controller
/**
* Add a new comment
* @param $id
*
* @param $id
*
* @return \Illuminate\Http\Resources\Json\AnonymousResourceCollection
*/
public function comments_get($id)
@@ -387,10 +404,13 @@ class PirepController extends Controller
/**
* Add a new comment
*
* @param $id
* @param CommentRequest $request
* @return PirepCommentResource
*
* @throws \App\Exceptions\PirepCancelled
*
* @return PirepCommentResource
*/
public function comments_post($id, CommentRequest $request)
{
@@ -399,7 +419,7 @@ class PirepController extends Controller
Log::debug('Posting comment, PIREP: '.$id, $request->post());
# Add it
// Add it
$comment = new PirepComment($request->post());
$comment->pirep_id = $id;
$comment->user_id = Auth::id();
@@ -410,7 +430,9 @@ class PirepController extends Controller
/**
* Get all of the fields for a PIREP
*
* @param $pirep_id
*
* @return PirepFieldCollection
*/
public function fields_get($pirep_id)
@@ -421,8 +443,10 @@ class PirepController extends Controller
/**
* Set any fields for a PIREP
*
* @param string $pirep_id
* @param FieldsRequest $request
*
* @return PirepFieldCollection
*/
public function fields_post($pirep_id, FieldsRequest $request)
@@ -436,10 +460,12 @@ class PirepController extends Controller
}
/**
* @param $id
* @return \Illuminate\Http\Resources\Json\AnonymousResourceCollection
* @param $id
*
* @throws \UnexpectedValueException
* @throws \InvalidArgumentException
*
* @return \Illuminate\Http\Resources\Json\AnonymousResourceCollection
*/
public function finances_get($id)
{
@@ -451,11 +477,13 @@ class PirepController extends Controller
/**
* @param $id
* @param Request $request
* @return \Illuminate\Http\Resources\Json\AnonymousResourceCollection
*
* @throws \UnexpectedValueException
* @throws \InvalidArgumentException
* @throws \Exception
* @throws \Prettus\Validator\Exceptions\ValidatorException
*
* @return \Illuminate\Http\Resources\Json\AnonymousResourceCollection
*/
public function finances_recalculate($id, Request $request)
{
@@ -471,6 +499,7 @@ class PirepController extends Controller
/**
* @param $id
* @param Request $request
*
* @return \Illuminate\Http\Resources\Json\AnonymousResourceCollection
*/
public function route_get($id, Request $request)
@@ -478,22 +507,25 @@ class PirepController extends Controller
$pirep = Pirep::find($id);
return AcarsRouteResource::collection(Acars::where([
'pirep_id' => $id,
'type' => AcarsType::ROUTE
'type' => AcarsType::ROUTE,
])->orderBy('order', 'asc')->get());
}
/**
* Post the ROUTE for a PIREP, can be done from the ACARS log
*
* @param $id
* @param RouteRequest $request
* @return \Illuminate\Http\JsonResponse
*
* @throws \App\Exceptions\PirepCancelled
* @throws \Symfony\Component\HttpKernel\Exception\BadRequestHttpException
* @throws \Exception
*
* @return \Illuminate\Http\JsonResponse
*/
public function route_post($id, RouteRequest $request)
{
# Check if the status is cancelled...
// Check if the status is cancelled...
$pirep = Pirep::find($id);
$this->checkCancelled($pirep);
@@ -502,7 +534,7 @@ class PirepController extends Controller
// Delete the route before posting a new one
Acars::where([
'pirep_id' => $id,
'type' => AcarsType::ROUTE
'type' => AcarsType::ROUTE,
])->delete();
$count = 0;
@@ -518,7 +550,7 @@ class PirepController extends Controller
$acars = Acars::create($position);
$acars->save();
++$count;
$count++;
}
return $this->message($count.' points added', $count);
@@ -527,8 +559,10 @@ class PirepController extends Controller
/**
* @param $id
* @param Request $request
* @return \Illuminate\Http\JsonResponse
*
* @throws \Exception
*
* @return \Illuminate\Http\JsonResponse
*/
public function route_delete($id, Request $request)
{
@@ -536,7 +570,7 @@ class PirepController extends Controller
Acars::where([
'pirep_id' => $id,
'type' => AcarsType::ROUTE
'type' => AcarsType::ROUTE,
])->delete();
return $this->message('Route deleted');

4
app/Http/Controllers/Api/SettingsController.php
View File

@@ -9,7 +9,6 @@ use Illuminate\Http\Request;
/**
* Class SettingsController
* @package App\Http\Controllers\Api
*/
class SettingsController extends Controller
{
@@ -17,6 +16,7 @@ class SettingsController extends Controller
/**
* SettingsController constructor.
*
* @param SettingRepository $settingRepo
*/
public function __construct(
@@ -27,7 +27,9 @@ class SettingsController extends Controller
/**
* Return all the airlines, paginated
*
* @param Request $request
*
* @return \Illuminate\Http\Resources\Json\AnonymousResourceCollection
*/
public function index(Request $request)

1
app/Http/Controllers/Api/StatusController.php
View File

@@ -7,7 +7,6 @@ use PragmaRX\Version\Package\Facade as Version;
/**
* Class StatusController
* @package App\Http\Controllers\Api
*/
class StatusController extends Controller
{

35
app/Http/Controllers/Api/UserController.php
View File

@@ -2,7 +2,6 @@
namespace App\Http\Controllers\Api;
use App\Exceptions\BidExists;
use App\Http\Resources\Bid as BidResource;
use App\Http\Resources\Pirep as PirepResource;
use App\Http\Resources\Subfleet as SubfleetResource;
@@ -24,19 +23,19 @@ use Prettus\Repository\Exceptions\RepositoryException;
/**
* Class UserController
* @package App\Http\Controllers\Api
*/
class UserController extends Controller
{
private $flightRepo,
$flightSvc,
$pirepRepo,
$subfleetRepo,
$userRepo,
$userSvc;
private $flightRepo;
private $flightSvc;
private $pirepRepo;
private $subfleetRepo;
private $userRepo;
private $userSvc;
/**
* UserController constructor.
*
* @param FlightRepository $flightRepo
* @param FlightService $flightSvc
* @param PirepRepository $pirepRepo
@@ -62,6 +61,7 @@ class UserController extends Controller
/**
* @param Request $request
*
* @return int|mixed
*/
protected function getUserId(Request $request)
@@ -75,7 +75,9 @@ class UserController extends Controller
/**
* Return the profile for the currently auth'd user
*
* @param Request $request
*
* @return UserResource
*/
public function index(Request $request)
@@ -85,7 +87,9 @@ class UserController extends Controller
/**
* Get the profile for the passed-in user
*
* @param $id
*
* @return UserResource
*/
public function get($id)
@@ -95,16 +99,19 @@ class UserController extends Controller
/**
* Return all of the bids for the passed-in user
*
* @param Request $request
* @return mixed
*
* @throws \Illuminate\Database\Eloquent\ModelNotFoundException
* @throws \App\Exceptions\BidExists
*
* @return mixed
*/
public function bids(Request $request)
{
$user = $this->userRepo->find($this->getUserId($request));
# Add a bid
// Add a bid
if ($request->isMethod('PUT') || $request->isMethod('POST')) {
$flight_id = $request->input('flight_id');
$flight = $this->flightRepo->find($flight_id);
@@ -125,7 +132,7 @@ class UserController extends Controller
$this->flightSvc->removeBid($flight, $user);
}
# Return the flights they currently have bids on
// Return the flights they currently have bids on
$bids = Bid::where(['user_id' => $user->id])->get();
return BidResource::collection($bids);
@@ -133,7 +140,9 @@ class UserController extends Controller
/**
* Return the fleet that this user is allowed to
*
* @param Request $request
*
* @return \Illuminate\Http\Resources\Json\AnonymousResourceCollection
*/
public function fleet(Request $request)
@@ -146,8 +155,10 @@ class UserController extends Controller
/**
* @param Request $request
* @return \Illuminate\Http\Resources\Json\AnonymousResourceCollection
*
* @throws RepositoryException
*
* @return \Illuminate\Http\Resources\Json\AnonymousResourceCollection
*/
public function pireps(Request $request)
{

1
app/Http/Controllers/Auth/ForgotPasswordController.php
View File

@@ -7,7 +7,6 @@ use Illuminate\Foundation\Auth\SendsPasswordResetEmails;
/**
* Class ForgotPasswordController
* @package App\Http\Controllers\Auth
*/
class ForgotPasswordController extends Controller
{

2
app/Http/Controllers/Auth/LoginController.php
View File

@@ -11,7 +11,6 @@ use Illuminate\Support\Facades\Log;
/**
* Class LoginController
* @package App\Http\Controllers\Auth
*/
class LoginController extends Controller
{
@@ -38,6 +37,7 @@ class LoginController extends Controller
/**
* @param Request $request
*
* @return \Illuminate\Contracts\View\Factory|\Illuminate\Http\RedirectResponse|\Illuminate\View\View
*/
protected function sendLoginResponse(Request $request)

25
app/Http/Controllers/Auth/RegisterController.php
View File

@@ -19,7 +19,6 @@ use Validator;
/**
* Class RegisterController
* @package App\Http\Controllers\Auth
*/
class RegisterController extends Controller
{
@@ -27,16 +26,18 @@ class RegisterController extends Controller
/**
* Where to redirect users after login / registration.
*
* @var string
*/
protected $redirectTo = '/';
private $airlineRepo,
$airportRepo,
$userService;
private $airlineRepo;
private $airportRepo;
private $userService;
/**
* RegisterController constructor.
*
* @param AirlineRepository $airlineRepo
* @param AirportRepository $airportRepo
* @param UserService $userService
@@ -72,7 +73,9 @@ class RegisterController extends Controller
/**
* Get a validator for an incoming registration request.
* @param array $data
*
* @param array $data
*
* @return \Illuminate\Contracts\Validation\Validator
*/
protected function validator(array $data)
@@ -94,10 +97,13 @@ class RegisterController extends Controller
/**
* Get a validator for an incoming registration request.
* @param array $data
* @return User
*
* @param array $data
*
* @throws \RuntimeException
* @throws \Exception
*
* @return User
*/
protected function create(array $data)
{
@@ -119,9 +125,12 @@ class RegisterController extends Controller
/**
* Handle a registration request for the application.
*
* @param Request $request
* @return mixed
*
* @throws \Exception
*
* @return mixed
*/
public function register(Request $request)
{

3
app/Http/Controllers/Auth/ResetPasswordController.php
View File

@@ -8,7 +8,6 @@ use Illuminate\Http\Request;
/**
* Class ResetPasswordController
* @package App\Http\Controllers\Auth
*/
class ResetPasswordController extends Controller
{
@@ -19,6 +18,7 @@ class ResetPasswordController extends Controller
/**
* @param Request $request
* @param null $token
*
* @return \Illuminate\Contracts\View\Factory|\Illuminate\View\View
*/
public function showResetForm(Request $request, $token = null)
@@ -30,6 +30,7 @@ class ResetPasswordController extends Controller
/**
* Create a new controller instance.
*
* @return void
*/
public function __construct()

7
app/Http/Controllers/Frontend/AcarsController.php
View File

@@ -9,15 +9,15 @@ use Illuminate\Http\Request;
/**
* Class AcarsController
* @package App\Http\Controllers\Frontend
*/
class AcarsController extends Controller
{
private $acarsRepo,
$geoSvc;
private $acarsRepo;
private $geoSvc;
/**
* AcarsController constructor.
*
* @param AcarsRepository $acarsRepo
* @param GeoService $geoSvc
*/
@@ -31,6 +31,7 @@ class AcarsController extends Controller
/**
* @param Request $request
*
* @return \Illuminate\Contracts\View\Factory|\Illuminate\View\View
*/
public function index(Request $request)

13
app/Http/Controllers/Frontend/AirportController.php
View File

@@ -3,21 +3,18 @@
namespace App\Http\Controllers\Frontend;
use App\Interfaces\Controller;
use App\Models\User;
use App\Repositories\AirportRepository;
use App\Repositories\FlightRepository;
use Flash;
use Illuminate\Database\QueryException;
use Request;
/**
* Class HomeController
* @package App\Http\Controllers\Frontend
*/
class AirportController extends Controller
{
private $airportRepo,
$flightRepo;
private $airportRepo;
private $flightRepo;
public function __construct(
AirportRepository $airportRepo,
@@ -29,6 +26,8 @@ class AirportController extends Controller
/**
* Show the airport
*
* @param mixed $id
*/
public function show($id, Request $request)
{
@@ -53,8 +52,8 @@ class AirportController extends Controller
])->all();
return view('airports.show', [
'airport' => $airport,
'inbound_flights' => $inbound_flights,
'airport' => $airport,
'inbound_flights' => $inbound_flights,
'outbound_flights' => $outbound_flights,
]);
}

2
app/Http/Controllers/Frontend/DashboardController.php
View File

@@ -8,7 +8,6 @@ use Illuminate\Support\Facades\Auth;
/**
* Class DashboardController
* @package App\Http\Controllers\Frontend
*/
class DashboardController extends Controller
{
@@ -16,6 +15,7 @@ class DashboardController extends Controller
/**
* DashboardController constructor.
*
* @param PirepRepository $pirepRepo
*/
public function __construct(PirepRepository $pirepRepo)

11
app/Http/Controllers/Frontend/DownloadController.php
View File

@@ -10,7 +10,6 @@ use Illuminate\Support\Facades\Storage;
/**
* Class DownloadController
* @package App\Http\Controllers\Frontend
*/
class DownloadController extends Controller
{
@@ -25,7 +24,7 @@ class DownloadController extends Controller
* Group all the files but compound the model with the ID,
* since we can have multiple files for every `ref_model`
*/
$grouped_files = $files->groupBy(function($item, $key) {
$grouped_files = $files->groupBy(function ($item, $key) {
return $item['ref_model'].'_'.$item['ref_model_id'];
});
@@ -35,7 +34,7 @@ class DownloadController extends Controller
* name of the group to the object instance "name"
*/
$regrouped_files = [];
foreach($grouped_files as $group => $files) {
foreach ($grouped_files as $group => $files) {
[$class, $id] = explode('_', $group);
$klass = new $class();
$obj = $klass->find($id);
@@ -54,6 +53,8 @@ class DownloadController extends Controller
/**
* Show the application dashboard.
*
* @param mixed $id
*/
public function show($id)
{
@@ -71,10 +72,10 @@ class DownloadController extends Controller
return redirect(config('app.login_redirect'));
}
++$file->download_count;
$file->download_count++;
$file->save();
if($file->disk === 'public') {
if ($file->disk === 'public') {
$storage = Storage::disk('public');
return $storage->download($file->path, $file->filename);
}

26
app/Http/Controllers/Frontend/FlightController.php
View File

@@ -17,17 +17,17 @@ use Prettus\Repository\Exceptions\RepositoryException;
/**
* Class FlightController
* @package App\Http\Controllers\Frontend
*/
class FlightController extends Controller
{
private $airlineRepo,
$airportRepo,
$flightRepo,
$geoSvc;
private $airlineRepo;
private $airportRepo;
private $flightRepo;
private $geoSvc;
/**
* FlightController constructor.
*
* @param AirlineRepository $airlineRepo
* @param AirportRepository $airportRepo
* @param FlightRepository $flightRepo
@@ -47,6 +47,7 @@ class FlightController extends Controller
/**
* @param Request $request
*
* @return \Illuminate\Contracts\View\Factory|\Illuminate\View\View
*/
public function index(Request $request)
@@ -56,7 +57,7 @@ class FlightController extends Controller
'visible' => true,
];
if(setting('pilots.restrict_to_company')) {
if (setting('pilots.restrict_to_company')) {
$where['airline_id'] = Auth::user()->airline_id;
}
@@ -90,7 +91,9 @@ class FlightController extends Controller
/**
* Find the user's bids and display them
*
* @param Request $request
*
* @return \Illuminate\Contracts\View\Factory|\Illuminate\View\View
*/
public function bids(Request $request)
@@ -111,15 +114,18 @@ class FlightController extends Controller
/**
* Make a search request using the Repository search
*
* @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 search(Request $request)
{
if(setting('pilots.restrict_to_company')) {
if (setting('pilots.restrict_to_company')) {
$this->flightRepo
->pushCriteria(New WhereCriteria($request, ['airline_id' => Auth::user()->airline_id]))
->pushCriteria(new WhereCriteria($request, ['airline_id' => Auth::user()->airline_id]))
->paginate();
}
@@ -141,7 +147,9 @@ class FlightController extends Controller
/**
* Show the flight information page
*
* @param $id
*
* @return \Illuminate\Contracts\View\Factory|\Illuminate\Http\RedirectResponse|\Illuminate\Routing\Redirector|\Illuminate\View\View
*/
public function show($id)

1
app/Http/Controllers/Frontend/HomeController.php
View File

@@ -8,7 +8,6 @@ use Illuminate\Database\QueryException;
/**
* Class HomeController
* @package App\Http\Controllers\Frontend
*/
class HomeController extends Controller
{

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

@@ -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)

23
app/Http/Controllers/Frontend/ProfileController.php
View File

@@ -13,24 +13,24 @@ use Flash;
use Hash;
use Illuminate\Http\Request;
use Illuminate\Support\Facades\Auth;
use Illuminate\Support\Facades\Storage;
use Intervention\Image\Facades\Image;
use Jackiedo\Timezonelist\Facades\Timezonelist;
use Log;
use Validator;
use Intervention\Image\Facades\Image;
use Illuminate\Support\Facades\Storage;
/**
* Class ProfileController
* @package App\Http\Controllers\Frontend
*/
class ProfileController extends Controller
{
private $airlineRepo,
$airportRepo,
$userRepo;
private $airlineRepo;
private $airportRepo;
private $userRepo;
/**
* ProfileController constructor.
*
* @param AirlineRepository $airlineRepo
* @param AirportRepository $airportRepo
* @param UserRepository $userRepo
@@ -64,6 +64,7 @@ class ProfileController extends Controller
/**
* @param $id
*
* @return \Illuminate\Contracts\View\Factory|\Illuminate\Http\RedirectResponse|\Illuminate\Routing\Redirector|\Illuminate\View\View
*/
public function show($id)
@@ -85,7 +86,9 @@ class ProfileController extends Controller
/**
* Show the edit for form the user's profile
*
* @param Request $request
*
* @return \Illuminate\Contracts\View\Factory|\Illuminate\Http\RedirectResponse|\Illuminate\Routing\Redirector|\Illuminate\View\View
*/
public function edit(Request $request)
@@ -111,8 +114,10 @@ class ProfileController extends Controller
/**
* @param Request $request
* @return $this
*
* @throws \Prettus\Validator\Exceptions\ValidatorException
*
* @return $this
*/
public function update(Request $request)
{
@@ -148,7 +153,7 @@ class ProfileController extends Controller
}
if ($request->hasFile('avatar')) {
$avatar = $request->file('avatar');
$file_name = $user->pilot_id . '.' .$avatar->getClientOriginalExtension();
$file_name = $user->pilot_id.'.'.$avatar->getClientOriginalExtension();
$path = "avatars/{$file_name}";
Image::make($avatar)->resize(config('phpvms.avatar.width'), config('phpvms.avatar.height'))->save(public_path('uploads/avatars/'.$file_name));
$req_data['avatar'] = $path;
@@ -163,7 +168,9 @@ class ProfileController extends Controller
/**
* Regenerate the user's API key
*
* @param Request $request
*
* @return \Illuminate\Http\RedirectResponse|\Illuminate\Routing\Redirector
*/
public function regen_apikey(Request $request)

3
app/Http/Controllers/Frontend/UserController.php
View File

@@ -8,7 +8,6 @@ use Illuminate\Http\Request;
/**
* Class UserController
* @package App\Http\Controllers\Frontend
*/
class UserController extends Controller
{
@@ -16,6 +15,7 @@ class UserController extends Controller
/**
* UserController constructor.
*
* @param UserRepository $userRepo
*/
public function __construct(
@@ -26,6 +26,7 @@ class UserController extends Controller
/**
* @param Request $request
*
* @return \Illuminate\Contracts\View\Factory|\Illuminate\View\View
*/
public function index(Request $request)