From ea0bb53f78fd6885182172e2be103163272f1c74 Mon Sep 17 00:00:00 2001 From: Vincent Vanwaelscappel Date: Wed, 7 Dec 2022 19:25:39 +0100 Subject: [PATCH] wait #5626 @0.25 --- .../Admin/Operations/TeamLeave/ICSOperation.php | 8 ++------ 1 file changed, 2 insertions(+), 6 deletions(-) diff --git a/app/Http/Controllers/Admin/Operations/TeamLeave/ICSOperation.php b/app/Http/Controllers/Admin/Operations/TeamLeave/ICSOperation.php index 0af4f4c4d..5a5e5bfa9 100644 --- a/app/Http/Controllers/Admin/Operations/TeamLeave/ICSOperation.php +++ b/app/Http/Controllers/Admin/Operations/TeamLeave/ICSOperation.php @@ -63,7 +63,7 @@ trait ICSOperation $users = []; $res = []; - foreach (TeamLeave::where('public', '1')->get() as $leave) { + foreach (TeamLeave::withoutGlobalScopes()->where('public', '1')->where('accepted','1')->get() as $leave) { if (!isset($users[$leave->worker])) { $users[$leave->worker] = User::withoutGlobalScopes()->find($leave->worker); } @@ -71,11 +71,7 @@ trait ICSOperation $user = $users[$leave->worker]; /** @var $leave TeamLeave */ - /* - * title : 'event3', - start : '2010-01-09T12:30:00', - allDay : false // will make the time show - */ + $event = ['title' => $user->firstname, 'start' => $leave->start_day->format('c'), 'end' => $leave->end_day->modify('+1 day')->format('c'), 'allDay' => true, 'color' => $user->planning_color]; -- 2.39.5