fix value data

app/Http/Controllers/Dosen/KelompokController.php

@@ -27,11 +27,11 @@ class KelompokController extends Controller
         $title      = 'Daftar Kelompok';
         $bio        = auth()->user()->rBiodata;
         $getDosen   = GetDataApiController::getDosen();
-        // $periode    = Periode::where('status', 1)->first();
+        // $periode    = Periode::where('status', '1')->first();
         $periode    = Periode::query()->orderBy('nama', 'ASC')->get();
         $year       = !is_null($request->year) ? $request->year : now()->year;
 
-        $kelompok = Kelompok::with(['rAnggota'])
+        $kelompok = Kelompok::with(['rKetua', 'rAnggota'])
                     // ->where('nidn_dosen', $bio->noidentitas)
                     // ->when($bio->noidentitas !== null, function ($query) use ($bio) {
                     //     return $query->where('nidn_dosen', $bio->noidentitas)

app/Http/Controllers/Dosen/MonevController.php

@@ -21,7 +21,7 @@ class MonevController extends Controller
         $nidn     = $bio->noidentitas;
         $periode  = Periode::query()->get();
         $year     = !is_null($request->year) ? $request->year : now()->year;
-        $jadwal   = JadwalKegiatan::where('periode_id', $periode->where('status', 1)->first()->periode_id)
+        $jadwal   = JadwalKegiatan::where('periode_id', $periode->where('status', '1')->first()->periode_id)
                                   ->where('nama','Monev Internal '.$id)->first();
 
         $title    = 'Monev Internal '.$id;

app/Http/Controllers/Mahasiswa/KelompokController.php

@@ -33,7 +33,7 @@ class KelompokController extends Controller
         $periode_aktif    = Periode::where('status', '1')->first();
         $year       = !is_null($request->year) ? $request->year : now()->year;
 
-        $kelompok = Kelompok::with(['rAnggota'])
+        $kelompok = Kelompok::with(['rKetua', 'rAnggota'])
                     ->whereHas('rAnggota', function ($query) use($nim){
                         $query->where('nim', $nim);
                     })
@@ -41,7 +41,11 @@ class KelompokController extends Controller
                     ->orderBy('kode')
                     ->get();
 
-        $cekKel   = $kelompok->where('created_user', auth()->user()->id)->where('periode_id', $periode_aktif->periode_id)->whereIn('status', [0,1])->count();
+        // $cekKel   = $kelompok->where('created_user', auth()->user()->id)->where('periode_id', $periode_aktif->periode_id)->whereIn('status', [0,1])->count();
+        $cekKel = $kelompok->where('created_user', auth()->user()->id)
+                ->where('periode_id', $periode_aktif->periode_id)
+                ->whereRaw("TRIM(status) IN ('0','1')")
+                ->count();
 
         // $getMhs   = GetDataApiController::getAccount(20030244001);
         // dd($getMhs);
@@ -90,7 +94,7 @@ class KelompokController extends Controller
         Session::put('ss_kelompokid', $kelompok_id);
 
         $title      = 'Tambah Kelompok Mahasiswa';
-        $kelompok   = Kelompok::with('rAnggota')->where('kelompok_id', $kelompok_id)->first();
+        $kelompok   = Kelompok::with(['rKetua', 'rAnggota'])->where('kelompok_id', $kelompok_id)->first();
         $periode    = Periode::where('status', '1')->first();
         $getDosen   = GetDataApiController::getDosen();
 

app/Http/Controllers/Mahasiswa/MonevController.php

@@ -31,7 +31,7 @@ class MonevController extends Controller
         $nim      = $bio->noidentitas;
         $periode  = Periode::query()->get();
         $year     = !is_null($request->year) ? $request->year : now()->year;
-        $jadwal   = JadwalKegiatan::where('periode_id', $periode->where('status', 1)->first()->periode_id)
+        $jadwal   = JadwalKegiatan::where('periode_id', $periode->where('status', '1')->first()->periode_id)
                                 ->where('nama','Monev Internal '.$id)->first();
         // $jadwal = now();
 
@@ -176,13 +176,13 @@ class MonevController extends Controller
 
         return redirect()->route('mahasiswa.monev-index', $pro['monev'])->with('success', 'Proposal Berhasil revisi');
     }
-    
+
     public function revisiMonevAll($id)
     {
         $id = explode('__', decrypt($id));
         // $proposal = MonevInternal::with(['rProposal'])->find($id[0]);
         $proposal = MonevInternal::with(['rProposal'])->where('id', $id[0])->first();
-        
+
         $id[1] == 'II' ? $title = 'Revisi Dokumen Monev II' : $title = 'Revisi Dokumen Monev I';
         $type = ['proposal', 'logbook', 'kemajuan', 'akhir', 'produk'];
         $label = ['Unggah Revisi Proposal', 'Unggah Revisi Logbook', 'Unggah Revisi Laporan Kemajuan', 'Unggah Revisi Laporan Akhir', 'Unggah Revisi Produk Akhir'];
@@ -202,7 +202,7 @@ class MonevController extends Controller
     {
         $pro   = $request->except('_token');
         $type = ['proposal', 'logbook', 'kemajuan', 'akhir', 'produk'];
-        
+
         $request->validate([
             'produk_url' => 'nullable|url', // Produk URL validasi opsional
             'proposal' => 'nullable|mimes:pdf|max:5000',
@@ -214,7 +214,7 @@ class MonevController extends Controller
             'max' => ':attribute tidak boleh lebih dari 5MB.',
             // 'produk_url.url' => 'Produk URL harus berupa URL valid.',
         ]);
-            
+
         $proposal = MonevInternal::with(['rProposal'])->find($pro['monev_id']);
 
         foreach ($type as $field) {
@@ -226,7 +226,7 @@ class MonevController extends Controller
                 $file_nama  = $proposal->rProposal->rPeriode->nama.'_'.$proposal->rProposal->proposal_id.'.'.$file->getClientOriginalExtension();
                 $store = Storage::disk('static')->put('simpmw/monev/'.$pro['monev'].'/'.$field.'/'.$file_nama, file_get_contents($file->getRealPath()));
                 $url = 'simpmw/monev/'.$pro['monev'].'/'.$field.'/'.$file_nama;
-                
+
                 $proposal->{$field . '_file'} = $file_nama;
                 $proposal->{$field . '_date'} = now();
                 $urls[] = $url;
@@ -242,9 +242,9 @@ class MonevController extends Controller
     public function buktiAnggaran($id)
     {
         $monev_id = decrypt($id);
-        
+
         $title = 'Bukti Penggunaan Anggaran';
-        
+
         $anggaran = BuktiAnggaran::with(['rProposal', 'rMonev'])
                     ->where('monev_id', $monev_id)
                     ->get();
@@ -308,7 +308,7 @@ class MonevController extends Controller
                 'created_by' => $userid,
                 'updated_by' => $userid,
             ]);
-        
+
             DB::commit();
             return redirect()->route('mahasiswa.monev-anggaran', ['id' => encrypt($key['monev_id'])])->with('success', 'Data berhasil disimpan');
         } catch (\Exception $e) {

app/Http/Controllers/Mahasiswa/ProposalController.php

@@ -80,7 +80,7 @@ class ProposalController extends Controller
                                 ->where('periode_id', $periode->periode_id)
                                 ->first();
 
-        $jadwal   = JadwalKegiatan::where('periode_id', $periode->where('status', 1)->first()->periode_id)
+        $jadwal   = JadwalKegiatan::where('periode_id', $periode->where('status', '1')->first()->periode_id)
                                     ->where('nama','Upload Proposal Seleksi Internal')->first();
 
         // dd($jadwal->tanggal_sekesai);

app/Http/Controllers/Operator/DaftarProposalController.php

@@ -45,7 +45,7 @@ class DaftarProposalController extends Controller
 
     /* AJAX request */
     public function getData(Request $request){
-        // $periode    = Periode::where('status', 1)->first();
+        // $periode    = Periode::where('status', '1')->first();
         // $reqPeriodeId = $periode->periode_id;
 
         // parameter
@@ -220,7 +220,7 @@ class DaftarProposalController extends Controller
                         </td>';
 
                         $revisi1 = '';
-                        
+
             $revisi2 = '';
             if($record->reviewerProposal2){
                 if($record->reviewerProposal2->revisi_nilai != 1) {
@@ -789,7 +789,7 @@ class DaftarProposalController extends Controller
     private function createMonevInternal($proposalId)
     {
         $reviewerProposal = ReviewerProposal::where('proposal_id', $proposalId)->whereIn('urut', [1, 2]);
-        $count = $reviewerProposal->where('status_administrasi', 1)->count();
+        $count = $reviewerProposal->where('status_administrasi', '1')->count();
         $monevInternal = MonevInternal::query()->where('proposal_id', $proposalId)->get();
 
         // if($count == 2){
@@ -890,7 +890,7 @@ class DaftarProposalController extends Controller
         return Excel::download(new DaftarProposalExport($jenis, $status, $tahun), 'daftar_seleksi_internal_'.$tahun.'-export_pmw.xlsx');
         // $daftarProposalExport = new DaftarProposalExport($jenis, $status, $tahun);
         // $data = $daftarProposalExport->view(); // Mendapatkan koleksi data
-    
+
         // return $data;
     }
 

app/Http/Controllers/Operator/SelectController.php

@@ -15,7 +15,7 @@ class SelectController extends Controller
     {
         $nim = request('nim');
         $kelompok_id = Session::get('ss_kelompokid');
-        $kelompok   = Kelompok::with('rAnggota')->where('kelompok_id', $kelompok_id)->first();
+        $kelompok   = Kelompok::with(['rKetua', 'rAnggota'])->where('kelompok_id', $kelompok_id)->first();
 
         $person = GetDataApiController::getAccount($nim);
 

app/Models/Kelompok.php

@@ -39,6 +39,12 @@ class Kelompok extends Model
         return $this->hasMany(KelompokDetail::class, 'kelompok_id', 'kelompok_id')->orderBy('status_ketua');
     }
 
+    public function rKetua()
+    {
+        return $this->hasOne(KelompokDetail::class, 'kelompok_id', 'kelompok_id')
+                    ->whereRaw("TRIM(status_ketua) = '1'");
+    }
+
     public function rBiodata()
     {
         return $this->hasOne(Biodata::class, 'id', 'created_user');

resources/views/backend/dosen/kelompok/index.blade.php

@@ -74,8 +74,8 @@
                                 <tr id="row-{{ $token }}">
                                     <td>{{ $loop->iteration }}</td>
                                     <td>{{ $item->kode }}</td>
-                                    <td>{{ $item->rAnggota->where('status_ketua', 1)->count() > 0 ? $item->rAnggota->where('status_ketua', 1)[0]->nama : '' }}</td>
-                                    <td>{{ $item->rAnggota->where('status_ketua', 1)->count() > 0 ? $item->rAnggota->where('status_ketua', 1)[0]->nim : ''}}</td>
+                                    <td>{{ $item->rKetua->nama ?? '' }}</td>
+                                    <td>{{ $item->rKetua->nim ?? '' }}</td>
                                     <td>{{ $item->nama_dosen }}</td>
                                     <td>{{ $item->nidn_dosen }}</td>
                                     <td>

resources/views/backend/mahasiswa/kelompok/index.blade.php

@@ -82,8 +82,8 @@
                                 <tr id="row-{{ $token }}">
                                     <td>{{ $loop->iteration }}</td>
                                     <td>{{ $item->kode }}</td>
-                                    <td>{{ $item->rAnggota->where('status_ketua', 1)->count() > 0 ? $item->rAnggota->where('status_ketua', 1)[0]->nama : '' }}</td>
-                                    <td>{{ $item->rAnggota->where('status_ketua', 1)->count() > 0 ? $item->rAnggota->where('status_ketua', 1)[0]->nim : ''}}</td>
+                                    <td>{{ $item->rKetua->nama ?? '' }}</td>
+                                    <td>{{ $item->rKetua->nim ?? '' }}</td>
                                     <td>{{ $item->nama_dosen }}</td>
                                     <td>{{ $item->nidn_dosen }}</td>
                                     <td>
@@ -99,12 +99,12 @@
                                     </td>
                                     <td>
                                         <button data-bs-toggle="modal" data-bs-target="{{ '#lihat'.$item->kelompok_id }}" href="{{ URL::to('mahasiswa/kelompok-new', encrypt($item->kelompok_id)) }}" class="btn btn-info btn-sm">Lihat</button>
-    
+
                                         @if((auth()->user()->id == $item->created_user) && ($item->status == 0))
                                             <a href="{{ URL::to('mahasiswa/kelompok-new', encrypt($item->kelompok_id)) }}" class="btn btn-warning btn-sm">Edit</a>
                                             <a onclick="hapus('{{ encrypt($item->kelompok_id) }}', 'row-{{ $token }}')" class="btn btn-danger btn-sm">Hapus</a>
                                         @endif
-    
+
                                         <div id="{{ 'lihat'.$item->kelompok_id }}" class="modal fade" tabindex="-1" role="dialog"
                                             aria-labelledby="lihatLabel" aria-hidden="true">
                                             <div class="modal-dialog modal-xl">
@@ -153,7 +153,7 @@
                                                     </div>
                                                 </div>
                                             </div>
-                                        </div>  
+                                        </div>
                                     </td>
                                 </tr>
                                 @endforeach

resources/views/backend/mahasiswa/kelompok/modalkel.blade.php

@@ -12,7 +12,7 @@
                     <div class="col-12">
                         <h5 class="font-size-16">Silahkan pilih dosen pembimbing : </h5>
                     <p>
-                        <input type="hidden" name="periode" value="{{ $periode->where('status', 1)->first()->periode_id; }}" >
+                        <input type="hidden" name="periode" value="{{ $periode->where('status', '1')->first()->periode_id; }}" >
                         <select class="form-select" style="width: 100%" id="selectmodal" name="dosen">
                         <option selected>Pilih Dosen</option>
                             @foreach($dosen as $item)