Skip to content

S
simpkm
Commit bd940a2b by Novan Bagus Setiawan
Options

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.
parent 5d9a4181
Showing with 44 additions and 29 deletions
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,21 +83,25 @@
Upload proposal pada : -<br>
Disetujui proposal pada : -<br>
@else
@if($item->status == '1')
<span class="badge bg-success">Sudah Disetujui Dosen</span> <br>
<strong> Keterangan : </strong> <br>
Upload proposal pada : <h6 class="text-primary"> {{ $item->date_upload }} </h6>
Disetujui proposal pada : <h6 class="text-primary"> {{ $item->date_approval }} </h6>
@elseif($item->status == '2')
<span class="badge bg-danger">Ditolak Dosen</span> <br>
<strong> Keterangan : </strong> <br>
Upload proposal pada : <h6 class="text-primary"> {{ $item->date_upload }} </h6>
Komentar : <h6 class="text-primary"> {{ $item->alasan_revisi }} </h6>
@if($item->rKelompok->status == '3')
<span class="badge bg-danger">Kelompok Ditolak Operator</span>
@else
<span class="badge bg-warning">Menunggu Persetujuan Dosen</span> <br>
<strong> Keterangan : </strong> <br>
Upload proposal pada : <h6 class="text-primary"> {{ $item->date_upload }} </h6>
Disetujui proposal pada :
@if($item->status == '1')
<span class="badge bg-success">Sudah Disetujui Dosen</span> <br>
<strong> Keterangan : </strong> <br>
Upload proposal pada : <h6 class="text-primary"> {{ $item->date_upload }} </h6>
Disetujui proposal pada : <h6 class="text-primary"> {{ $item->date_approval }} </h6>
@elseif($item->status == '2')
<span class="badge bg-danger">Ditolak Dosen</span> <br>
<strong> Keterangan : </strong> <br>
Upload proposal pada : <h6 class="text-primary"> {{ $item->date_upload }} </h6>
Komentar : <h6 class="text-primary"> {{ $item->alasan_revisi }} </h6>
@else
<span class="badge bg-warning">Menunggu Persetujuan Dosen</span> <br>
<strong> Keterangan : </strong> <br>
Upload proposal pada : <h6 class="text-primary"> {{ $item->date_upload }} </h6>
Disetujui proposal pada :
@endif
@endif
@endif
</td>
......
resources/views/backend/mahasiswa/proposal/index.blade.php
......@@ -84,22 +84,26 @@
Upload proposal pada : -<br>
Disetujui proposal pada : -<br>
@else
@if($item->status == '0')
<span class="badge bg-warning">Menunggu Persetujuan Dosen</span>
<strong> Keterangan : </strong> <br>
Upload proposal pada : <h6 class="text-primary"> {{ $item->date_upload }} </h6>
Disetujui proposal pada : <h6 class="text-primary"> {{ $item->date_approval }} </h6>
@elseif($item->status == '2')
<span class="badge bg-danger">Ditolak Dosen</span>
<strong> Keterangan : </strong> <br>
Upload proposal pada : <h6 class="text-primary"> {{ $item->date_upload }} </h6>
Komentar : <h6 class="text-primary"> {{ $item->alasan_revisi }} </h6>
@if($item->rKelompok->status == '3')
<span class="badge bg-danger">Kelompok Ditolak Operator</span>
@else
<span class="badge bg-success">Sudah Disetujui Dosen</span> <br>
{{-- <span class="badge bg-warning">Menunggu Persetujuan Dosen</span> <br> --}}
<strong> Keterangan : </strong> <br>
Upload proposal pada : <h6 class="text-primary"> {{ $item->date_upload }} </h6>
Disetujui proposal pada : <h6 class="text-primary"> {{ $item->date_approval }} </h6>
@if($item->status == '0')
<span class="badge bg-warning">Menunggu Persetujuan Dosen</span>
<strong> Keterangan : </strong> <br>
Upload proposal pada : <h6 class="text-primary"> {{ $item->date_upload }} </h6>
Disetujui proposal pada : <h6 class="text-primary"> {{ $item->date_approval }} </h6>
@elseif($item->status == '2')
<span class="badge bg-danger">Ditolak Dosen</span>
<strong> Keterangan : </strong> <br>
Upload proposal pada : <h6 class="text-primary"> {{ $item->date_upload }} </h6>
Komentar : <h6 class="text-primary"> {{ $item->alasan_revisi }} </h6>
@else
<span class="badge bg-success">Sudah Disetujui Dosen</span> <br>
{{-- <span class="badge bg-warning">Menunggu Persetujuan Dosen</span> <br> --}}
<strong> Keterangan : </strong> <br>
Upload proposal pada : <h6 class="text-primary"> {{ $item->date_upload }} </h6>
Disetujui proposal pada : <h6 class="text-primary"> {{ $item->date_approval }} </h6>
@endif
@endif
@endif
</td>
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment