penambahan filter by status untuk jumlah task

app/Helpers/Lpj.php

@@ -289,5 +289,10 @@
     {
         return Penilaian::whereHas('userPenilai', function ($query) use ($userId) {
             $query->where('user_id', $userId);
-        })->count();
+        })
+        ->whereHas('permohonan', function ($query) {
+            $query->where('status', 'assign');
+        })
+        ->count();
+
     }

app/Http/Controllers/ActivityController.php

@@ -250,6 +250,8 @@ class ActivityController extends Controller
         ])
         ->whereHas('userPenilai', function ($q) use ($id) {
             $q->where('user_id', $id);
+        })->whereHas('permohonan', function ($q) {
+            $q->where('status', 'assign');
         });
 
 

app/Models/Penilaian.php

@@ -32,11 +32,6 @@ class Penilaian extends Model
         return $this->belongsTo(Teams::class, 'teams_id', 'id');
     }
 
-    public function users()
-    {
-        return $this->belongsTo(User::class, 'user_id', 'id');
-    }
-
     public function userPenilai()
     {
         return $this->hasMany(PenilaianTeam::class, 'penilaian_id', 'id');

app/Models/TeamsUsers.php

@@ -32,9 +32,9 @@ class TeamsUsers extends Model
         return $this->belongsTo(User::class, 'user_id', 'id');
     }
 
-    public function penilaian()
+    public function penilaianTeam()
     {
-        return $this->belongsTo(Penilaian::class, 'teams_id', 'id');
+        return $this->belongsTo(PenilaianTeam::class, 'team_id', 'id');
     }
 
 }

resources/views/activity/progres_activity/index.blade.php

@@ -49,11 +49,11 @@
             <div data-accordion="true">
 
                 @php
-
                     $sortedTeamsActivity = $teamsActivity->sortBy(function ($item) {
                         return $item->team->regions->penilaiTeam
-                            ->filter(function ($penilaiTeam) use ($item) {
-                                return $penilaiTeam->user_id == $item->user->id;
+                            ->filter(function ($penilaiTeam) {
+                                $permohonan = optional($penilaiTeam->penilaian)->permohonan;
+                                return $permohonan !== null;
                             })
                             ->count();
                     });