From 704f52392fd40f42f1fc7beb105d01565a03592a Mon Sep 17 00:00:00 2001
From: Daeng Deni Mardaeni <ddeni05@gmail.com>
Date: Fri, 7 Mar 2025 08:01:41 +0700
Subject: [PATCH] fix(penilaian): perbaiki logika otorisasi dan penanganan
 dataHeader

- Memperbaiki logika untuk mendapatkan otorisasi berdasarkan jenis laporan.
- Menambahkan pengecekan untuk memastikan $permohonan->authorization->approve_so ada sebelum digunakan.
- Memperbarui fungsi handleRejection untuk menerima parameter dataHeader.
---
 app/Http/Controllers/PenilaianController.php        | 12 +++++++-----
 resources/views/penilaian/otorisator/show.blade.php |  9 +++++----
 2 files changed, 12 insertions(+), 9 deletions(-)

diff --git a/app/Http/Controllers/PenilaianController.php b/app/Http/Controllers/PenilaianController.php
index 616f5b9..4655298 100644
--- a/app/Http/Controllers/PenilaianController.php
+++ b/app/Http/Controllers/PenilaianController.php
@@ -891,11 +891,13 @@ class PenilaianController extends Controller
 
     public function revisiLaporan(Request $request, $id)
     {
-        $permohonan = Permohonan::find($id);
-        $userRole = Auth::user()->roles[0]->name;
-
-        $authorization = Authorization::where('permohonan_id', $permohonan->id)
-            ->where('jenis', 'paparan')->first();
+        if($request->dataHeader=='Paparan'){
+            $authorization = Authorization::find($id);
+            $permohonan = Permohonan::find($authorization->permohonan_id);
+        } else {
+            $permohonan = Permohonan::find($id);
+            $userRole   = Auth::user()->roles[0]->name;
+        }
 
         if ($permohonan->status === 'proses-paparan') {
             if ($authorization) {
diff --git a/resources/views/penilaian/otorisator/show.blade.php b/resources/views/penilaian/otorisator/show.blade.php
index 1865701..5a026cc 100644
--- a/resources/views/penilaian/otorisator/show.blade.php
+++ b/resources/views/penilaian/otorisator/show.blade.php
@@ -110,7 +110,7 @@
         @endif
 
 
-        @if ($permohonan->authorization->approve_so && $dataHeader == 'paparan' )
+        @if (isset($permohonan->authorization->approve_so) && $dataHeader == 'paparan' )
         <div class="card border border-agi-100 pb-2.5">
             <div class="card-header bg-agi-50" id="basic_settings">
                 <h3 class="card-title">
@@ -247,7 +247,7 @@
 
     @push('scripts')
         <script>
-            const handleRejection = (dataId) => {
+            const handleRejection = (dataId,dataHeader='') => {
                 Swal.fire({
                     title: 'Masukkan alasan penolakan:',
                     input: 'textarea',
@@ -268,7 +268,8 @@
                     if (rejectResult.isConfirmed) {
                         handleAjaxRequest(
                             `/otorisator/revisi-laporan/${dataId}`, {
-                                keterangan: rejectResult.value
+                                keterangan: rejectResult.value,
+                                dataHeader: dataHeader
                             },
                             'Data berhasil ditolak.',
                             'Terjadi kesalahan saat melakukan penolakan.'
@@ -383,7 +384,7 @@
                             'Terjadi kesalahan saat melakukan otorisasi.'
                         );
                     } else if (result.isDenied) {
-                        handleRejection(dataId);
+                        handleRejection(dataId,dataHeader);
                     }
                 });
             }