From da7883919e57362532a19a791d7db47646c2b84f Mon Sep 17 00:00:00 2001
From: nurafrinaalimi16 <nurafrinaalimi16@gmail.com>
Date: Tue, 11 Nov 2025 22:23:37 +0800
Subject: [PATCH] add column name on operasi approval

---
 app/Http/Controllers/KelulusanController.php | 64 +++++++++++++-------
 1 file changed, 42 insertions(+), 22 deletions(-)

diff --git a/app/Http/Controllers/KelulusanController.php b/app/Http/Controllers/KelulusanController.php
index 5c21b70..ead5d4d 100644
--- a/app/Http/Controllers/KelulusanController.php
+++ b/app/Http/Controllers/KelulusanController.php
@@ -231,7 +231,7 @@ class KelulusanController extends Controller
         'namaoperasi' => $namaoperasi
     ]);
 
-    // ✅ Kalau LULUS
+    // Kalau LULUS
     if ($status == 1) {
         $kelulusan = MohonAnggota::on($cawangan['mysql'])
             ->where('nokp', '=', $nokp)
@@ -243,14 +243,14 @@ class KelulusanController extends Controller
                 'updated_at'        => $harini,
             ]);
 
-        // 🟢 Update CUSTOMER di pusat (mysql7)
+        // Update CUSTOMER di pusat (mysql7)
         Customer::on('mysql7')
             ->where('kpbaru', '=', $nokp)
             ->update([
                 'tag_anggota' => 1,
             ]);
     }
-    // ❌ Kalau BATAL / TOLAK
+    // Kalau BATAL / TOLAK
     else if ($status == 2) {
         $kelulusan = MohonAnggota::on($cawangan['mysql'])
             ->where('nokp', '=', $nokp)
@@ -663,33 +663,53 @@ public function create(REQUEST $request,$kodcaw,$norujukan,$roles)
       return response()->json($kelulusan, 200);
    }
 
-   public function listKelulusanAnggota(Request $request){
-    
-      $harini = Carbon::now();
-      $harini = new Carbon;
-      Log::info($request->all());
-      $cawangan = Cawangan::on('mysql7')->get();
+   public function listKelulusanAnggota(Request $request)
+{
+    $harini = Carbon::now();
+    Log::info($request->all());
+    $cawangan = Cawangan::on('mysql7')->get();
 
-      $array_kelulusan = [];
+    $array_kelulusan = [];
 
-      foreach($cawangan as $caw){
-
-         $kelulusan = MohonAnggota::on($caw['mysql'])
-            ->where('tarikh', '=', $harini->toDateString())
-            ->where('peloperasi', '=', 0)
-            ->orWhereNull('peloperasi')  // Corrected this part
+    foreach ($cawangan as $caw) {
+        
+        $kelulusan = MohonAnggota::on($caw['mysql'])
+            ->whereDate('tarikh', $harini->toDateString())
+            ->where(function ($query) {
+                $query->where('peloperasi', '=', 0)
+                      ->orWhereNull('peloperasi');
+            })
             ->orderBy('id', 'desc')
             ->get();
 
-         if(sizeof($kelulusan) != 0){
-             array_push($array_kelulusan,["kelulusanall" => $kelulusan,"cawangan" => $caw['details_caw'],"cawangankod" => $caw['kodcaw']]);
-         }
+        if ($kelulusan->isNotEmpty()) {
 
-      }      
+            // Kumpul semua nokp daripada senarai kelulusan
+            $nokpList = $kelulusan->pluck('nokp')->unique()->toArray();
 
+            // Ambil semua nama daripada table customer (main DB)
+            $customers = Customer::whereIn('kpbaru', $nokpList)
+                ->pluck('nama', 'kpbaru')
+                ->toArray();
+
+            // Masukkan nama ke dalam setiap item kelulusan
+            $kelulusan = $kelulusan->map(function ($item) use ($customers) {
+                $item->nama = $customers[$item->nokp] ?? '-';
+                return $item;
+            });
+
+            // Tambah ke array utama
+            $array_kelulusan[] = [
+                "kelulusanall" => $kelulusan,
+                "cawangan" => $caw['details_caw'],
+                "cawangankod" => $caw['kodcaw']
+            ];
+        }
+    }
+
+    return response()->json($array_kelulusan, 200);
+}
 
-      return response()->json($array_kelulusan,200);
-   }