From c572f061e39b5b682fa521bf7fd27d60e777a75a Mon Sep 17 00:00:00 2001 From: Daeng Deni Mardaeni Date: Mon, 10 Mar 2025 07:39:39 +0700 Subject: [PATCH 1/9] fix(penawaran): ubah nilai awal luas tanah dan bangunan menjadi string kosong - Mengubah nilai awal dari `null` menjadi string kosong (`""`) pada beberapa file. - Memastikan konsistensi dalam penanganan data saat memproses detail dokumen. - Meningkatkan kejelasan dan menghindari potensi kesalahan saat memanipulasi data. --- resources/views/penawaran/kirimEmail.blade.php | 2 +- resources/views/penawaran/kirimEmailKJPP.blade.php | 2 +- resources/views/penawaran/surat_tender.blade.php | 2 +- resources/views/penawaran/surat_tender_download.blade.php | 2 +- resources/views/penawaran/surat_tender_kjpp.blade.php | 2 +- resources/views/penawaran/surat_tender_kjpp_download.blade.php | 2 +- 6 files changed, 6 insertions(+), 6 deletions(-) diff --git a/resources/views/penawaran/kirimEmail.blade.php b/resources/views/penawaran/kirimEmail.blade.php index 817d5a6..80eff30 100644 --- a/resources/views/penawaran/kirimEmail.blade.php +++ b/resources/views/penawaran/kirimEmail.blade.php @@ -126,7 +126,7 @@ @foreach ($permohonan->documents as $document) @foreach ($document->detail as $index => $detail) @if($detail->details) - @php $luastanah = $luasbangunan = null; @endphp + @php $luastanah = $luasbangunan = ""; @endphp @foreach (json_decode($detail->details) as $key => $value) @foreach($value as $k => $v) @if($k=='luas_tanah') diff --git a/resources/views/penawaran/kirimEmailKJPP.blade.php b/resources/views/penawaran/kirimEmailKJPP.blade.php index 791212f..e6d0e71 100644 --- a/resources/views/penawaran/kirimEmailKJPP.blade.php +++ b/resources/views/penawaran/kirimEmailKJPP.blade.php @@ -128,7 +128,7 @@ @foreach ($permohonan->documents as $document) @foreach ($document->detail as $index => $detail) @if($detail->details) - @php $luastanah = $luasbangunan = null; @endphp + @php $luastanah = $luasbangunan = ""; @endphp @foreach (json_decode($detail->details) as $key => $value) @foreach($value as $k => $v) @if($k=='luas_tanah') diff --git a/resources/views/penawaran/surat_tender.blade.php b/resources/views/penawaran/surat_tender.blade.php index d7ad287..0175082 100644 --- a/resources/views/penawaran/surat_tender.blade.php +++ b/resources/views/penawaran/surat_tender.blade.php @@ -111,7 +111,7 @@ @foreach ($permohonan->documents as $document) @foreach ($document->detail as $index => $detail) @if($detail->details) - @php $luastanah = $luasbangunan = null; @endphp + @php $luastanah = $luasbangunan = ""; @endphp @foreach (json_decode($detail->details) as $key => $value) @foreach($value as $k => $v) @if($k=='luas_tanah') diff --git a/resources/views/penawaran/surat_tender_download.blade.php b/resources/views/penawaran/surat_tender_download.blade.php index db007cc..6b103d6 100644 --- a/resources/views/penawaran/surat_tender_download.blade.php +++ b/resources/views/penawaran/surat_tender_download.blade.php @@ -126,7 +126,7 @@ @foreach ($permohonan->documents as $document) @foreach ($document->detail as $index => $detail) @if($detail->details) - @php $luastanah = $luasbangunan = null; @endphp + @php $luastanah = $luasbangunan = ""; @endphp @foreach (json_decode($detail->details) as $key => $value) @foreach($value as $k => $v) @if($k=='luas_tanah') diff --git a/resources/views/penawaran/surat_tender_kjpp.blade.php b/resources/views/penawaran/surat_tender_kjpp.blade.php index 8402599..91fa28c 100644 --- a/resources/views/penawaran/surat_tender_kjpp.blade.php +++ b/resources/views/penawaran/surat_tender_kjpp.blade.php @@ -109,7 +109,7 @@ @foreach ($permohonan->documents as $document) @foreach ($document->detail as $index => $detail) @if($detail->details) - @php $luastanah = $luasbangunan = null; @endphp + @php $luastanah = $luasbangunan = ""; @endphp @foreach (json_decode($detail->details) as $key => $value) @foreach($value as $k => $v) @if($k=='luas_tanah') diff --git a/resources/views/penawaran/surat_tender_kjpp_download.blade.php b/resources/views/penawaran/surat_tender_kjpp_download.blade.php index 7bd9b0b..d4f9685 100644 --- a/resources/views/penawaran/surat_tender_kjpp_download.blade.php +++ b/resources/views/penawaran/surat_tender_kjpp_download.blade.php @@ -128,7 +128,7 @@ @foreach ($permohonan->documents as $document) @foreach ($document->detail as $index => $detail) @if($detail->details) - @php $luastanah = $luasbangunan = null; @endphp + @php $luastanah = $luasbangunan = ""; @endphp @foreach (json_decode($detail->details) as $key => $value) @foreach($value as $k => $v) @if($k=='luas_tanah') From 4464943dd0f7fb56730787acc3e409134471a7d5 Mon Sep 17 00:00:00 2001 From: Daeng Deni Mardaeni Date: Mon, 10 Mar 2025 07:40:13 +0700 Subject: [PATCH 2/9] fix(detail-jaminan): perbaiki tampilan dokumen jaminan - Menambahkan pengecekan untuk memastikan dokumen jaminan ada sebelum ditampilkan. - Memperbaiki struktur HTML untuk memastikan elemen ditampilkan dengan benar. --- .../views/component/detail-jaminan.blade.php | 2 ++ .../debitur/components/jaminan.blade.php | 35 +++++++++---------- 2 files changed, 19 insertions(+), 18 deletions(-) diff --git a/resources/views/component/detail-jaminan.blade.php b/resources/views/component/detail-jaminan.blade.php index 59d5661..b8eec1e 100644 --- a/resources/views/component/detail-jaminan.blade.php +++ b/resources/views/component/detail-jaminan.blade.php @@ -275,6 +275,7 @@ @php $document = $dokumen; @endphp @foreach($document->detail as $detail) + @if(isset($detail->dokumen_jaminan)) + @endif @endforeach
@@ -340,6 +341,7 @@

diff --git a/resources/views/debitur/components/jaminan.blade.php b/resources/views/debitur/components/jaminan.blade.php index 1af9f4b..9853fbf 100644 --- a/resources/views/debitur/components/jaminan.blade.php +++ b/resources/views/debitur/components/jaminan.blade.php @@ -76,17 +76,17 @@
@foreach($document->detail as $detail) -
+ @if(isset($detail->dokumen_jaminan)) +
{{ $loop->index+1 }}. {{ $detail->jenisLegalitasJaminan->name }} -
-   +
+   +
-
-
+
- @if(isset($detail->dokumen_jaminan)) @php $dokumen_jaminan = is_array(json_decode($detail->dokumen_jaminan)) ? json_decode($detail->dokumen_jaminan) : [$detail->dokumen_jaminan]; $dokumen_nomor = is_array(json_decode($detail->dokumen_nomor)) ? json_decode($detail->dokumen_nomor) : ($detail->dokumen_nomor ? [$detail->dokumen_nomor] : []); @@ -127,19 +127,18 @@ @endif @endif @endforeach + +
+ + keterangan + +

+ {{ $detail->keterangan }} +

+
+
+
@endif - - -
- - keterangan - -

- {{ $detail->keterangan }} -

-
-
-
@endforeach
From 106fd2514bea701850a55aaba211da6041442e97 Mon Sep 17 00:00:00 2001 From: Daeng Deni Mardaeni Date: Mon, 10 Mar 2025 07:46:58 +0700 Subject: [PATCH 3/9] fix(penawaran): ubah nilai awal luas tanah dan bangunan menjadi 0 - Mengubah nilai awal variabel luas tanah dan bangunan dari string kosong menjadi 0. - Perubahan ini dilakukan di beberapa file tampilan untuk konsistensi data. --- resources/views/penawaran/kirimEmail.blade.php | 2 +- resources/views/penawaran/kirimEmailKJPP.blade.php | 2 +- resources/views/penawaran/surat_tender.blade.php | 2 +- resources/views/penawaran/surat_tender_download.blade.php | 2 +- resources/views/penawaran/surat_tender_kjpp.blade.php | 2 +- resources/views/penawaran/surat_tender_kjpp_download.blade.php | 2 +- 6 files changed, 6 insertions(+), 6 deletions(-) diff --git a/resources/views/penawaran/kirimEmail.blade.php b/resources/views/penawaran/kirimEmail.blade.php index 80eff30..988aee8 100644 --- a/resources/views/penawaran/kirimEmail.blade.php +++ b/resources/views/penawaran/kirimEmail.blade.php @@ -126,7 +126,7 @@ @foreach ($permohonan->documents as $document) @foreach ($document->detail as $index => $detail) @if($detail->details) - @php $luastanah = $luasbangunan = ""; @endphp + @php $luastanah = $luasbangunan = 0; @endphp @foreach (json_decode($detail->details) as $key => $value) @foreach($value as $k => $v) @if($k=='luas_tanah') diff --git a/resources/views/penawaran/kirimEmailKJPP.blade.php b/resources/views/penawaran/kirimEmailKJPP.blade.php index e6d0e71..6ab6d02 100644 --- a/resources/views/penawaran/kirimEmailKJPP.blade.php +++ b/resources/views/penawaran/kirimEmailKJPP.blade.php @@ -128,7 +128,7 @@ @foreach ($permohonan->documents as $document) @foreach ($document->detail as $index => $detail) @if($detail->details) - @php $luastanah = $luasbangunan = ""; @endphp + @php $luastanah = $luasbangunan = 0; @endphp @foreach (json_decode($detail->details) as $key => $value) @foreach($value as $k => $v) @if($k=='luas_tanah') diff --git a/resources/views/penawaran/surat_tender.blade.php b/resources/views/penawaran/surat_tender.blade.php index 0175082..5601349 100644 --- a/resources/views/penawaran/surat_tender.blade.php +++ b/resources/views/penawaran/surat_tender.blade.php @@ -111,7 +111,7 @@ @foreach ($permohonan->documents as $document) @foreach ($document->detail as $index => $detail) @if($detail->details) - @php $luastanah = $luasbangunan = ""; @endphp + @php $luastanah = $luasbangunan = 0; @endphp @foreach (json_decode($detail->details) as $key => $value) @foreach($value as $k => $v) @if($k=='luas_tanah') diff --git a/resources/views/penawaran/surat_tender_download.blade.php b/resources/views/penawaran/surat_tender_download.blade.php index 6b103d6..18c4d8d 100644 --- a/resources/views/penawaran/surat_tender_download.blade.php +++ b/resources/views/penawaran/surat_tender_download.blade.php @@ -126,7 +126,7 @@ @foreach ($permohonan->documents as $document) @foreach ($document->detail as $index => $detail) @if($detail->details) - @php $luastanah = $luasbangunan = ""; @endphp + @php $luastanah = $luasbangunan = 0; @endphp @foreach (json_decode($detail->details) as $key => $value) @foreach($value as $k => $v) @if($k=='luas_tanah') diff --git a/resources/views/penawaran/surat_tender_kjpp.blade.php b/resources/views/penawaran/surat_tender_kjpp.blade.php index 91fa28c..1d5a66f 100644 --- a/resources/views/penawaran/surat_tender_kjpp.blade.php +++ b/resources/views/penawaran/surat_tender_kjpp.blade.php @@ -109,7 +109,7 @@ @foreach ($permohonan->documents as $document) @foreach ($document->detail as $index => $detail) @if($detail->details) - @php $luastanah = $luasbangunan = ""; @endphp + @php $luastanah = $luasbangunan = 0; @endphp @foreach (json_decode($detail->details) as $key => $value) @foreach($value as $k => $v) @if($k=='luas_tanah') diff --git a/resources/views/penawaran/surat_tender_kjpp_download.blade.php b/resources/views/penawaran/surat_tender_kjpp_download.blade.php index d4f9685..b5bad50 100644 --- a/resources/views/penawaran/surat_tender_kjpp_download.blade.php +++ b/resources/views/penawaran/surat_tender_kjpp_download.blade.php @@ -128,7 +128,7 @@ @foreach ($permohonan->documents as $document) @foreach ($document->detail as $index => $detail) @if($detail->details) - @php $luastanah = $luasbangunan = ""; @endphp + @php $luastanah = $luasbangunan = 0; @endphp @foreach (json_decode($detail->details) as $key => $value) @foreach($value as $k => $v) @if($k=='luas_tanah') From 2210f41337cc944c0d2e17698e437ef233a43602 Mon Sep 17 00:00:00 2001 From: Daeng Deni Mardaeni Date: Mon, 10 Mar 2025 07:54:30 +0700 Subject: [PATCH 4/9] fix(tender): ubah redirect untuk email penawaran - Mengganti redirect dari route spesifik ke redirect kembali. - Memastikan pesan sukses dan error tetap ditampilkan setelah pengiriman email. --- app/Http/Controllers/TenderController.php | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/app/Http/Controllers/TenderController.php b/app/Http/Controllers/TenderController.php index 8b0571f..0d724d4 100644 --- a/app/Http/Controllers/TenderController.php +++ b/app/Http/Controllers/TenderController.php @@ -815,7 +815,7 @@ class TenderController extends Controller } } - return redirect()->route('tender.penawaran.ulang.index') + return redirect()->back() ->with('success', 'Email Penawaran Berhasil Terkirim!'); } catch (\Exception $e) { // Log email gagal untuk setiap KJPP @@ -871,7 +871,7 @@ class TenderController extends Controller } } - return redirect()->route('tender.penawaran.showKirimEmail', ['noreg' => $noreg]) + return redirect()->back() ->with('error', 'Email Penawaran Gagal Terkirim!'); } } @@ -1015,7 +1015,7 @@ class TenderController extends Controller } } - return redirect()->route('tender.penawaran.ulang.index')->with('success', 'Email Penawaran Berhasil Terkirim!'); + return redirect()->back()->with('success', 'Email Penawaran Berhasil Terkirim!'); } catch (\Exception $e) { // Log email gagal foreach ($kjpps as $email) { @@ -1067,7 +1067,7 @@ class TenderController extends Controller } } - return redirect()->route('tender.penawaran.showKirimEmail', ['noreg' => $noreg])->with('error', 'Email Penawaran Gagal Terkirim!'); + return redirect()->back()->with('error', 'Email Penawaran Gagal Terkirim!'); } } } From ee0419578eb09e04bbb2e8dd8c17423a4f39c876 Mon Sep 17 00:00:00 2001 From: Daeng Deni Mardaeni Date: Mon, 10 Mar 2025 08:44:04 +0700 Subject: [PATCH 5/9] fix(Lpj): perbaiki nilai default untuk created_at - Menambahkan nilai default "-" jika created_at tidak tersedia. - Memastikan fungsi getNomorLaporan mengembalikan nilai yang konsisten. --- app/Helpers/Lpj.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/Helpers/Lpj.php b/app/Helpers/Lpj.php index 7049c2a..3de19d7 100644 --- a/app/Helpers/Lpj.php +++ b/app/Helpers/Lpj.php @@ -380,7 +380,7 @@ 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; + return $type == 'nomor_laporan' ? $laporan->nomor_laporan : $laporan->created_at ?? "-"; } function getCustomField($param) From 06ea38fa5f03636e059a2958903e00e2c23d2b43 Mon Sep 17 00:00:00 2001 From: Daeng Deni Mardaeni Date: Mon, 10 Mar 2025 08:56:36 +0700 Subject: [PATCH 6/9] fix(detail-jaminan): perbaiki pengecekan peran pengguna - Mengubah pengecekan peran pengguna dari 'penilai' menjadi 'Penilai' untuk konsistensi. - Menambahkan peran 'penilai' dalam pengecekan untuk memastikan akses yang tepat. --- resources/views/component/detail-jaminan.blade.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/resources/views/component/detail-jaminan.blade.php b/resources/views/component/detail-jaminan.blade.php index b8eec1e..5996974 100644 --- a/resources/views/component/detail-jaminan.blade.php +++ b/resources/views/component/detail-jaminan.blade.php @@ -390,7 +390,7 @@ @endforelse - @if(Auth::user()->hasRole(['penilai', 'administrator'])) + @if(Auth::user()->hasRole(['Penilai', 'administrator','penilai']))
@csrf From 8d1dacb3349cadd66b8576cc6ce626251b7ceb61 Mon Sep 17 00:00:00 2001 From: Daeng Deni Mardaeni Date: Mon, 10 Mar 2025 10:05:21 +0700 Subject: [PATCH 7/9] fix(penawaran): perbaiki konversi luas tanah dan bangunan menjadi integer - Mengubah konversi luas tanah dan bangunan dari string ke integer. - Memastikan nilai yang diakumulasi adalah angka yang valid. - Meningkatkan keakuratan perhitungan luas dalam tampilan email dan surat tender. --- resources/views/penawaran/kirimEmail.blade.php | 4 ++-- resources/views/penawaran/kirimEmailKJPP.blade.php | 7 +++---- resources/views/penawaran/surat_tender.blade.php | 4 ++-- resources/views/penawaran/surat_tender_download.blade.php | 4 ++-- resources/views/penawaran/surat_tender_kjpp.blade.php | 4 ++-- .../views/penawaran/surat_tender_kjpp_download.blade.php | 4 ++-- 6 files changed, 13 insertions(+), 14 deletions(-) diff --git a/resources/views/penawaran/kirimEmail.blade.php b/resources/views/penawaran/kirimEmail.blade.php index 988aee8..2205e5c 100644 --- a/resources/views/penawaran/kirimEmail.blade.php +++ b/resources/views/penawaran/kirimEmail.blade.php @@ -131,12 +131,12 @@ @foreach($value as $k => $v) @if($k=='luas_tanah') @php - $luastanah += preg_replace('/[^0-9.]/', '', str_replace('m2', '', $v)); + $luastanah += (int) preg_replace('/[^0-9.]/', '', str_replace('m2', '', $v)); @endphp @endif @if($k=='luas_bangunan') @php - $luasbangunan += preg_replace('/[^0-9.]/', '', str_replace('m2', '', $v)); + $luasbangunan += (int) preg_replace('/[^0-9.]/', '', str_replace('m2', '', $v)); @endphp @endif @endforeach diff --git a/resources/views/penawaran/kirimEmailKJPP.blade.php b/resources/views/penawaran/kirimEmailKJPP.blade.php index 6ab6d02..a245d64 100644 --- a/resources/views/penawaran/kirimEmailKJPP.blade.php +++ b/resources/views/penawaran/kirimEmailKJPP.blade.php @@ -106,8 +106,7 @@
Aset Jaminan: @foreach ($permohonan->documents as $document) {{ $document->jenisJaminan->name }} - @endforeach - Lokasi Jaminan: @foreach ($permohonan->documents as $document) + @endforeachLokasi Jaminan: @foreach ($permohonan->documents as $document) {{ $document->address }}, Kel. @foreach ($villages as $village) {{ $village->name }} @endforeach, Kec. @foreach ($districts as $district) @@ -133,12 +132,12 @@ @foreach($value as $k => $v) @if($k=='luas_tanah') @php - $luastanah += preg_replace('/[^0-9.]/', '', str_replace('m2', '', $v)); + $luastanah += (int) preg_replace('/[^0-9.]/', '', str_replace('m2', '', $v)); @endphp @endif @if($k=='luas_bangunan') @php - $luasbangunan += preg_replace('/[^0-9.]/', '', str_replace('m2', '', $v)); + $luasbangunan += (int) preg_replace('/[^0-9.]/', '', str_replace('m2', '', $v)); @endphp @endif @endforeach diff --git a/resources/views/penawaran/surat_tender.blade.php b/resources/views/penawaran/surat_tender.blade.php index 5601349..2be8a60 100644 --- a/resources/views/penawaran/surat_tender.blade.php +++ b/resources/views/penawaran/surat_tender.blade.php @@ -116,12 +116,12 @@ @foreach($value as $k => $v) @if($k=='luas_tanah') @php - $luastanah += preg_replace('/[^0-9.]/', '', str_replace('m2', '', $v)); + $luastanah += (int) preg_replace('/[^0-9.]/', '', str_replace('m2', '', $v)); @endphp @endif @if($k=='luas_bangunan') @php - $luasbangunan += preg_replace('/[^0-9.]/', '', str_replace('m2', '', $v)); + $luasbangunan += (int) preg_replace('/[^0-9.]/', '', str_replace('m2', '', $v)); @endphp @endif @endforeach diff --git a/resources/views/penawaran/surat_tender_download.blade.php b/resources/views/penawaran/surat_tender_download.blade.php index 18c4d8d..65c6a72 100644 --- a/resources/views/penawaran/surat_tender_download.blade.php +++ b/resources/views/penawaran/surat_tender_download.blade.php @@ -131,12 +131,12 @@ @foreach($value as $k => $v) @if($k=='luas_tanah') @php - $luastanah += preg_replace('/[^0-9.]/', '', str_replace('m2', '', $v)); + $luastanah += (int) preg_replace('/[^0-9.]/', '', str_replace('m2', '', $v)); @endphp @endif @if($k=='luas_bangunan') @php - $luasbangunan += preg_replace('/[^0-9.]/', '', str_replace('m2', '', $v)); + $luasbangunan += (int) preg_replace('/[^0-9.]/', '', str_replace('m2', '', $v)); @endphp @endif @endforeach diff --git a/resources/views/penawaran/surat_tender_kjpp.blade.php b/resources/views/penawaran/surat_tender_kjpp.blade.php index 1d5a66f..8053741 100644 --- a/resources/views/penawaran/surat_tender_kjpp.blade.php +++ b/resources/views/penawaran/surat_tender_kjpp.blade.php @@ -114,12 +114,12 @@ @foreach($value as $k => $v) @if($k=='luas_tanah') @php - $luastanah += preg_replace('/[^0-9.]/', '', str_replace('m2', '', $v)); + $luastanah += (int) preg_replace('/[^0-9.]/', '', str_replace('m2', '', $v)); @endphp @endif @if($k=='luas_bangunan') @php - $luasbangunan += preg_replace('/[^0-9.]/', '', str_replace('m2', '', $v)); + $luasbangunan += (int) preg_replace('/[^0-9.]/', '', str_replace('m2', '', $v)); @endphp @endif @endforeach diff --git a/resources/views/penawaran/surat_tender_kjpp_download.blade.php b/resources/views/penawaran/surat_tender_kjpp_download.blade.php index b5bad50..73e08d8 100644 --- a/resources/views/penawaran/surat_tender_kjpp_download.blade.php +++ b/resources/views/penawaran/surat_tender_kjpp_download.blade.php @@ -133,12 +133,12 @@ @foreach($value as $k => $v) @if($k=='luas_tanah') @php - $luastanah += preg_replace('/[^0-9.]/', '', str_replace('m2', '', $v)); + $luastanah += (int) preg_replace('/[^0-9.]/', '', str_replace('m2', '', $v)); @endphp @endif @if($k=='luas_bangunan') @php - $luasbangunan += preg_replace('/[^0-9.]/', '', str_replace('m2', '', $v)); + $luasbangunan += (int) preg_replace('/[^0-9.]/', '', str_replace('m2', '', $v)); @endphp @endif @endforeach From e8e86186e73a0e6e32de509720f8f4585c4de507 Mon Sep 17 00:00:00 2001 From: Daeng Deni Mardaeni Date: Mon, 10 Mar 2025 10:11:43 +0700 Subject: [PATCH 8/9] feat(activity): tambahkan fitur upload lampiran dokumen - Menambahkan bagian baru untuk lampiran dokumen pada detail aktivitas. - Memperbarui pengecekan peran pengguna untuk mengizinkan admin mengupload lampiran. - Mengorganisir tampilan lampiran dokumen dengan opsi untuk melihat dan mengunduh. --- .../views/activity/activitydetail.blade.php | 130 +++++++++++++----- .../views/component/detail-jaminan.blade.php | 2 +- 2 files changed, 99 insertions(+), 33 deletions(-) diff --git a/resources/views/activity/activitydetail.blade.php b/resources/views/activity/activitydetail.blade.php index 6afc8f0..3ecbaa8 100644 --- a/resources/views/activity/activitydetail.blade.php +++ b/resources/views/activity/activitydetail.blade.php @@ -57,45 +57,111 @@ @if ($permohonan->status === 'done') - @foreach ($permohonan->documents as $dokumen) - @php - $inspeksiId = null; + @foreach ($permohonan->documents as $dokumen) + @php + $inspeksiId = null; - foreach ($dokumen->inspeksi as $item) { - $inspeksiId = $item->id; - } + foreach ($dokumen->inspeksi as $item) { + $inspeksiId = $item->id; + } - $jaminanId = $dokumen->id; - $currentInspeksi = $inspeksiData[$jaminanId] ?? null; - $tanahBangunanTypes = ['KAPAL', 'PESAWAT', 'ALAT BERAT']; - @endphp -
+ $jaminanId = $dokumen->id; + $currentInspeksi = $inspeksiData[$jaminanId] ?? null; + $tanahBangunanTypes = ['KAPAL', 'PESAWAT', 'ALAT BERAT']; + @endphp +
-
-

- Hasil Laporan Penilaian -

+
+

+ Hasil Laporan Penilaian +

+
+ +
+ + + LAMPIRAN FOTO DAN DOKUMEN + + + Hasil Inspeksi + + + Print Laporan + +
+
+ @endforeach + @endif + + +
+
+

+ Lampiran Dokumen +

+
+
+
+ @forelse($permohonan->lampiranDokumen as $lampiran) +
+

{{ $lampiran->nama_file }}

+

Keterangan : {{ $lampiran->keterangan }}

+
+ + @if(Auth::user()->hasRole('administrator')) + + @csrf + @method('DELETE') + + + @endif +
+
+ @empty +

Tidak ada lampiran dokumen.

+ @endforelse
-
- - - LAMPIRAN FOTO DAN DOKUMEN - - - Hasil Inspeksi - - - Print Laporan - + @if(Auth::user()->hasRole(['Penilai', 'administrator','penilai','admin'])) +
+ @csrf + +
+
+ + +
+
+ + +
+
+ + +
+
+
+ +
+
+ @endif
-
- @endforeach - @endif +
-
- @include('lpj::component.history-permohonan') -
+
+ @include('lpj::component.history-permohonan') +
@endsection @include('lpj::surveyor.js.utils') diff --git a/resources/views/component/detail-jaminan.blade.php b/resources/views/component/detail-jaminan.blade.php index 5996974..b1c1825 100644 --- a/resources/views/component/detail-jaminan.blade.php +++ b/resources/views/component/detail-jaminan.blade.php @@ -390,7 +390,7 @@ @endforelse
- @if(Auth::user()->hasRole(['Penilai', 'administrator','penilai'])) + @if(Auth::user()->hasRole(['Penilai', 'administrator','penilai','admin']))
@csrf From de6e7ad7326845942ae9a07424f96d8e469c611b Mon Sep 17 00:00:00 2001 From: Daeng Deni Mardaeni Date: Mon, 10 Mar 2025 10:37:19 +0700 Subject: [PATCH 9/9] feat(permohonan): tambahkan relasi laporanExternal dan perbarui query show - Menambahkan method laporanExternal pada model Permohonan untuk mendefinisikan relasi dengan LaporanExternal. - Memperbarui query pada method show di PenilaiController untuk menyertakan relasi jenisPenilaian dan laporanExternal. --- app/Http/Controllers/PenilaiController.php | 2 +- app/Models/Permohonan.php | 5 + resources/views/penilai/show.blade.php | 115 ++++++++++++++------- 3 files changed, 82 insertions(+), 40 deletions(-) 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 @@
-