Enhance proposal status handling by adding checks for 'Kelompok Ditolak…

Enhance proposal status handling by adding checks for 'Kelompok Ditolak Operator' and updating display logic for proposal statuses in views.

app/Http/Controllers/Mahasiswa/ProposalController.php

@@ -77,6 +77,9 @@ class ProposalController extends Controller
 
         $cekproposal  = Proposal::where('created_user', auth()->user()->id)
                                 ->where('periode_id', $periode->periode_id)
+                                ->whereHas('rKelompok', function ($query) {
+                                    $query->where('status', '!=', '3');
+                                })
                                 ->first();
 
         $jadwal   = JadwalKegiatan::where('periode_id', $periode->where('status', 1)->first()->periode_id)

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

@@ -81,6 +81,10 @@
                                     @if(!is_null($item->kirim))
                                         @if($item->status == 0)
                                             <span class="badge bg-danger">Menunggu Persetujuan Dosen</span>
+                                        @elseif($item->status == 2)
+                                            <span class="badge bg-danger">Ditolak Dosen</span>
+                                        @elseif($item->status == 3)
+                                            <span class="badge bg-danger">Ditolak Operator</span>
                                         @else
                                             <span class="badge bg-success">Sudah Disetujui Dosen</span>
                                         @endif

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

@@ -83,6 +83,9 @@
                                         Upload proposal pada : -<br>
                                         Disetujui proposal pada : -<br>
                                     @else
+                                        @if($item->rKelompok->status == '3')
+                                            <span class="badge bg-danger">Kelompok Ditolak Operator</span>
+                                        @else
                                             @if($item->status == '1')
                                                 <span class="badge bg-success">Sudah Disetujui Dosen</span> <br>
                                                 <strong> Keterangan : </strong>  <br>
@@ -100,6 +103,7 @@
                                                 Disetujui proposal pada :
                                             @endif
                                         @endif
+                                    @endif
                                 </td>
                                 <td>
                                     <a data-toggle="tooltip"  data-id="{{ $item->proposal_id }}" data-original-title="Lihat" class="btn btn-info btn-sm lihatDet"><i class="far fa-eye"></i> Lihat</a>

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

@@ -84,6 +84,9 @@
                                         Upload proposal pada : -<br>
                                         Disetujui proposal pada : -<br>
                                     @else
+                                        @if($item->rKelompok->status == '3')
+                                            <span class="badge bg-danger">Kelompok Ditolak Operator</span>
+                                        @else
                                             @if($item->status == '0')
                                                 <span class="badge bg-warning">Menunggu Persetujuan Dosen</span>
                                                 <strong> Keterangan : </strong>  <br>
@@ -102,6 +105,7 @@
                                                 Disetujui proposal pada : <h6 class="text-primary"> {{ $item->date_approval }} </h6>
                                             @endif
                                         @endif
+                                    @endif
                                 </td>
                                 <td>
                                     <button data-bs-toggle="modal" data-bs-target="{{ '#lihat'.$item->proposal_id }}" href="{{ URL::to('mahasiswa/kelompok-new', encrypt($item->proposal_id)) }}" class="btn btn-info btn-sm">Lihat</button>