Merge branch 'staging' into feature/senior-officer

2024-12-05 01:38:23 +07:00
parent d797b0d2c0 08746d3262
commit 13f3065a01
3 changed files with 47 additions and 50 deletions
--- a/resources/views/activity/progres_activity/index.blade.php
+++ b/resources/views/activity/progres_activity/index.blade.php
@@ -73,14 +73,7 @@
                                    </th>
                                    <th class="min-w-[150px]">
                                        <span class="text-base text-gray-900 font-normal">
-                                            @php
-                                                $totalTasks = $item->team->regions->penilaiTeam
-                                                    ->filter(function ($penilaiTeam) use ($item) {
-                                                        return $penilaiTeam->user_id == $item->user->id;
-                                                    })
-                                                    ->count();
-                                            @endphp
-                                            <p>Total Task: {{ $totalTasks }}</p>
+                                            <p>Total Task: {{ countPermohonanForUser($item->user->id) }}</p>
                                        </span>
                                    </th>
                                    <th>