From 2759fdc8d952e451f713b7c1498cfc5f7f4b6fc8 Mon Sep 17 00:00:00 2001 From: Daeng Deni Mardaeni Date: Thu, 27 Feb 2025 14:08:57 +0700 Subject: [PATCH 1/4] fix(penawaran): perbaiki tampilan opsi pada form edit - Menambahkan jenis kantor pada opsi yang ditampilkan. - Menampilkan nama kota tanpa awalan 'KOTA', 'KAB.', atau 'KAB' jika jenis kantor adalah 'Kantor Cabang'. --- resources/views/penawaran/edit.blade.php | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/resources/views/penawaran/edit.blade.php b/resources/views/penawaran/edit.blade.php index f67ec55..61ac3b2 100644 --- a/resources/views/penawaran/edit.blade.php +++ b/resources/views/penawaran/edit.blade.php @@ -91,7 +91,10 @@ @if ($row->status == 1) @endif @endforeach From f6bae680afe167353c037ac24f422cff312e6847 Mon Sep 17 00:00:00 2001 From: Daeng Deni Mardaeni Date: Thu, 27 Feb 2025 15:26:24 +0700 Subject: [PATCH 2/4] fix(spk): perbaiki pengolahan data dokumen jaminan - Memperbaiki relasi data dokumen jaminan pada controller. - Mengubah penghitungan total aset untuk menggunakan dokumen jaminan yang benar. - Memperbarui tampilan untuk menampilkan dokumen jaminan dengan benar. --- app/Http/Controllers/SpkController.php | 2 +- resources/views/spk/edit.blade.php | 5 ++--- 2 files changed, 3 insertions(+), 4 deletions(-) diff --git a/app/Http/Controllers/SpkController.php b/app/Http/Controllers/SpkController.php index 8908860..994520b 100644 --- a/app/Http/Controllers/SpkController.php +++ b/app/Http/Controllers/SpkController.php @@ -175,7 +175,7 @@ use Illuminate\Support\Facades\Auth; ->select('permohonan.*', 'jenis_jaminan.name as jenis_jaminan_name', 'dokumen_jaminan.address as dokumen_jaminan_address'); - $data = $permohonan->with(['user', 'debiture', 'branch', 'tujuanPenilaian','dokumenjaminan'])->first(); + $data = $permohonan->with(['user', 'debiture', 'branch', 'tujuanPenilaian','dokumenjaminan.detail'])->first(); if($penawaran->detail_penawaran_tgl_proposal) $penawaran->detail_penawaran_tgl_proposal = Carbon::parse($penawaran->detail_penawaran_tgl_proposal)->format('d F Y'); diff --git a/resources/views/spk/edit.blade.php b/resources/views/spk/edit.blade.php index 0f9f699..a672c45 100644 --- a/resources/views/spk/edit.blade.php +++ b/resources/views/spk/edit.blade.php @@ -106,10 +106,9 @@ @php $i=1; - $totalAsset = count($data->debiture->documents); + $totalAsset = count($data->dokumenjaminan); @endphp - - @foreach ($data->debiture->documents as $dokumen) + @foreach ($data->dokumenjaminan as $dokumen) Lokasi Jaminan {{ $totalAsset >1 ? $i : '' }} : From 03b0ba4ac06981c04dace274953c3ac0d74fe269 Mon Sep 17 00:00:00 2001 From: Daeng Deni Mardaeni Date: Thu, 27 Feb 2025 15:38:32 +0700 Subject: [PATCH 3/4] fix(spk): perbaiki tampilan dokumen jaminan - Memperbaiki kondisi pengecekan ID dokumen jaminan. - Menambahkan tampilan nama detail dokumen jaminan jika ada. - Memperbaiki format tampilan nomor dokumen dengan pemisah koma. --- resources/views/spk/edit.blade.php | 11 ++++++++--- 1 file changed, 8 insertions(+), 3 deletions(-) diff --git a/resources/views/spk/edit.blade.php b/resources/views/spk/edit.blade.php index a672c45..9b768ae 100644 --- a/resources/views/spk/edit.blade.php +++ b/resources/views/spk/edit.blade.php @@ -126,7 +126,7 @@ @endphp @foreach ($data->dokumenjaminan as $dokumen_jaminans) - @if ($dokumen->id== $dokumen_jaminans->id) + @if ($dokumen->id == $dokumen_jaminans->id) @php $shouldExclude = false; $shouldExcludeNomor = false; @@ -141,6 +141,8 @@ @if(!$shouldExclude) @php $details = $dokumen_jaminans->detail; @endphp @foreach ($details as $index => $detail) + @if($detail->dokumen_jaminan) + {{ $detail->name }} @php $shouldExcludeNomor = false; foreach ($excludedDocuments as $excludedDoc) { @@ -152,11 +154,14 @@ @endphp @if(!$shouldExcludeNomor) @if($detail->dokumen_nomor) - @foreach(json_decode($detail->dokumen_nomor) as $item) - {{ $item }}
+ {{ " | " }} + @foreach(json_decode($detail->dokumen_nomor) as $key => $item) + {{ $item }}{{ $key < count(json_decode($detail->dokumen_nomor)) - 1 ? ',' : '' }} @endforeach @endif @endif +
+ @endif @endforeach @endif @endif From cc500bfcacc85a8284c743411cb3bfa0056d3d76 Mon Sep 17 00:00:00 2001 From: Daeng Deni Mardaeni Date: Thu, 27 Feb 2025 15:47:08 +0700 Subject: [PATCH 4/4] fix(spk): perbaiki pengolahan dokumen jaminan - Mengubah referensi dari $data->debiture->documents menjadi $data->dokumenjaminan. - Memperbaiki logika pengulangan untuk menampilkan dokumen jaminan. - Menambahkan pengecekan untuk memastikan detail dokumen jaminan ditampilkan dengan benar. --- resources/views/spk/documentSPK.blade.php | 35 +++++++++++++---------- 1 file changed, 20 insertions(+), 15 deletions(-) diff --git a/resources/views/spk/documentSPK.blade.php b/resources/views/spk/documentSPK.blade.php index 08460ad..76bd9e8 100644 --- a/resources/views/spk/documentSPK.blade.php +++ b/resources/views/spk/documentSPK.blade.php @@ -90,9 +90,9 @@ @php $i=1; - $totalAsset = count($data->debiture->documents); + $totalAsset = count($data->dokumenjaminan); @endphp - @foreach ($data->debiture->documents as $dokumen) + @foreach ($data->dokumenjaminan as $dokumen) Lokasi Jaminan {{ $totalAsset >1 ? $i : '' }} : @@ -125,21 +125,26 @@ @if(!$shouldExclude) @php $details = $dokumen_jaminans->detail; @endphp @foreach ($details as $index => $detail) - @php - $shouldExcludeNomor = false; - foreach ($excludedDocuments as $excludedDoc) { - if (str_contains(strtolower($detail->dokumen_nomor), strtolower($excludedDoc))) { - $shouldExcludeNomor = true; - break; + @if($detail->dokumen_jaminan) + {{ $detail->name }} + @php + $shouldExcludeNomor = false; + foreach ($excludedDocuments as $excludedDoc) { + if (str_contains(strtolower($detail->dokumen_nomor), strtolower($excludedDoc))) { + $shouldExcludeNomor = true; + break; + } } - } - @endphp - @if(!$shouldExcludeNomor) - @if($detail->dokumen_nomor) - @foreach(json_decode($detail->dokumen_nomor) as $item) - {{ $item }}
- @endforeach + @endphp + @if(!$shouldExcludeNomor) + @if($detail->dokumen_nomor) + {{ " | " }} + @foreach(json_decode($detail->dokumen_nomor) as $key => $item) + {{ $item }}{{ $key < count(json_decode($detail->dokumen_nomor)) - 1 ? ',' : '' }} + @endforeach + @endif @endif +
@endif @endforeach @endif