diff --git a/app/Http/Controllers/ActivityController.php b/app/Http/Controllers/ActivityController.php
index 8670fe3..35daf20 100644
--- a/app/Http/Controllers/ActivityController.php
+++ b/app/Http/Controllers/ActivityController.php
@@ -326,7 +326,7 @@ class ActivityController extends Controller
         $filteredRecords = $query->count();
 
         // Get data with necessary relationships
-        $data = $query->with(['user', 'debiture', 'branch', 'tujuanPenilaian', 'penilaian', 'dokumenjaminan'])->get();
+        //$data = $query->with(['user', 'debiture', 'branch', 'tujuanPenilaian', 'penilaian', 'dokumenjaminan','nilaiPlafond'])->get();
 
         // Calculate total pages
         $pageCount = ceil($totalRecords / $request->get('size', 10));
@@ -444,26 +444,40 @@ class ActivityController extends Controller
             $jeniAsset = null;
             $statusPembayaran = trim(strtolower($item->permohonan->status_bayar ?? ''));
             $tujuanPenilaian = $item->permohonan->tujuanPenilaian->name ?? null;
+            $plafond = $item->permohonan->nilaiPlafond->name ?? null;
+
             $now = Carbon::now();
+            $type_report = $item->permohonan->penilai->type ?? "";
 
-            // $plafond = $item->permohonan->nilaiPlafond->name ?? null;
-            // $type_report = $item->permohonan->penilai->type_penilai;
+            $hari = $hariPaparan = 0;
 
-            // $hari = 0;
-            // if ($plafond == '< 1M') {
-            //     $item->paparan = 'Tidak Ada';
-            // }else if($plafond == '2 M - 5 M'){
-            //     $hari = 2;
-            // }else if($plafond == '5 M - 10 M'){
-            //     $hari = 3;
-            // }
+            if($type_report == "sederhana"){
+                $hari = 2;
+                $item->paparan = 'Tidak Ada';
+            } else{
+                if ($plafond == '< 2M') {
+                    $item->paparan = 'Tidak Ada';
+                    $hari = 3;
+                }else if($plafond == '2 M - 5 M'){
+                    $hari = 3;
+                    $hariPaparan = 2;
+                }else {
+                    $hari = 5;
+                    $hariPaparan = 3;
+                }
+            }
+
+            if ($tujuanPenilaian == 'RAP') {
+                $hari = 2;
+                $hariPaparan = 2;
+            }
 
 
             if ($item->permohonan && $item->permohonan->debiture) {
                 $jeniAsset = $item->permohonan->debiture->documents->first() ?? null;
             }
 
-            $hariTambahan = 0;
+            /*$hariTambahan = 0;
 
             if ($tujuanPenilaian == 'RAP') {
                 $hariTambahan = 2;
@@ -473,33 +487,50 @@ class ActivityController extends Controller
                 } else {
                     $hariTambahan = 2; // H+2 untuk yang belum bayar
                 }
-            }
+            }*/
 
             $tanggalMulai = $item->waktu_penilaian;
 
             if ($tanggalMulai) {
+                if (!$tanggalMulai instanceof Carbon) {
+                    $tanggalMulai = Carbon::parse($tanggalMulai);
+                }
+                $hariKerjaBerikutnya = hitungHariKerja($tanggalMulai->toDateString(),$tanggalMulai->copy()->addDays(1));
+                $hariKerjaBerikutnya = max($hariKerjaBerikutnya, 1);
+                $tanggalMulai = $tanggalMulai->copy()->addDays($hariKerjaBerikutnya);
+
                 // Konversi string tanggal ke objek Carbon jika belum
                 if (!$tanggalMulai instanceof Carbon) {
                     $tanggalMulai = Carbon::parse($tanggalMulai);
                 }
 
                 // Hitung tanggal selesai berdasarkan hari tambahan
-                $tanggalSelesai = $tanggalMulai->copy()->addDays($hariTambahan);
+                $tanggalSelesai = $tanggalMulai->copy()->addDays($hari);
+                $tanggalPaparan = $tanggalMulai->copy()->addDays($hariPaparan);
 
                 // Hitung hari kerja
                 $hariKerja = hitungHariKerja($tanggalMulai->toDateString(), $tanggalSelesai->toDateString());
+                $hariKerja = max($hariKerja, $hari);
+
+                $hariKerjaPaparan = hitungHariKerja($tanggalMulai->toDateString(), $tanggalPaparan->toDateString());
+                $hariKerjaPaparan = max($hariKerjaPaparan, $hariPaparan);
 
                 // Set due date SLA
                 $dueDateSla = $tanggalMulai->copy()->addDays($hariKerja);
+                $dueDateSlaPaparan = $tanggalMulai->copy()->addDays($hariKerjaPaparan);
 
                 // Cek apakah sudah melewati due date
-                if ($now->greaterThan($dueDateSla)) {
+                /*if ($now->greaterThan($dueDateSla)) {
                     $item->due_date_sla = null;
                 } else {
                     $item->due_date_sla = $dueDateSla->toDateString();
-                }
+                }*/
+
+                $item->due_date_sla = $dueDateSla->toDateString();
+                $item->paparan = $dueDateSlaPaparan->toDateString();
             } else {
                 $item->due_date_sla = null;
+                $item->paparan = null;
 
             }
 
diff --git a/app/Http/Controllers/LaporanController.php b/app/Http/Controllers/LaporanController.php
index 1fdbaa5..b457413 100644
--- a/app/Http/Controllers/LaporanController.php
+++ b/app/Http/Controllers/LaporanController.php
@@ -123,7 +123,7 @@ class LaporanController extends Controller
         $filteredRecords = $query->count();
 
         // Get the data for the current page
-        $data = $query->with(['user', 'debiture', 'branch', 'tujuanPenilaian', 'penilaian','jenisFasilitasKredit', 'documents.inspeksi','penilai'])->get();
+        $data = $query->with(['user', 'debiture', 'branch', 'tujuanPenilaian', 'penilaian','jenisFasilitasKredit', 'documents.inspeksi','penilai','documents.detail'])->get();
 
         // Calculate the page count
         $pageCount = ceil($totalRecords / $size);
diff --git a/resources/views/activity/progres_activity/index.blade.php b/resources/views/activity/progres_activity/index.blade.php
index 11c5fac..844fce5 100644
--- a/resources/views/activity/progres_activity/index.blade.php
+++ b/resources/views/activity/progres_activity/index.blade.php
@@ -120,8 +120,8 @@
                                                         <th class="min-w-[100px]">Tgl Assign</th>
                                                         <th class="min-w-[100px]">Tgl Kunjungan</th>
                                                         <th class="min-w-[100px]">Progress</th>
-                                                        <th class="min-w-[100px]">Due Date SLA</th>
-                                                        <th class="min-w-[100px]">Paparan</th>
+                                                        <th class="min-w-[100px]">SLA Laporan</th>
+                                                        <th class="min-w-[100px]">SLA Paparan</th>
                                                         <th class="min-w-[100px]">Approve</th>
                                                         <th class="min-w-[50px] text-center">Keterangan</th>
                                                         <th class="min-w-[50px] text-center">Action</th>
@@ -251,6 +251,15 @@
                                     return `${window.formatTanggalIndonesia(data.due_date_sla)}`;
                                 }
                             },
+                            due_date: {
+                                title: 'Due Date SLA',
+                                render: (item, data) => {
+                                    if (!data.due_date_sla) {
+                                        return `-`;
+                                    }
+                                    return `${window.formatTanggalIndonesia(data.due_date_sla)}`;
+                                },
+                            },
 
                             paparan: {
                                 title: 'Paparan',
@@ -258,7 +267,7 @@
                                     if (!data.due_date_sla) {
                                         return `-`;
                                     }
-                                    return `${window.formatTanggalIndonesia(data.due_date_sla)}`;
+                                    return `${window.formatTanggalIndonesia(data.paparan)}`;
                                 }
                             },
                             approve: {