Merge branch 'staging' into feature/senior-officer

app/Http/Controllers/LaporanController.php

@@ -105,7 +105,7 @@ class LaporanController extends Controller
         $filteredRecords = $query->count();
 
         // Get the data for the current page
-        $data = $query->with(['user', 'debiture', 'branch', 'tujuanPenilaian', 'penilaian','jenisFasilitasKredit', 'debiture.documents.inspeksi'])->get();
+        $data = $query->with(['user', 'debiture', 'branch', 'tujuanPenilaian', 'penilaian','jenisFasilitasKredit', 'debiture.documents.inspeksi','penilai'])->get();
 
         // Calculate the page count
         $pageCount = ceil($totalRecords / $size);

app/Http/Controllers/PenilaiController.php

@@ -375,7 +375,7 @@ class PenilaiController extends Controller
             });
         }
 
-        $query->whereRaw('LOWER(status) IN (?, ?, ?, ?, ?)', ['assign','done', 'proses-laporan', 'paparan', 'proses-paparan']);
+        $query->whereRaw('LOWER(status) IN (?, ?, ?, ?, ?, ?)', ['assign','done', 'proses-laporan', 'paparan', 'proses-paparan','paparan']);
 
         if (!Auth::user()->hasRole('administrator')) {
             $query->whereHas('penilaian.userPenilai', function ($q) {
@@ -390,6 +390,8 @@ class PenilaiController extends Controller
             $order  = $request->get('sortOrder');
             $column = $request->get('sortField');
             $query->orderBy($column, $order);
+        } else {
+            $query->orderBy('updated_at','DESC');
         }
 
         // Get the total count of records

resources/views/debitur/components/dokumen.blade.php

@@ -3,7 +3,7 @@
         @method('PUT')
     @endif
     @csrf
-    <input type="hidden" name="permohonan_id" value="{{ $document->id ?? request()->get('permohonan_id') }}">
+    <input type="hidden" name="permohonan_id" value="{{ $document->permohonan_id ?? request()->get('permohonan_id') }}">
     <div class="flex items-baseline flex-wrap lg:flex-nowrap gap-2.5">
         <label class="form-label max-w-56">
             Debitur

resources/views/laporan/index.blade.php

@@ -190,15 +190,19 @@
                         const dokumenID = data.debiture?.documents[0]?.id || '-';
                         const jenisJaminanID = data.debiture?.documents[0]?.jenis_jaminan_id || '-';
                         let laporanButton = '';
+                        let resumeButton = '';
+
+                        if(data.penilai.resume) {
                             const resumeButton = `
                         <a href="{{ route('penilai.print-out') }}?permohonanId=${data.id}&documentId=${dokumenID}&inspeksiId=${inspeksiId}&jaminanId=${jenisJaminanID}&statusLpj=0" class="btn btn-sm btn-success">
                             Resume
                         </a>`;
+                        }
 
                         if(data.nilai_liquidasi==null) {
                             laporanButton = `
                             <a href="laporan/${data.id}" class="btn btn-sm btn-dark">
-                                Input NL
+                                Laporn
                             </a>`;
                         }
 

resources/views/penilai/index.blade.php

@@ -68,6 +68,10 @@
                                     <span class="sort"> <span class="sort-label"> Due Date SLA </span>
                                         <span class="sort-icon"> </span> </span>
                                 </th>
+                                <th class="min-w-[150px]" data-datatable-column="status">
+                                    <span class="sort"> <span class="sort-label"> Status</span>
+                                        <span class="sort-icon"> </span> </span>
+                                </th>
                                 <th class="min-w-[50px] text-center" data-datatable-column="actions">Action</th>
                             </tr>
                         </thead>
@@ -178,10 +182,16 @@
                         return `${formatDate(new Date(data.created_at))}`;
                     },
                 },
+                status: {
+                    title: 'Status',
+                    render: (item, data) => {
+                        return `<span class="badge badge-sm badge-default uppercase flex justify-center">${data.status.replace(/-/g, ' ')}</span>`;
+                    },
+                },
                 actions: {
                     title: 'Action',
                     render: (item, data) => {
-                        if (data.status === 'done' || data.status === 'proses-laporan') {
+                        if (data.status === 'done' || data.status === 'proses-laporan' || data.status === 'paparan') {
                             return `
                         <div class="flex flex-nowrap justify-center gap-1.5">
                             <a class="btn btn-sm btn-outline btn-info" href="penilai/${data.id}/show">