From bbb0e006e7aeeeb3b53efe5bbae3d55e08bcf827 Mon Sep 17 00:00:00 2001 From: majid Date: Mon, 17 Mar 2025 10:42:08 +0700 Subject: [PATCH] fix(penilai): perbaikkan data double di table penilai -> hapus field inspeksi id dan perbaikkan format tanggal --- app/Helpers/Lpj.php | 13 +++- app/Http/Controllers/PenilaiController.php | 36 ++------- app/Http/Controllers/PenilaianController.php | 3 +- ...eld_inspeksi_id_in_table_penilai_table.php | 30 +++++++ .../components/analisa/tanah.blade.php | 2 +- .../penilai/components/call-report.blade.php | 9 +-- .../lpj-sederhana-standar.blade.php | 4 +- .../views/penilai/components/memo.blade.php | 6 +- .../components/print-out-sederhana.blade.php | 5 ++ .../components/print-out-standar.blade.php | 9 ++- .../penilai/components/rap-penilai.blade.php | 8 +- .../views/penilai/components/resume.blade.php | 6 +- resources/views/penilai/show.blade.php | 78 +++++++++---------- .../views/penilaian/otorisator/show.blade.php | 16 +--- 14 files changed, 110 insertions(+), 115 deletions(-) create mode 100644 database/migrations/2025_03_17_013537_remove_field_inspeksi_id_in_table_penilai_table.php diff --git a/app/Helpers/Lpj.php b/app/Helpers/Lpj.php index 8fb1e58..d00270c 100644 --- a/app/Helpers/Lpj.php +++ b/app/Helpers/Lpj.php @@ -19,11 +19,16 @@ use Modules\Location\Models\Village; function formatTanggalIndonesia($date, $time = false) { Carbon::setLocale('id'); - $waktu = Carbon::parse($date); - if (!$time) { - return $waktu->translatedFormat('d F Y'); + try { + $waktu = Carbon::parse($date); + if (!$time) { + return $waktu->translatedFormat('d F Y'); + } + return $waktu->translatedFormat('d F Y') . ' pukul ' . $waktu->format('H.i') . ' WIB'; + } catch (\Throwable $e) { + return $date; } - return $waktu->translatedFormat('d F Y') . ' pukul ' . $waktu->format('H.i') . ' WIB'; + } diff --git a/app/Http/Controllers/PenilaiController.php b/app/Http/Controllers/PenilaiController.php index e46ea62..b66021b 100644 --- a/app/Http/Controllers/PenilaiController.php +++ b/app/Http/Controllers/PenilaiController.php @@ -84,7 +84,6 @@ class PenilaiController extends Controller $documentId = $request->query('documentId'); $jaminanId = $request->query('jaminanId'); - $inspeksiId = $request->query('inspeksiId'); $permohonan = $this->surveyorController->getPermohonanJaminanId($id, $documentId, $jaminanId); $basicData = $this->surveyorController->getCommonData(); $provinces = Province::all(); @@ -96,7 +95,6 @@ class PenilaiController extends Controller [ 'permohonan_id' => $id, 'dokument_id' => $documentId, - 'inspeksi_id' => $inspeksiId, ], [ 'type_penilai' => 'sederhana', @@ -152,7 +150,6 @@ class PenilaiController extends Controller $documentId = $request->query('documentId'); $jaminanId = $request->query('jaminanId'); - $inspeksiId = $request->query('inspeksiId'); $permohonan = $this->surveyorController->getPermohonanJaminanId($id, $documentId, $jaminanId); $basicData = $this->surveyorController->getCommonData(); @@ -164,7 +161,6 @@ class PenilaiController extends Controller [ 'permohonan_id' => $id, 'dokument_id' => $documentId, - 'inspeksi_id' => $inspeksiId, ], [ 'type_penilai' => 'standar', @@ -219,7 +215,6 @@ class PenilaiController extends Controller { $permohonanId = $request->query('permohonanId'); $documentId = $request->query('documentId'); - $inspeksiId = $request->query('inspeksiId'); $jaminanId = $request->query('jaminanId'); $permohonan = $this->surveyorController->getPermohonanJaminanId($permohonanId, $documentId, $jaminanId); @@ -230,7 +225,6 @@ class PenilaiController extends Controller [ 'permohonan_id' => $permohonanId, 'dokument_id' => $documentId, - 'inspeksi_id' => $inspeksiId, ], [ 'type_penilai' => 'resume', @@ -269,7 +263,6 @@ class PenilaiController extends Controller [ 'permohonan_id' => $req['permohonanId'], 'dokument_id' => $req['documentId'], - 'inspeksi_id' => $request->inspeksiId, ], [ 'type_penilai' => 'memo', @@ -348,7 +341,6 @@ class PenilaiController extends Controller [ 'permohonan_id' => $request->permohonan_id, 'dokument_id' => $request->dokument_id, - 'inspeksi_id' => $request->inspeksi_id, ] ); @@ -377,7 +369,6 @@ class PenilaiController extends Controller $permohonanId = $request->query('permohonanId'); $documentId = $request->query('documentId'); - $inspeksiId = $request->query('inspeksiId'); $jaminanId = $request->query('jaminanId'); $permohonan = $this->surveyorController->getPermohonanJaminanId($permohonanId, $documentId, $jaminanId); @@ -398,7 +389,6 @@ class PenilaiController extends Controller $permohonanId = $request->query('permohonanId'); $documentId = $request->query('documentId'); - $inspeksiId = $request->query('inspeksiId'); $jaminanId = $request->query('jaminanId'); $provinces = Province::all(); $permohonan = $this->surveyorController->getPermohonanJaminanId($permohonanId, $documentId, $jaminanId); @@ -409,7 +399,6 @@ class PenilaiController extends Controller [ 'permohonan_id' => $permohonanId, 'dokument_id' => $documentId, - 'inspeksi_id' => $inspeksiId, ], [ 'type_penilai' => 'rap', @@ -478,7 +467,6 @@ class PenilaiController extends Controller $permohonanId = $request->query('permohonanId'); $documentId = $request->query('documentId'); - $inspeksiId = $request->query('inspeksiId'); $jaminanId = $request->query('jaminanId'); $provinces = Province::all(); $permohonan = $this->surveyorController->getPermohonanJaminanId($permohonanId, $documentId, $jaminanId); @@ -489,7 +477,6 @@ class PenilaiController extends Controller [ 'permohonan_id' => $permohonanId, 'dokument_id' => $documentId, - 'inspeksi_id' => $inspeksiId, ], [ 'type_penilai' => 'call-report', @@ -721,7 +708,6 @@ class PenilaiController extends Controller $validatedData = $request->validate([ 'permohonan_id' => 'required|integer', 'document_id' => 'required|integer', - 'inspeksi_id' => 'required|integer', 'kertas_kerja' => 'required|file|mimes:pdf', ]); @@ -734,7 +720,6 @@ class PenilaiController extends Controller [ 'permohonan_id' => $validatedData['permohonan_id'], 'dokument_id' => $validatedData['document_id'], - 'inspeksi_id' => $validatedData['inspeksi_id'], ], [ 'kertas_kerja' => $filePath, @@ -761,11 +746,9 @@ class PenilaiController extends Controller { $permohonanId = $request->query('permohonanId'); $documentId = $request->query('documentId'); - $inspeksiId = $request->query('inspeksiId'); $statusLpj = Penilai::where('permohonan_id', $permohonanId) ->where('dokument_id', $documentId) - ->where('inspeksi_id', $inspeksiId) ->first(); return response()->json(['status' => $statusLpj ? $statusLpj->type : null]); @@ -778,8 +761,7 @@ class PenilaiController extends Controller Penilai::updateOrCreate( [ 'permohonan_id' => $request->permohonan_id, - 'dokument_id' => $request->document_id, - 'inspeksi_id' => $request->inspeksi_id, + 'dokument_id' => $request->document_i ], [ 'type' => $request->type, @@ -887,7 +869,7 @@ class PenilaiController extends Controller $validatedData = $request->validate([ 'permohonan_id' => 'required', 'dokument_id' => 'required', - 'inspeksi_id' => 'required', + 'resume' => 'required|array', 'fakta_positif' => 'nullable|array', 'fakta_negatif' => 'nullable|array', @@ -901,7 +883,7 @@ class PenilaiController extends Controller [ 'permohonan_id' => $validatedData['permohonan_id'], 'dokument_id' => $validatedData['dokument_id'], - 'inspeksi_id' => $validatedData['inspeksi_id'], + ], [ 'resume' => json_encode($validatedData['resume']), @@ -970,7 +952,6 @@ class PenilaiController extends Controller $validatedData = $request->validate([ 'permohonan_id' => 'required|integer', 'document_id' => 'required|integer', - 'inspeksi_id' => 'required|integer', 'memo' => 'required', ]); @@ -980,7 +961,7 @@ class PenilaiController extends Controller [ 'permohonan_id' => $validatedData['permohonan_id'], 'dokument_id' => $validatedData['document_id'], - 'inspeksi_id' => $validatedData['inspeksi_id'], + ], [ 'memo' => json_encode($memoData), @@ -1075,7 +1056,7 @@ class PenilaiController extends Controller [ 'permohonan_id' => $request->permohonanId, 'dokument_id' => $request->documentId, - 'inspeksi_id' => $request->inspeksiId, + ], [ 'lpj' => json_encode($data), @@ -1129,7 +1110,7 @@ class PenilaiController extends Controller [ 'permohonan_id' => $request->permohonanId, 'dokument_id' => $request->documentId, - 'inspeksi_id' => $request->inspeksiId, + ], [ 'rap' => json_encode($data), @@ -1160,7 +1141,6 @@ class PenilaiController extends Controller $validated = $request->validate([ 'permohonan_id' => 'required|exists:permohonan,id', 'dokument_id' => 'required', - 'inspeksi_id' => 'required', 'data' => 'required', 'fakta_positif' => 'nullable|array', 'fakta_negatif' => 'nullable|array', @@ -1175,7 +1155,6 @@ class PenilaiController extends Controller [ 'permohonan_id' => $validated['permohonan_id'], 'dokument_id' => $validated['dokument_id'], - 'inspeksi_id' => $validated['inspeksi_id'], ], [ 'call_report' => json_encode($validated['data']), @@ -1389,7 +1368,6 @@ class PenilaiController extends Controller 'permohonanId' => $request->query('permohonanId'), 'documentId' => $request->query('documentId'), 'jaminanId' => $request->query('jaminanId'), - 'inspeksiId' => $request->query('inspeksiId') ]; } @@ -1397,12 +1375,10 @@ class PenilaiController extends Controller { $permohonanId = $request->query('permohonanId'); $documentId = $request->query('documentId'); - $inspeksiId = $request->query('inspeksiId'); // Ambil data berdasarkan ID $statusLpj = Penilai::where('permohonan_id', $permohonanId) ->where('dokument_id', $documentId) - ->where('inspeksi_id', $inspeksiId) ->first(); // Jika data tidak ditemukan, kembalikan status null diff --git a/app/Http/Controllers/PenilaianController.php b/app/Http/Controllers/PenilaianController.php index 3c88325..5aeb88b 100644 --- a/app/Http/Controllers/PenilaianController.php +++ b/app/Http/Controllers/PenilaianController.php @@ -786,7 +786,6 @@ class PenilaianController extends Controller $inspeksi = Inspeksi::where('permohonan_id', $id)->where('dokument_id', $documentId)->first(); $lpj = Penilai::where('permohonan_id', $id) ->where('dokument_id', $documentId) - ->where('inspeksi_id', $inspeksi->id) ->first(); $penilai = $lpj; @@ -879,7 +878,7 @@ class PenilaianController extends Controller [ 'permohonan_id' => $request->permohonanId, 'dokument_id' => $request->documentId, - 'inspeksi_id' => $request->inspeksiId, + ], [ 'lpj' => json_encode($data), diff --git a/database/migrations/2025_03_17_013537_remove_field_inspeksi_id_in_table_penilai_table.php b/database/migrations/2025_03_17_013537_remove_field_inspeksi_id_in_table_penilai_table.php new file mode 100644 index 0000000..286ad78 --- /dev/null +++ b/database/migrations/2025_03_17_013537_remove_field_inspeksi_id_in_table_penilai_table.php @@ -0,0 +1,30 @@ +dropForeign(['inspeksi_id']); + $table->dropColumn('inspeksi_id'); + }); + } + + /** + * Reverse the migrations. + */ + public function down(): void + { + Schema::table('penilai', function (Blueprint $table) { + $table->unsignedBigInteger('inspeksi_id')->nullable(); + $table->foreign('inspeksi_id')->references('id')->on('inspeksi')->onDelete('cascade'); + }); + } +}; diff --git a/resources/views/penilai/components/analisa/tanah.blade.php b/resources/views/penilai/components/analisa/tanah.blade.php index 7806951..8c50a6a 100644 --- a/resources/views/penilai/components/analisa/tanah.blade.php +++ b/resources/views/penilai/components/analisa/tanah.blade.php @@ -16,7 +16,7 @@ @endphp Luas Tanah : - {{ $luas ?? '' }} + {{ $luas ?? '' }} m2 @php diff --git a/resources/views/penilai/components/call-report.blade.php b/resources/views/penilai/components/call-report.blade.php index 0d48d5e..391caa1 100644 --- a/resources/views/penilai/components/call-report.blade.php +++ b/resources/views/penilai/components/call-report.blade.php @@ -512,7 +512,7 @@ @endif @if (Auth::user()->hasAnyRole(['senior-officer', 'EO Appraisal', 'DD Appraisal'])) + href="{{ route('penilai.lampiran') }}?permohonanId={{ request('permohonanId') }}&documentId={{ request('documentId') }}&jaminanId={{ request('jaminanId') }}&statusLpj=1"> Lampiran Foto dan Dokument Cetak Hasil Inspeksi + onclick="checkLaporan('{{ $permohonan->id }}', '{{ request('documentId') }}',{{ request('jaminanId') }}, )"> Cetak Laporan @endif @@ -589,7 +589,6 @@ const urlParams = new URLSearchParams(window.location.search); const permohonanId = {{ $permohonan->id }}; const documentId = urlParams.get('documentId'); - const inspeksiId = urlParams.get('inspeksiId'); const faktaPositif = Array.from(document.querySelectorAll('[name="fakta_positif[]"]')) .map(textarea => textarea.value.trim()) @@ -609,7 +608,7 @@ .map(input => input.value) .join(',') || ""; const requestUrl = - `{{ route('penilai.storeCallReport') }}?permohonan_id=${permohonanId}&inspeksi_id=${inspeksiId}&dokument_id=${documentId}`; + `{{ route('penilai.storeCallReport') }}?permohonan_id=${permohonanId}&dokument_id=${documentId}`; const jsonData = formatJson(formElement); @@ -619,7 +618,7 @@ data: JSON.stringify({ permohonan_id: permohonanId, dokument_id: documentId, - inspeksi_id: inspeksiId, + data: jsonData, fakta_positif: faktaPositif, fakta_negatif: faktaNegatif, diff --git a/resources/views/penilai/components/lpj-sederhana-standar.blade.php b/resources/views/penilai/components/lpj-sederhana-standar.blade.php index fbc7b90..1008b5f 100644 --- a/resources/views/penilai/components/lpj-sederhana-standar.blade.php +++ b/resources/views/penilai/components/lpj-sederhana-standar.blade.php @@ -52,7 +52,7 @@ @endif @if (Auth::user()->hasAnyRole(['senior-officer', 'EO Appraisal', 'DD Appraisal', 'administrator'])) + href="{{ route('penilai.lampiran') }}?permohonanId={{ $permohonan->id }}&documentId={{ request('documentId') }}&jaminanId={{ request('jaminanId') }}&statusLpj=1"> Lampiran Foto dan Dokumen Cetak Hasil Inspeksi + onclick="checkLaporan('{{ $permohonan->id }}', '{{ request('documentId') }}', {{ request('jaminanId') }}, )"> Cetak Laporan @endif diff --git a/resources/views/penilai/components/memo.blade.php b/resources/views/penilai/components/memo.blade.php index 42e304f..b7e9e56 100644 --- a/resources/views/penilai/components/memo.blade.php +++ b/resources/views/penilai/components/memo.blade.php @@ -322,7 +322,7 @@ @endif @if (Auth::user()->hasAnyRole(['administrator', 'senior-officer', 'EO Appraisal', 'DD Appraisal'])) + href="{{ route('penilai.lampiran') }}?permohonanId={{ request('permohonanId') }}&documentId={{ request('documentId') }}&jaminanId={{ request('jaminanId') }}&statusLpj=1"> Lampiran Foto dan Dokumen Hasil Inspeksi + onclick="checkLaporan('{{ $permohonan->id }}', '{{ request('documentId') }}', {{ request('jaminanId') }}, )"> Cetak Laporan @endif @@ -440,13 +440,11 @@ const urlParams = new URLSearchParams(window.location.search); const permohonanId = urlParams.get('permohonanId'); const documentId = urlParams.get('documentId'); - const inspeksiId = urlParams.get('inspeksiId'); // Create a new FormData object to send both JSON and files const sendFormData = new FormData(); sendFormData.append('permohonan_id', permohonanId); sendFormData.append('document_id', documentId); - sendFormData.append('inspeksi_id', inspeksiId); sendFormData.append('memo', JSON.stringify(jsonData)); // Append all files from Dropzone diff --git a/resources/views/penilai/components/print-out-sederhana.blade.php b/resources/views/penilai/components/print-out-sederhana.blade.php index 37b938c..e39dc9b 100644 --- a/resources/views/penilai/components/print-out-sederhana.blade.php +++ b/resources/views/penilai/components/print-out-sederhana.blade.php @@ -3,6 +3,7 @@ $data = ''; foreach ($permohonan->documents as $dokumen) { $data .= $dokumen->jenisJaminan->name . ', '; + $jenisAset = $dokumen->jenisJaminan->name; } $data = rtrim($data, ', '); @endphp @@ -730,6 +731,10 @@ 'pesawat' => 'Luas Pesawat', 'kapal' => 'Luas Kapal', ]; + if (strcasecmp($jenisAset, 'RUKO/RUKAN') === 0) { + $labelNilai['bangunan'] = 'Luas Unit'; + unset($labelNilai['tanah']); + } @endphp @foreach ($labelNilai as $key => $label) @if (isset($lpjData['luas_' . $key])) diff --git a/resources/views/penilai/components/print-out-standar.blade.php b/resources/views/penilai/components/print-out-standar.blade.php index 60fee0e..e284caa 100644 --- a/resources/views/penilai/components/print-out-standar.blade.php +++ b/resources/views/penilai/components/print-out-standar.blade.php @@ -5,6 +5,7 @@ $dokument = null; foreach ($permohonan->documents as $dokumen) { $data .= $dokumen->jenisJaminan->name . ', '; + $jenisAset = $dokumen->jenisJaminan->name; $dokument = $dokumen; } $data = rtrim($data, ', '); @@ -269,10 +270,10 @@ 'kapal' => 'Luas Kapal', ]; - // if (strcasecmp($jenisAset, 'RUKO/RUKAN') === 0) { - // $labelNilai['bangunan'] = 'Luas Unit'; - // unset($labelNilai['tanah']); - // } + if (strcasecmp($jenisAset, 'RUKO/RUKAN') === 0) { + $labelNilai['bangunan'] = 'Luas Unit'; + unset($labelNilai['tanah']); + } @endphp @foreach ($labelNilai as $key => $label) diff --git a/resources/views/penilai/components/rap-penilai.blade.php b/resources/views/penilai/components/rap-penilai.blade.php index 1f3b622..be5966a 100644 --- a/resources/views/penilai/components/rap-penilai.blade.php +++ b/resources/views/penilai/components/rap-penilai.blade.php @@ -77,7 +77,7 @@ @endif @if (Auth::user()->hasAnyRole(['senior-officer', 'EO Appraisal', 'DD Appraisal', 'administrator'])) + href="{{ route('penilai.lampiran') }}?permohonanId={{ request('permohonanId') }}&documentId={{ request('documentId') }}&jaminanId={{ request('jaminanId') }}&statusLpj=1"> Lampiran Foto dan Dokumen Cetak Hasil Inspeksi + onclick="checkLaporan('{{ $permohonan->id }}', '{{ request('documentId') }}', {{ request('jaminanId') }}, )"> Cetak Laporan @endif @@ -228,9 +228,9 @@ const urlParams = new URLSearchParams(window.location.search); const permohonanId = {{ $permohonan->id }}; const documentId = urlParams.get('documentId'); - const inspeksiId = urlParams.get('inspeksiId'); + const requestUrl = - `{{ route('penilai.storeRap') }}?permohonanId=${permohonanId}&inspeksiId=${inspeksiId}&documentId=${documentId}`; + `{{ route('penilai.storeRap') }}?permohonanId=${permohonanId}&documentId=${documentId}`; $.ajax({ url: requestUrl, type: 'POST', diff --git a/resources/views/penilai/components/resume.blade.php b/resources/views/penilai/components/resume.blade.php index e8010fd..033dbf9 100644 --- a/resources/views/penilai/components/resume.blade.php +++ b/resources/views/penilai/components/resume.blade.php @@ -431,7 +431,7 @@ @if (Auth::user()->hasAnyRole(['senior-officer', 'EO Appraisal', 'DD Appraisal', 'administrator'])) + href="{{ route('penilai.lampiran') }}?permohonanId={{ request('permohonanId') }}&documentId={{ request('documentId') }}&jaminanId={{ request('jaminanId') }}&statusLpj=1"> Lampiran Foto dan Dokumen Cetak Hasil Inspeksi + onclick="checkLaporan('{{ $permohonan->id }}', '{{ request('documentId') }}', {{ request('jaminanId') }}, )"> Cetak Laporan @endif @@ -551,7 +551,6 @@ const urlParams = new URLSearchParams(window.location.search); // Mengambil query parameters dari URL const permohonanId = urlParams.get('permohonanId'); const documentId = urlParams.get('documentId'); - const inspeksiId = urlParams.get('inspeksiId'); const faktaPositif = Array.from(document.querySelectorAll('[name="fakta_positif[]"]')) .map(textarea => textarea.value.trim()) .filter(value => value !== ''); @@ -580,7 +579,6 @@ data: JSON.stringify({ permohonan_id: permohonanId, dokument_id: documentId, - inspeksi_id: inspeksiId, resume: jsonData, fakta_positif: faktaPositif, fakta_negatif: faktaNegatif, diff --git a/resources/views/penilai/show.blade.php b/resources/views/penilai/show.blade.php index 91a9b76..2a4a155 100644 --- a/resources/views/penilai/show.blade.php +++ b/resources/views/penilai/show.blade.php @@ -211,10 +211,6 @@ @php - $inspeksiId = null; - foreach ($dokumen->inspeksi as $item) { - $inspeksiId = $item->id; - } $jaminanId = $dokumen->id; $currentInspeksi = $inspeksiData[$jaminanId] ?? null; @@ -224,7 +220,7 @@
+ href="{{ route('penilai.lampiran') }}?permohonanId={{ $permohonan->id }}&documentId={{ $dokumen->id }}&jaminanId={{ $dokumen->jenis_jaminan_id }}"> Lampiran Foto dan Dokumen @if (strtolower($permohonan->tujuanPenilaian->name) != 'rap') @@ -233,7 +229,7 @@ @endif + onclick="paparan({{ $permohonan->id }}, {{ $dokumen->id }}, {{ $dokumen->jenis_jaminan_id }})"> Paparan @@ -248,7 +244,7 @@ @if (strtolower($permohonan->tujuanPenilaian->name) == 'rap')
+ onclick="rap('{{ $permohonan->id }}', '{{ $dokumen->id }}', {{ $dokumen->jenis_jaminan_id }})"> @@ -264,7 +260,7 @@ {{-- existing di --}}
+ onclick="memo('{{ $permohonan->id }}', '{{ $dokumen->id }}', {{ $dokumen->jenis_jaminan_id }})"> @@ -278,7 +274,7 @@ @if ($permohonan->status_bayar === 'belum_bayar')
+ onclick="resume('{{ $permohonan->id }}', '{{ $dokumen->id }}', {{ $dokumen->jenis_jaminan_id }})"> @@ -294,7 +290,7 @@
+ onclick="seletSederhanaStandart('{{ $permohonan->id }}', '{{ $dokumen->id }}', {{ $dokumen->jenis_jaminan_id }}, '{{ $permohonan->jenisFasilitasKredit->name }}', '{{ $permohonan->status_bayar }}')"> @@ -304,7 +300,7 @@ @endif
+ onclick="callReport('{{ $permohonan->id }}', '{{ $dokumen->id }}', {{ $dokumen->jenis_jaminan_id }})"> @@ -372,13 +368,13 @@ + onclick="checkLaporan('{{ $permohonan->id }}', '{{ $dokumen->id }}', {{ $dokumen->jenis_jaminan_id }}, 1 )"> Lihat Laporan + onclick="checkLaporan('{{ $permohonan->id }}', '{{ $dokumen->id }}', {{ $dokumen->jenis_jaminan_id }}, 0 )"> Cetak Laporan @@ -420,7 +416,7 @@
@php $jenisJaminanId = null; - $inspeksiId = null; + $documentId = null; $firstDocument = $permohonan->documents->first(); // Ambil dokumen pertama @@ -428,9 +424,7 @@ $documentId = $firstDocument->id; // Ambil ID inspeksi pertama (jika ada) - if ($firstDocument->inspeksi->isNotEmpty()) { - $inspeksiId = $firstDocument->inspeksi->first()->id; - } + // Ambil jenis jaminan jika ada if ($firstDocument->jenisjaminan) { @@ -438,7 +432,7 @@ } } else { $documentId = 'Tidak ada dokumen'; - $inspeksiId = 'Tidak ada inspeksi'; + $jenisJaminanId = 'Tidak ada jenis jaminan'; } @@ -449,7 +443,7 @@
@@ -472,7 +466,7 @@ @include('lpj::component.pdfviewer')