daengdeni/lpj
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

fix(dokumen_jaminan): perbaiki pengambilan data detail dokumen

Browse Source 
- Memperbaiki logika pengambilan data 'details' pada Dokumen Jaminan.
- Mengubah cara pengolahan data luas tanah dan luas bangunan untuk akurasi.
- Memperbaiki tampilan data pada email dan komponen jaminan.
This commit is contained in:
Daeng Deni Mardaeni
2025-03-07 16:50:09 +07:00
parent 5932192d92
commit d52edb9481
4 changed files with 126 additions and 117 deletions
Download Patch File Download Diff File Expand all files Collapse all files

179
resources/views/component/detail-jaminan.blade.php
View File

@@ -68,36 +68,36 @@
{{ $penawaran->tujuanPenilaianKjpp->name }} {{ $penawaran->tujuanPenilaianKjpp->name }}
</span> </span>
</div> </div>
@else @else
<div class="mb-5"> <div class="mb-5">
<h3 class="text-md font-medium text-gray-900"> <h3 class="text-md font-medium text-gray-900">
Tujan Permohonan: Tujan Permohonan:
</h3> </h3>
<span class="text-2sm text-gray-700"> <span class="text-2sm text-gray-700">
{{ $permohonan->tujuanPenilaian->name }} {{ $permohonan->tujuanPenilaian->name }}
</span> </span>
</div> </div>
<div class="mb-5"> <div class="mb-5">
<h3 class="text-md font-medium text-gray-900"> <h3 class="text-md font-medium text-gray-900">
Nilai Plafond: Nilai Plafond:
</h3> </h3>
<span class="text-2sm text-gray-700"> <span class="text-2sm text-gray-700">
{{ $permohonan->nilaiPlafond->name }} {{ $permohonan->nilaiPlafond->name }}
</span> </span>
</div> </div>
<div class="mb-5"> <div class="mb-5">
<h3 class="text-md font-medium text-gray-900"> <h3 class="text-md font-medium text-gray-900">
Status Bayar: Status Bayar:
</h3> </h3>
<span <span
class="text-md font-bold {{ $permohonan->status_bayar === 'belum_bayar' ? 'text-red-600' : 'text-green-600' }} uppercase"> class="text-md font-bold {{ $permohonan->status_bayar === 'belum_bayar' ? 'text-red-600' : 'text-green-600' }} uppercase">
{{ str_replace('_', ' ', $permohonan->status_bayar) }} {{ str_replace('_', ' ', $permohonan->status_bayar) }}
</span> </span>
</div> </div>
@endif @endif
</div> </div>
</div> </div>
@@ -263,84 +263,82 @@
</div> </div>
</div> </div>
@endif @endif
<div class="card-table scrollable-x-auto pb-3"> <div class="card-table scrollable-x-auto pb-3">
<a href="{{ route('debitur.jaminan.bulk.download', ['id' => $permohonan->debiture->id, 'jaminan' => $dokumen->id]) }}" <a href="{{ route('debitur.jaminan.bulk.download', ['id' => $permohonan->debiture->id, 'jaminan' => $dokumen->id]) }}"
class="ml-6 btn btn-dark dark:btn-light"> class="ml-6 btn btn-dark dark:btn-light">
<i class="ki-outline ki-cloud-download"></i> Download Semua Dokumen <i class="ki-outline ki-cloud-download"></i> Download Semua Dokumen
</a> </a>
<table class="table align-middle text-sm text-gray-500"> <table class="table align-middle text-sm text-gray-500">
@foreach ($dokumen->detail as $detail) @php $document = $dokumen; @endphp
<tr> @foreach($document->detail as $detail)
<td class="py-2 text-gray-600 font-normal max-w-[100px]"> <tr>
{{ $loop->index + 1 }}. {{ $detail->jenisLegalitasJaminan->name }} <td colspan="2">
</td> <strong class="text-2xs text-gray-600 uppercase">
<td class="py-2 text-gray-800 font-normal text-2sm"> {{ $loop->index+1 }}. {{ $detail->jenisLegalitasJaminan->name }}
{{ $detail->name ?? '' }} </strong>
</td> </td>
</tr> </tr>
@if(isset($detail->details))
@if(json_decode($detail->details))
@foreach (json_decode($detail->details) as $key => $value)
<tr>
<td class="py-3 capitalize">
{{formatLabel($key)}}
</td>
<td class="py-2 text-gray-800 font-normal text-2sm">
{{ $value ?? "" }}
</td>
</tr>
@endforeach
@endif
@endif
<tr>
<td class="py-3 max-w-[100px] align-top">
Dokumen Jaminan
</td>
<td class="py-3 text-gray-700 text-2sm font-normal">
@if (isset($detail->dokumen_jaminan)) @if(isset($detail->dokumen_jaminan))
@php @php
$dokumen_jaminan = is_array(json_decode($detail->dokumen_jaminan)) $dokumen_jaminan = is_array(json_decode($detail->dokumen_jaminan)) ? json_decode($detail->dokumen_jaminan) : [$detail->dokumen_jaminan];
? json_decode($detail->dokumen_jaminan) $dokumen_nomor = is_array(json_decode($detail->dokumen_nomor)) ? json_decode($detail->dokumen_nomor) : ($detail->dokumen_nomor ? [$detail->dokumen_nomor] : []);
: [$detail->dokumen_jaminan]; @endphp
$dokumen_nomor = is_array(json_decode($detail->dokumen_nomor)) @foreach($dokumen_jaminan as $index => $dokumen)
? json_decode($detail->dokumen_nomor) <tr>
: ($detail->dokumen_nomor <td>
? [$detail->dokumen_nomor] <span class="text-2xs text-gray-600 uppercase pl-3">
: []); {{ $loop->index+1 }}. Nomor : {{ $dokumen_nomor[$index] }}
@endphp </span>
@foreach ($dokumen_jaminan as $index => $dokumen) </td>
<div class="flex w-full lg:w-[30%]"> <td class="text-left">
@if (in_array(Auth::user()->roles[0]->name, ['administrator', 'pemohon-eo'])) @if(in_array(Auth::user()->roles[0]->name,['administrator','pemohon-eo']))
@if (!empty($dokumen_nomor)) <a href="{{ route('debitur.jaminan.download', ['id' => $permohonan->debiture->id, 'dokumen' => $detail->id, 'index' => $index]) }}"
<span class="flex-1 mt-2 text-info">Nomor Dokumen : class="flex-none badge badge-sm badge-outline mt-2 mr-2">
{{ $dokumen_nomor[$index] }}</span> {{ basename($dokumen) }}
@endif <i class="ki-filled ki-cloud-download"></i>
<a href="{{ route('debitur.jaminan.download', ['id' => $permohonan->debiture->id, 'dokumen' => $detail->id, 'index' => $index]) }}" </a>
class="flex-none badge badge-sm badge-outline mt-2 mr-2">
{{ basename($dokumen) }}
<i class="ki-filled ki-cloud-download"></i>
</a>
@endif
<span class="flex-none badge badge-sm badge-outline badge-warning mt-2"
onclick="viewPDF('{{ Storage::url($dokumen_jaminan[$index]) }}')"><i
class="ki-filled ki-eye mr-2"></i>Preview</span>
</div>
<br>
@endforeach
@endif @endif
<span class="badge badge-sm badge-outline badge-warning mt-2" onclick="viewPDF('{{ Storage::url($dokumen_jaminan[$index]) }}')">
<i class="ki-filled ki-eye mr-2"></i>Preview
</span>
</td>
</tr>
</td> @if(isset($detail->details) && json_decode($detail->details)[$index])
</tr> @foreach (json_decode($detail->details)[$index] as $key => $value)
<tr> <tr>
<td class="py-3 max-w-[100px]"> <td>
Keterangan <span class="text-2xs text-gray-600 uppercase pl-3">
</td> - {{ str_replace("_"," ",$key) ?? "" }}
<td class="py-3 text-gray-700 text-2sm font-normal"> </span>
{{ $detail->keterangan ?? '' }} </td>
</td> <td class="text-left">
</tr> <p class="text-2xs text-gray-600 max-w-[250px]">
{{ $value }}
</p>
</td>
</tr>
@endforeach
@endif
@endforeach @endforeach
@endif
<tr>
<td>
<span class="text-2xs text-gray-600 uppercase pl-3">
- keterangan
</span>
</td>
<td class="text-right">
<p class="text-2xs text-gray-600 max-w-[250px]">
{{ $detail->keterangan }}
</p>
</td>
</tr>
@endforeach
</table> </table>
</div> </div>
</div> </div>
@@ -349,6 +347,9 @@
</div> </div>
@if (!isset($status)) @if (!isset($status))
</div> </div>
@include('lpj::component.history-permohonan') @include('lpj::component.history-permohonan')
@endif @endif
@include('lpj::component.pdfviewer') @include('lpj::component.pdfviewer')

1
resources/views/debitur/components/dokumen.blade.php
View File

@@ -506,6 +506,7 @@
</div> </div>
</form> </form>
@push('scripts') @push('scripts')
{{--Pemilik Jaminan--}} {{--Pemilik Jaminan--}}
<script> <script>

1
resources/views/debitur/components/jaminan.blade.php
View File

@@ -189,6 +189,7 @@
@endif @endif
</div> </div>
@include('lpj::component.pdfviewer') @include('lpj::component.pdfviewer')
@push('scripts') @push('scripts')

62
resources/views/penawaran/kirimEmail.blade.php
View File

@@ -124,35 +124,41 @@
@endphp @endphp
@foreach ($permohonan->documents as $document) @foreach ($permohonan->documents as $document)
@foreach ($document->detail as $detail) @foreach ($document->detail as $index => $detail)
@php @if($detail->details)
$details = json_decode($detail->details); @php $luastanah = $luasbangunan = null; @endphp
@endphp @foreach (json_decode($detail->details) as $key => $value)
@foreach($value as $k => $v)
@if($k=='luas_tanah')
@php
$luastanah += preg_replace('/[^0-9.]/', '', str_replace('m2', '', $v));
@endphp
@endif
@if($k=='luas_bangunan')
@php
$luasbangunan += preg_replace('/[^0-9.]/', '', str_replace('m2', '', $v));
@endphp
@endif
@endforeach
@endforeach
@if (isset($luastanah) && isset($luasbangunan))
{{ $n }}. {{ $detail->name }}<br>
Luas Tanah / Luas Bangunan: {{ $luastanah }} m<sup>2</sup> / {{ $luasbangunan }} m<sup>2</sup>
<br>
@php $n++; @endphp
@elseif (isset($luastanah))
{{ $n }}. {{ $detail->name }}<br>
Luas Tanah : {{ $luastanah }} m<sup>2</sup>
<br>
@php $n++; @endphp
@elseif (isset($luasbangunan))
{{ $n }}. {{ $detail->name }}<br>
Luas Bangunan: {{ $luasbangunan }} m<sup>2</sup>
<br>
@php $n++; @endphp
@endif
@if (isset($details->luas_tanah) && isset($details->luas_bangunan))
{{ $n }}. {{ $detail->name }}<br>
Luas Tanah / Luas Bangunan:
{{ preg_replace('/[^0-9.]/', '', str_replace('m2', '', $details->luas_tanah)) }}
m<sup>2</sup>
/
{{ preg_replace('/[^0-9.]/', '', str_replace('m2', '', $details->luas_bangunan)) }}
m<sup>2</sup>
<br>
@php $n++; @endphp
@elseif (isset($details->luas_tanah))
{{ $n }}. {{ $detail->name }}<br>
Luas Tanah :
{{ preg_replace('/[^0-9.]/', '', str_replace('m2', '', $details->luas_tanah)) }}
m<sup>2</sup>
<br>
@php $n++; @endphp
@elseif (isset($details->luas_bangunan))
{{ $n }}. {{ $detail->name }}<br>
Luas Bangunan:
{{ preg_replace('/[^0-9.]/', '', str_replace('m2', '', $details->luas_bangunan)) }}
m<sup>2</sup>
<br>
@php $n++; @endphp
@endif @endif
@endforeach @endforeach
@endforeach @endforeach