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

#43 - vacation summary for employee #66

Merged
Baakoma merged 19 commits from #43-vacation-summary-for-employee into main 2022-03-03 09:03:17 +01:00
Conversation 3 Commits 19 Files Changed 69 +4 -3
1 changed files with 4 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Showing only changes of commit ac81882b3f - Show all commits

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

@@ -67,9 +67,10 @@ class VacationRequestController extends Controller
$yearPeriod = $yearPeriodRetriever->selected(); $yearPeriod = $yearPeriodRetriever->selected();
$users = User::query() $users = User::query()
->whereRelation("vacationlimits", fn(Builder $query) => $query ->whereRelation(
->where("year_period_id", $yearPeriod->id) "vacationlimits",
->whereNotNull("days")) fn(Builder $query) => $query->where("year_period_id", $yearPeriod->id)->whereNotNull("days"),
)
->orderBy("last_name") ->orderBy("last_name")
->orderBy("first_name") ->orderBy("first_name")
->get(); ->get();