From a60a8c7ec4dfea709b4d2bc5d4ef52b473c51bc2 Mon Sep 17 00:00:00 2001
From: majid <rustammajid76@gmail.com>
Date: Tue, 21 Jan 2025 12:11:04 +0700
Subject: [PATCH] fix(so): tampilan memo tidak tampil

---
 app/Http/Controllers/PenilaianController.php  | 27 ++++++++++++++-----
 .../surveyor/components/informasi.blade.php   |  2 +-
 2 files changed, 22 insertions(+), 7 deletions(-)

diff --git a/app/Http/Controllers/PenilaianController.php b/app/Http/Controllers/PenilaianController.php
index e5c2b5b..cd51dc2 100644
--- a/app/Http/Controllers/PenilaianController.php
+++ b/app/Http/Controllers/PenilaianController.php
@@ -23,19 +23,19 @@ use Modules\Location\Models\District;
 use Modules\Location\Models\Village;
 use Modules\Usermanagement\Models\User;
 use Modules\Lpj\Http\Controllers\SurveyorController;
-// use Modules\Lpj\Http\Controllers\PenilaiController;
+use Modules\Lpj\Http\Controllers\PenilaiController;
 use Modules\Lpj\Http\Requests\FormSurveyorRequest;
 
 class PenilaianController extends Controller
 {
     public $user;
     protected $surveyorController;
-    // protected $penilaiController;
+    protected $penilaiController;
 
-    public function __construct(SurveyorController $surveyorController)
+    public function __construct(SurveyorController $surveyorController, PenilaiController $penilaiController)
     {
         $this->surveyorController = $surveyorController;
-        // $this->penilaiController = $penilaiController;
+        $this->penilaiController = $penilaiController;
     }
 
 
@@ -677,11 +677,26 @@ class PenilaianController extends Controller
         if ($inspeksi) {
             $forminspeksi = json_decode($inspeksi->data_form, true);
         }
+        $noLpmemo =     $this->penilaiController->generateNoLaporan($permohonan, $documentId, 'memo');
+        $formFoto = $formPeta = $cities = $districts = $villages = $memo = null;
 
         if ($lpj) {
             $lpjData = json_decode($lpj->lpj, true);
             $resumeData = json_decode($lpj->resume, true);
-            $memo = json_decode($lpj->memo, true);
+            if (isset($lpj->memo)) {
+                $memo = json_decode($lpj->memo);
+            }
+            if (isset($memo->lokasi->province_code)) {
+                $cities = City::where('province_code', $memo->lokasi->province_code)->get();
+            }
+
+            if (isset($memo->lokasi->city_code)) {
+                $districts = District::where('city_code', $memo->lokasi->city_code)->get();
+            }
+
+            if (isset($memo->lokasi->district_code)) {
+                $villages = Village::where('district_code', $memo->lokasi->district_code)->get();
+            }
             $rap = json_decode($lpj->rap, true);
         }
 
@@ -695,7 +710,7 @@ class PenilaianController extends Controller
             return redirect()->back()->with('error', 'Laporan belum dibuat');
         }
 
-        return view('lpj::' . $viewLaporan, compact('permohonan', 'forminspeksi', 'basicData', 'inspeksi', 'lpjData', 'provinces', 'resumeData', 'rap', 'memo'));
+        return view('lpj::' . $viewLaporan, compact('permohonan', 'forminspeksi', 'basicData', 'inspeksi', 'lpjData', 'provinces', 'resumeData', 'rap', 'memo', 'cities', 'districts', 'villages','formFoto', 'formPeta','noLpmemo'));
     }
 
     private function getViewLaporan($tipe)
diff --git a/resources/views/surveyor/components/informasi.blade.php b/resources/views/surveyor/components/informasi.blade.php
index 152b710..e452f5b 100644
--- a/resources/views/surveyor/components/informasi.blade.php
+++ b/resources/views/surveyor/components/informasi.blade.php
@@ -206,7 +206,7 @@
                    </div>
 
                    <img id="foto_tempat-preview"
-                   src="{{ isset($forminspeksi['foto_tempat']) ? asset('storage/' . (is_array($forminspeksi['foto_tempat']) ? $forminspeksi['foto_tempat']['path'] : $forminspeksi['foto_tempat'])) : '' }}"
+                   src="{{ isset($forminspeksi['foto_tempat']) ? asset('storage/' . (is_array($forminspeksi['foto_tempat']) ? $forminspeksi['foto_tempat'] : $forminspeksi['foto_tempat'])) : '' }}"
                    alt="Foto Argis Region" class="mt-2 max-w-full h-auto"
                    style="{{ isset($forminspeksi['foto_tempat']) ? '' : 'display: none;' }} max-width: 30rem;">
                </div>