diff --git a/app/Http/Controllers/MonitoringController.php b/app/Http/Controllers/MonitoringController.php index ad5b447..e92b41b 100644 --- a/app/Http/Controllers/MonitoringController.php +++ b/app/Http/Controllers/MonitoringController.php @@ -34,7 +34,9 @@ public function pemutihan(){ 'pengajuan_pemutihans.*', 'users.nama_gelar as dosen_pengampu', ) - ->join('users','users.id','=','dosen_id')->get(); + ->join('users','users.id','=','dosen_id') + ->orderBy('created_at','desc') + ->get(); return view('monitoring.pemutihan',['title' => 'Monitoring Pemutihan','data'=>$data]); } diff --git a/resources/views/monitoring/pemutihan.blade.php b/resources/views/monitoring/pemutihan.blade.php index d9a51ad..5876b75 100644 --- a/resources/views/monitoring/pemutihan.blade.php +++ b/resources/views/monitoring/pemutihan.blade.php @@ -66,7 +66,7 @@ {{$item->dosen_pengampu}} {{$item->ruang_kelas}} {{$item->tanggal_kelas}} - {{$item->status_operator}} + @if($item->status_operator === null)Diproses @else Selesai @endif @endforeach @@ -111,7 +111,7 @@ $("#example1").DataTable({ "pageLength": 50, "responsive": true, "lengthChange": false, "autoWidth": false, - order: [[6, 'asc']], + order: [[5, 'desc']], "buttons": ["csv", "excel", "pdf", "print", "colvis"] }).buttons().container().appendTo('#example1_wrapper .col-md-6:eq(0)');