#90 - wip

2022-04-08 12:42:24 +02:00
parent 4af0482a93
commit 6506855bba
50 changed files with 581 additions and 196 deletions
--- a/app/Infrastructure/Http/Controllers/TimesheetController.php
+++ b/app/Infrastructure/Http/Controllers/TimesheetController.php
@@ -28,9 +28,9 @@ class TimesheetController extends Controller
        $carbonMonth = Carbon::create($yearPeriod->year, $month->toCarbonNumber());

        $users = User::query()
-            ->where("employment_form", EmploymentForm::EmploymentContract)
-            ->orderBy("last_name")
-            ->orderBy("first_name")
+            ->whereRelation("profile", "employment_form", EmploymentForm::EmploymentContract)
+            ->orderByProfileField("last_name")
+            ->orderByProfileField("first_name")
            ->get();

        $types = VacationType::all()