Updates user data and improves UI components
Updates user data display across multiple views to handle migrated data. Improves UI components by adding a detail location component and refining print layouts. Also, it fixes minor bugs and enhances data presentation in reports and forms.
This commit is contained in:
@@ -1,4 +1,4 @@
|
||||
<div class="no-break">
|
||||
{{-- <div class="no-break"> --}}
|
||||
<table class="judul" style="width: 100%; ">
|
||||
<tr>
|
||||
<td style="width: 100%; border: 1px solid #000; text-align: center;">
|
||||
@@ -63,7 +63,7 @@
|
||||
</tr>
|
||||
@endif
|
||||
|
||||
@if (!empty($forminspeksi['fakta']['batas_batas_input']))
|
||||
@if (!empty($forminspeksi['fakta']['batas_batas_input']) && count($forminspeksi['fakta']['batas_batas_input']) > 0)
|
||||
<tr>
|
||||
<td width="25%" style="vertical-align: top;">Batas batas</td>
|
||||
<td width="1%" style="vertical-align: top;">:</td>
|
||||
@@ -103,4 +103,4 @@
|
||||
|
||||
|
||||
</table>
|
||||
</div>
|
||||
{{-- </div> --}}
|
||||
|
||||
@@ -19,6 +19,7 @@
|
||||
</td>
|
||||
</tr>
|
||||
</table>
|
||||
@if ($inspeksi->is_mig != 1)
|
||||
<table style="width: 100%; ">
|
||||
<tr>
|
||||
<td style="border: 1px solid #000; text-align: center;">
|
||||
@@ -79,9 +80,8 @@
|
||||
@endforeach
|
||||
</table>
|
||||
</div>
|
||||
|
||||
|
||||
<div class="page-break"></div>
|
||||
@endif
|
||||
<table style="width: 100%; ">
|
||||
<tr>
|
||||
<td style="border: 1px solid #000; text-align: center;">
|
||||
|
||||
@@ -142,6 +142,25 @@
|
||||
<td style=" padding: 2px; vertical-align: top;">{{ $permohonan->tujuanPenilaian->name ?? '' }}
|
||||
</td>
|
||||
</tr>
|
||||
@if ($permohonan->is_mig == 1)
|
||||
{{-- <table style="width: 100%; "> --}}
|
||||
@if (@isset($dokumen))
|
||||
@foreach ($dokumen->detail as $detail)
|
||||
@if (!empty($detail->name) && isset($detail->details) && !empty($detail->dokumen_jaminan))
|
||||
<tr>
|
||||
<td width="25%"><strong>{{ $detail->name ?? '' }}</strong></td>
|
||||
</tr>
|
||||
@endif
|
||||
|
||||
@if (isset($detail->details) && $detail->name == 'LOKASI JAMINAN')
|
||||
@php
|
||||
$details = json_decode($detail->details, true);
|
||||
@endphp
|
||||
@include('lpj::component.detail-lokasi', ['details' => $details])
|
||||
@endif
|
||||
@endforeach
|
||||
@endif
|
||||
@else
|
||||
<tr>
|
||||
<td style=" padding: 2px; vertical-align: top;">Terletak di</td>
|
||||
<td style=" padding: 2px; vertical-align: top;">:</td>
|
||||
@@ -168,6 +187,7 @@
|
||||
<td style=" padding: 2px; vertical-align: top;">{{ $alamat['province_code'] ?? '' }}</td>
|
||||
</tr>
|
||||
|
||||
@endif
|
||||
@include('lpj::component.print-out-dokument')
|
||||
|
||||
@if (isset($forminspeksi['asset']['nomor_nib']))
|
||||
@@ -1021,7 +1041,7 @@
|
||||
</td>
|
||||
@if ($permohonan->approval_so != null)
|
||||
<td style=" padding: 4px;">
|
||||
{{ $senior_officer->name ?? '' }}</br>
|
||||
{{ $soUser->name ?? '' }}</br>
|
||||
<span>
|
||||
{{ ucwords(strtolower('SENIOR OFFICER')) }}
|
||||
</span>
|
||||
@@ -1031,7 +1051,7 @@
|
||||
|
||||
@if ($permohonan->approval_eo != null)
|
||||
<td style=" padding: 4px;">
|
||||
{{ User::role('EO Appraisal')->first()->name ?? '' }}</br>
|
||||
{{ $eoUser->name ?? '' }}</br>
|
||||
<span>
|
||||
{{ ucwords(strtolower('EXECUTIVE OFFICER')) }}
|
||||
</span>
|
||||
@@ -1039,7 +1059,7 @@
|
||||
@endif
|
||||
@if ($permohonan->approval_dd != null)
|
||||
<td style=" padding: 4px;">
|
||||
{{ User::role('DD Appraisal')->first()->name ?? '' }}</br>
|
||||
{{ $ddUser->name ?? '' }}</br>
|
||||
<span>
|
||||
{{ ucwords(strtolower('DEPUTY DIRECTOR')) }}
|
||||
</span>
|
||||
|
||||
@@ -64,7 +64,7 @@
|
||||
<tr>
|
||||
<td style="width: 25%; padding: 2px;">Ao</td>
|
||||
<td style="width: 1%; padding: 2px;">:</td>
|
||||
<td style="vertical-align: top; padding: 2px;">{{ $permohonan->user->name ?? '' }}</td>
|
||||
<td style="vertical-align: top; padding: 2px;">{{ $permohonan->user->name ?? $permohonan->mig_nama_ao ?? '' }}</td>
|
||||
</tr>
|
||||
</table>
|
||||
</td>
|
||||
@@ -106,7 +106,7 @@
|
||||
<tr>
|
||||
<td style="width: 25%; padding: 2px; vertical-align: top;">Debitur / Wakil Debitur</td>
|
||||
<td style="width: 1%; vertical-align: top;">:</td>
|
||||
<td>{{ $permohonan->debiture->name ?? '' }}
|
||||
<td>{{ $forminspeksi['asset']['debitur_perwakilan'] ??$permohonan->debiture->name ?? '' }}
|
||||
</td>
|
||||
</tr>
|
||||
<tr>
|
||||
@@ -126,6 +126,26 @@
|
||||
</td>
|
||||
</tr>
|
||||
</table>
|
||||
@if ($permohonan->is_mig == 1)
|
||||
<table style="width: 100%; ">
|
||||
@if (@isset($dokumen))
|
||||
@foreach ($dokumen->detail as $detail)
|
||||
@if (!empty($detail->name) && isset($detail->details) && !empty($detail->dokumen_jaminan))
|
||||
<tr>
|
||||
<td width="25%"><strong>{{ $detail->name ?? '' }}</strong></td>
|
||||
</tr>
|
||||
@endif
|
||||
|
||||
@if (isset($detail->details) && $detail->name == 'LOKASI JAMINAN')
|
||||
@php
|
||||
$details = json_decode($detail->details, true);
|
||||
@endphp
|
||||
@include('lpj::component.detail-lokasi', ['details' => $details])
|
||||
@endif
|
||||
@endforeach
|
||||
@endif
|
||||
</table>
|
||||
@else
|
||||
<table style="width: 100%; ">
|
||||
<tr>
|
||||
<td width="25%">Terletak di</td>
|
||||
@@ -153,6 +173,7 @@
|
||||
<td>{{ $alamat['province_code'] ?? '' }}</td>
|
||||
</tr>
|
||||
</table>
|
||||
@endif
|
||||
</div>
|
||||
|
||||
{{-- <div class="no-break"> --}}
|
||||
@@ -437,7 +458,7 @@
|
||||
</td>
|
||||
@if ($permohonan->approval_so != null)
|
||||
<td style=" padding: 4px;">
|
||||
{{ $senior_officer->name ?? '' }}</br>
|
||||
{{ $soUser->name ?? '' }}</br>
|
||||
<span>
|
||||
{{ ucwords(strtolower('SENIOR OFFICER')) }}
|
||||
</span>
|
||||
@@ -447,7 +468,7 @@
|
||||
|
||||
@if ($permohonan->approval_eo != null)
|
||||
<td style=" padding: 4px;">
|
||||
{{ User::role('EO Appraisal')->first()->name ?? '' }}</br>
|
||||
{{ $eoUser->name ?? '' }}</br>
|
||||
<span>
|
||||
{{ ucwords(strtolower('EXECUTIVE OFFICER')) }}
|
||||
</span>
|
||||
@@ -455,7 +476,7 @@
|
||||
@endif
|
||||
@if ($permohonan->approval_dd != null)
|
||||
<td style=" padding: 4px;">
|
||||
{{ User::role('DD Appraisal')->first()->name ?? '' }}</br>
|
||||
{{ $ddUser->name ?? '' }}</br>
|
||||
<span>
|
||||
{{ ucwords(strtolower('DEPUTY DIRECTOR')) }}
|
||||
</span>
|
||||
|
||||
Reference in New Issue
Block a user