kamilniemczycki/toby
1
0
Fork 0
Code Issues Pull Requests 2 Projects Releases Activity

#62 - wip

Browse Source
This commit is contained in:
Adrian Hopek
2022-03-07 11:31:34 +01:00
parent 3a1b9862c1
commit 5d64ad9d2a
7 changed files with 41 additions and 43 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
app/Infrastructure/Http/Controllers/VacationRequestController.php
View File

@@ -40,7 +40,7 @@ class VacationRequestController extends Controller
->with("vacations")
->where("year_period_id", $yearPeriodRetriever->selected()->id)
->latest()
->states(VacationRequestStatesRetriever::filterByStatus($status))
->states(VacationRequestStatesRetriever::filterByStatusGroup($status))
->paginate();
return inertia("VacationRequest/Index", [
@@ -53,7 +53,7 @@ class VacationRequestController extends Controller
public function indexForApprovers(
Request $request,
YearPeriodRetriever $yearPeriodRetriever
YearPeriodRetriever $yearPeriodRetriever,
): RedirectResponse|Response {
if ($request->user()->cannot("listAll", VacationRequest::class)) {
return redirect()->route("vacation.requests.index");
@@ -67,7 +67,7 @@ class VacationRequestController extends Controller
->with(["user", "vacations"])
->where("year_period_id", $yearPeriod->id)
->when($user !== null, fn(Builder $query) => $query->where("user_id", $user))
->when($status !== null, fn (Builder $query) => $query->states(VacationRequestStatesRetriever::filterByStatus($status)))
->when($status !== null, fn(Builder $query) => $query->states([$status]))
->latest()
->paginate();