perubahan pengecekan periode mahasiswa, jika sudah ikut tahun lalu ya seharusnya…

perubahan pengecekan periode mahasiswa, jika sudah ikut tahun lalu ya seharusnya bisa ikut tahun sekarang.

app/Helpers/InseoHelper.php

@@ -70,6 +70,8 @@ class InseoHelper
         'fiK' => 'FIO',
         'fak. ilmu olahraga' => 'FIO',
 
+        'ilmu keolahragaan dan kesehatan' => 'FIKK',
+
         'ekonomi' => 'FEB',
         'fakultas ekonomi' => 'FEB',
         'fe' => 'FEB',
@@ -80,6 +82,8 @@ class InseoHelper
         'vokasi' => 'VOKASI',
         'fakultas vokasi' => 'VOKASI',
         'fak. vokasi' => 'VOKASI',
+
+        'fak. vokasi' => 'VOKASI',
       ];
 
         return $fak;

app/Http/Controllers/GetDataApiController.php

@@ -26,7 +26,7 @@ class GetDataApiController extends Controller
         return json_decode($apiRequest->getBody()->getContents(), true);
     }
 
-    public function getAccount($nim)
+    public static function getAccount($nim)
     {
         $client = new Client();
 

app/Http/Controllers/Mahasiswa/KelompokController.php

@@ -30,6 +30,7 @@ class KelompokController extends Controller
         $nim        = $bio->noidentitas;
         $getDosen   = GetDataApiController::getDosen();
         $periode    = Periode::query()->get();
+        $periode_aktif    = Periode::where('status', 1)->first();
         $year       = !is_null($request->year) ? $request->year : now()->year;
 
         $kelompok = Kelompok::with(['rAnggota'])
@@ -40,7 +41,7 @@ class KelompokController extends Controller
                     ->orderBy('kode')
                     ->get();
 
-        $cekKel   = $kelompok->where('created_user', auth()->user()->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();
 
         // $getMhs   = GetDataApiController::getAccount(20030244001);
         // dd($getMhs);

app/Http/Controllers/Operator/DaftarProposalController.php

@@ -186,7 +186,7 @@ class DaftarProposalController extends Controller
                 $opt .= '<option value="'.Crypt::encrypt($proposal_id.'###'.$value->jenis_id).'" '.$selected.'>'.$value->nama.'</option>';
             }
 
-            $pil_jenis_pkm = '<td class="table-action">
+            $pil_jenis_pkm = '<td class="table-action" width="100%">
                 <select class="form-control select2 jenis">
                 '.$opt.'
                 </select>

resources/views/backend/operator/daftar_proposal/index.blade.php

@@ -83,15 +83,15 @@
                         <thead>
                             <tr>
                                 <th rowspan="2">id</th>
-                                <th rowspan="2">Kode Kelompok</th>
-                                <th rowspan="2">Jenis PKM</th>
-                                <th rowspan="2">Judul Proposal</th>
-                                <th rowspan="2">Dosen Pembimbing</th>
-                                <th rowspan="2">Reviewer 1</th>
-                                <th rowspan="2">Reviewer 2</th>
-                                <th colspan="2" style="text-align: center">Nilai</th>
-                                <th rowspan="2">Nilai Akhir</th>
-                                <th rowspan="2">Aksi</th>
+                                <th rowspan="2" width='5%'>Kode Kelompok</th>
+                                <th rowspan="2" width='15%'>Jenis PKM</th>
+                                <th rowspan="2" width='20%'>Judul Proposal</th>
+                                <th rowspan="2" width='10%'>Dosen Pembimbing</th>
+                                <th rowspan="2" width='15%'>Reviewer 1</th>
+                                <th rowspan="2" width='15%'>Reviewer 2</th>
+                                <th colspan="2" width='5%' style="text-align: center">Nilai</th>
+                                <th rowspan="2" width='5%'>Nilai Akhir</th>
+                                <th rowspan="2" width='10%'>Aksi</th>
                             </tr>
                             <tr>
                                 <th>Reviewer 1</th>