perabaikan team activity, form inspeksi rap,laporan memo, rap, resume dan penambahan basic data perizinan

app/Helpers/Lpj.php

@@ -287,14 +287,26 @@ function holidays()
 
 function countPermohonanForUser($userId)
 {
-    return Penilaian::whereHas('userPenilai', function ($query) use ($userId) {
+    $validStatuses = ['assign', 'proses-laporan', 'done'];
+
+    $result = Penilaian::whereHas('userPenilai', function ($query) use ($userId) {
         $query->where('user_id', $userId);
     })
-    ->whereHas('permohonan', function ($query) {
-        $query->where('status', 'assign');
-    })
-    ->count();
+        ->whereHas('permohonan', function ($query) use ($validStatuses) {
+            $query->whereIn('status', $validStatuses);
+        })
+        ->get()
+        ->groupBy(function ($item) {
+            // Pastikan mengakses properti dari model yang valid
+            return $item->userPenilai->first()->user_id . '-' . $item->permohonan->id;
+        })
+        ->map(function ($group) {
+            return [
+                'statuses' => $group->pluck('permohonan.status')->unique()->values()->all(),
+            ];
+        });
 
+    return $result->count();
 }