wait #5626 @0.25

diff --git a/app/Http/Controllers/Admin/Operations/TeamLeave/ICSOperation.php b/app/Http/Controllers/Admin/Operations/TeamLeave/ICSOperation.php
index 0af4f4c4dda13d5eb20e188bd36938f89c13a1be..5a5e5bfa9d05bf413c2e4a34bc90240ab3c70767 100644 (file)
--- 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];