#23 assign subfleets to ranks
This commit is contained in:
@@ -5,7 +5,7 @@ namespace App\Http\Controllers\Admin;
|
||||
use App\Http\Requests\CreateRankRequest;
|
||||
use App\Http\Requests\UpdateRankRequest;
|
||||
use App\Repositories\RankRepository;
|
||||
use App\Http\Controllers\AppBaseController as InfyOmBaseController;
|
||||
use App\Repositories\SubfleetRepository;
|
||||
use Illuminate\Http\Request;
|
||||
use Flash;
|
||||
use Prettus\Repository\Criteria\RequestCriteria;
|
||||
@@ -14,11 +14,28 @@ use Response;
|
||||
class RankController extends BaseController
|
||||
{
|
||||
/** @var RankRepository */
|
||||
private $rankRepository;
|
||||
private $rankRepository, $subfleetRepo;
|
||||
|
||||
public function __construct(RankRepository $rankingRepo)
|
||||
public function __construct(
|
||||
RankRepository $rankingRepo,
|
||||
SubfleetRepository $subfleetRepo
|
||||
)
|
||||
{
|
||||
$this->rankRepository = $rankingRepo;
|
||||
$this->subfleetRepo = $subfleetRepo;
|
||||
}
|
||||
|
||||
protected function getAvailSubfleets($rank)
|
||||
{
|
||||
$retval = [];
|
||||
$all_subfleets = $this->subfleetRepo->all();
|
||||
$avail_subfleets = $all_subfleets->except($rank->subfleets->modelKeys());
|
||||
foreach ($avail_subfleets as $subfleet) {
|
||||
$retval[$subfleet->id] = $subfleet->name.
|
||||
' (airline: '.$subfleet->airline->code.')';
|
||||
}
|
||||
|
||||
return $retval;
|
||||
}
|
||||
|
||||
/**
|
||||
@@ -32,8 +49,9 @@ class RankController extends BaseController
|
||||
$this->rankRepository->pushCriteria(new RequestCriteria($request));
|
||||
$ranks = $this->rankRepository->all();
|
||||
|
||||
return view('admin.ranks.index')
|
||||
->with('ranks', $ranks);
|
||||
return view('admin.ranks.index', [
|
||||
'ranks' => $ranks,
|
||||
]);
|
||||
}
|
||||
|
||||
/**
|
||||
@@ -48,12 +66,10 @@ class RankController extends BaseController
|
||||
|
||||
/**
|
||||
* Store a newly created Ranking in storage.
|
||||
*
|
||||
* @param CreateRankRequest $request
|
||||
*
|
||||
* @return Response
|
||||
*/
|
||||
public function store(Request $request)
|
||||
public function store(CreateRankRequest $request)
|
||||
{
|
||||
$input = $request->all();
|
||||
|
||||
@@ -61,8 +77,9 @@ class RankController extends BaseController
|
||||
Flash::success('Ranking saved successfully.');
|
||||
|
||||
$ranks = $this->rankRepository->all();
|
||||
return view('admin.ranks.table')
|
||||
->with('ranks', $ranks);
|
||||
return view('admin.ranks.table', [
|
||||
'ranks' => $ranks,
|
||||
]);
|
||||
}
|
||||
|
||||
/**
|
||||
@@ -81,7 +98,9 @@ class RankController extends BaseController
|
||||
return redirect(route('admin.ranks.index'));
|
||||
}
|
||||
|
||||
return view('admin.ranks.show')->with('rank', $rank);
|
||||
return view('admin.ranks.show', [
|
||||
'rank' => $rank
|
||||
]);
|
||||
}
|
||||
|
||||
/**
|
||||
@@ -100,7 +119,11 @@ class RankController extends BaseController
|
||||
return redirect(route('admin.ranks.index'));
|
||||
}
|
||||
|
||||
return view('admin.ranks.edit')->with('rank', $rank);
|
||||
$avail_subfleets = $this->getAvailSubfleets($rank);
|
||||
return view('admin.ranks.edit', [
|
||||
'rank' => $rank,
|
||||
'avail_subfleets' => $avail_subfleets,
|
||||
]);
|
||||
}
|
||||
|
||||
/**
|
||||
@@ -123,7 +146,6 @@ class RankController extends BaseController
|
||||
$rank = $this->rankRepository->update($request->all(), $id);
|
||||
|
||||
Flash::success('Ranking updated successfully.');
|
||||
|
||||
return redirect(route('admin.ranks.index'));
|
||||
}
|
||||
|
||||
@@ -146,7 +168,38 @@ class RankController extends BaseController
|
||||
$this->rankRepository->delete($id);
|
||||
|
||||
Flash::success('Ranking deleted successfully.');
|
||||
|
||||
return redirect(route('admin.ranks.index'));
|
||||
}
|
||||
|
||||
protected function return_subfleet_view($rank)
|
||||
{
|
||||
$avail_subfleets = $this->getAvailSubfleets($rank);
|
||||
return view('admin.ranks.subfleets', [
|
||||
'rank' => $rank,
|
||||
'avail_subfleets' => $avail_subfleets,
|
||||
]);
|
||||
}
|
||||
|
||||
public function subfleets(Request $request)
|
||||
{
|
||||
$id = $request->id;
|
||||
|
||||
$rank = $this->rankRepository->findWithoutFail($id);
|
||||
if (empty($rank)) {
|
||||
Flash::error('Rank not found!');
|
||||
return redirect(route('admin.ranks.index'));
|
||||
}
|
||||
|
||||
// add aircraft to flight
|
||||
if ($request->isMethod('post')) {
|
||||
$rank->subfleets()->syncWithoutDetaching([$request->subfleet_id]);
|
||||
}
|
||||
|
||||
// remove aircraft from flight
|
||||
elseif ($request->isMethod('delete')) {
|
||||
$rank->subfleets()->detach($request->subfleet_id);
|
||||
}
|
||||
|
||||
return $this->return_subfleet_view($rank);
|
||||
}
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user