From 145b677dbc36fa78514a205babe8c784aa280fcc Mon Sep 17 00:00:00 2001
From: majid <rustammajid76@gmail.com>
Date: Fri, 20 Dec 2024 16:08:11 +0700
Subject: [PATCH] perbaikan submit surveyor tidak bisa submit

---
 app/Http/Controllers/SurveyorController.php | 23 ++++++++++-----------
 app/Models/Inspeksi.php                     |  9 ++------
 2 files changed, 13 insertions(+), 19 deletions(-)

diff --git a/app/Http/Controllers/SurveyorController.php b/app/Http/Controllers/SurveyorController.php
index 2d1be44..ed42275 100644
--- a/app/Http/Controllers/SurveyorController.php
+++ b/app/Http/Controllers/SurveyorController.php
@@ -465,7 +465,9 @@ class SurveyorController extends Controller
     {
         try {
             // Get all inspeksi records for this permohonan
-            $inspeksiRecords = Inspeksi::where('permohonan_id', $id)->get();
+            $inspeksiRecords = Inspeksi::with(['dokument.jenisJaminan'])
+            ->where('permohonan_id', $id)
+            ->get();
 
             if ($inspeksiRecords->isEmpty()) {
                 return response()->json(['buttonDisable' => true]);
@@ -477,23 +479,20 @@ class SurveyorController extends Controller
                 $denahForm = json_decode($inspeksi->denah_form, true);
                 $dataPembanding = json_decode($inspeksi->data_pembanding, true);
 
-                // Get jenis jaminan to check if it needs denah
-                $jenisJaminan = JenisJaminan::find($inspeksi->dokument_id);
+                $jenisJaminan = $inspeksi->dokument->jenisJaminan->name ?? '';
+
                 $isTanahBangunan = !in_array(
                     strtoupper($jenisJaminan->name ?? ''),
                     ['KAPAL', 'PESAWAT', 'KENDARAAN', 'ALAT BERAT']
                 );
 
-                // Check if required forms are empty or incomplete
-                if (empty($dataForm) || empty($fotoForm)) {
-                    return response()->json(['buttonDisable' => true]);
-                }
+                $isInvalid =
+                empty($dataForm) ||
+                empty($fotoForm) ||
+                (($isTanahBangunan && empty($denahForm)) ||
+                empty($dataPembanding));
 
-                if ($isTanahBangunan && empty($denahForm)) {
-                    return response()->json(['buttonDisable' => true]);
-                }
-
-                if (empty($dataPembanding)) {
+                if ($isInvalid) {
                     return response()->json(['buttonDisable' => true]);
                 }
             }
diff --git a/app/Models/Inspeksi.php b/app/Models/Inspeksi.php
index 32e9c90..e6d253d 100644
--- a/app/Models/Inspeksi.php
+++ b/app/Models/Inspeksi.php
@@ -21,13 +21,8 @@ class Inspeksi extends Model
         return $this->belongsTo(Permohonan::class, 'permohonan_id');
     }
 
-    public function jenis_jaminan()
+    public function dokument()
     {
-        return $this->belongsTo(JenisJaminan::class, 'jenis_jaminan_id');
+        return $this->belongsTo(DokumenJaminan::class, 'dokument_id');
     }
-
-    // protected static function newFactory(): InspeksiFactory
-    // {
-    //     // return InspeksiFactory::new();
-    // }
 }