Perbaikan conflict helper

app/Helpers/Lpj.php

@@ -5,6 +5,7 @@
     use Modules\Lpj\Models\HolidayCalendar;
     use Modules\Lpj\Models\PenawaranDetailTender;
     use Modules\Lpj\Models\PenawaranTender;
+    use Modules\Lpj\Models\Penilaian;
 
     function formatTanggalIndonesia($date, $time = false)
     {
@@ -144,7 +145,7 @@
     // generate last penawaran.no_spk 
     function onLastnumberCodePenawaranSPK($jenis_laporan_code): string
     {
-        
+
         // 20241124_001 ==> spk_no_core
         // XXX / PJ / JKT / MONTH-ROM / FR|SR / 2024
         // 001 / PJ / JKT / XI / FR / 2024
@@ -159,18 +160,18 @@
         {
             $no_spk_penawaran_last = substr ($maxCode, -3);
             $year_penawaran_last = substr ($maxCode, 0, 4);
-            
+
             if($year_now == $year_penawaran_last)
             {
-                $noUrutAkhirString = sprintf("%03s", abs($no_spk_penawaran_last + 1));  
+                $noUrutAkhirString = sprintf("%03s", abs($no_spk_penawaran_last + 1));
             }
             // jika ternyata tahun tdk sama (kurang dari tahun sekarang), maka nomor di set 001
         }
-        
+
         $month = onRomawi(Carbon::now()->month);
-        
+
         $lastSPK = $noUrutAkhirString.' / PJ / JKT / '. $month .' / ' .$jenis_laporan_code.' / '.$year_now;
-        return $lastSPK;    
+        return $lastSPK;
     }
 
     function onRomawi(int $bln): string
@@ -214,7 +215,7 @@
                 break;
 
         }
-        
+
     }
 
     function penyebut($nilai) {
@@ -241,16 +242,16 @@
 			$temp = penyebut($nilai/1000000000) . " milyar" . penyebut(fmod($nilai,1000000000));
 		} else if ($nilai < 1000000000000000) {
 			$temp = penyebut($nilai/1000000000000) . " trilyun" . penyebut(fmod($nilai,1000000000000));
-		}     
+		}
 		return $temp;
 	}
- 
+
 	function terbilang($nilai) {
 		if($nilai<0) {
 			$hasil = "minus ". trim(penyebut($nilai));
 		} else {
 			$hasil = trim(penyebut($nilai));
-		}     		
+		}
 		return $hasil;
 	}
     // andy add
@@ -283,3 +284,10 @@
             },
         )->toArray();
     }
+
+    function countPermohonanForUser($userId)
+    {
+        return Penilaian::whereHas('userPenilai', function ($query) use ($userId) {
+            $query->where('user_id', $userId);
+        })->count();
+    }

app/Http/Controllers/ActivityController.php

@@ -33,48 +33,33 @@ class ActivityController extends Controller
 
     public function progres_activity()
     {
-        // Ambil user yang sedang login
+        // Ambil user yang sedang login dengan roles
-        $user = auth()->user();
+        $user = auth()->user()->load('roles');
-        $roles = $user->load('roles');
 
-        // Inisialisasi regionId dan teamId sebagai null agar bisa dinamis
+        // Inisialisasi regionId dan teamId
-        $regionId = null;
+        $regionId = $teamId = null;
-        $teamId = null;
 
-        if ($roles->roles->pluck('name')->contains('senior-officer')) {
+        if ($user->roles->pluck('name')->contains('senior-officer')) {
-            $userTeam = TeamsUsers::with('team')
+            $userTeam = TeamsUsers::with('team')->firstWhere('user_id', $user->id);
-                ->where('user_id', $user->id)
-                ->first();
             $regionId = $userTeam?->team->regions_id;
             $teamId = $userTeam?->teams_id;
-
         }
 
         $teamsActivity = TeamsUsers::with(['user', 'team', 'team.regions', 'user.roles'])
             ->whereHas('team', function ($q) use ($regionId, $teamId) {
-                if ($regionId) {
+                $q->when($regionId, fn($q) => $q->where('regions_id', $regionId))
-                    $q->where('regions_id', $regionId);
+                  ->when($teamId, fn($q) => $q->where('id', $teamId));
-                }
-                if ($teamId) {
-                    $q->where('id', $teamId); // Hanya tim yang sama
-                }
             })
             ->where('user_id', '!=', $user->id)
-            ->whereHas('user.roles', function ($query) {
+            ->whereHas('user.roles', fn($q) => $q->whereIn('name', ['surveyor', 'surveyor-penilai']))
-                // Filter hanya peran 'surveyor' atau 'surveyor-penilai'
-                $query->whereIn('name', ['surveyor', 'surveyor-penilai']);
-            })
             ->get();
 
-
-
-
         return view('lpj::activity.progres_activity.index', compact('teamsActivity'));
     }
 
 
     function updateTeamAssingment(Request $request) {
-    
+
         try {
             $id = $request->input('id');
             $user = PenilaianTeam::where('penilaian_id', $id)->get();
@@ -86,7 +71,7 @@ class ActivityController extends Controller
                 }
                 return redirect()->route('activity.progres.index')->with('success', 'Surveyor berhasil diganti');
             }
-        
+
         } catch (\Throwable $th) {
             return redirect()->route('activity.progres.index')->with('success', $th->getMessage());
         }

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
+                                            <p>Total Task: {{ countPermohonanForUser($item->user->id) }}</p>
-                                                $totalTasks = $item->team->regions->penilaiTeam
-                                                    ->filter(function ($penilaiTeam) use ($item) {
-                                                        return $penilaiTeam->user_id == $item->user->id;
-                                                    })
-                                                    ->count();
-                                            @endphp
-                                            <p>Total Task: {{ $totalTasks }}</p>
                                         </span>
                                     </th>
                                     <th>