fixing persentase data in datatable ghost

app/Http/Controllers/PitStopController.php

@@ -2058,29 +2058,12 @@ class PitStopController extends Controller
 
         $totalSteps = (int) MasterPitStopPraAkre::where('statusenabled', true)->count();
 
-        // ----------------------------------------------------------------
+        // ── Internal ────────────────────────────────────────────────────
-        // Subquery: belum_count & belum_steps dihitung SEKALI via CTE
-        // Hindari correlated subquery per-baris
-        // ----------------------------------------------------------------
-        $belumCte = DB::connection('pgsql')
-            ->table('public.masterpitstop as ms')
-            ->where('ms.statusenabled', true)
-            ->select([
-                'ms.id as ms_id',
-                'ms.nama as ms_nama',
-            ]);
-
-        // ----------------------------------------------------------------
-        // Internal query — ganti correlated subquery dengan LEFT JOIN agregasi
-        // ----------------------------------------------------------------
         $internal = DB::connection('pgsql')
             ->table('public.mappegawaijabatantounitkerja_m as mp')
             ->join('public.pegawai_m as pg',          'pg.id',  '=', 'mp.objectpegawaifk')
             ->join('public.unitkerjapegawai_m as ukp', 'ukp.id', '=', 'mp.objectunitkerjapegawaifk')
-            ->leftJoin('public.praakre as p', function ($join) {
+            ->leftJoin('public.praakre as p', 'p.pegawai_id', '=', 'pg.id')
-                $join->on('p.pegawai_id', '=', 'pg.id')
-                    ->where('p.tipe_karyawan', '!=', 'luar'); // pastikan hanya internal
-            })
             ->leftJoin('public.masterpitstop as m', function ($join) {
                 $join->on(DB::raw('m.id::text'), '=', 'p.masterpitstop_id')
                     ->where('m.statusenabled', true);
@@ -2094,17 +2077,13 @@ class PitStopController extends Controller
                 DB::raw("'internal' as tipe_karyawan"),
                 'pg.id',
                 DB::raw("coalesce(pg.namalengkap, '-') as nama"),
+                DB::raw("coalesce(pg.nip_pns, '-') as identitas"),
                 DB::raw("coalesce(ukp.name, '-') as unit_name"),
                 DB::raw("count(distinct m.id) as lulus_count"),
-                // belum_count = totalSteps - lulus (dihitung di PHP, bukan subquery)
-                DB::raw("0 as belum_count"),        // placeholder, dihitung di PHP
-                DB::raw("'' as belum_steps"),        // placeholder, isi jika memang dibutuhkan
             ])
             ->groupBy('pg.id', 'pg.namalengkap', 'pg.nip_pns', 'ukp.name');
 
-        // ----------------------------------------------------------------
+        // ── External ────────────────────────────────────────────────────
-        // External query
-        // ----------------------------------------------------------------
         $external = DB::connection('pgsql')
             ->table('public.pegawai_luar_pl as pl')
             ->leftJoin('public.praakre as p', function ($join) {
@@ -2119,45 +2098,31 @@ class PitStopController extends Controller
                 DB::raw("'luar' as tipe_karyawan"),
                 'pl.id',
                 DB::raw("coalesce(pl.nama, '-') as nama"),
+                DB::raw("coalesce(pl.nik, '-') as identitas"),
                 DB::raw("coalesce(nullif(btrim(pl.tipe), ''), '-') as unit_name"),
                 DB::raw("count(distinct m.id) as lulus_count"),
-                DB::raw("0 as belum_count"),
-                DB::raw("'' as belum_steps"),
             ])
             ->groupBy('pl.id', 'pl.nama', 'pl.nik', DB::raw("coalesce(nullif(btrim(pl.tipe), ''), '-')"));
-        // ----------------------------------------------------------------
-        // Union & base query — hanya SATU kali wrap
-        // ----------------------------------------------------------------
-        $union = $internal->unionAll($external);
 
-        $base = DB::connection('pgsql')
+        // ── Union & Base ─────────────────────────────────────────────────
-            ->query()
+        $union = $internal->unionAll($external);
-            ->fromSub($union, 'u');
+        $base  = DB::connection('pgsql')->query()->fromSub($union, 'u');
 
         if ($search !== '') {
             $base->where(function ($q) use ($search) {
                 $q->where('u.nama',           'ILIKE', "%{$search}%")
+                ->orWhere('u.identitas',    'ILIKE', "%{$search}%")
                 ->orWhere('u.unit_name',    'ILIKE', "%{$search}%")
                 ->orWhere('u.tipe_karyawan','ILIKE', "%{$search}%");
             });
         }
 
-        // ----------------------------------------------------------------
+        // ── Count — eksekusi SEKALI ──────────────────────────────────────
-        // Hitung total SEKALI dengan conditional aggregate
+        $recordsFiltered = (clone $base)->count();
-        // Hindari eksekusi query count dua kali
+        $recordsTotal    = $search === '' ? $recordsFiltered
-        // ----------------------------------------------------------------
+            : DB::connection('pgsql')->query()->fromSub($union, 'u')->count();
-        $counts = (clone $base)
-            ->selectRaw('count(*) as total')
-            ->first();
 
-        $recordsFiltered = (int) ($counts->total ?? 0);
+        // ── Fetch halaman ini saja ───────────────────────────────────────
-        $recordsTotal    = $search === ''
-            ? $recordsFiltered
-            : (int) DB::connection('pgsql')->query()->fromSub($union, 'u')->count();
-
-        // ----------------------------------------------------------------
-        // Ambil data dengan pagination
-        // ----------------------------------------------------------------
         $rows = (clone $base)
             ->select('u.*')
             ->orderByDesc('lulus_count')
@@ -2166,22 +2131,25 @@ class PitStopController extends Controller
             ->limit($length)
             ->get();
 
-        // ----------------------------------------------------------------
+        // ── Batch query belum_steps (hanya untuk baris di halaman ini) ───
-        // belum_steps: hanya ambil untuk baris yang ditampilkan saja (bukan semua)
+        $allSteps = DB::connection('pgsql')
-        // Jauh lebih efisien daripada subquery per-baris
+            ->table('public.masterpitstop')
-        // ----------------------------------------------------------------
+            ->where('statusenabled', true)
-        $pegawaiIds = $rows->where('tipe_karyawan', 'internal')->pluck('id')->toArray();
+            ->orderBy('id')
+            ->pluck('nama', 'id');  // [id => nama]
+
+        $internalIds = $rows->where('tipe_karyawan', 'internal')->pluck('id')->toArray();
         $luarIds     = $rows->where('tipe_karyawan', 'luar')->pluck('id')->toArray();
 
-        // Ambil step yang sudah lulus per pegawai (hanya untuk baris di halaman ini)
+        // Step yang sudah lulus, di-group per pegawai_id
         $lulusInternal = collect();
         $lulusLuar     = collect();
 
-        if (!empty($pegawaiIds)) {
+        if (!empty($internalIds)) {
             $lulusInternal = DB::connection('pgsql')
                 ->table('public.praakre as p')
                 ->join('public.masterpitstop as ms', DB::raw('ms.id::text'), '=', 'p.masterpitstop_id')
-                ->whereIn('p.pegawai_id', $pegawaiIds)
+                ->whereIn('p.pegawai_id', $internalIds)
                 ->where('ms.statusenabled', true)
                 ->select('p.pegawai_id', 'ms.id as step_id')
                 ->get()
@@ -2200,32 +2168,19 @@ class PitStopController extends Controller
                 ->groupBy('pegawai_id');
         }
 
-        // Semua step aktif
+        // ── Map hasil ────────────────────────────────────────────────────
-        $allSteps = DB::connection('pgsql')
-            ->table('public.masterpitstop')
-            ->where('statusenabled', true)
-            ->orderBy('id')
-            ->pluck('nama', 'id');
-
-        // ----------------------------------------------------------------
-        // Map hasil
-        // ----------------------------------------------------------------
         $data = $rows->map(function ($r) use ($totalSteps, $lulusInternal, $lulusLuar, $allSteps) {
             $isLuar      = $r->tipe_karyawan === 'luar';
-            $lulusMap = $isLuar
+            $lulusMap    = $isLuar ? ($lulusLuar->get($r->id) ?? collect())
-                ? ($lulusLuar->get($r->id) ?? collect())
                                 : ($lulusInternal->get($r->id) ?? collect());
-
+            $lulusIds    = $lulusMap->pluck('step_id')->toArray();
-            $lulusStepIds = $lulusMap->pluck('step_id')->toArray();
 
             $belumSteps  = $allSteps
-                ->filter(fn($nama, $id) => !in_array($id, $lulusStepIds))
+                ->filter(fn($nama, $id) => !in_array($id, $lulusIds))
-                ->values()
                 ->implode(', ');
 
             $lulus = (int) ($r->lulus_count ?? 0);
-            $belum   = $totalSteps - $lulus;
+            $belum = max(0, $totalSteps - $lulus);
-            $pct     = $totalSteps > 0 ? round(($lulus / $totalSteps) * 100, 1) : 0;
 
             return [
                 'tipe_karyawan' => (string) ($r->tipe_karyawan ?? 'internal'),
@@ -2233,9 +2188,9 @@ class PitStopController extends Controller
                 'nama'          => (string) ($r->nama ?? '-'),
                 'unit_name'     => (string) ($r->unit_name ?? '-'),
                 'lulus_count'   => $lulus,
-                'pct'           => $pct,
+                'pct'           => $totalSteps > 0 ? round(($lulus / $totalSteps) * 100, 1) : 0,
-                'selesai'       => $totalSteps > 0 ? ($lulus >= $totalSteps ? 1 : 0) : 0,
+                'selesai'       => $totalSteps > 0 && $lulus >= $totalSteps ? 1 : 0,
-                'belum_count'   => max(0, $belum),
+                'belum_count'   => $belum,
                 'belum_steps'   => $belumSteps,
             ];
         })->values();

storage/.gitignore

@@ -0,0 +1 @@
+/debugbar