diff --git a/app/Helpers/Lpj.php b/app/Helpers/Lpj.php index 3de19d7..0855bb3 100644 --- a/app/Helpers/Lpj.php +++ b/app/Helpers/Lpj.php @@ -380,7 +380,12 @@ function getNomorLaporan($permohonanId, $documentId, $type = 'nomor_laporan') 'permohonan_id' => $permohonanId, 'dokumen_jaminan_id' => $documentId, ])->first(); - return $type == 'nomor_laporan' ? $laporan->nomor_laporan : $laporan->created_at ?? "-"; + + if (!$laporan) { + return $type == 'nomor_laporan' ? '-' : null; + } + + return $type == 'nomor_laporan' ? $laporan->nomor_laporan : $laporan->created_at; } function getCustomField($param) diff --git a/app/Http/Controllers/PenilaiController.php b/app/Http/Controllers/PenilaiController.php index 0afcc21..5d32d87 100644 --- a/app/Http/Controllers/PenilaiController.php +++ b/app/Http/Controllers/PenilaiController.php @@ -305,7 +305,7 @@ class PenilaiController extends Controller */ public function show($id) { - $permohonan = Permohonan::with(['debiture.documents.jenisjaminan', 'region.teams.teamsUsers.user', 'penilaian', 'documents.inspeksi'])->find($id); + $permohonan = Permohonan::with(['debiture.documents.jenisjaminan', 'region.teams.teamsUsers.user', 'penilaian', 'documents.inspeksi','jenisPenilaian','laporanExternal'])->find($id); // return response()->json(['permohonan' => $permohonan]); diff --git a/app/Models/Permohonan.php b/app/Models/Permohonan.php index b3e881c..dc08b61 100644 --- a/app/Models/Permohonan.php +++ b/app/Models/Permohonan.php @@ -235,4 +235,9 @@ { return $this->hasMany(LampiranDokumen::class); } + + public function laporanExternal() + { + return $this->belongsTo(LaporanExternal::class,'id','permohonan_id'); + } } diff --git a/resources/views/penilai/show.blade.php b/resources/views/penilai/show.blade.php index c8d856a..cb3ea4e 100644 --- a/resources/views/penilai/show.blade.php +++ b/resources/views/penilai/show.blade.php @@ -85,7 +85,6 @@ -