update searching ketua

app/Http/Controllers/Operator/KelompokController.php

@@ -47,7 +47,7 @@ class KelompokController extends Controller
         $searchValue = strtoupper($search_arr['value']); // Search value
 
         // Total records
-        $statementGlobal = " STATUS_HAPUS = '0' ";
+        $statementGlobal = " KELOMPOK.STATUS_HAPUS = '0' ";
 
         if($status != "0")
         {
@@ -62,20 +62,23 @@ class KelompokController extends Controller
         }
 
         $totalRecords = Kelompok::select('count(1) as allcount')->whereRaw($statementGlobal)->count();
-        $statement = " AND (UPPER(NAMA_DOSEN) LIKE '%".$searchValue."%') ";
+        $statement = " AND B.STATUS_KETUA = '1' AND (UPPER(NAMA_DOSEN) LIKE '%".$searchValue."%' OR (UPPER(NAMA) LIKE '%".$searchValue."%')) ";
 
         $totalRecordswithFilter =   Kelompok::select('count(1) as allcount')
+                                    ->join('kelompok_detil as b', 'kelompok.kelompok_id', '=', 'b.kelompok_id')
                                     ->whereRaw($statementGlobal.$statement)->count();
 
         // Fetch records
         $records = Kelompok::orderBy($columnName,$columnSortOrder)
+            ->join('kelompok_detil as b', 'kelompok.kelompok_id', '=', 'b.kelompok_id')
             ->whereRaw($statementGlobal.$statement)
-            ->selectRaw('*, ambil_ketua_kelompok(kelompok.kelompok_id) ketua')
+            ->selectRaw('kelompok.kelompok_id, kode, nama_dosen, nidn_dosen, status, ambil_ketua_kelompok(kelompok.kelompok_id) ketua')
             ->skip($start)
             ->take($rowperpage)
             ->get();
 
         $data_arr = array();
+
         foreach($records as $record){
             $kelompok_id = $record->kelompok_id;
             $kode = $record->kode;