From 99fb76c5bc08523ff6acfab3e21c104098f7cabf Mon Sep 17 00:00:00 2001
From: majid <rustammajid76@gmail.com>
Date: Fri, 24 Jan 2025 16:08:33 +0700
Subject: [PATCH] perbaikan nomor laporan di memo dan rap

---
 app/Http/Controllers/PenilaiController.php               | 4 ++--
 app/Http/Controllers/PenilaianController.php             | 6 ++++--
 resources/views/penilai/components/memo.blade.php        | 2 +-
 resources/views/penilai/components/rap-penilai.blade.php | 2 +-
 4 files changed, 8 insertions(+), 6 deletions(-)

diff --git a/app/Http/Controllers/PenilaiController.php b/app/Http/Controllers/PenilaiController.php
index 1f5f6d5..fb8409d 100644
--- a/app/Http/Controllers/PenilaiController.php
+++ b/app/Http/Controllers/PenilaiController.php
@@ -190,7 +190,7 @@ class PenilaiController extends Controller
         $data = $this->getDataPermohonanWithPenilaiAndInspeksi($req['permohonanId'], $req['documentId'], $req['jaminanId']);
         $permohonan = $data['permohonan'];
 
-        $noLpmemo =     $this->generateNoLaporan($permohonan, $req['documentId'], 'memo');
+        $nomorLaporan =     $this->generateNoLaporan($permohonan, $req['documentId'], 'memo');
         $inspeksi = Inspeksi::where('permohonan_id', $req['permohonanId'])->where('dokument_id', $req['documentId'])->first();
         $penilai = Penilai::where('permohonan_id', $req['permohonanId'])->where('dokument_id', $req['documentId'])->first();
         $provinces = Province::all();
@@ -323,7 +323,7 @@ class PenilaiController extends Controller
         $jaminanId = $request->query('jaminanId');
         $provinces = Province::all();
         $permohonan = $this->surveyorController->getPermohonanJaminanId($permohonanId, $documentId, $jaminanId);
-        $noLpRAP =     $this->generateNoLaporan($permohonan, $documentId, 'rap');
+        $nomorLaporan =     $this->generateNoLaporan($permohonan, $documentId, 'rap');
         $basicData =  $this->surveyorController->getCommonData();
         $inspeksi = Inspeksi::where('permohonan_id', $permohonanId)->where('dokument_id', $documentId)->first();
         Penilai::updateOrCreate(
diff --git a/app/Http/Controllers/PenilaianController.php b/app/Http/Controllers/PenilaianController.php
index e3e3229..4160d59 100644
--- a/app/Http/Controllers/PenilaianController.php
+++ b/app/Http/Controllers/PenilaianController.php
@@ -729,7 +729,9 @@ class PenilaianController extends Controller
         if ($inspeksi) {
             $forminspeksi = json_decode($inspeksi->data_form, true);
         }
-        $noLpmemo =     $this->penilaiController->generateNoLaporan($permohonan, $documentId, 'memo');
+        $nomorLaporan =   $this->penilaiController->generateNoLaporan($permohonan, $documentId, $lpj->type_penilai);
+
+
         $formFoto = $formPeta = $cities = $districts = $villages = $memo = null;
 
         if ($lpj) {
@@ -762,7 +764,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', 'cities', 'districts', 'villages','formFoto', 'formPeta','noLpmemo'));
+        return view('lpj::' . $viewLaporan, compact('permohonan', 'forminspeksi', 'basicData', 'inspeksi', 'lpjData', 'provinces', 'resumeData', 'rap', 'memo', 'cities', 'districts', 'villages','formFoto', 'formPeta','nomorLaporan'));
     }
 
     private function getViewLaporan($tipe)
diff --git a/resources/views/penilai/components/memo.blade.php b/resources/views/penilai/components/memo.blade.php
index cffbd9e..71cee50 100644
--- a/resources/views/penilai/components/memo.blade.php
+++ b/resources/views/penilai/components/memo.blade.php
@@ -38,7 +38,7 @@
                         <label class="form-label max-w-56">Nomor Memo</label>
                         <div class="flex flex-wrap items-base line w-full">
                             <input type="text" name="nomor_memo" class="input w-full" placeholder="Masukkan..."
-                                value="{{ $noLpmemo ?? '' }}" @readonly(true)>
+                                value="{{ $nomorLaporan ?? '' }}" @readonly(true)>
                         </div>
                     </div>
                     {{-- 250109828129/ --}}
diff --git a/resources/views/penilai/components/rap-penilai.blade.php b/resources/views/penilai/components/rap-penilai.blade.php
index f0e7296..39f8a5a 100644
--- a/resources/views/penilai/components/rap-penilai.blade.php
+++ b/resources/views/penilai/components/rap-penilai.blade.php
@@ -42,7 +42,7 @@
                         <label class="form-label max-w-56">Nomor RAP</label>
                         <div class="flex flex-wrap items-base line w-full">
                             <input type="text" name="nomor_rap" class="input w-full" placeholder="Masukkan..."
-                                value="{{ $noLpRAP ?? '' }}" @readonly(true)>
+                                value="{{ $nomorLaporan ?? '' }}" @readonly(true)>
                         </div>
                     </div>
                     {{-- 250109828129/ --}}