Fix formatting and interfaces in nearly every file
This commit is contained in:
@@ -4,6 +4,7 @@ namespace App\Http\Controllers\Admin;
|
||||
|
||||
use App\Http\Requests\CreateRankRequest;
|
||||
use App\Http\Requests\UpdateRankRequest;
|
||||
use App\Interfaces\Controller;
|
||||
use App\Repositories\RankRepository;
|
||||
use App\Repositories\SubfleetRepository;
|
||||
use App\Services\FleetService;
|
||||
@@ -13,17 +14,20 @@ use Illuminate\Http\Request;
|
||||
use Prettus\Repository\Criteria\RequestCriteria;
|
||||
use Response;
|
||||
|
||||
class RankController extends BaseController
|
||||
/**
|
||||
* Class RankController
|
||||
* @package App\Http\Controllers\Admin
|
||||
*/
|
||||
class RankController extends Controller
|
||||
{
|
||||
/** @var RankRepository */
|
||||
private $fleetSvc,
|
||||
$rankRepository,
|
||||
$subfleetRepo;
|
||||
|
||||
/**
|
||||
* RankController constructor.
|
||||
* @param FleetService $fleetSvc
|
||||
* @param RankRepository $rankingRepo
|
||||
* @param FleetService $fleetSvc
|
||||
* @param RankRepository $rankingRepo
|
||||
* @param SubfleetRepository $subfleetRepo
|
||||
*/
|
||||
public function __construct(
|
||||
@@ -109,6 +113,7 @@ class RankController extends BaseController
|
||||
|
||||
if (empty($rank)) {
|
||||
Flash::error('Ranking not found');
|
||||
|
||||
return redirect(route('admin.ranks.index'));
|
||||
}
|
||||
|
||||
@@ -128,19 +133,21 @@ class RankController extends BaseController
|
||||
|
||||
if (empty($rank)) {
|
||||
Flash::error('Ranking not found');
|
||||
|
||||
return redirect(route('admin.ranks.index'));
|
||||
}
|
||||
|
||||
$avail_subfleets = $this->getAvailSubfleets($rank);
|
||||
|
||||
return view('admin.ranks.edit', [
|
||||
'rank' => $rank,
|
||||
'rank' => $rank,
|
||||
'avail_subfleets' => $avail_subfleets,
|
||||
]);
|
||||
}
|
||||
|
||||
/**
|
||||
* Update the specified Ranking in storage.
|
||||
* @param int $id
|
||||
* @param int $id
|
||||
* @param UpdateRankRequest $request
|
||||
* @return Response
|
||||
* @throws \Prettus\Validator\Exceptions\ValidatorException
|
||||
@@ -151,6 +158,7 @@ class RankController extends BaseController
|
||||
|
||||
if (empty($rank)) {
|
||||
Flash::error('Ranking not found');
|
||||
|
||||
return redirect(route('admin.ranks.index'));
|
||||
}
|
||||
|
||||
@@ -158,6 +166,7 @@ class RankController extends BaseController
|
||||
Cache::forget(config('cache.keys.RANKS_PILOT_LIST.key'));
|
||||
|
||||
Flash::success('Ranking updated successfully.');
|
||||
|
||||
return redirect(route('admin.ranks.index'));
|
||||
}
|
||||
|
||||
@@ -172,12 +181,14 @@ class RankController extends BaseController
|
||||
|
||||
if (empty($rank)) {
|
||||
Flash::error('Ranking not found');
|
||||
|
||||
return redirect(route('admin.ranks.index'));
|
||||
}
|
||||
|
||||
$this->rankRepository->delete($id);
|
||||
|
||||
Flash::success('Ranking deleted successfully.');
|
||||
|
||||
return redirect(route('admin.ranks.index'));
|
||||
}
|
||||
|
||||
@@ -188,15 +199,16 @@ class RankController extends BaseController
|
||||
protected function return_subfleet_view($rank)
|
||||
{
|
||||
$avail_subfleets = $this->getAvailSubfleets($rank);
|
||||
|
||||
return view('admin.ranks.subfleets', [
|
||||
'rank' => $rank,
|
||||
'rank' => $rank,
|
||||
'avail_subfleets' => $avail_subfleets,
|
||||
]);
|
||||
}
|
||||
|
||||
/**
|
||||
* Subfleet operations on a rank
|
||||
* @param $id
|
||||
* @param $id
|
||||
* @param Request $request
|
||||
* @return mixed
|
||||
*/
|
||||
@@ -205,6 +217,7 @@ class RankController extends BaseController
|
||||
$rank = $this->rankRepository->findWithoutFail($id);
|
||||
if (empty($rank)) {
|
||||
Flash::error('Rank not found!');
|
||||
|
||||
return redirect(route('admin.ranks.index'));
|
||||
}
|
||||
|
||||
@@ -212,17 +225,13 @@ class RankController extends BaseController
|
||||
if ($request->isMethod('post')) {
|
||||
$subfleet = $this->subfleetRepo->find($request->input('subfleet_id'));
|
||||
$this->fleetSvc->addSubfleetToRank($subfleet, $rank);
|
||||
}
|
||||
|
||||
elseif($request->isMethod('put')) {
|
||||
} elseif ($request->isMethod('put')) {
|
||||
$override = [];
|
||||
$override[$request->name] = $request->value;
|
||||
$subfleet = $this->subfleetRepo->find($request->input('subfleet_id'));
|
||||
|
||||
$this->fleetSvc->addSubfleetToRank($subfleet, $rank);
|
||||
}
|
||||
|
||||
// remove aircraft from flight
|
||||
} // remove aircraft from flight
|
||||
elseif ($request->isMethod('delete')) {
|
||||
$subfleet = $this->subfleetRepo->find($request->input('subfleet_id'));
|
||||
$this->fleetSvc->removeSubfleetFromRank($subfleet, $rank);
|
||||
|
||||
Reference in New Issue
Block a user