From 27633cef7a083e88d48f19fbfcd1a2a16ec7d424 Mon Sep 17 00:00:00 2001
From: majid <rustammajid76@gmail.com>
Date: Thu, 17 Apr 2025 15:33:34 +0700
Subject: [PATCH 1/2] fix(surveyor):perbaikkan hapus foto

---
 resources/views/surveyor/components/foto.blade.php | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

diff --git a/resources/views/surveyor/components/foto.blade.php b/resources/views/surveyor/components/foto.blade.php
index 534f350..571ca91 100644
--- a/resources/views/surveyor/components/foto.blade.php
+++ b/resources/views/surveyor/components/foto.blade.php
@@ -364,6 +364,8 @@
                                     param_name: paramName
                                 };
 
+
+
                                 // Add file to existing files set to prevent duplicates
                                 existingFiles.add(file.name);
 
@@ -830,6 +832,9 @@
 
             const filePreviewElement = file.previewElement;
 
+            console.log(file.originalPath);
+
+
             if (!filePreviewElement) {
                 console.error('File preview element not found for:', file);
                 return;
@@ -874,7 +879,7 @@
                             url: "{{ route('surveyor.hapusFoto') }}",
                             method: 'DELETE',
                             data: {
-                                path: file.originalPath,
+                                path: response.path,
                                 permohonan_id: {{ $permohonan->id ?? 0 }},
                                 dokument_id: '{{ request('dokument') ?? '' }}',
                                 param_name: response.param_name

From 55036bf5819199c606c98aec75a377441d2c3df5 Mon Sep 17 00:00:00 2001
From: majid <rustammajid76@gmail.com>
Date: Thu, 17 Apr 2025 19:01:46 +0700
Subject: [PATCH 2/2] fix(penilai):perbaikkan otorisasi paparan dibawah < 2M

---
 app/Http/Controllers/PenilaianController.php        | 12 ++++++++++--
 resources/views/penilaian/otorisator/show.blade.php |  6 +++---
 2 files changed, 13 insertions(+), 5 deletions(-)

diff --git a/app/Http/Controllers/PenilaianController.php b/app/Http/Controllers/PenilaianController.php
index 904c721..24a60bf 100644
--- a/app/Http/Controllers/PenilaianController.php
+++ b/app/Http/Controllers/PenilaianController.php
@@ -603,8 +603,15 @@ class PenilaianController extends Controller
                 break;
             case 'paparan':
                 if (Auth::user()->roles[0]->name === 'senior-officer' || Auth::user()->roles[0]->name === 'administrator' && $authorization->approve_so === null) {
+                    $status = '3';
+                    if (in_array($permohonan->nilai_plafond_id, [3])) {
+                        $status = '1';
+                        $permohonan->update([
+                            'status'         => $authorization->request
+                        ]);
+                    }
                     $authorization->update([
-                        'status'         => '3',
+                        'status'         => $status,
                         'status_so' => '1',
                         'approve_so'    => Auth::user()->id,
                         'approve_so_at' => now(),
@@ -615,9 +622,10 @@ class PenilaianController extends Controller
                         'tanggal_paparan' => $request->tanggalPaparan,
                         'keterangan'      => $request->keterangan
                     ]);
+
                 } elseif (Auth::user()->roles[0]->name === 'EO Appraisal') {
                     $status = '2';
-                    if (in_array($permohonan->nilai_plafond_id, [1,2])) {
+                    if (in_array($permohonan->nilai_plafond_id, [1,2, 3])) {
                         $status = '1';
                         $permohonan->update([
                             'status'         => $authorization->request
diff --git a/resources/views/penilaian/otorisator/show.blade.php b/resources/views/penilaian/otorisator/show.blade.php
index 38c23cc..cf027b1 100644
--- a/resources/views/penilaian/otorisator/show.blade.php
+++ b/resources/views/penilaian/otorisator/show.blade.php
@@ -172,7 +172,7 @@
                         @if (Auth::user()->hasAnyRole(['administrator', 'EO Appraisal']) &&
                                 $permohonan->approval_so &&
                                 $permohonan->approval_eo == 0 &&
-                                in_array($permohonan->nilai_plafond_id, [1, 2, 4]))
+                                in_array($permohonan->nilai_plafond_id, [1, 2,3, 4]))
                             <button onclick="otorisatorData({{ $permohonan->id }})" type="button" class="btn btn-primary">
                                 <i class="ki-filled ki-double-check"></i>
                                 Otorisator {{ $header ?? '' }}
@@ -216,7 +216,7 @@
                             </button>
                         @endif
 
-                        @if (Auth::user()->hasAnyRole(['administrator', 'EO Appraisal']) && $authorization->approve_so && $authorization->approve_eo == null && in_array($permohonan->nilai_plafond_id, [1, 2,4]))
+                        @if (Auth::user()->hasAnyRole(['administrator', 'EO Appraisal']) && $authorization->approve_so && $authorization->approve_eo == null && in_array($permohonan->nilai_plafond_id, [1, 2,3,4]) && $permohonan->status === 'proses-paparan')
                             <button onclick="otorisatorData({{ $authorization->id }},'EO')" type="button"
                                 class="btn btn-primary">
                                 <i class="ki-filled ki-double-check"></i>
@@ -224,7 +224,7 @@
                             </button>
                         @endif
 
-                        @if (Auth::user()->hasAnyRole(['administrator', 'DD Appraisal']) && $authorization->approve_eo &&  $authorization->approve_dd == null && in_array($permohonan->nilai_plafond_id, [4]))
+                        @if (Auth::user()->hasAnyRole(['administrator', 'DD Appraisal']) && $authorization->approve_eo &&  $authorization->approve_dd == null && in_array($permohonan->nilai_plafond_id, [4]) &&$permohonan->status === 'proses-paparan')
                             <button onclick="otorisatorData({{ $authorization->id }},'DD')" type="button"
                                 class="btn btn-primary">
                                 <i class="ki-filled ki-double-check"></i>