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

Author: laravelwebdev

app/Models/NaskahKeluar.php

@@ -23,7 +23,11 @@ protected static function booted(): void
     {
         static::saving(function (NaskahKeluar $naskah) {
             if ($naskah->isDirty(['jenis_naskah_id', 'tanggal', 'kode_arsip_id', 'derajat_naskah_id', 'unit_kerja_id'])) {
-                $unit_kerja_id = $naskah->unit_kerja_id ?? optional(Helper::getDataPegawaiByUserId(Auth::user()->id, $naskah->tanggal))->unit_kerja_id;
+                $pegawai = Helper::getDataPegawaiByUserId(Auth::user()->id, $naskah->tanggal);
+                if (is_null($pegawai)) {
+                    $pegawai = Helper::getDataPegawaiByUserId(Auth::user()->id, now());
+                }
+                $unit_kerja_id = $naskah->unit_kerja_id ?? optional($pegawai)->unit_kerja_id;
                 $nomor = Helper::nomor($naskah->tanggal, $naskah->jenis_naskah_id, $unit_kerja_id, $naskah->kode_arsip_id, $naskah->derajat_naskah_id);
                 $naskah->nomor = $nomor['nomor'];
                 $naskah->no_urut = $nomor['no_urut'];

app/Nova/Metrics/RealisasiPerJenisBelanja.php

@@ -61,7 +61,9 @@ public function __construct()
                 $item->target = round(($total / 100) * $targetSerapan, 0);
                 $item->realisasi = $item->realisasi ?? 0;
                 $item->selisih = $item->realisasi - $item->target;
-                $item->persen = round(($item->realisasi / $item->target) * 100, 2);
+                $item->persen = ($item->target == 0)
+                    ? 100
+                    : round(($item->realisasi / $item->target) * 100, 2);
                 $item->jenis_belanja = Helper::JENIS_BELANJA[$item->jenis_belanja];
 
                 return $item;

app/Nova/TindakLanjut.php

@@ -183,14 +183,14 @@ public static function indexQuery(NovaRequest $request, $query)
         $currentDate = now();
         $startOfYear = $currentDate->copy()->startOfYear();
         $triwulan = match (true) {
-            $currentDate->between($startOfYear, $startOfYear->copy()->addMonths(3)->addDays(10)) => 4,
-            $currentDate->between($startOfYear->copy()->addMonths(3), $startOfYear->copy()->addMonths(6)->addDays(10)) => 1,
-            $currentDate->between($startOfYear->copy()->addMonths(6), $startOfYear->copy()->addMonths(9)->addDays(10)) => 2,
-            $currentDate->between($startOfYear->copy()->addMonths(9), $startOfYear->copy()->endOfYear()->addDays(10)) => 3,
+            $currentDate->between($startOfYear, $startOfYear->copy()->addMonths(3)) => 4,
+            $currentDate->between($startOfYear->copy()->addMonths(3), $startOfYear->copy()->addMonths(6)) => 1,
+            $currentDate->between($startOfYear->copy()->addMonths(6), $startOfYear->copy()->addMonths(9)) => 2,
+            $currentDate->between($startOfYear->copy()->addMonths(9), $startOfYear->copy()->endOfYear()) => 3,
         };
 
         return $query->where('tahun', session('year'))
-            ->where('triwulan', $triwulan)
+            // ->where('triwulan', $triwulan)
             ->withCount(['perjanjianKinerja', 'pelaksanaanTindakLanjut']);
     }
 }