Merge branch 'main' of https://github.com/laravelwebdev/simpede

Author: laravelwebdev

app/Models/IzinKeluar.php

@@ -2,7 +2,6 @@
 
 namespace App\Models;
 
-use App\Models\User;
 use Illuminate\Database\Eloquent\Factories\HasFactory;
 use Illuminate\Database\Eloquent\Model;
 use Illuminate\Support\Facades\Auth;
@@ -25,46 +24,46 @@ protected static function booted(): void
         static::creating(function (IzinKeluar $izin) {
             $izin->user_id = Auth::user()->id;
             $izin->tahun = session('year');
-
         });
         static::created(function (IzinKeluar $izin) {
             $usercache = User::cache()->get('all');
             if (Auth::user()->role === 'kepala') {
                 $users = $usercache->where('role', 'koordinator');
-                foreach ($users as $user) 
-                $user->notify(
-                NovaNotification::make()
-                    ->message('Izin Keluar Baru: '.Auth::user()->nama.' Mengajukan Izin Keluar untuk '.$izin->kegiatan)
-                    ->action('Lihat', URL::remote(Nova::path() . "/resources/".\App\Nova\IzinKeluar::uriKey()."/".$izin->id))
-                    ->icon('information-circle')
-                    ->type('info')
-                );
+                foreach ($users as $user) {
+                    $user->notify(
+                        NovaNotification::make()
+                            ->message('Izin Keluar Baru: '.Auth::user()->nama.' Mengajukan Izin Keluar untuk '.$izin->kegiatan)
+                            ->action('Lihat', URL::remote(Nova::path().'/resources/'.\App\Nova\IzinKeluar::uriKey().'/'.$izin->id))
+                            ->icon('information-circle')
+                            ->type('info')
+                    );
+                }
             }
             if (Auth::user()->role === 'koordinator') {
                 $users = $usercache->where('role', 'kepala');
-                foreach ($users as $user) 
-                $user->notify(
-                NovaNotification::make()
-                    ->message('Izin Keluar Baru: '.Auth::user()->nama.' Mengajukan Izin Keluar untuk '.$izin->kegiatan)
-                    ->action('Lihat', URL::remote(Nova::path() . "/resources/".\App\Nova\IzinKeluar::uriKey()."/".$izin->id))
-                    ->icon('information-circle')
-                    ->type('info')
-                );
+                foreach ($users as $user) {
+                    $user->notify(
+                        NovaNotification::make()
+                            ->message('Izin Keluar Baru: '.Auth::user()->nama.' Mengajukan Izin Keluar untuk '.$izin->kegiatan)
+                            ->action('Lihat', URL::remote(Nova::path().'/resources/'.\App\Nova\IzinKeluar::uriKey().'/'.$izin->id))
+                            ->icon('information-circle')
+                            ->type('info')
+                    );
+                }
             }
             if (Auth::user()->role === 'anggota') {
                 $users = $usercache->where('role', 'koordinator')
-                ->where('unit_kerja_id', Auth::user()->unit_kerja_id);
-                foreach ($users as $user) 
-                $user->notify(
-                NovaNotification::make()
-                    ->message('Izin Keluar Baru: '.Auth::user()->nama.' Mengajukan Izin Keluar untuk '.$izin->kegiatan)
-                    ->action('Lihat', URL::remote(Nova::path() . "/resources/".\App\Nova\IzinKeluar::uriKey()."/".$izin->id))
-                    ->icon('information-circle')
-                    ->type('info')
-                );
+                    ->where('unit_kerja_id', Auth::user()->unit_kerja_id);
+                foreach ($users as $user) {
+                    $user->notify(
+                        NovaNotification::make()
+                            ->message('Izin Keluar Baru: '.Auth::user()->nama.' Mengajukan Izin Keluar untuk '.$izin->kegiatan)
+                            ->action('Lihat', URL::remote(Nova::path().'/resources/'.\App\Nova\IzinKeluar::uriKey().'/'.$izin->id))
+                            ->icon('information-circle')
+                            ->type('info')
+                    );
+                }
             }
-
         });
-       
     }
 }

app/Models/User.php

@@ -71,5 +71,4 @@ public function unitKerja(): BelongsTo
     {
         return $this->belongsTo(UnitKerja::class);
     }
-
 }

app/Nova/IzinKeluar.php

@@ -68,15 +68,15 @@ public function fields(NovaRequest $request)
                 ->displayUsing(fn ($tanggal) => Helper::terbilangTanggal($tanggal))
                 ->filterable(),
             Time::make('Jam Keluar', 'keluar')
-                ->rules('required'),                
+                ->rules('required'),
             Text::make('Kegiatan')
                 ->rules('required'),
             Panel::make('Jam Kembali', [
                 Time::make('Jam Kembali', 'kembali'),
                 Image::make('Bukti Dukung', 'bukti')
                     ->disk('izin_keluar'),
-                ]),
-                
+            ]),
+
         ];
     }
 

app/Nova/User.php

@@ -81,7 +81,7 @@ public function fields(NovaRequest $request)
                 Select::make('Role')
                     ->options(Helper::$role)
                     ->rules('required')
-                    ->filterable(), 
+                    ->filterable(),
             ]),
         ];
     }