KoPKB/api_arrahn
2
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

add column name on operasi approval

Browse Source
This commit is contained in:
nurafrinaalimi16
2025-11-11 22:23:37 +08:00
parent c7874c15bc
commit cc11e3aed6
1 changed files with 42 additions and 22 deletions
Download Patch File Download Diff File Expand all files Collapse all files
app/Http/Controllers/KelulusanController.php
+41 -21
View File
@@ -258,7 +258,7 @@ class KelulusanController extends Controller
'namaoperasi' => $namaoperasi 'namaoperasi' => $namaoperasi
]); ]);
// ✅ Kalau LULUS // Kalau LULUS
if ($status == 1) { if ($status == 1) {
$kelulusan = MohonAnggota::on($cawangan['mysql']) $kelulusan = MohonAnggota::on($cawangan['mysql'])
->where('nokp', '=', $nokp) ->where('nokp', '=', $nokp)
@@ -270,14 +270,14 @@ class KelulusanController extends Controller
'updated_at' => $harini, 'updated_at' => $harini,
]); ]);
// 🟢 Update CUSTOMER di pusat (mysql7) // Update CUSTOMER di pusat (mysql7)
Customer::on('mysql7') Customer::on('mysql7')
->where('kpbaru', '=', $nokp) ->where('kpbaru', '=', $nokp)
->update([ ->update([
'tag_anggota' => 1, 'tag_anggota' => 1,
]); ]);
} }
// ❌ Kalau BATAL / TOLAK // Kalau BATAL / TOLAK
else if ($status == 2) { else if ($status == 2) {
$kelulusan = MohonAnggota::on($cawangan['mysql']) $kelulusan = MohonAnggota::on($cawangan['mysql'])
->where('nokp', '=', $nokp) ->where('nokp', '=', $nokp)
@@ -692,33 +692,53 @@ public function create(REQUEST $request,$kodcaw,$norujukan,$roles)
return response()->json($kelulusan, 200); return response()->json($kelulusan, 200);
} }
public function listKelulusanAnggota(Request $request){ public function listKelulusanAnggota(Request $request)
{
$harini = Carbon::now();
Log::info($request->all());
$cawangan = Cawangan::on('mysql7')->get();
$harini = Carbon::now(); $array_kelulusan = [];
$harini = new Carbon;
Log::info($request->all());
$cawangan = Cawangan::on('mysql7')->get();
$array_kelulusan = []; foreach ($cawangan as $caw) {
foreach($cawangan as $caw){ $kelulusan = MohonAnggota::on($caw['mysql'])
->whereDate('tarikh', $harini->toDateString())
$kelulusan = MohonAnggota::on($caw['mysql']) ->where(function ($query) {
->where('tarikh', '=', $harini->toDateString()) $query->where('peloperasi', '=', 0)
->where('peloperasi', '=', 0) ->orWhereNull('peloperasi');
->orWhereNull('peloperasi') // Corrected this part })
->orderBy('id', 'desc') ->orderBy('id', 'desc')
->get(); ->get();
if(sizeof($kelulusan) != 0){ if ($kelulusan->isNotEmpty()) {
array_push($array_kelulusan,["kelulusanall" => $kelulusan,"cawangan" => $caw['details_caw'],"cawangankod" => $caw['kodcaw']]);
}
} // 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);
}