diff --git a/app/Http/Controllers/PenilaiController.php b/app/Http/Controllers/PenilaiController.php
index 819a1d6..e7c8ef4 100644
--- a/app/Http/Controllers/PenilaiController.php
+++ b/app/Http/Controllers/PenilaiController.php
@@ -544,7 +544,9 @@ class PenilaiController extends Controller
             'branch',
             'tujuanPenilaian',
             'jenisfasilitasKredit',
-            'penilaian.userPenilai' // Ensure this relation is included
+            'penilaian.userPenilai',
+            'penilai',
+            'nilaiPlafond'
         ])->get();
 
         // Calculate the page count
diff --git a/app/Http/Controllers/RegistrasiController.php b/app/Http/Controllers/RegistrasiController.php
index 4695cbd..137f10d 100644
--- a/app/Http/Controllers/RegistrasiController.php
+++ b/app/Http/Controllers/RegistrasiController.php
@@ -10,6 +10,7 @@ use Illuminate\Support\Facades\Auth;
 use Illuminate\Support\Facades\Validator;
 use Maatwebsite\Excel\Facades\Excel;
 use Modules\Lpj\Models\JenisPenilaian;
+use Modules\Lpj\Models\Penilai;
 use Modules\Lpj\Models\Permohonan;
 use Modules\Lpj\Models\Regions;
 use Modules\Lpj\Models\DokumenJaminan;
@@ -167,6 +168,13 @@ class RegistrasiController extends Controller
                     $modal = Permohonan::find($id);
 
                     $modal->update($dataku);
+
+                    if($modal && $request->jenis_laporan){
+                        Penilai::updateOrCreate(
+                            ['permohonan_id' => $id],
+                            ['type' => $request->jenis_laporan]
+                        );
+                    }
                     //
                     $data['status']                      = 'success';
                     $data['message'] ['message_success'] = ['Regitrasi ' . $modal->nomor_registrasi . ' successfully'];
diff --git a/resources/views/laporan/index.blade.php b/resources/views/laporan/index.blade.php
index 788f865..27d00f4 100644
--- a/resources/views/laporan/index.blade.php
+++ b/resources/views/laporan/index.blade.php
@@ -93,6 +93,24 @@
 @endsection
 
 @push('scripts')
+    <script type="text/javascript">
+        function formatDate(date) {
+            const day = date.getDate().toString().padStart(2, '0');
+            const month = (date.getMonth() + 1).toString().padStart(2, '0');
+            // Months are 0-indexed
+            const year = date.getFullYear();
+
+            return `${day} ${getIndonesianMonth(month)} ${year}`;
+        }
+
+        function getIndonesianMonth(month) {
+            const months = ['Januari', 'Februari', 'Maret', 'April', 'Mei', 'Juni',
+                'Juli', 'Agustus', 'September', 'Oktober', 'November', 'Desember'
+            ];
+            return months[month -
+            1];
+        }
+    </script>
     <script type="module">
         const element = document.querySelector('#laporan-table');
         const searchInput = document.getElementById('search');
@@ -168,14 +186,40 @@
                 tanggal_survei: {
                     title: 'Tanggal Survei',
                     render: (item, data) => {
-                        return '-';
-                    }
+                        if(data.penilaian.waktu_penilaian){
+                            return `${formatDate(new Date(data.penilaian.waktu_penilaian))}`;
+                        }
+                        return `${formatDate(new Date(data.penilaian.created_at))}`;
+                    },
                 },
                 due_date_sla: {
                     title: 'Due Date SLA',
                     render: (item, data) => {
-                        return '-';
-                    }
+                        const tujuan_penilaian = data.tujuan_penilaian.name;
+                        const tipe_laporan = data.penilai?.type;
+                        const nilai_plafond = data.penilaian.nilaiPlafond?.name;
+                        let waktu_penilaian = new Date(data.penilaian.created_at);
+                        if(data.penilaian.waktu_penilaian){
+                            waktu_penilaian = new Date(data.penilaian.waktu_penilaian);
+                        }
+
+                        if(tujuan_penilaian.name==="RAP"){
+                            waktu_penilaian.setDate(waktu_penilaian.getDate() + 3);
+                        } else {
+                            if(tipe_laporan==="sederhana"){
+                                waktu_penilaian.setDate(waktu_penilaian.getDate() + 2);
+                            } else if(tipe_laporan==="standar"){
+                                if(nilai_plafond==="2 M - 5 M"){
+                                    waktu_penilaian.setDate(waktu_penilaian.getDate() + 3);
+                                } else if(nilai_plafond==="< 2M"){
+                                    waktu_penilaian.setDate(waktu_penilaian.getDate() + 3);
+                                } else {
+                                    waktu_penilaian.setDate(waktu_penilaian.getDate() + 5);
+                                }
+                            }
+                        }
+                        return formatDate(waktu_penilaian);
+                    },
                 },
                 status: {
                     title: 'Status',
diff --git a/resources/views/penilai/index.blade.php b/resources/views/penilai/index.blade.php
index bda05fe..cd076ef 100644
--- a/resources/views/penilai/index.blade.php
+++ b/resources/views/penilai/index.blade.php
@@ -60,6 +60,10 @@
                                     <span class="sort"> <span class="sort-label"> Fasilitas Kredit </span>
                                         <span class="sort-icon"> </span> </span>
                                 </th>
+                                <th class="min-w-[150px]" data-datatable-column="jenis_laporan">
+                                    <span class="sort"> <span class="sort-label"> Jenis Laporan </span>
+                                        <span class="sort-icon"> </span> </span>
+                                </th>
                                 <th class="min-w-[150px]" data-datatable-column="tanggal_survei">
                                     <span class="sort"> <span class="sort-label"> Tanggal Survei </span>
                                         <span class="sort-icon"> </span> </span>
@@ -170,16 +174,53 @@
                         return data.jenisfasilitas_kredit && data.jenisfasilitas_kredit.name ? `${data.jenisfasilitas_kredit.name}` : '-';
                     },
                 },
+                jenis_laporan: {
+                    title: 'Jenis Laporan',
+                    render: (item, data) => {
+                        return data.penilai?.type;
+                    },
+                },
                 tanggal_survei: {
                     title: 'Tanggal Survei',
                     render: (item, data) => {
-                        return `${formatDate(new Date(data.created_at))}`;
+                        if(data.penilaian.waktu_penilaian){
+                            return `${formatDate(new Date(data.penilaian.waktu_penilaian))}`;
+                        }
+                        return `${formatDate(new Date(data.penilaian.created_at))}`;
                     },
                 },
                 due_date_sla: {
                     title: 'Due Date SLA',
                     render: (item, data) => {
-                        return `${formatDate(new Date(data.created_at))}`;
+                        const tujuan_penilaian = data.tujuan_penilaian.name;
+                        const tipe_laporan = data.penilai?.type;
+                        const nilai_plafond = data.penilaian.nilaiPlafond?.name;
+                        let waktu_penilaian = new Date(data.penilaian.created_at);
+                        if(data.penilaian.waktu_penilaian){
+                            waktu_penilaian = new Date(data.penilaian.waktu_penilaian);
+                        }
+
+                        if(tujuan_penilaian.name==="RAP"){
+                            waktu_penilaian.setDate(waktu_penilaian.getDate() + 3);
+                        } else {
+                            if(tipe_laporan==="sederhana"){
+                                waktu_penilaian.setDate(waktu_penilaian.getDate() + 2);
+                            } else if(tipe_laporan==="standar"){
+                                if(nilai_plafond==="2 M - 5 M"){
+                                    waktu_penilaian.setDate(waktu_penilaian.getDate() + 3);
+                                } else if(nilai_plafond==="< 2M"){
+                                    waktu_penilaian.setDate(waktu_penilaian.getDate() + 3);
+                                } else {
+                                    waktu_penilaian.setDate(waktu_penilaian.getDate() + 5);
+                                }
+                            }
+                        }
+
+
+
+
+                        return formatDate(waktu_penilaian);
+
                     },
                 },
                 status: {
diff --git a/resources/views/penilaian/otorisator/show.blade.php b/resources/views/penilaian/otorisator/show.blade.php
index a09a60a..1865701 100644
--- a/resources/views/penilaian/otorisator/show.blade.php
+++ b/resources/views/penilaian/otorisator/show.blade.php
@@ -217,7 +217,7 @@
 
 
                         @if (Auth::user()->hasAnyRole(['administrator', 'senior-officer'])  && $authorization->approve_so == null)
-                            <button onclick="otorisatorData({{ $permohonan->id }},'SO')" type="button"
+                            <button onclick="otorisatorData({{ $authorization->id }},'SO')" type="button"
                                 class="btn btn-primary">
                                 <i class="ki-filled ki-double-check"></i>
                                 Otorisator {{ $header ?? '' }}
@@ -225,7 +225,7 @@
                         @endif
 
                         @if (Auth::user()->hasAnyRole(['administrator', 'EO Appraisal']) && $authorization->approve_so && $authorization->approve_eo == null)
-                            <button onclick="otorisatorData({{ $permohonan->id }},'EO')" type="button"
+                            <button onclick="otorisatorData({{ $authorization->id }},'EO')" type="button"
                                 class="btn btn-primary">
                                 <i class="ki-filled ki-double-check"></i>
                                 Otorisator {{ $header ?? '' }}
@@ -233,7 +233,7 @@
                         @endif
 
                         @if (Auth::user()->hasAnyRole(['administrator', 'DD Appraisal']) && $authorization->approve_eo &&  $authorization->approve_dd == null)
-                            <button onclick="otorisatorData({{ $permohonan->id }},'DD')" type="button"
+                            <button onclick="otorisatorData({{ $authorization->id }},'DD')" type="button"
                                 class="btn btn-primary">
                                 <i class="ki-filled ki-double-check"></i>
                                 Otorisator {{ $header ?? '' }}
diff --git a/resources/views/registrasi/edit.blade.php b/resources/views/registrasi/edit.blade.php
index 0b6af09..359819f 100644
--- a/resources/views/registrasi/edit.blade.php
+++ b/resources/views/registrasi/edit.blade.php
@@ -84,6 +84,18 @@
                                     <em id="{{$route[0]}}_region_msg" class="alert text-danger text-sm"></em>
                                 </div>
                             </div>
+                            <div id="{{ $route[0] }}_div_jenis_laporan" class="flex items-baseline flex-wrap lg:flex-nowrap gap-2.5">
+                                <label class="form-label max-w-56">
+                                    Jenis Laporan
+                                </label>
+                                <div class="flex flex-wrap items-baseline w-full">
+                                    <select class="inputku select" id="jenis_laporan" name="jenis_laporan">
+                                        <option value="sederhana">Sederhana</option>
+                                        <option value="standar">Standar</option>
+                                    </select>
+                                    <em id="jenis_laporan_msg" class="alert text-danger text-sm"></em>
+                                </div>
+                            </div>
                             <div id="{{ $route[0] }}_div_catatan2" class="flex items-baseline flex-wrap lg:flex-nowrap gap-2.5">
                                 <label class="form-label max-w-56">
                                     Catatan
diff --git a/resources/views/registrasi/js/editjs.blade.php b/resources/views/registrasi/js/editjs.blade.php
index dd085f1..b005f59 100644
--- a/resources/views/registrasi/js/editjs.blade.php
+++ b/resources/views/registrasi/js/editjs.blade.php
@@ -120,6 +120,7 @@
         let region = $("#{{$route[0]}}_region").val();
         let catatan = $("#{{$route[0]}}_catatan").val();
         let catatan2 = $("#{{$route[0]}}_catatan2").val();
+        let jenis_laporan = $("#jenis_laporan").val();
 
         if(jenis_penilaian==0)
             jenis_penilaian='';
@@ -135,6 +136,7 @@
         input_data.region= region;
         input_data.catatan = catatan;
         input_data.catatan2 = catatan2;
+        input_data.jenis_laporan = jenis_laporan;
 
         let useURL= '{{ route($route[0].'.update', $id) }}';
         $.ajax({