diff --git a/app/Exports/LaporanUserLimitExport.php b/app/Exports/LaporanUserLimitExport.php
new file mode 100644
index 0000000..eb2ac46
--- /dev/null
+++ b/app/Exports/LaporanUserLimitExport.php
@@ -0,0 +1,232 @@
+<?php
+
+namespace Modules\Lpj\Exports;
+
+use Maatwebsite\Excel\Concerns\FromCollection;
+use Maatwebsite\Excel\Concerns\WithHeadings;
+use Maatwebsite\Excel\Concerns\WithMapping;
+use Maatwebsite\Excel\Concerns\WithTitle;
+use Maatwebsite\Excel\Concerns\WithCustomStartCell;
+use Maatwebsite\Excel\Concerns\WithEvents;
+use Maatwebsite\Excel\Events\AfterSheet;
+use Modules\Lpj\Models\Permohonan;
+use Modules\Lpj\Models\Branch;
+use Illuminate\Support\Facades\Auth;
+use Carbon\Carbon;
+use Illuminate\Support\Facades\DB;
+
+class LaporanUserLimitExport implements FromCollection, WithHeadings, WithMapping, WithTitle, WithCustomStartCell, WithEvents
+{
+    protected $request;
+
+    public function __construct($request)
+    {
+        $this->request = $request;
+    }
+
+    public function collection()
+    {
+        $query = Permohonan::query();
+        $query = $query->where('status', 'done');
+
+        // Apply date range filter if provided
+        if ($this->request->has('start_date') || $this->request->has('end_date')) {
+             $startDate = $this->request->start_date ?? '1900-01-01';
+            $endDate = $this->request->end_date ?? now()->toDateString();
+
+            $query->where(function ($q) use ($startDate, $endDate) {
+
+                $q->whereHas('penilaian', function ($q2) use ($startDate, $endDate) {
+                    $q2->whereBetween('tanggal_kunjungan', [$startDate, $endDate]);
+                });
+
+                // OR check if has penawaran with date in range
+                $q->orWhereHas('penawaran', function ($q3) use ($startDate, $endDate) {
+                    $q3->whereBetween('tanggal_penilaian_sebelumnya', [$startDate, $endDate]);
+                });
+            });
+        }
+
+        // Apply branch filter if provided
+        if ($this->request->has('branch_id') && !empty($this->request->branch_id)) {
+            $query->where('branch_id', $this->request->branch_id);
+        }
+
+        if ($this->request->has('penilai_id') && !empty($this->request->penilai_id)) {
+            $request = $this->request; // Store in a local variable
+            $query->whereHas('penilaian._user_penilai.userPenilaiTeam', function ($q) use ($request) {
+                $q->where('user_id', $request->penilai_id);
+            });
+        }
+
+        // Apply search filter if provided
+        if ($this->request->has('search') && !empty($this->request->search)) {
+            $search = $this->request->search;
+            $query->where(function ($q) use ($search) {
+                $q->where('nomor_registrasi', 'LIKE', '%' . $search . '%');
+                $q->orWhere('tanggal_permohonan', 'LIKE', '%' . $search . '%');
+                $q->orWhereRelation('user', 'name', 'LIKE', '%' . $search . '%');
+                $q->orWhereRelation('tujuanPenilaian', 'name', 'LIKE', '%' . $search . '%');
+                 $q->orWhereRelation('debiture', DB::raw('LOWER(name)'), 'LIKE', '%' . strtolower($search) . '%');
+
+                $q->orWhereRelation('branch', 'name', 'LIKE', '%' . $search . '%');
+                $q->orWhereRelation('jenisFasilitasKredit', 'name', 'LIKE', '%' . $search . '%');
+                $q->orWhereRelation('jenisPenilaian', 'name', 'LIKE', '%' . $search . '%');
+                $q->orWhere('status', 'LIKE', '%' . $search . '%');
+            });
+        }
+
+        // Default ordering
+        $query->orderBy('nomor_registrasi', 'asc');
+
+        return $query->get();
+    }
+
+    protected $rowNumber = 0;
+
+    public function map($permohonan): array
+    {
+        $this->rowNumber++;
+        $npw = 0;
+
+        if (isset($permohonan->penilai->lpj)) {
+            $lpj = json_decode($permohonan->penilai->lpj, true);
+            $npw = str_replace('.', '', $lpj['total_nilai_pasar_wajar'] ?? 0);
+        }
+
+        return [
+            $this->rowNumber,
+            $permohonan->nomor_registrasi,
+            $permohonan->debiture->branch->name ?? '',
+            $permohonan->debiture->name ?? '',
+            $permohonan->user->name ?? $permohonan->mig_nama_ao ?? '',
+            $permohonan->tanggal_permohonan ?? '',
+            $permohonan->penilaian->_user_penilai->userPenilaiTeam->name ?? '',
+            $permohonan->penilaian && $permohonan->penilaian->tanggal_kunjungan
+    ? formatTanggalIndonesia($permohonan->penilaian->tanggal_kunjungan)
+    : '',
+             formatRupiah($npw, 2),
+        ];
+    }
+
+    public function headings(): array
+    {
+        return [
+            'No',
+            'Nomor Registrasi',
+            'Cabang',
+            'Nama Debitur',
+            'Pemohon',
+            'Tanggal Permohonan',
+            'Nama Penilai',
+            'Tanggal Laporan',
+            'Nilai Pasar Wajar',
+
+        ];
+    }
+
+    /**
+     * @return string
+     */
+    public function title(): string
+    {
+        return 'Laporan User Limit';
+    }
+
+    /**
+     * @return string
+     */
+    public function startCell(): string
+    {
+        return 'A7';
+    }
+
+    /**
+     * @return array
+     */
+    public function registerEvents(): array
+    {
+        return [
+            AfterSheet::class => function (AfterSheet $event) {
+                // Get the sheet
+                $sheet = $event->sheet->getDelegate();
+
+                // Set the title
+                $sheet->setCellValue('A1', 'LAPORAN PENILAIAN JAMINAN');
+                $sheet->getStyle('A1')->getFont()->setBold(true)->setSize(16);
+
+                // Merge cells for title
+                $sheet->mergeCells('A1:AH1');
+                $sheet->getStyle('A1')->getAlignment()->setHorizontal(\PhpOffice\PhpSpreadsheet\Style\Alignment::HORIZONTAL_CENTER);
+
+                // Set the branch information if filtered
+                $branchInfo = '';
+                if ($this->request->has('branch_id') && !empty($this->request->branch_id)) {
+                    $branch = Branch::find($this->request->branch_id);
+                    if ($branch) {
+                        $branchInfo = 'Cabang: ' . $branch->name;
+                        $sheet->setCellValue('A2', $branchInfo);
+                        $sheet->mergeCells('A2:AH2');
+                        $sheet->getStyle('A2')->getAlignment()->setHorizontal(\PhpOffice\PhpSpreadsheet\Style\Alignment::HORIZONTAL_CENTER);
+                        $sheet->getStyle('A2')->getFont()->setBold(true);
+                    }
+                }
+
+                // Set the period
+                $startDate = $this->request->start_date ?? '';
+                $endDate = $this->request->end_date ?? '';
+
+                $rowIndex = $branchInfo ? 3 : 2;
+
+                if ($startDate && $endDate) {
+                    $startDateFormatted = Carbon::parse($startDate)->format('d F Y');
+                    $endDateFormatted = Carbon::parse($endDate)->format('d F Y');
+                    $sheet->setCellValue('A' . $rowIndex, 'Periode: ' . $startDateFormatted . ' - ' . $endDateFormatted);
+                } else {
+                    $sheet->setCellValue('A' . $rowIndex, 'Periode: Semua Data');
+                }
+                $sheet->mergeCells('A' . $rowIndex . ':AH' . $rowIndex);
+                $sheet->getStyle('A' . $rowIndex)->getAlignment()->setHorizontal(\PhpOffice\PhpSpreadsheet\Style\Alignment::HORIZONTAL_CENTER);
+
+                // Set the date of export
+                $rowIndex++;
+                $sheet->setCellValue('A' . $rowIndex, 'Tanggal Export: ' . Carbon::now()->format('d F Y H:i:s'));
+
+                // Set the user who exported
+                $rowIndex++;
+                $userName = Auth::user() ? Auth::user()->name : 'System';
+                $sheet->setCellValue('A' . $rowIndex, 'Diexport oleh: ' . $userName);
+
+                // Add a blank line
+                $rowIndex++;
+                $sheet->setCellValue('A' . $rowIndex, '');
+
+                // Style the header row
+                $headerRange = 'A7:' . $sheet->getHighestColumn() . '7';
+                $sheet->getStyle($headerRange)->getFont()->setBold(true);
+                $sheet->getStyle($headerRange)->getFill()
+                      ->setFillType(\PhpOffice\PhpSpreadsheet\Style\Fill::FILL_SOLID)
+                      ->getStartColor()->setARGB('FFCCCCCC');
+
+                // Auto-size columns - fixed to handle columns beyond Z
+                $highestColumn = $sheet->getHighestColumn();
+                $highestColumnIndex = \PhpOffice\PhpSpreadsheet\Cell\Coordinate::columnIndexFromString($highestColumn);
+
+                for ($i = 1; $i <= $highestColumnIndex; $i++) {
+                    $currentColumn = \PhpOffice\PhpSpreadsheet\Cell\Coordinate::stringFromColumnIndex($i);
+                    $sheet->getColumnDimension($currentColumn)->setAutoSize(true);
+                }
+
+                // Add borders to all cells with data
+                $dataRange = 'A7:' . $sheet->getHighestColumn() . $sheet->getHighestRow();
+                $sheet->getStyle($dataRange)->getBorders()->getAllBorders()->setBorderStyle(\PhpOffice\PhpSpreadsheet\Style\Border::BORDER_THIN);
+
+                // Center align the header row
+                $sheet->getStyle($headerRange)->getAlignment()->setHorizontal(\PhpOffice\PhpSpreadsheet\Style\Alignment::HORIZONTAL_CENTER);
+
+                // Set text wrap for header cells
+                $sheet->getStyle($headerRange)->getAlignment()->setWrapText(true);
+            },
+        ];
+    }
+}
diff --git a/app/Http/Controllers/LaporanUserController.php b/app/Http/Controllers/LaporanUserController.php
index 7d48559..3d6801b 100644
--- a/app/Http/Controllers/LaporanUserController.php
+++ b/app/Http/Controllers/LaporanUserController.php
@@ -4,6 +4,8 @@ namespace Modules\Lpj\Http\Controllers;
 
 use App\Http\Controllers\Controller;
 use Illuminate\Http\Request;
+    use Maatwebsite\Excel\Facades\Excel;
+use Modules\Lpj\Exports\LaporanUserLimitExport;
 use Modules\Lpj\Services\LaporanUserService;
 
 class LaporanUserController extends Controller
@@ -38,4 +40,12 @@ class LaporanUserController extends Controller
         return $this->laporanUserService->dataForDatatables($request);
     }
 
+     public function export(Request $request)
+    {
+        $startDate = $request->start_date;
+        $endDate = $request->end_date;
+        // name of the file
+        $fileName = 'laporan_user_limit' . $startDate . '_' . $endDate . '.xlsx';
+        return Excel::download(new LaporanUserLimitExport($request), $fileName);
+    }
 }
diff --git a/app/Services/LaporanBiayaService.php b/app/Services/LaporanBiayaService.php
new file mode 100644
index 0000000..049ab91
--- /dev/null
+++ b/app/Services/LaporanBiayaService.php
@@ -0,0 +1,21 @@
+<?php
+
+namespace Modules\Lpj\Services;
+use Illuminate\Http\Request;
+use Modules\Lpj\Models\Permohonan;
+
+class LaporanBiayaService
+{
+    public function buildDataTableQuery(array $data){
+        $query = Permohonan::with([
+            'noc'
+        ]);
+
+        if($data['search']){
+
+        }
+
+
+        return $query;
+    }
+}
diff --git a/app/Services/LaporanSLAPenilaiService.php b/app/Services/LaporanSLAPenilaiService.php
index 9010ceb..74acdaf 100644
--- a/app/Services/LaporanSLAPenilaiService.php
+++ b/app/Services/LaporanSLAPenilaiService.php
@@ -5,124 +5,119 @@ namespace Modules\Lpj\Services;
 use Modules\Lpj\Models\Permohonan;
 use Modules\Lpj\Models\Penilaian;
 use Illuminate\Http\Request;
+use Carbon\Carbon;
 
 class LaporanSLAPenilaiService
 {
     public function dataForDatatables(Request $request)
-        {
-            // Retrieve data from the database
-            $query = Permohonan::query();
-            $query = $query->where('status', 'done');
+    {
+        // Retrieve data from the database
+        $query = Permohonan::query();
+        $query = $query->where('status', 'done');
 
-            // Apply search filter if provided
-            if ($request->has('search') && !empty($request->get('search'))) {
-                $search = json_decode($request->get('search'));
+        // Apply search filter if provided
+        if ($request->has('search') && !empty($request->get('search'))) {
+            $search = json_decode($request->get('search'));
 
-                if (isset($search->start_date) || isset($search->end_date)) {
-                    $query->whereBetween('tanggal_permohonan', [
-                        $search->start_date ?? '1900-01-01',
-                        $search->end_date ?? now()->toDateString()
-                    ]);
-                }
-
-
-                if (isset($search->penilai_id) && !empty($search->penilai_id)) {
-                    $query->whereHas('penilaian._user_penilai.userPenilaiTeam', function($q) use ($search) {
-                        $q->where('user_id', $search->penilai_id);
-                    });
-                }
-
-                if (isset($search->search)) {
-
-                    $query->where(function ($q) use ($search) {
-                        $q->where('nomor_registrasi', 'LIKE', '%' . $search->search . '%');
-                        $q->orWhere('tanggal_permohonan', 'LIKE', '%' . $search->search . '%');
-                        $q->orWhereRelation('user', 'name', 'LIKE', '%' . $search->search . '%');
-                        $q->orWhereRelation('tujuanPenilaian', 'name', 'LIKE', '%' . $search->search . '%');
-                        $q->orWhereRelation('branch', 'name', 'LIKE', '%' . $search->search . '%');
-                        $q->orWhereRelation('jenisFasilitasKredit', 'name', 'LIKE', '%' . $search->search . '%');
-                        $q->orWhereRelation('jenisPenilaian', 'name', 'LIKE', '%' . $search->search . '%');
-                        $q->orWhere('status', 'LIKE', '%' . $search->search . '%');
-                    });
-                }
+            if (isset($search->start_date) || isset($search->end_date)) {
+                $query->whereBetween('tanggal_permohonan', [
+                    $search->start_date ?? '1900-01-01',
+                    $search->end_date ?? now()->toDateString()
+                ]);
             }
 
-            // Apply sorting if provided
-            if ($request->has('sortOrder') && !empty($request->get('sortOrder'))) {
-                $order  = $request->get('sortOrder');
-                $column = $request->get('sortField');
-                $query->orderBy($column, $order);
+
+            if (isset($search->penilai_id) && !empty($search->penilai_id)) {
+                $query->whereHas('penilaian._user_penilai.userPenilaiTeam', function ($q) use ($search) {
+                    $q->where('user_id', $search->penilai_id);
+                });
             }
 
-            // Get the total count of records
-            $totalRecords = $query->count();
+            if (isset($search->search)) {
 
-            // Apply pagination if provided
-            if ($request->has('page') && $request->has('size')) {
-                $page   = $request->get('page');
-                $size   = $request->get('size');
-                $offset = ($page - 1) * $size; // Calculate the offset
-
-                $query->skip($offset)->take($size);
+                $query->where(function ($q) use ($search) {
+                    $q->where('nomor_registrasi', 'LIKE', '%' . $search->search . '%');
+                    $q->orWhere('tanggal_permohonan', 'LIKE', '%' . $search->search . '%');
+                    $q->orWhereRelation('user', 'name', 'LIKE', '%' . $search->search . '%');
+                    $q->orWhereRelation('tujuanPenilaian', 'name', 'LIKE', '%' . $search->search . '%');
+                    $q->orWhereRelation('branch', 'name', 'LIKE', '%' . $search->search . '%');
+                    $q->orWhereRelation('jenisFasilitasKredit', 'name', 'LIKE', '%' . $search->search . '%');
+                    $q->orWhereRelation('jenisPenilaian', 'name', 'LIKE', '%' . $search->search . '%');
+                    $q->orWhere('status', 'LIKE', '%' . $search->search . '%');
+                });
             }
-
-            // Get the filtered count of records
-            $filteredRecords = $query->count();
-
-            // Get the data for the current page
-            $data = $query->with(['debiture.branch'])->get();
-
-            $data = $data->map(function ($permohonan) {
-                $luas_tanah    = 0;
-                $luas_bangunan = 0;
-                $nilai_tanah     = 0;
-                $nilai_bangunan  = 0;
-                $npw = 0;
-                $nilai_liquidasi = 0;
-                if (isset($permohonan->penilai->lpj)) {
-                    $lpj = json_decode($permohonan->penilai->lpj, true);
-                    $npw = str_replace('.', '', $lpj['total_nilai_pasar_wajar'] ?? 0);
-
-                    $luas_tanah    = $lpj['luas_tanah'] ?? 0;
-                    $luas_bangunan = $lpj['luas_bangunan'] ?? 0;
-                    // Calculate nilai_tanah dynamically by looking for all keys that start with 'nilai_tanah_'
-                    $nilai_tanah     = str_replace('.', '', $lpj['nilai_tanah_2'] ?? 0);
-
-                    $nilai_bangunan  = str_replace('.', '', $lpj['nilai_bangunan_2'] ?? 0);
-                    $nilai_liquidasi = str_replace('.', '', $lpj['likuidasi_nilai_2'] ?? 0);
-                }
-
-                return [
-                    'id'                => $permohonan->id,
-                    'nomor_registrasi'  => $permohonan->nomor_registrasi,
-                    'tanggal_permohonan' => $permohonan->tanggal_permohonan,
-                    'branch'            => $permohonan->debiture?->branch?->name,
-                    'name'              => $permohonan->debiture?->name,
-                    'pemohon'           => $permohonan->creator?->name,
-                    'tujuan_penilaian'  => $permohonan->tujuanPenilaian?->name,
-                    'jenis_agunan'      => $permohonan->documents?->pluck('jenisJaminan.name')->unique()->implode(', '),
-
-                    'tanggal_laporan'   => $permohonan->approval_dd_at ?? $permohonan->approval_eo_at ?? '',
-                    'tanggal_review'    => $permohonan->penilaian?->tanggal_kunjungan ?? '',
-                    'nama_penilai'      => $permohonan->penilaian?->_user_penilai?->userPenilaiTeam?->name,
-                ];
-            });
-
-            // Calculate the page count
-            $pageCount = ceil($totalRecords / $request->get('size'));
-
-            // Calculate the current page number
-            $currentPage = $request->get('page', 1);
-
-            // Return the response data as a JSON object
-            return response()->json([
-                'draw'            => $request->get('draw'),
-                'recordsTotal'    => $totalRecords,
-                'recordsFiltered' => $filteredRecords,
-                'pageCount'       => $pageCount,
-                'page'            => $currentPage,
-                'totalCount'      => $totalRecords,
-                'data'            => $data,
-            ]);
         }
+
+        // Apply sorting if provided
+        if ($request->has('sortOrder') && !empty($request->get('sortOrder'))) {
+            $order  = $request->get('sortOrder');
+            $column = $request->get('sortField');
+            $query->orderBy($column, $order);
+        }
+
+        // Get the total count of records
+        $totalRecords = $query->count();
+
+        // Apply pagination if provided
+        if ($request->has('page') && $request->has('size')) {
+            $page   = $request->get('page');
+            $size   = $request->get('size');
+            $offset = ($page - 1) * $size; // Calculate the offset
+
+            $query->skip($offset)->take($size);
+        }
+
+        // Get the filtered count of records
+        $filteredRecords = $query->count();
+
+        // Get the data for the current page
+        $data = $query->with(['documents','debiture.branch'])->get();
+
+        $data = $data->map(function ($permohonan) {
+
+            $tgl_kunjungan = $permohonan->penilaian?->tanggal_kunjungan;
+            $tgl_otorisator = $permohonan->approval_dd_at ?? $permohonan->approval_eo_at ?? $permohonan->approval_so_at;
+            $jangkaWaktu = $this->hitungTotalJangkaWaktuSla($tgl_kunjungan, $tgl_otorisator);
+
+
+
+            return [
+                'id'                => $permohonan->id,
+                'nomor_registrasi'  => $permohonan->nomor_registrasi,
+                'tanggal_permohonan' => $permohonan->tanggal_permohonan,
+                'branch'            => $permohonan->debiture?->branch?->name,
+                'name'              => $permohonan->debiture?->name,
+                'pemohon'           => $permohonan->creator?->name,
+                'tujuan_penilaian'  => $permohonan->tujuanPenilaian?->name,
+                'tanggal_laporan'   => $permohonan->approval_dd_at ?? $permohonan->approval_eo_at ?? '',
+                'tanggal_approval'    => $permohonan->approval_dd_at ?? $permohonan->approval_eo_at ?? '',
+                'tanggal_kunjungan'    => $permohonan->penilaian?->tanggal_kunjungan ?? '',
+                'nama_penilai'      => $permohonan->penilaian?->_user_penilai?->userPenilaiTeam?->name,
+                'jangka_waktu' => $jangkaWaktu,
+                'keterangan' => $permohonan->keterangan
+            ];
+        });
+
+        // Calculate the page count
+        $pageCount = ceil($totalRecords / $request->get('size'));
+
+        // Calculate the current page number
+        $currentPage = $request->get('page', 1);
+
+        // Return the response data as a JSON object
+        return response()->json([
+            'draw'            => $request->get('draw'),
+            'recordsTotal'    => $totalRecords,
+            'recordsFiltered' => $filteredRecords,
+            'pageCount'       => $pageCount,
+            'page'            => $currentPage,
+            'totalCount'      => $totalRecords,
+            'data'            => $data,
+        ]);
+    }
+
+    private function hitungTotalJangkaWaktuSla($tgl_kunjungan,$tgl_otorisator){
+            $countHariKerja = hitungHariKerja($tgl_kunjungan, $tgl_otorisator);
+            return $countHariKerja;
+    }
 }
diff --git a/app/Services/LaporanUserService.php b/app/Services/LaporanUserService.php
index c53dd59..9890aaa 100644
--- a/app/Services/LaporanUserService.php
+++ b/app/Services/LaporanUserService.php
@@ -85,96 +85,25 @@ class LaporanUserService
         $data = $query->with(['debiture.branch'])->get();
 
         $data = $data->map(function ($permohonan) {
-            $luas_tanah      = 0;
-            $luas_bangunan   = 0;
-            $nilai_tanah     = 0;
-            $nilai_bangunan  = 0;
+
             $npw             = 0;
-            $nilai_liquidasi = 0;
+
 
             if (isset($permohonan->penilai->lpj)) {
                 $lpj = json_decode($permohonan->penilai->lpj, true);
                 $npw = str_replace('.', '', $lpj['total_nilai_pasar_wajar'] ?? 0);
-
-                $luas_tanah    = $lpj['luas_tanah'] ?? 0;
-                $luas_bangunan = $lpj['luas_bangunan'] ?? 0;
-                // Calculate nilai_tanah dynamically by looking for all keys that start with 'nilai_tanah_'
-                $nilai_tanah = str_replace('.', '', $lpj['nilai_tanah_2'] ?? 0);
-
-                $nilai_bangunan  = str_replace('.', '', $lpj['nilai_bangunan_2'] ?? 0);
-                $nilai_liquidasi = str_replace('.', '', $lpj['likuidasi_nilai_2'] ?? 0);
             }
 
             return [
                 'id'                        => $permohonan->id,
                 'nomor_registrasi'          => $permohonan->nomor_registrasi,
-                'jenis_penilaian'           => $permohonan->jenisPenilaian?->name,
-                'tujuan_penilaian'          => $permohonan->tujuanPenilaian?->name,
-                'jenis_fasilitas_kredit'    => $permohonan->jenisFasilitasKredit?->name,
                 'branch'                    => $permohonan->debiture->branch?->name,
-                'pemohon'                   => $permohonan->creator?->name,
-                'cif'                       => $permohonan->debiture->cif,
                 'name'                      => $permohonan->debiture?->name,
-                'jenis_agunan'              => $permohonan->documents?->pluck('jenisJaminan.name')
-                                                                     ->unique()
-                                                                     ->implode(', '),
-                'alamat_agunan'             => $permohonan->documents?->map(function ($document) {
-                    return formatAlamat($document);
-                })->unique()->implode(', '),
-                'bukti_kepemilikan' => (function () use ($permohonan) {
-                    $legalitasItems = $permohonan->documents?->flatMap(function ($document) {
-                        return $document->detail->map(function ($detail) {
-                            // Jika tidak ada jenis legalitas jaminan, lewati
-                            if (empty($detail->jenisLegalitasJaminan)) {
-                                return null;
-                            }
-
-                            // Hanya tampilkan detail yang memiliki dokumen_jaminan
-                            if (empty($detail->dokumen_jaminan)) {
-                                return null;
-                            }
-
-                            // Tampilkan nama legalitas jaminan saja
-                            return $detail->jenisLegalitasJaminan->name ?? '';
-                        });
-                    })->filter()->unique()->values()->toArray();
-
-                    // Buat daftar bernomor
-                    $result = '';
-                    foreach ($legalitasItems as $index => $item) {
-                        $result .= ($index + 1) . '. ' . $item . "\n";
-                    }
-
-                    return $result;
-                })(),
-                'nama_pemilik'              => $permohonan->documents?->pluck('pemilik.name')
-                                                                     ->unique()
-                                                                     ->implode(', '),
-                'luas_tanah'                => $luas_tanah . ' m²',
-                'nilai_tanah'               => formatRupiah($nilai_tanah, 2),
-                'luas_bangunan'             => $luas_bangunan . ' m²',
-                'nilai_bangunan'            => formatRupiah($nilai_bangunan, 2),
-                'nilai_njop'                => formatRupiah($permohonan->nilai_njop, 2),
-                'nilai_pasar_wajar'         => formatRupiah($npw, 2),
-                'nilai_likuidasi'           => formatRupiah($nilai_liquidasi, 2),
-                'tanggal_documen_diterima'  => $permohonan->documents?->map(function ($document) {
-                    return $document->created_at->format('d-m-Y');
-                }),
-                'tanggal_spk'               => '',
-                'nomor_spk'                 => '',
-                'tanggal_rencana_kunjunagn' => '',
-                'tanggal_kunjungan'         => '',
-                'taggal_delivered'          => '',
-                'jangka_waktu_sla'          => '',
-                'nama_penilai'              => $permohonan->penilaian?->_user_penilai?->userPenilaiTeam?->name,
-                'nama_team_leader'          => $permohonan->penilaian?->teams,
-                'saran'                     => '',
-                'catatan'                   => '',
-
-
+                'pemohon'                   => $permohonan->creator?->name,
                 'tanggal_permohonan' => $permohonan->tanggal_permohonan,
+                'nama_penilai'              => $permohonan->penilaian?->_user_penilai?->userPenilaiTeam?->name,
                 'tanggal_laporan'    => $permohonan->approval_dd_at ?? $permohonan->approval_eo_at ?? '',
-                'tanggal_review'     => $permohonan->penilaian?->tanggal_kunjungan ?? '',
+                 'nilai_pasar_wajar'         => formatRupiah($npw, 2)
             ];
         });
 
diff --git a/resources/views/daftar-pustaka/index.blade.php b/resources/views/daftar-pustaka/index.blade.php
index 847a640..057c59f 100644
--- a/resources/views/daftar-pustaka/index.blade.php
+++ b/resources/views/daftar-pustaka/index.blade.php
@@ -5,6 +5,15 @@
 @endsection
 
 @section('content')
+<style>
+    @media (max-width: 768px) {
+    #previewContent {
+        height: 400px;
+        overflow: auto;
+    }
+}
+
+</style>
 
     <div class="flex flex-col items-stretch gap-7">
         <div class="flex items-center gap-3 w-full">
@@ -66,10 +75,12 @@
             @if (isset($daftar_pustaka))
                 @foreach ($daftar_pustaka as $item)
                     <div class="card border shadow-none ">
-                        <a class="show-pustaka h-[300px] w-full block" href="{{ route('daftar-pustaka.show', $item->id) }}"
+                        <a class="show-pustaka h-[300px] bg-gray-200 w-full block" href="{{ route('daftar-pustaka.show', $item->id) }}"
                             data-url="{{ $item->attachment }}">
                             <div class="p-4 h-full w-full flex items-center justify-center overflow-hidden">
-                                <div class="preview-content h-full w-full"></div>
+                                <div class="  text-red-500 flex items-center justify-center rounded">
+                                <i class="ki-filled ki-document text-3xl"></i>
+                            </div>
                             </div>
                         </a>
 
@@ -84,18 +95,18 @@
                                 </p>
                             </a>
                             <div class="flex justify-between items-center gap-2.5 mt-2">
-                                <p class="badge  rounded-full badge-sm badge-outline badge-success text-xs text-gray-700">
+                                <p class="badge  rounded-full badge-xs badge-outline badge-success text-xs text-gray-700">
                                     # {{ $item->category->name }}</p>
 
                                 @auth
                                     @if (auth()->user()->hasRole(['administrator', 'admin']))
                                         <div>
-                                            <a class="btn btn-sm btn-danger" onclick="deleteData({{ $item->id }})">
+                                            <a class="btn btn-xs btn-danger" onclick="deleteData({{ $item->id }})">
                                                 <i class="ki-filled ki-trash">
                                                 </i>
                                                 Hapus
                                             </a>
-                                            <a class="btn btn-sm btn-info"
+                                            <a class="btn btn-xs btn-info"
                                                 href="{{ route('daftar-pustaka.edit', $item->id) }}">
                                                 <i class="ki-filled ki-pencil">
                                                 </i>
@@ -120,22 +131,24 @@
                         <div class="card-body flex items-center flex-wrap justify-between p-2 pe-5 gap-4.5">
                             <div class="flex items-center gap-3.5">
                                 <div
-                                    class="kt-card flex items-center justify-center bg-accent/50 h-[70px] w-[90px] shadow-none">
+                                    class="card bg-gray-200 flex items-center justify-center bg-accent/50 h-[70px] w-[90px] shadow-none">
                                     <a class="show-pustaka h-[90px] w-full block"
                                         href="{{ route('daftar-pustaka.show', $item->id) }}"
                                         data-url="{{ $item->attachment }}">
                                         <div class="p-4 h-full w-full flex items-center justify-center overflow-hidden">
-                                            <div class="preview-content h-full w-full"></div>
+                                            <div class="  text-red-500 flex items-center justify-center rounded">
+                                <i class="ki-filled ki-document text-3xl"></i>
+                            </div>
                                         </div>
                                     </a>
                                 </div>
+                                <a href="{{ route('daftar-pustaka.show', $item->id) }}">
                                 <div class="flex flex-col gap-2 cursor-pointer">
-                                    <a href="{{ route('daftar-pustaka.show', $item->id) }}">
                                         <div class="flex items-center mt-1">
                                             <a class="hover:text-primary text-sm font-medium text-mono leading-5.5">
                                                 {{ $item->judul }}
-                                            </a>
-                                        </div>
+                                            </div>
+                                        </a>
                                         <div class="flex items-center flex-wrap gap-3">
                                             <span class="kt-badge kt-badge-warning kt-badge-sm rounded-full gap-1">
                                                 <span class="text-xs font-medium text-foreground">
@@ -144,8 +157,8 @@
                                             </span>
 
                                         </div>
-                                    </a>
-                                </div>
+                                    </div>
+                                </a>
                             </div>
                             <div class="flex items-center gap-1.5">
                                 <p class="badge  rounded-full badge-sm badge-outline badge-success text-xs text-gray-700">
@@ -202,7 +215,6 @@
 @endsection
 
 @push('scripts')
-    <script src="{{ asset('vendor/pdfobject.min.js') }}"></script>
     <script type="text/javascript">
         function deleteData(data) {
             Swal.fire({
@@ -236,30 +248,7 @@
         }
 
 
-        document.addEventListener('DOMContentLoaded', function() {
-            document.querySelectorAll('.show-pustaka').forEach(function(element) {
-                const url = element.getAttribute('data-url');
-                const previewContent = element.querySelector('.preview-content');
 
-                if (!previewContent || !url) return;
-
-                const fileExtension = url.split('.').pop().toLowerCase();
-
-                if (fileExtension === 'pdf') {
-                    PDFObject.embed(url, previewContent, {
-                        height: "100%",
-                        width: "100%"
-                    });
-                } else if (['jpg', 'jpeg', 'png', 'gif'].includes(fileExtension)) {
-                    previewContent.innerHTML = `
-                <img src="${url}" alt="Preview"
-                     class="w-full h-full object-cover rounded" />
-            `;
-                } else {
-                    previewContent.innerHTML = '<p class="text-center">Unsupported file type</p>';
-                }
-            });
-        });
 
         function showGrid() {
             document.getElementById("daftar_pustaka_grid").classList.remove("hidden");
diff --git a/resources/views/daftar-pustaka/show.blade.php b/resources/views/daftar-pustaka/show.blade.php
index 0472df0..2ca6c40 100644
--- a/resources/views/daftar-pustaka/show.blade.php
+++ b/resources/views/daftar-pustaka/show.blade.php
@@ -4,6 +4,7 @@
     {{-- {{ Breadcrumbs::render(request()->route()->getName()) }} --}}
 @endsection
 
+
 @section('content')
     <div class="w-full grid gap-5 lg:gap-7.5 mx-auto">
 
@@ -22,17 +23,36 @@
                     </div>
                 </div>
                 <div class="card-body grid gap-5">
-                    <div
-                        class=" min-w-3xl w-[1280px] h-[768px]">
+                    <div class=" min-w-3xl">
                         <div class="p-4 h-full flex flex-col">
                             <div class="flex justify-between items-center mb-4">
-                                <button type="button" id="downloadBtn" class="btn btn-primary btn-sm">
+                                <a href="{{ asset('storage/' . $daftarPustaka->attachment)}}" class="btn btn-primary btn-sm">
                                     <i class="ki-duotone ki-cloud-download me-1"><span class="path1"></span><span
                                             class="path2"></span></i>
                                     Download File
-                                </button>
+                                </a>
                             </div>
-                            <div id="previewContent" class="flex-grow"></div>
+                            @php
+
+                                $fileExtension = pathinfo($daftarPustaka->attachment, PATHINFO_EXTENSION);
+                                // cek extension
+                                $isPdf = $fileExtension == 'pdf';
+                                $imageExtensions = ['jpg', 'jpeg', 'png', 'gif', 'webp'];
+                                $isImage = in_array(strtolower($fileExtension), $imageExtensions);
+                                $fileUrl = asset('storage/' . $daftarPustaka->attachment);
+                            @endphp
+
+                            @if ($isPdf)
+                                <iframe src="{{$fileUrl}}"
+                                    width="100%" height="600px" frameborder="0"></iframe>
+                            @elseif ($isImage)
+                                <img src="{{ $fileUrl }}" class="w-full  object-contain rounded" />
+                            @else
+                                <p class="text-red-500">File tidak bisa ditampilkan, silakan <a href="{{ $fileUrl }}"
+                                        class="text-blue-500 underline" download>unduh di sini</a>.</p>
+                            @endif
+
+
                         </div>
                     </div>
 
@@ -47,7 +67,7 @@
     </div>
 @endsection
 
-@push('scripts')
+{{-- @push('scripts')
     <script src="{{ asset('vendor/pdfobject.min.js') }}"></script>
 
     <script>
@@ -59,7 +79,12 @@
             const previewContent = document.getElementById('previewContent');
 
             if (['pdf'].includes(fileExtension)) {
-                PDFObject.embed(url, "#previewContent");
+                if (window.innerWidth < 768) {
+                    document.getElementById('pdfFrame').style.display = 'block';
+                    document.getElementById('pdfFrame').src = urlStorage;
+                } else {
+                    PDFObject.embed(urlStorage, "#previewContent");
+                }
             } else if (['jpg', 'jpeg', 'png', 'gif'].includes(fileExtension)) {
                 previewContent.innerHTML =
                     `<img src="${url}" alt="Preview" class="max-w-full max-h-full object-contain">`;
@@ -68,4 +93,4 @@
             }
         });
     </script>
-@endpush
+@endpush --}}
diff --git a/resources/views/laporan-biaya/external.blade.php b/resources/views/laporan-biaya/external.blade.php
index bc59c17..b39e173 100644
--- a/resources/views/laporan-biaya/external.blade.php
+++ b/resources/views/laporan-biaya/external.blade.php
@@ -44,15 +44,6 @@
                             @endforeach
                         </select>
                     </div>
-                    <div class="flex flex-col">
-                        <label class="text-base font-medium mb-1">Penilai</label>
-                        <select class="select tomselect" id="penilai_filter">
-                            <option value="">Semua Penilai</option>
-                            @foreach(\MOdules\Usermanagement\Models\User::role(['penilai','surveyor'])->get() as $penilai)
-                                <option value="{{ $penilai->id }}">{{ $penilai->name }}</option>
-                            @endforeach
-                        </select>
-                    </div>
                 </div>
 
                 <!-- Buttons row at the bottom -->
@@ -73,7 +64,7 @@
         <div class="card border border-agi-100 card-grid min-w-full" data-datatable="false" data-datatable-page-size="10" data-datatable-state-save="false" id="laporan-hasil-penilaian-jaminan-internal-external-table" data-api-url="{{ route('laporan-hasil-penilaian-jaminan-internal-external.data') }}">
             <div class="card-header bg-agi-50 py-5 flex-wrap">
                 <h3 class="card-title">
-                    Laporan Hasil Penilaian Jaminan Internal & External
+                    Rekap Penyelesaian External
                 </h3>
             </div>
 
@@ -89,130 +80,53 @@
                                 <span class="sort"> <span class="sort-label"> Nomor Registrasi </span>
                                     <span class="sort-icon"> </span> </span>
                             </th>
-                            <th class="min-w-[150px]" data-datatable-column="tanggal_permohonan">
-                                <span class="sort"> <span class="sort-label"> Tanggal Permohonan </span>
-                                    <span class="sort-icon"> </span> </span>
-                            </th>
                             <th class="min-w-[150px]" data-datatable-column="branch">
                                 <span class="sort"> <span class="sort-label"> Cabang </span>
                                     <span class="sort-icon"> </span> </span>
                             </th>
-                            <th class="min-w-[150px]" data-datatable-column="pemohon">
-                                <span class="sort"> <span class="sort-label"> Pemohon </span>
-                                    <span class="sort-icon"> </span> </span>
-                            </th>
-                            <th class="min-w-[150px]" data-datatable-column="cif">
-                                <span class="sort"> <span class="sort-label"> CIF </span>
-                                    <span class="sort-icon"> </span> </span>
-                            </th>
-                            <th class="min-w-[150px]" data-datatable-column="name">
+                                   <th class="min-w-[150px]" data-datatable-column="name">
                                 <span class="sort"> <span class="sort-label"> Nama Debitur </span>
                                     <span class="sort-icon"> </span> </span>
                             </th>
+                            <th class="min-w-[150px]" data-datatable-column="tanggal_permohonan">
+                                <span class="sort"> <span class="sort-label"> Tanggal KSL </span>
+                                    <span class="sort-icon"> </span> </span>
+                            </th>
+
+                            <th class="min-w-[150px]" data-datatable-column="pemohon">
+                                <span class="sort"> <span class="sort-label"> Nomor KSL </span>
+                                    <span class="sort-icon"> </span> </span>
+                            </th>
+                            <th class="min-w-[150px]" data-datatable-column="cif">
+                                <span class="sort"> <span class="sort-label"> Nominal KSL </span>
+                                    <span class="sort-icon"> </span> </span>
+                            </th>
+
                             <th class="min-w-[150px]" data-datatable-column="jenis_penilaian">
-                                <span class="sort"> <span class="sort-label"> Jenis Penilaian </span>
+                                <span class="sort"> <span class="sort-label">Tanggal Penyelesaian </span>
                                     <span class="sort-icon"> </span> </span>
                             </th>
                             <th class="min-w-[150px]" data-datatable-column="tujuan_penilaian">
-                                <span class="sort"> <span class="sort-label"> Tujuan Penilaian </span>
+                                <span class="sort"> <span class="sort-label"> Nominal Penyelesaian </span>
                                     <span class="sort-icon"> </span> </span>
                             </th>
                             <th class="min-w-[150px]" data-datatable-column="jenis_fasilitas_kredit">
-                                <span class="sort"> <span class="sort-label"> Jenis Fasilitas Kredit </span>
+                                <span class="sort"> <span class="sort-label"> No. Rekening (Tujuan Akhir) </span>
+                                    <span class="sort-icon"> </span> </span>
+                            </th>
+                            <th class="min-w-[150px]" data-datatable-column="jenis_fasilitas_kredit">
+                                <span class="sort"> <span class="sort-label"> Sisa KSL </span>
                                     <span class="sort-icon"> </span> </span>
                             </th>
                             <th class="min-w-[150px]" data-datatable-column="jenis_agunan">
-                                <span class="sort"> <span class="sort-label"> Jenis Agunan </span>
+                                <span class="sort"> <span class="sort-label"> Memo </span>
                                     <span class="sort-icon"> </span> </span>
                             </th>
                             <th class="min-w-[150px]" data-datatable-column="alamat_agunan">
-                                <span class="sort"> <span class="sort-label"> Alamat Agunan </span>
+                                <span class="sort"> <span class="sort-label"> Status</span>
                                     <span class="sort-icon"> </span> </span>
                             </th>
-                            <th class="min-w-[150px]" data-datatable-column="bukti_kepemilikan">
-                                <span class="sort"> <span class="sort-label"> Bukti Kepemilikan </span>
-                                    <span class="sort-icon"> </span> </span>
-                            </th>
-                            <th class="min-w-[150px]" data-datatable-column="nama_pemilik">
-                                <span class="sort"> <span class="sort-label"> Nama Pemilik </span>
-                                    <span class="sort-icon"> </span> </span>
-                            </th>
-                            <th class="min-w-[150px]" data-datatable-column="luas_tanah">
-                                <span class="sort"> <span class="sort-label"> Luas Tanah </span>
-                                    <span class="sort-icon"> </span> </span>
-                            </th>
-                            <th class="min-w-[150px]" data-datatable-column="nilai_tanah">
-                                <span class="sort"> <span class="sort-label"> Nilai Tanah </span>
-                                    <span class="sort-icon"> </span> </span>
-                            </th>
-                            <th class="min-w-[150px]" data-datatable-column="luas_bangunan">
-                                <span class="sort"> <span class="sort-label"> Luas Bangunan </span>
-                                    <span class="sort-icon"> </span> </span>
-                            </th>
-                            <th class="min-w-[150px]" data-datatable-column="nilai_bangunan">
-                                <span class="sort"> <span class="sort-label"> Nilai Bangunan </span>
-                                    <span class="sort-icon"> </span> </span>
-                            </th>
-                            <th class="min-w-[150px]" data-datatable-column="nilai_njop">
-                                <span class="sort"> <span class="sort-label"> Nilai NJOP </span>
-                                    <span class="sort-icon"> </span> </span>
-                            </th>
-                            <th class="min-w-[150px]" data-datatable-column="nilai_pasar_wajar">
-                                <span class="sort"> <span class="sort-label"> Nilai Pasar Wajar </span>
-                                    <span class="sort-icon"> </span> </span>
-                            </th>
-                            <th class="min-w-[150px]" data-datatable-column="nilai_likuidasi">
-                                <span class="sort"> <span class="sort-label"> Nilai Likuidasi </span>
-                                    <span class="sort-icon"> </span> </span>
-                            </th>
-                            <th class="min-w-[150px]" data-datatable-column="tanggal_documen_diterima">
-                                <span class="sort"> <span class="sort-label"> Tanggal Dokumen Diterima </span>
-                                    <span class="sort-icon"> </span> </span>
-                            </th>
-                            <th class="min-w-[150px]" data-datatable-column="tanggal_spk">
-                                <span class="sort"> <span class="sort-label"> Tanggal SPK </span>
-                                    <span class="sort-icon"> </span> </span>
-                            </th>
-                            <th class="min-w-[150px]" data-datatable-column="nomor_spk">
-                                <span class="sort"> <span class="sort-label"> Nomor SPK </span>
-                                    <span class="sort-icon"> </span> </span>
-                            </th>
-                            <th class="min-w-[150px]" data-datatable-column="tanggal_rencana_kunjunagn">
-                                <span class="sort"> <span class="sort-label"> Tanggal Rencana Kunjungan </span>
-                                    <span class="sort-icon"> </span> </span>
-                            </th>
-                            <th class="min-w-[150px]" data-datatable-column="tanggal_kunjungan">
-                                <span class="sort"> <span class="sort-label"> Tanggal Kunjungan </span>
-                                    <span class="sort-icon"> </span> </span>
-                            </th>
-                            <th class="min-w-[150px]" data-datatable-column="taggal_delivered">
-                                <span class="sort"> <span class="sort-label"> Tanggal Delivered </span>
-                                    <span class="sort-icon"> </span> </span>
-                            </th>
-                            <th class="min-w-[150px]" data-datatable-column="jangka_waktu_sla">
-                                <span class="sort"> <span class="sort-label"> Jangka Waktu SLA </span>
-                                    <span class="sort-icon"> </span> </span>
-                            </th>
-                            <th class="min-w-[150px]" data-datatable-column="tanggal_laporan">
-                                <span class="sort"> <span class="sort-label"> Tanggal Laporan </span>
-                                    <span class="sort-icon"> </span> </span>
-                            </th>
-                            <th class="min-w-[150px]" data-datatable-column="tanggal_review">
-                                <span class="sort"> <span class="sort-label"> Tanggal Review </span>
-                                    <span class="sort-icon"> </span> </span>
-                            </th>
-                            <th class="min-w-[150px]" data-datatable-column="nama_penilai">
-                                <span class="sort"> <span class="sort-label"> Nama Penilai </span>
-                                    <span class="sort-icon"> </span> </span>
-                            </th>
-                            <th class="min-w-[150px]" data-datatable-column="nama_team_leader">
-                                <span class="sort"> <span class="sort-label"> Nama Team Leader </span>
-                                    <span class="sort-icon"> </span> </span>
-                            </th>
-                            <th class="min-w-[150px]" data-datatable-column="saran">
-                                <span class="sort"> <span class="sort-label"> Saran </span>
-                                                                    <span class="sort-icon"> </span> </span>
-                            </th>
+
                             <th class="min-w-[150px]" data-datatable-column="catatan">
                                 <span class="sort"> <span class="sort-label"> Catatan </span>
                                     <span class="sort-icon"> </span> </span>
@@ -266,144 +180,41 @@
                 nomor_registrasi: {
                     title: 'Nomor Registrasi',
                 },
-                tanggal_permohonan: {
+                 branch: {
+                    title: 'Cabang',
+                },
+                 name: {
+                    title: 'Nama Debitur',
+                },
+                tanggal_ksl: {
                     title: 'Tanggal Permohonan',
                     render: (item, data) => {
                         return data.tanggal_permohonan ? window.formatTanggalIndonesia(data.tanggal_permohonan) : '-';
                     },
                 },
-                branch: {
-                    title: 'Cabang',
-                },
-                pemohon: {
-                    title: 'Pemohon',
-                },
-                cif: {
+                nomor_ksl: {
                     title: 'CIF',
                 },
-                name: {
-                    title: 'Nama Debitur',
-                },
-                jenis_penilaian: {
+                nominal_ksl: {
                     title: 'Jenis Penilaian',
                 },
-                tujuan_penilaian: {
+                tanggal_penyelesaian: {
                     title: 'Tujuan Penilaian',
                 },
-                jenis_fasilitas_kredit: {
+                nominal_penyelesaian: {
                     title: 'Jenis Fasilitas Kredit',
                 },
-                jenis_agunan: {
+                nomor_rekening: {
+                    title: 'Nomor Rekening',
+                },
+                sisa_ksl: {
                     title: 'Jenis Agunan',
                 },
-                alamat_agunan: {
-                    title: 'Alamat Agunan',
+                memo: {
+                    title: 'Memo',
                 },
-                bukti_kepemilikan: {
-                    title: 'Bukti Kepemilikan',
-                    render: (item, data) => {
-                        if (data.bukti_kepemilikan) {
-                            // Ganti karakter baris baru dengan tag <br> untuk HTML
-                            return data.bukti_kepemilikan.split('\n').join('<br>');
-                        }
-                        return '-';
-                    },
-                },
-                nama_pemilik: {
-                    title: 'Nama Pemilik',
-                },
-                luas_tanah: {
-                    title: 'Luas Tanah',
-                },
-                nilai_tanah: {
-                    title: 'Nilai Tanah',
-                    render: (item, data) => {
-                        return data.nilai_tanah ?? '-';
-                    },
-                },
-                luas_bangunan: {
-                    title: 'Luas Bangunan',
-                },
-                nilai_bangunan: {
-                    title: 'Nilai Bangunan',
-                    render: (item, data) => {
-                        return data.nilai_bangunan ?? '-';
-                    },
-                },
-                nilai_njop: {
-                    title: 'Nilai NJOP',
-                    render: (item, data) => {
-                        return data.nilai_njop ?? '-';
-                    },
-                },
-                nilai_pasar_wajar: {
-                    title: 'Nilai Pasar Wajar',
-                    render: (item, data) => {
-                        return data.nilai_pasar_wajar ?? '-';
-                    },
-                },
-                nilai_likuidasi: {
-                    title: 'Nilai Likuidasi',
-                    render: (item, data) => {
-                        return data.nilai_likuidasi ?? '-';
-                    },
-                },
-                tanggal_documen_diterima: {
-                    title: 'Tanggal Dokumen Diterima',
-                    render: (item, data) => {
-                        return data.tanggal_documen_diterima ? window.formatTanggalIndonesia(data.tanggal_documen_diterima) : '-';
-                    },
-                },
-                tanggal_spk: {
-                    title: 'Tanggal SPK',
-                    render: (item, data) => {
-                        return data.tanggal_spk ? window.formatTanggalIndonesia(data.tanggal_spk) : '-';
-                    },
-                },
-                nomor_spk: {
-                    title: 'Nomor SPK',
-                },
-                tanggal_rencana_kunjunagn: {
-                    title: 'Tanggal Rencana Kunjungan',
-                    render: (item, data) => {
-                        return data.tanggal_rencana_kunjunagn ? window.formatTanggalIndonesia(data.tanggal_rencana_kunjunagn) : '-';
-                    },
-                },
-                tanggal_kunjungan: {
-                    title: 'Tanggal Kunjungan',
-                    render: (item, data) => {
-                        return data.tanggal_kunjungan ? window.formatTanggalIndonesia(data.tanggal_kunjungan) : '-';
-                    },
-                },
-                taggal_delivered: {
-                    title: 'Tanggal Delivered',
-                    render: (item, data) => {
-                        return data.taggal_delivered ? window.formatTanggalIndonesia(data.taggal_delivered) : '-';
-                    },
-                },
-                jangka_waktu_sla: {
-                    title: 'Jangka Waktu SLA',
-                },
-                tanggal_laporan: {
-                    title: 'Tanggal Laporan',
-                    render: (item, data) => {
-                        return data.tanggal_laporan ? window.formatTanggalIndonesia(data.tanggal_laporan) : '-';
-                    },
-                },
-                tanggal_review: {
-                    title: 'Tanggal Review',
-                    render: (item, data) => {
-                        return data.tanggal_review ? window.formatTanggalIndonesia(data.tanggal_review) : '-';
-                    },
-                },
-                nama_penilai: {
-                    title: 'Nama Penilai',
-                },
-                nama_team_leader: {
-                    title: 'Nama Team Leader',
-                },
-                saran: {
-                    title: 'Saran',
+                status: {
+                    title: 'Status',
                 },
                 catatan: {
                     title: 'Catatan',
diff --git a/resources/views/laporan-biaya/internal.blade.php b/resources/views/laporan-biaya/internal.blade.php
index 860f8cc..5f5658a 100644
--- a/resources/views/laporan-biaya/internal.blade.php
+++ b/resources/views/laporan-biaya/internal.blade.php
@@ -44,15 +44,7 @@
                             @endforeach
                         </select>
                     </div>
-                    <div class="flex flex-col">
-                        <label class="text-base font-medium mb-1">Penilai</label>
-                        <select class="select tomselect" id="penilai_filter">
-                            <option value="">Semua Penilai</option>
-                            @foreach(\MOdules\Usermanagement\Models\User::role(['penilai','surveyor'])->get() as $penilai)
-                                <option value="{{ $penilai->id }}">{{ $penilai->name }}</option>
-                            @endforeach
-                        </select>
-                    </div>
+
                 </div>
 
                 <!-- Buttons row at the bottom -->
@@ -73,7 +65,7 @@
         <div class="card border border-agi-100 card-grid min-w-full" data-datatable="false" data-datatable-page-size="10" data-datatable-state-save="false" id="laporan-hasil-penilaian-jaminan-internal-external-table" data-api-url="{{ route('laporan-hasil-penilaian-jaminan-internal-external.data') }}">
             <div class="card-header bg-agi-50 py-5 flex-wrap">
                 <h3 class="card-title">
-                    Laporan Hasil Penilaian Jaminan Internal & External
+                    Rekap Penyelesaian Internal
                 </h3>
             </div>
 
@@ -81,7 +73,7 @@
                 <div class="scrollable-x-auto">
                     <table class="table table-auto table-border align-middle text-gray-700 font-medium text-sm" data-datatable-table="true">
                         <thead>
-                        <tr>
+                       <tr>
                             <th class="w-14">
                                 <input class="checkbox checkbox-sm" data-datatable-check="true" type="checkbox"/>
                             </th>
@@ -89,130 +81,49 @@
                                 <span class="sort"> <span class="sort-label"> Nomor Registrasi </span>
                                     <span class="sort-icon"> </span> </span>
                             </th>
-                            <th class="min-w-[150px]" data-datatable-column="tanggal_permohonan">
-                                <span class="sort"> <span class="sort-label"> Tanggal Permohonan </span>
-                                    <span class="sort-icon"> </span> </span>
-                            </th>
                             <th class="min-w-[150px]" data-datatable-column="branch">
                                 <span class="sort"> <span class="sort-label"> Cabang </span>
                                     <span class="sort-icon"> </span> </span>
                             </th>
-                            <th class="min-w-[150px]" data-datatable-column="pemohon">
-                                <span class="sort"> <span class="sort-label"> Pemohon </span>
-                                    <span class="sort-icon"> </span> </span>
-                            </th>
-                            <th class="min-w-[150px]" data-datatable-column="cif">
-                                <span class="sort"> <span class="sort-label"> CIF </span>
-                                    <span class="sort-icon"> </span> </span>
-                            </th>
-                            <th class="min-w-[150px]" data-datatable-column="name">
+                                   <th class="min-w-[150px]" data-datatable-column="name">
                                 <span class="sort"> <span class="sort-label"> Nama Debitur </span>
                                     <span class="sort-icon"> </span> </span>
                             </th>
+                            <th class="min-w-[150px]" data-datatable-column="tanggal_permohonan">
+                                <span class="sort"> <span class="sort-label"> Tanggal KSL </span>
+                                    <span class="sort-icon"> </span> </span>
+                            </th>
+
+                            <th class="min-w-[150px]" data-datatable-column="pemohon">
+                                <span class="sort"> <span class="sort-label"> Nomor KSL </span>
+                                    <span class="sort-icon"> </span> </span>
+                            </th>
+                            <th class="min-w-[150px]" data-datatable-column="cif">
+                                <span class="sort"> <span class="sort-label"> Nominal KSL </span>
+                                    <span class="sort-icon"> </span> </span>
+                            </th>
+
                             <th class="min-w-[150px]" data-datatable-column="jenis_penilaian">
-                                <span class="sort"> <span class="sort-label"> Jenis Penilaian </span>
+                                <span class="sort"> <span class="sort-label">Tanggal Penyelesaian </span>
                                     <span class="sort-icon"> </span> </span>
                             </th>
                             <th class="min-w-[150px]" data-datatable-column="tujuan_penilaian">
-                                <span class="sort"> <span class="sort-label"> Tujuan Penilaian </span>
+                                <span class="sort"> <span class="sort-label"> Nominal Penyelesaian </span>
                                     <span class="sort-icon"> </span> </span>
                             </th>
                             <th class="min-w-[150px]" data-datatable-column="jenis_fasilitas_kredit">
-                                <span class="sort"> <span class="sort-label"> Jenis Fasilitas Kredit </span>
+                                <span class="sort"> <span class="sort-label"> Sisa KSL </span>
                                     <span class="sort-icon"> </span> </span>
                             </th>
                             <th class="min-w-[150px]" data-datatable-column="jenis_agunan">
-                                <span class="sort"> <span class="sort-label"> Jenis Agunan </span>
+                                <span class="sort"> <span class="sort-label"> Memo </span>
                                     <span class="sort-icon"> </span> </span>
                             </th>
                             <th class="min-w-[150px]" data-datatable-column="alamat_agunan">
-                                <span class="sort"> <span class="sort-label"> Alamat Agunan </span>
+                                <span class="sort"> <span class="sort-label"> Status</span>
                                     <span class="sort-icon"> </span> </span>
                             </th>
-                            <th class="min-w-[150px]" data-datatable-column="bukti_kepemilikan">
-                                <span class="sort"> <span class="sort-label"> Bukti Kepemilikan </span>
-                                    <span class="sort-icon"> </span> </span>
-                            </th>
-                            <th class="min-w-[150px]" data-datatable-column="nama_pemilik">
-                                <span class="sort"> <span class="sort-label"> Nama Pemilik </span>
-                                    <span class="sort-icon"> </span> </span>
-                            </th>
-                            <th class="min-w-[150px]" data-datatable-column="luas_tanah">
-                                <span class="sort"> <span class="sort-label"> Luas Tanah </span>
-                                    <span class="sort-icon"> </span> </span>
-                            </th>
-                            <th class="min-w-[150px]" data-datatable-column="nilai_tanah">
-                                <span class="sort"> <span class="sort-label"> Nilai Tanah </span>
-                                    <span class="sort-icon"> </span> </span>
-                            </th>
-                            <th class="min-w-[150px]" data-datatable-column="luas_bangunan">
-                                <span class="sort"> <span class="sort-label"> Luas Bangunan </span>
-                                    <span class="sort-icon"> </span> </span>
-                            </th>
-                            <th class="min-w-[150px]" data-datatable-column="nilai_bangunan">
-                                <span class="sort"> <span class="sort-label"> Nilai Bangunan </span>
-                                    <span class="sort-icon"> </span> </span>
-                            </th>
-                            <th class="min-w-[150px]" data-datatable-column="nilai_njop">
-                                <span class="sort"> <span class="sort-label"> Nilai NJOP </span>
-                                    <span class="sort-icon"> </span> </span>
-                            </th>
-                            <th class="min-w-[150px]" data-datatable-column="nilai_pasar_wajar">
-                                <span class="sort"> <span class="sort-label"> Nilai Pasar Wajar </span>
-                                    <span class="sort-icon"> </span> </span>
-                            </th>
-                            <th class="min-w-[150px]" data-datatable-column="nilai_likuidasi">
-                                <span class="sort"> <span class="sort-label"> Nilai Likuidasi </span>
-                                    <span class="sort-icon"> </span> </span>
-                            </th>
-                            <th class="min-w-[150px]" data-datatable-column="tanggal_documen_diterima">
-                                <span class="sort"> <span class="sort-label"> Tanggal Dokumen Diterima </span>
-                                    <span class="sort-icon"> </span> </span>
-                            </th>
-                            <th class="min-w-[150px]" data-datatable-column="tanggal_spk">
-                                <span class="sort"> <span class="sort-label"> Tanggal SPK </span>
-                                    <span class="sort-icon"> </span> </span>
-                            </th>
-                            <th class="min-w-[150px]" data-datatable-column="nomor_spk">
-                                <span class="sort"> <span class="sort-label"> Nomor SPK </span>
-                                    <span class="sort-icon"> </span> </span>
-                            </th>
-                            <th class="min-w-[150px]" data-datatable-column="tanggal_rencana_kunjunagn">
-                                <span class="sort"> <span class="sort-label"> Tanggal Rencana Kunjungan </span>
-                                    <span class="sort-icon"> </span> </span>
-                            </th>
-                            <th class="min-w-[150px]" data-datatable-column="tanggal_kunjungan">
-                                <span class="sort"> <span class="sort-label"> Tanggal Kunjungan </span>
-                                    <span class="sort-icon"> </span> </span>
-                            </th>
-                            <th class="min-w-[150px]" data-datatable-column="taggal_delivered">
-                                <span class="sort"> <span class="sort-label"> Tanggal Delivered </span>
-                                    <span class="sort-icon"> </span> </span>
-                            </th>
-                            <th class="min-w-[150px]" data-datatable-column="jangka_waktu_sla">
-                                <span class="sort"> <span class="sort-label"> Jangka Waktu SLA </span>
-                                    <span class="sort-icon"> </span> </span>
-                            </th>
-                            <th class="min-w-[150px]" data-datatable-column="tanggal_laporan">
-                                <span class="sort"> <span class="sort-label"> Tanggal Laporan </span>
-                                    <span class="sort-icon"> </span> </span>
-                            </th>
-                            <th class="min-w-[150px]" data-datatable-column="tanggal_review">
-                                <span class="sort"> <span class="sort-label"> Tanggal Review </span>
-                                    <span class="sort-icon"> </span> </span>
-                            </th>
-                            <th class="min-w-[150px]" data-datatable-column="nama_penilai">
-                                <span class="sort"> <span class="sort-label"> Nama Penilai </span>
-                                    <span class="sort-icon"> </span> </span>
-                            </th>
-                            <th class="min-w-[150px]" data-datatable-column="nama_team_leader">
-                                <span class="sort"> <span class="sort-label"> Nama Team Leader </span>
-                                    <span class="sort-icon"> </span> </span>
-                            </th>
-                            <th class="min-w-[150px]" data-datatable-column="saran">
-                                <span class="sort"> <span class="sort-label"> Saran </span>
-                                                                    <span class="sort-icon"> </span> </span>
-                            </th>
+
                             <th class="min-w-[150px]" data-datatable-column="catatan">
                                 <span class="sort"> <span class="sort-label"> Catatan </span>
                                     <span class="sort-icon"> </span> </span>
@@ -266,144 +177,38 @@
                 nomor_registrasi: {
                     title: 'Nomor Registrasi',
                 },
-                tanggal_permohonan: {
+                 branch: {
+                    title: 'Cabang',
+                },
+                 name: {
+                    title: 'Nama Debitur',
+                },
+                tanggal_ksl: {
                     title: 'Tanggal Permohonan',
                     render: (item, data) => {
                         return data.tanggal_permohonan ? window.formatTanggalIndonesia(data.tanggal_permohonan) : '-';
                     },
                 },
-                branch: {
-                    title: 'Cabang',
-                },
-                pemohon: {
-                    title: 'Pemohon',
-                },
-                cif: {
+                nomor_ksl: {
                     title: 'CIF',
                 },
-                name: {
-                    title: 'Nama Debitur',
-                },
-                jenis_penilaian: {
+                nominal_ksl: {
                     title: 'Jenis Penilaian',
                 },
-                tujuan_penilaian: {
+                tanggal_penyelesaian: {
                     title: 'Tujuan Penilaian',
                 },
-                jenis_fasilitas_kredit: {
+                nominal_penyelesaian: {
                     title: 'Jenis Fasilitas Kredit',
                 },
-                jenis_agunan: {
+                sisa_ksl: {
                     title: 'Jenis Agunan',
                 },
-                alamat_agunan: {
-                    title: 'Alamat Agunan',
+                memo: {
+                    title: 'Memo',
                 },
-                bukti_kepemilikan: {
-                    title: 'Bukti Kepemilikan',
-                    render: (item, data) => {
-                        if (data.bukti_kepemilikan) {
-                            // Ganti karakter baris baru dengan tag <br> untuk HTML
-                            return data.bukti_kepemilikan.split('\n').join('<br>');
-                        }
-                        return '-';
-                    },
-                },
-                nama_pemilik: {
-                    title: 'Nama Pemilik',
-                },
-                luas_tanah: {
-                    title: 'Luas Tanah',
-                },
-                nilai_tanah: {
-                    title: 'Nilai Tanah',
-                    render: (item, data) => {
-                        return data.nilai_tanah ?? '-';
-                    },
-                },
-                luas_bangunan: {
-                    title: 'Luas Bangunan',
-                },
-                nilai_bangunan: {
-                    title: 'Nilai Bangunan',
-                    render: (item, data) => {
-                        return data.nilai_bangunan ?? '-';
-                    },
-                },
-                nilai_njop: {
-                    title: 'Nilai NJOP',
-                    render: (item, data) => {
-                        return data.nilai_njop ?? '-';
-                    },
-                },
-                nilai_pasar_wajar: {
-                    title: 'Nilai Pasar Wajar',
-                    render: (item, data) => {
-                        return data.nilai_pasar_wajar ?? '-';
-                    },
-                },
-                nilai_likuidasi: {
-                    title: 'Nilai Likuidasi',
-                    render: (item, data) => {
-                        return data.nilai_likuidasi ?? '-';
-                    },
-                },
-                tanggal_documen_diterima: {
-                    title: 'Tanggal Dokumen Diterima',
-                    render: (item, data) => {
-                        return data.tanggal_documen_diterima ? window.formatTanggalIndonesia(data.tanggal_documen_diterima) : '-';
-                    },
-                },
-                tanggal_spk: {
-                    title: 'Tanggal SPK',
-                    render: (item, data) => {
-                        return data.tanggal_spk ? window.formatTanggalIndonesia(data.tanggal_spk) : '-';
-                    },
-                },
-                nomor_spk: {
-                    title: 'Nomor SPK',
-                },
-                tanggal_rencana_kunjunagn: {
-                    title: 'Tanggal Rencana Kunjungan',
-                    render: (item, data) => {
-                        return data.tanggal_rencana_kunjunagn ? window.formatTanggalIndonesia(data.tanggal_rencana_kunjunagn) : '-';
-                    },
-                },
-                tanggal_kunjungan: {
-                    title: 'Tanggal Kunjungan',
-                    render: (item, data) => {
-                        return data.tanggal_kunjungan ? window.formatTanggalIndonesia(data.tanggal_kunjungan) : '-';
-                    },
-                },
-                taggal_delivered: {
-                    title: 'Tanggal Delivered',
-                    render: (item, data) => {
-                        return data.taggal_delivered ? window.formatTanggalIndonesia(data.taggal_delivered) : '-';
-                    },
-                },
-                jangka_waktu_sla: {
-                    title: 'Jangka Waktu SLA',
-                },
-                tanggal_laporan: {
-                    title: 'Tanggal Laporan',
-                    render: (item, data) => {
-                        return data.tanggal_laporan ? window.formatTanggalIndonesia(data.tanggal_laporan) : '-';
-                    },
-                },
-                tanggal_review: {
-                    title: 'Tanggal Review',
-                    render: (item, data) => {
-                        return data.tanggal_review ? window.formatTanggalIndonesia(data.tanggal_review) : '-';
-                    },
-                },
-                nama_penilai: {
-                    title: 'Nama Penilai',
-                },
-                nama_team_leader: {
-                    title: 'Nama Team Leader',
-                },
-                saran: {
-                    title: 'Saran',
+                status: {
+                    title: 'Status',
                 },
                 catatan: {
                     title: 'Catatan',
diff --git a/resources/views/laporan-monitoring/show.blade.php b/resources/views/laporan-monitoring/show.blade.php
index 315106d..1dd2301 100644
--- a/resources/views/laporan-monitoring/show.blade.php
+++ b/resources/views/laporan-monitoring/show.blade.php
@@ -35,21 +35,19 @@
                          <thead>
                              <tr>
                                  <th class="min-w-[100px]">Nama Debitur</th>
-                                 <th class="min-w-[100px]">Tujuan Penilaian</th>
-                                 <th class="min-w-[100px]">Status Bayar</th>
-                                 <th class="min-w-[100px]">Jenis Asset</th>
-                                 <th class="min-w-[100px]">Penugasan</th>
-                                 <th class="min-w-[100px]">Jenis Report</th>
-                                 <th class="min-w-[100px]">Tgl Register</th>
-                                 <th class="min-w-[100px]">Tgl Assign</th>
+                                 <th class="min-w-[100px]">Cabang</th>
+                                 <th class="min-w-[100px]">Lokasi Jaminan</th>
+                                 <th class="min-w-[100px]">TUjuan Penilaian</th>
                                  <th class="min-w-[100px]">Tgl Kunjungan</th>
-                                 <th class="min-w-[100px]">Tgl Reported</th>
-                                 <th class="min-w-[100px]">Progress</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-[100px]">Tgl Lpj Done</th>
+                                 <th class="min-w-[100px]">SLA Buku Kjpp</th>
+                                 <th class="min-w-[100px]">Status</th>
+                                 <th class="min-w-[100px]">Poin</th>
+                                 <th class="min-w-[100px]">SLA INTERNAL</th>
+                                 <th class="min-w-[100px]">SLA PENDAMPINGAN KJPP</th>
+                                 <th class="min-w-[100px]">Absensi</th>
+                                 <th class="min-w-[100px]">Zabtu</th>
                                  <th class="min-w-[50px] text-center">Keterangan</th>
-                                 <th class="min-w-[50px] text-center">Action</th>
                              </tr>
                          </thead>
                          <tbody>
@@ -189,20 +187,7 @@
                          return `${window.formatTanggalIndonesia(data.paparan)}`;
                      }
                  },
-                 approve: {
-                     title: 'Approve',
-                     render: (item, data) => {
-                         // Gabungkan nama dengan <br> untuk pemisah baris baru
-                         let dataHtml = `
-            ${data.permohonan?.approve_so?.name || ''}
-            <br>
-            ${data.permohonan?.approve_eo?.name || ''}
-            <br>
-            ${data.permohonan?.approve_dd?.name || ''}
-        `;
-                         return dataHtml;
-                     },
-                 },
+
 
 
                  keterangan: {
diff --git a/resources/views/laporan-sla-penilai/index.blade.php b/resources/views/laporan-sla-penilai/index.blade.php
index 7cead13..8e05868 100644
--- a/resources/views/laporan-sla-penilai/index.blade.php
+++ b/resources/views/laporan-sla-penilai/index.blade.php
@@ -104,10 +104,6 @@
                                 <span class="sort"> <span class="sort-label"> Tujuan Penilaian </span>
                                     <span class="sort-icon"> </span> </span>
                             </th>
-                            <th class="min-w-[150px]" data-datatable-column="jenis_agunan">
-                                <span class="sort"> <span class="sort-label"> Penilaian</span>
-                                    <span class="sort-icon"> </span> </span>
-                            </th>
 
                             <th class="min-w-[150px]" data-datatable-column="tanggal_laporan">
                                 <span class="sort"> <span class="sort-label"> Tanggal Dokuemen </span>
@@ -199,20 +195,16 @@
                 tujuan_penilaian: {
                     title: 'Tujuan Penilaian',
                 },
-                jenis_agunan: {
-                    title: 'Jenis Agunan',
-                },
-
                 tanggal_laporan: {
                     title: 'Tanggal Laporan',
                     render: (item, data) => {
                         return data.tanggal_laporan ? window.formatTanggalIndonesia(data.tanggal_laporan) : '-';
                     },
                 },
-                tanggal_review: {
-                    title: 'Tanggal Review',
+                tanggal_approval: {
+                    title: 'Tanggal Approval',
                     render: (item, data) => {
-                        return data.tanggal_review ? window.formatTanggalIndonesia(data.tanggal_review) : '-';
+                        return data.tanggal_approval ? window.formatTanggalIndonesia(data.tanggal_approval) : '-';
                     },
                 },
                 tanggal_kunjungan: {
@@ -225,7 +217,7 @@
                 jangka_waktu: {
                     title: 'Jangka Waktu',
                     render: (item, data) => {
-                        return data.jangka_waktu ?? '3';
+                        return data.jangka_waktu ?? '-';
                     },
                 },
                 keterangan: {
diff --git a/resources/views/laporan-user/index.blade.php b/resources/views/laporan-user/index.blade.php
index 5f2e629..dae9788 100644
--- a/resources/views/laporan-user/index.blade.php
+++ b/resources/views/laporan-user/index.blade.php
@@ -9,7 +9,7 @@
         <!-- Filter Card -->
         <div class="card border border-agi-100">
             <div class="card-header bg-agi-50 py-5">
-                <h3 class="card-title"> Laporan User Pemohon</h3>
+                <h3 class="card-title"> Laporan User Penilai</h3>
             </div>
             <div class="card-body grid gap-4">
                 <!-- Search field at the top, full width -->
@@ -49,7 +49,7 @@
                         <i class="ki-outline ki-filter fs-2 me-1"></i>
                         Terapkan Filter
                     </button>
-                    <a class="btn btn-sm btn-light" href="{{ route('laporan-hasil-penilaian-jaminan-internal-external.export') }}" id="export-btn">
+                    <a class="btn btn-sm btn-light" href="{{ route('laporan-user.export') }}" id="export-btn">
                         <i class="ki-outline ki-file-down fs-2 me-1"></i>
                         Export to Excel
                     </a>
@@ -77,132 +77,37 @@
                                 <span class="sort"> <span class="sort-label"> Nomor Registrasi </span>
                                     <span class="sort-icon"> </span> </span>
                             </th>
-                            <th class="min-w-[150px]" data-datatable-column="tanggal_permohonan">
-                                <span class="sort"> <span class="sort-label"> Tanggal Permohonan </span>
-                                    <span class="sort-icon"> </span> </span>
-                            </th>
                             <th class="min-w-[150px]" data-datatable-column="branch">
                                 <span class="sort"> <span class="sort-label"> Cabang </span>
                                     <span class="sort-icon"> </span> </span>
+                            </th>
+                              <th class="min-w-[150px]" data-datatable-column="name">
+                                <span class="sort"> <span class="sort-label"> Nama Debitur </span>
+                                    <span class="sort-icon"> </span> </span>
                             </th>
                             <th class="min-w-[150px]" data-datatable-column="pemohon">
                                 <span class="sort"> <span class="sort-label"> Pemohon </span>
                                     <span class="sort-icon"> </span> </span>
                             </th>
-                            <th class="min-w-[150px]" data-datatable-column="cif">
-                                <span class="sort"> <span class="sort-label"> CIF </span>
-                                    <span class="sort-icon"> </span> </span>
-                            </th>
-                            <th class="min-w-[150px]" data-datatable-column="name">
-                                <span class="sort"> <span class="sort-label"> Nama Debitur </span>
-                                    <span class="sort-icon"> </span> </span>
-                            </th>
+
+
                             <th class="min-w-[150px]" data-datatable-column="jenis_penilaian">
-                                <span class="sort"> <span class="sort-label"> Jenis Penilaian </span>
+                                <span class="sort"> <span class="sort-label"> Tgl Terima </span>
                                     <span class="sort-icon"> </span> </span>
                             </th>
                             <th class="min-w-[150px]" data-datatable-column="tujuan_penilaian">
-                                <span class="sort"> <span class="sort-label"> Tujuan Penilaian </span>
-                                    <span class="sort-icon"> </span> </span>
-                            </th>
-                            <th class="min-w-[150px]" data-datatable-column="jenis_fasilitas_kredit">
-                                <span class="sort"> <span class="sort-label"> Jenis Fasilitas Kredit </span>
-                                    <span class="sort-icon"> </span> </span>
-                            </th>
-                            <th class="min-w-[150px]" data-datatable-column="jenis_agunan">
-                                <span class="sort"> <span class="sort-label"> Jenis Agunan </span>
+                                <span class="sort"> <span class="sort-label"> Penilai </span>
                                     <span class="sort-icon"> </span> </span>
                             </th>
+
                             <th class="min-w-[150px]" data-datatable-column="alamat_agunan">
-                                <span class="sort"> <span class="sort-label"> Alamat Agunan </span>
+                                <span class="sort"> <span class="sort-label"> Tgl Laporan </span>
                                     <span class="sort-icon"> </span> </span>
                             </th>
-                            <th class="min-w-[150px]" data-datatable-column="bukti_kepemilikan">
-                                <span class="sort"> <span class="sort-label"> Bukti Kepemilikan </span>
-                                    <span class="sort-icon"> </span> </span>
-                            </th>
-                            <th class="min-w-[150px]" data-datatable-column="nama_pemilik">
-                                <span class="sort"> <span class="sort-label"> Nama Pemilik </span>
-                                    <span class="sort-icon"> </span> </span>
-                            </th>
-                            <th class="min-w-[150px]" data-datatable-column="luas_tanah">
-                                <span class="sort"> <span class="sort-label"> Luas Tanah </span>
-                                    <span class="sort-icon"> </span> </span>
-                            </th>
-                            <th class="min-w-[150px]" data-datatable-column="nilai_tanah">
-                                <span class="sort"> <span class="sort-label"> Nilai Tanah </span>
-                                    <span class="sort-icon"> </span> </span>
-                            </th>
-                            <th class="min-w-[150px]" data-datatable-column="luas_bangunan">
-                                <span class="sort"> <span class="sort-label"> Luas Bangunan </span>
-                                    <span class="sort-icon"> </span> </span>
-                            </th>
-                            <th class="min-w-[150px]" data-datatable-column="nilai_bangunan">
-                                <span class="sort"> <span class="sort-label"> Nilai Bangunan </span>
-                                    <span class="sort-icon"> </span> </span>
-                            </th>
-                            <th class="min-w-[150px]" data-datatable-column="nilai_njop">
-                                <span class="sort"> <span class="sort-label"> Nilai NJOP </span>
-                                    <span class="sort-icon"> </span> </span>
-                            </th>
-                            <th class="min-w-[150px]" data-datatable-column="nilai_pasar_wajar">
-                                <span class="sort"> <span class="sort-label"> Nilai Pasar Wajar </span>
-                                    <span class="sort-icon"> </span> </span>
-                            </th>
-                            <th class="min-w-[150px]" data-datatable-column="nilai_likuidasi">
-                                <span class="sort"> <span class="sort-label"> Nilai Likuidasi </span>
-                                    <span class="sort-icon"> </span> </span>
-                            </th>
-                            <th class="min-w-[150px]" data-datatable-column="tanggal_documen_diterima">
-                                <span class="sort"> <span class="sort-label"> Tanggal Dokumen Diterima </span>
-                                    <span class="sort-icon"> </span> </span>
-                            </th>
-                            <th class="min-w-[150px]" data-datatable-column="tanggal_spk">
-                                <span class="sort"> <span class="sort-label"> Tanggal SPK </span>
-                                    <span class="sort-icon"> </span> </span>
-                            </th>
-                            <th class="min-w-[150px]" data-datatable-column="nomor_spk">
-                                <span class="sort"> <span class="sort-label"> Nomor SPK </span>
-                                    <span class="sort-icon"> </span> </span>
-                            </th>
-                            <th class="min-w-[150px]" data-datatable-column="tanggal_rencana_kunjunagn">
-                                <span class="sort"> <span class="sort-label"> Tanggal Rencana Kunjungan </span>
-                                    <span class="sort-icon"> </span> </span>
-                            </th>
-                            <th class="min-w-[150px]" data-datatable-column="tanggal_kunjungan">
-                                <span class="sort"> <span class="sort-label"> Tanggal Kunjungan </span>
-                                    <span class="sort-icon"> </span> </span>
-                            </th>
-                            <th class="min-w-[150px]" data-datatable-column="taggal_delivered">
-                                <span class="sort"> <span class="sort-label"> Tanggal Delivered </span>
-                                    <span class="sort-icon"> </span> </span>
-                            </th>
-                            <th class="min-w-[150px]" data-datatable-column="jangka_waktu_sla">
-                                <span class="sort"> <span class="sort-label"> Jangka Waktu SLA </span>
-                                    <span class="sort-icon"> </span> </span>
-                            </th>
-                            <th class="min-w-[150px]" data-datatable-column="tanggal_laporan">
-                                <span class="sort"> <span class="sort-label"> Tanggal Laporan </span>
-                                    <span class="sort-icon"> </span> </span>
-                            </th>
-                            <th class="min-w-[150px]" data-datatable-column="tanggal_review">
-                                <span class="sort"> <span class="sort-label"> Tanggal Review </span>
-                                    <span class="sort-icon"> </span> </span>
-                            </th>
-                            <th class="min-w-[150px]" data-datatable-column="nama_penilai">
-                                <span class="sort"> <span class="sort-label"> Nama Penilai </span>
-                                    <span class="sort-icon"> </span> </span>
-                            </th>
-                            <th class="min-w-[150px]" data-datatable-column="nama_team_leader">
-                                <span class="sort"> <span class="sort-label"> Nama Team Leader </span>
-                                    <span class="sort-icon"> </span> </span>
-                            </th>
-                            <th class="min-w-[150px]" data-datatable-column="saran">
-                                <span class="sort"> <span class="sort-label"> Saran </span>
-                                                                    <span class="sort-icon"> </span> </span>
-                            </th>
+
+
                             <th class="min-w-[150px]" data-datatable-column="catatan">
-                                <span class="sort"> <span class="sort-label"> Catatan </span>
+                                <span class="sort"> <span class="sort-label"> Nilai Pasar Wajar </span>
                                     <span class="sort-icon"> </span> </span>
                             </th>
                         </tr>
@@ -252,6 +157,15 @@
                 },
                 nomor_registrasi: {
                     title: 'Nomor Registrasi',
+                },
+                   branch: {
+                    title: 'Cabang',
+                },
+                name: {
+                    title: 'Nama Debitur',
+                },
+                 pemohon: {
+                    title: 'Pemohon',
                 },
                 tanggal_permohonan: {
                     title: 'Tanggal Permohonan',
@@ -259,68 +173,14 @@
                         return data.tanggal_permohonan ? window.formatTanggalIndonesia(data.tanggal_permohonan) : '-';
                     },
                 },
-                branch: {
-                    title: 'Cabang',
+                 nama_penilai: {
+                    title: 'Nama Penilai',
                 },
-                pemohon: {
-                    title: 'Pemohon',
-                },
-                cif: {
-                    title: 'CIF',
-                },
-                name: {
-                    title: 'Nama Debitur',
-                },
-                jenis_penilaian: {
-                    title: 'Jenis Penilaian',
-                },
-                tujuan_penilaian: {
-                    title: 'Tujuan Penilaian',
-                },
-                jenis_fasilitas_kredit: {
-                    title: 'Jenis Fasilitas Kredit',
-                },
-                jenis_agunan: {
-                    title: 'Jenis Agunan',
-                },
-                alamat_agunan: {
-                    title: 'Alamat Agunan',
-                },
-                bukti_kepemilikan: {
-                    title: 'Bukti Kepemilikan',
+
+                tanggal_laporan: {
+                    title: 'Tanggal Dokumen Diterima',
                     render: (item, data) => {
-                        if (data.bukti_kepemilikan) {
-                            // Ganti karakter baris baru dengan tag <br> untuk HTML
-                            return data.bukti_kepemilikan.split('\n').join('<br>');
-                        }
-                        return '-';
-                    },
-                },
-                nama_pemilik: {
-                    title: 'Nama Pemilik',
-                },
-                luas_tanah: {
-                    title: 'Luas Tanah',
-                },
-                nilai_tanah: {
-                    title: 'Nilai Tanah',
-                    render: (item, data) => {
-                        return data.nilai_tanah ?? '-';
-                    },
-                },
-                luas_bangunan: {
-                    title: 'Luas Bangunan',
-                },
-                nilai_bangunan: {
-                    title: 'Nilai Bangunan',
-                    render: (item, data) => {
-                        return data.nilai_bangunan ?? '-';
-                    },
-                },
-                nilai_njop: {
-                    title: 'Nilai NJOP',
-                    render: (item, data) => {
-                        return data.nilai_njop ?? '-';
+                        return data.tanggal_laporan ? window.formatTanggalIndonesia(data.tanggal_laporan) : '-';
                     },
                 },
                 nilai_pasar_wajar: {
@@ -328,72 +188,6 @@
                     render: (item, data) => {
                         return data.nilai_pasar_wajar ?? '-';
                     },
-                },
-                nilai_likuidasi: {
-                    title: 'Nilai Likuidasi',
-                    render: (item, data) => {
-                        return data.nilai_likuidasi ?? '-';
-                    },
-                },
-                tanggal_documen_diterima: {
-                    title: 'Tanggal Dokumen Diterima',
-                    render: (item, data) => {
-                        return data.tanggal_documen_diterima ? window.formatTanggalIndonesia(data.tanggal_documen_diterima) : '-';
-                    },
-                },
-                tanggal_spk: {
-                    title: 'Tanggal SPK',
-                    render: (item, data) => {
-                        return data.tanggal_spk ? window.formatTanggalIndonesia(data.tanggal_spk) : '-';
-                    },
-                },
-                nomor_spk: {
-                    title: 'Nomor SPK',
-                },
-                tanggal_rencana_kunjunagn: {
-                    title: 'Tanggal Rencana Kunjungan',
-                    render: (item, data) => {
-                        return data.tanggal_rencana_kunjunagn ? window.formatTanggalIndonesia(data.tanggal_rencana_kunjunagn) : '-';
-                    },
-                },
-                tanggal_kunjungan: {
-                    title: 'Tanggal Kunjungan',
-                    render: (item, data) => {
-                        return data.tanggal_kunjungan ? window.formatTanggalIndonesia(data.tanggal_kunjungan) : '-';
-                    },
-                },
-                taggal_delivered: {
-                    title: 'Tanggal Delivered',
-                    render: (item, data) => {
-                        return data.taggal_delivered ? window.formatTanggalIndonesia(data.taggal_delivered) : '-';
-                    },
-                },
-                jangka_waktu_sla: {
-                    title: 'Jangka Waktu SLA',
-                },
-                tanggal_laporan: {
-                    title: 'Tanggal Laporan',
-                    render: (item, data) => {
-                        return data.tanggal_laporan ? window.formatTanggalIndonesia(data.tanggal_laporan) : '-';
-                    },
-                },
-                tanggal_review: {
-                    title: 'Tanggal Review',
-                    render: (item, data) => {
-                        return data.tanggal_review ? window.formatTanggalIndonesia(data.tanggal_review) : '-';
-                    },
-                },
-                nama_penilai: {
-                    title: 'Nama Penilai',
-                },
-                nama_team_leader: {
-                    title: 'Nama Team Leader',
-                },
-                saran: {
-                    title: 'Saran',
-                },
-                catatan: {
-                    title: 'Catatan',
                 }
             }
         };
diff --git a/routes/web.php b/routes/web.php
index f082459..fd5dbce 100644
--- a/routes/web.php
+++ b/routes/web.php
@@ -746,6 +746,7 @@ Route::middleware(['auth'])->group(function () {
     // laporan user
     Route::prefix('laporan-user')->name('laporan-user.')->group(function () {
         Route::get('/', [LaporanUserController::class, 'index'])->name('index');
+        Route::get('export', [LaporanUserController::class, 'export'])->name('export');
         Route::get('api/user-pemohon', [LaporanUserController::class, 'searchUserPemohon'])->name('api.user-pemohon');
         Route::get('datatables', [LaporanUserController::class, 'dataTableForUserPemohon'])->name('datatables');
     });