diff --git a/app/Http/Controllers/PenilaianController.php b/app/Http/Controllers/PenilaianController.php
index 09d0ba4..234dd22 100644
--- a/app/Http/Controllers/PenilaianController.php
+++ b/app/Http/Controllers/PenilaianController.php
@@ -430,6 +430,14 @@ class PenilaianController extends Controller
                 ], 404);
             }
             $permohonan = Permohonan::find($authorization->permohonan_id);
+        } elseif ($context === 'Paparan') {
+            $authorization = Authorization::with(['user'])->find($id);
+            if (!$authorization) {
+                return response()->json([
+                    'message' => 'Data authorization Paparan tidak ditemukan.',
+                ], 404);
+            }
+            $permohonan = Permohonan::find($authorization->permohonan_id);
         } else {
             $permohonan = Permohonan::find($id);
         }
@@ -493,7 +501,7 @@ class PenilaianController extends Controller
                     ]);
                 } elseif (Auth::user()->roles[0]->name === 'EO Appraisal' || Auth::user()->roles[0]->name === 'administrator') {
                     $status = '2';
-                    if (!in_array($permohonan->nulai_plafond_id, [1, 4])) {
+                    if (!in_array($permohonan->nilai_plafond_id, [1, 4])) {
                         $status = '1';
                         $permohonan->update([
                             'status'         => $authorization->request
@@ -522,11 +530,45 @@ class PenilaianController extends Controller
                 }
                 break;
             case 'paparan':
-                $permohonan->update([
-                    'status'     => 'paparan',
-                    'keterangan' => $request->message,
-                ]);
+                if (Auth::user()->roles[0]->name === 'senior-officer') {
+                    $authorization->update([
+                        'status'         => '3',
+                        'status_so' => '1',
+                        'approve_so'    => Auth::user()->id,
+                        'approve_so_at' => now(),
+                        'keterangan_so'     => $request->message,
+                    ]);
+                } elseif (Auth::user()->roles[0]->name === 'EO Appraisal' || Auth::user()->roles[0]->name === 'administrator') {
+                    $status = '2';
+                    if (!in_array($permohonan->nilai_plafond_id, [1, 4])) {
+                        $status = '1';
+                        $permohonan->update([
+                            'status'         => $authorization->request
+                        ]);
+                    }
+                    $authorization->update([
+                        'status'         => $status,
+                        'status_eo' => '1',
+                        'approve_eo'    => Auth::user()->id,
+                        'approve_eo_at' => now(),
+                        'keterangan_eo'     => $request->message,
+                    ]);
+                } elseif (Auth::user()->roles[0]->name === 'DD Appraisal') {
+                    $authorization->update([
+                        'status'         => '1',
+                        'status_dd' => '1',
+                        'approve_dd'    => Auth::user()->id,
+                        'approve_dd_at' => now(),
+                        'keterangan_dd'     => $request->message,
+                    ]);
+
+                    $permohonan->update([
+                        'status'         => 'paparan',
+                        'tanggal_paparan' => $request->tanggalPaparan
+                    ]);
+                }
                 break;
+                
             default:
                 return response()->json([
                     'message' => 'Konteks otorisasi tidak valid.',
diff --git a/resources/views/penilaian/otorisator/show.blade.php b/resources/views/penilaian/otorisator/show.blade.php
index baf9663..6e40a96 100644
--- a/resources/views/penilaian/otorisator/show.blade.php
+++ b/resources/views/penilaian/otorisator/show.blade.php
@@ -129,9 +129,36 @@
                             href="{{ route('otorisator.view-laporan') }}?permohonanId={{ $permohonan->id }}&documentId={{ $documentId }}&inspeksiId={{ $inspeksiId }}&jaminanId={{ $jenisJaminanId }}&statusLpj={{ true }}">
                             Lihat Laporan
                         </a>
-                    @endif
+                        @if (Auth::user()->hasAnyRole(['administrator', 'senior-officer']) && $permohonan->approval_so == null)
+                            <button onclick="otorisatorData({{ $permohonan->id }})" type="button" class="btn btn-primary">
+                                <i class="ki-filled ki-double-check"></i>
+                                Otorisator {{ $header ?? '' }}
+                            </button>
+                            <button class="btn btn-warning" onclick="revisiLaporan({{ $permohonan->id }})">
+                                <i class="ki-filled ki-arrow-circle-right"></i> Revisi
+                            </button>
+                        @endif
 
-                    @if ($dataHeader == 'paparan')
+                        @if (Auth::user()->hasAnyRole(['administrator', 'EO Appraisal']) &&
+                                $permohonan->approval_so &&
+                                $permohonan->approval_eo == null)
+                            <button onclick="otorisatorData({{ $permohonan->id }})" type="button" class="btn btn-primary">
+                                <i class="ki-filled ki-double-check"></i>
+                                Otorisator {{ $header ?? '' }}
+                            </button>
+                        @endif
+
+                        @if (Auth::user()->hasAnyRole(['administrator', 'DD Appraisal']) &&
+                                $permohonan->approval_eo &&
+                                $permohonan->approval_dd == null &&
+                                in_array($permohonan->nilai_plafond_id, [1, 4]))
+                            <button onclick="otorisatorData({{ $permohonan->id }})" type="button" class="btn btn-primary">
+                                <i class="ki-filled ki-double-check"></i>
+                                Otorisator {{ $header ?? '' }}
+                            </button>
+                        @endif
+                        
+                    @elseif($dataHeader == 'paparan')
                         <a class="btn btn-success"
                             href="{{ route('penilai.paparan') }}?permohonanId={{ $permohonan->id }}&documentId={{ $documentId }}&inspeksiId={{ $inspeksiId }}&jaminanId={{ $jenisJaminanId }}&statusLpj={{ true }}">
                             Lihat Data Paparan
@@ -142,37 +169,23 @@
                                 Otorisator {{ $header ?? '' }}
                             </button>
                         @endif
-                    @endif
 
-                    @if (Auth::user()->hasAnyRole(['administrator', 'senior-officer']) && $permohonan->approval_so == null)
-                        <button onclick="otorisatorData({{ $permohonan->id }})" type="button" class="btn btn-primary">
-                            <i class="ki-filled ki-double-check"></i>
-                            Otorisator {{ $header ?? '' }}
-                        </button>
-                        @if ($dataHeader != 'paparan')
-                            <button class="btn btn-warning" onclick="revisiLaporan({{ $permohonan->id }})">
-                                <i class="ki-filled ki-arrow-circle-right"></i> Revisi
+                        @if(Auth::user()->hasAnyRole(['administrator','senior-officer']) && $authorization->approve_so==null)
+                            <button onclick="otorisatorData({{ $authorization->id }})" type="button" class="btn btn-primary">
+                                <i class="ki-filled ki-double-check"></i>
+                                Otorisator {{ $header ?? '' }}
                             </button>
                         @endif
-                    @endif
 
-                    @if (Auth::user()->hasAnyRole(['administrator', 'EO Appraisal']) &&
-                            $permohonan->approval_so &&
-                            $permohonan->approval_eo == null)
-                        <button onclick="otorisatorData({{ $permohonan->id }})" type="button" class="btn btn-primary">
-                            <i class="ki-filled ki-double-check"></i>
-                            Otorisator {{ $header ?? '' }}
-                        </button>
-                    @endif
-
-                    @if (Auth::user()->hasAnyRole(['administrator', 'DD Appraisal']) &&
-                            $permohonan->approval_eo &&
-                            $permohonan->approval_dd == null &&
-                            in_array($permohonan->nilai_plafond_id, [1, 4]))
-                        <button onclick="otorisatorData({{ $permohonan->id }})" type="button" class="btn btn-primary">
-                            <i class="ki-filled ki-double-check"></i>
-                            Otorisator {{ $header ?? '' }}
-                        </button>
+                        @if (Auth::user()->hasAnyRole(['administrator', 'DD Appraisal']) &&
+                                $authorization->approve_so &&
+                                $authorization->approval_dd == null &&
+                                in_array($permohonan->nilai_plafond_id, [1, 4]))
+                            <button onclick="otorisatorData({{ $authorization->id }},'DD')" type="button" class="btn btn-primary">
+                                <i class="ki-filled ki-double-check"></i>
+                                Otorisator {{ $header ?? '' }}
+                            </button>
+                        @endif
                     @endif
                 </div>
             </div>
@@ -181,53 +194,162 @@
 
     @push('scripts')
         <script>
-            function otorisatorData(dataId) {
+            function otorisatorData(dataId, role='') {
                 const dataHeader = @json($header);
-                Swal.fire({
-                    title: 'Apakah Anda yakin?',
-                    text: `Untuk melakukan otorisator ${dataHeader}!`,
-                    icon: 'warning',
-                    input: 'textarea',
-                    inputLabel: 'Keterangan',
-                    inputPlaceholder: 'Masukkan keterangan...',
-                    inputAttributes: {
-                        'aria-label': 'Masukkan keterangan'
-                    },
-                    showCancelButton: true,
-                    confirmButtonColor: '#3085d6',
-                    cancelButtonColor: '#d33',
-                    confirmButtonText: 'Ya, Lanjutkan!',
-                    cancelButtonText: 'Batal',
-                }).then((result) => {
-                    if (result.isConfirmed) {
-                        const userMessage = result.value || ''; // Ambil pesan dari textarea
-                        $.ajaxSetup({
-                            headers: {
-                                'X-CSRF-TOKEN': '{{ csrf_token() }}'
+                if(dataHeader == 'Paparan'){
+                    if(role == 'DD'){
+                        Swal.fire({
+                            title: 'Apakah Anda yakin?',
+                            text: `Untuk melakukan otorisator ${dataHeader}!`,
+                            icon: 'warning',
+                            html: `
+                                <input id="swal-keterangan" class="swal2-input input" placeholder="Keterangan">
+                                <input id="swal-tanggal-paparan" class="swal2-input input" type="date" placeholder="Tanggal paparan">
+                                `,
+                                focusConfirm: false,
+                                preConfirm: () => {
+                                const keterangan = document.getElementById('swal-keterangan').value;
+                                const tanggalPaparan = document.getElementById('swal-tanggal-paparan').value;
+
+                                if (!keterangan || !tanggalPaparan) {
+                                    Swal.showValidationMessage('Keterangan atau Tanggal Paparan Harus diisi!');
+                                    return false;
+                                }
+
+                                return { keterangan, tanggalPaparan };
                             },
-                        });
-                        $.ajax({
-                            url: `/otorisator/otorisator/${dataId}/${dataHeader}`,
-                            type: 'POST',
-                            data: {
-                                message: userMessage
-                            },
-                            success: (response) => {
-                                Swal.fire('Berhasil!',
-                                    'Data berhasil diotorisasi. Menunggu Approval EO dan atau DD',
-                                    'success').then(() => {
-                                    window.location.reload();
+                            showCancelButton: true,
+                            confirmButtonColor: '#3085d6',
+                            cancelButtonColor: '#d33',
+                            confirmButtonText: 'Ya, Lanjutkan!',
+                            cancelButtonText: 'Batal',
+                        }).then((result) => {
+                            if (result.isConfirmed) {
+                                const keterangan = result.value.keterangan || ''; 
+                                const tanggalPaparan = result.value.tanggalPaparan || '';
+                                
+                                $.ajaxSetup({
+                                    headers: {
+                                        'X-CSRF-TOKEN': '{{ csrf_token() }}'
+                                    },
                                 });
-                                console.log(response);
+                                $.ajax({
+                                    url: `/otorisator/otorisator/${dataId}/${dataHeader}`,
+                                    type: 'POST',
+                                    data: {
+                                        message: keterangan,
+                                        tanggalPaparan: tanggalPaparan
+                                    },
+                                    success: (response) => {
+                                        Swal.fire('Berhasil!',
+                                            'Data berhasil diotorisasi. Menunggu Approval dan Tanggal Paparan dari DD',
+                                            'success').then(() => {
+                                            window.location.reload();
+                                        });
+                                        console.log(response);
+                                    },
+                                    error: (error) => {
+                                        console.error('Error:', error);
+                                        Swal.fire('Gagal!', 'Terjadi kesalahan saat melakukan otorisator.',
+                                            'error');
+                                    }
+                                });
+                            }
+                        });
+                    }else{
+                        Swal.fire({
+                            title: 'Apakah Anda yakin?',
+                            text: `Untuk melakukan otorisator ${dataHeader}!`,
+                            icon: 'warning',
+                            input: 'textarea',
+                            inputLabel: 'Keterangan',
+                            inputPlaceholder: 'Masukkan keterangan...',
+                            inputAttributes: {
+                                'aria-label': 'Masukkan keterangan'
                             },
-                            error: (error) => {
-                                console.error('Error:', error);
-                                Swal.fire('Gagal!', 'Terjadi kesalahan saat melakukan otorisator.',
-                                    'error');
+                            showCancelButton: true,
+                            confirmButtonColor: '#3085d6',
+                            cancelButtonColor: '#d33',
+                            confirmButtonText: 'Ya, Lanjutkan!',
+                            cancelButtonText: 'Batal',
+                        }).then((result) => {
+                            if (result.isConfirmed) {
+                                const userMessage = result.value || ''; // Ambil pesan dari textarea
+                                $.ajaxSetup({
+                                    headers: {
+                                        'X-CSRF-TOKEN': '{{ csrf_token() }}'
+                                    },
+                                });
+                                $.ajax({
+                                    url: `/otorisator/otorisator/${dataId}/${dataHeader}`,
+                                    type: 'POST',
+                                    data: {
+                                        message: userMessage
+                                    },
+                                    success: (response) => {
+                                        Swal.fire('Berhasil!',
+                                            'Data berhasil diotorisasi. Menunggu Approval dan Tanggal Paparan dari DD',
+                                            'success').then(() => {
+                                            window.location.reload();
+                                        });
+                                        console.log(response);
+                                    },
+                                    error: (error) => {
+                                        console.error('Error:', error);
+                                        Swal.fire('Gagal!', 'Terjadi kesalahan saat melakukan otorisator.',
+                                            'error');
+                                    }
+                                });
                             }
                         });
                     }
-                });
+                }else{
+                    Swal.fire({
+                        title: 'Apakah Anda yakin?',
+                        text: `Untuk melakukan otorisator ${dataHeader}!`,
+                        icon: 'warning',
+                        input: 'textarea',
+                        inputLabel: 'Keterangan',
+                        inputPlaceholder: 'Masukkan keterangan...',
+                        inputAttributes: {
+                            'aria-label': 'Masukkan keterangan'
+                        },
+                        showCancelButton: true,
+                        confirmButtonColor: '#3085d6',
+                        cancelButtonColor: '#d33',
+                        confirmButtonText: 'Ya, Lanjutkan!',
+                        cancelButtonText: 'Batal',
+                    }).then((result) => {
+                        if (result.isConfirmed) {
+                            const userMessage = result.value || ''; // Ambil pesan dari textarea
+                            $.ajaxSetup({
+                                headers: {
+                                    'X-CSRF-TOKEN': '{{ csrf_token() }}'
+                                },
+                            });
+                            $.ajax({
+                                url: `/otorisator/otorisator/${dataId}/${dataHeader}`,
+                                type: 'POST',
+                                data: {
+                                    message: userMessage
+                                },
+                                success: (response) => {
+                                    Swal.fire('Berhasil!',
+                                        'Data berhasil diotorisasi. Menunggu Approval EO dan atau DD',
+                                        'success').then(() => {
+                                        window.location.reload();
+                                    });
+                                    console.log(response);
+                                },
+                                error: (error) => {
+                                    console.error('Error:', error);
+                                    Swal.fire('Gagal!', 'Terjadi kesalahan saat melakukan otorisator.',
+                                        'error');
+                                }
+                            });
+                        }
+                    });
+                }
             }