perbaikan rap dan nilai otomatis likudasi menu laporan

This commit is contained in:
majid
2025-01-24 13:42:17 +07:00
parent 152718526b
commit 201003e020
4 changed files with 169 additions and 138 deletions

View File

@@ -23,6 +23,7 @@ use Illuminate\Support\Facades\App;
use App\Helpers\Lpj; use App\Helpers\Lpj;
use Modules\Lpj\Http\Requests\FormSurveyorRequest; use Modules\Lpj\Http\Requests\FormSurveyorRequest;
use Modules\Lpj\Models\Authorization; use Modules\Lpj\Models\Authorization;
use Modules\Lpj\Models\Debiture;
class PenilaiController extends Controller class PenilaiController extends Controller
{ {
@@ -345,6 +346,12 @@ class PenilaiController extends Controller
$forminspeksi = json_decode($inspeksi->data_form, true); $forminspeksi = json_decode($inspeksi->data_form, true);
$rap = json_decode($resume->rap, true); $rap = json_decode($resume->rap, true);
} }
// Default: gunakan data dari debitur
$debitur = Debiture::find($permohonan->debiture_id);
$provinceCode = $debitur->province_code;
$cityCode = $debitur->city_code;
$districtCode = $debitur->district_code;
$cekAlamat = $forminspeksi['asset']['alamat']['tidak sesuai'] ?? null; $cekAlamat = $forminspeksi['asset']['alamat']['tidak sesuai'] ?? null;
@@ -352,8 +359,6 @@ class PenilaiController extends Controller
$provinceCode = $cekAlamat['province_code'] ?? $provinceCode; $provinceCode = $cekAlamat['province_code'] ?? $provinceCode;
$cityCode = $cekAlamat['city_code'] ?? $cityCode; $cityCode = $cekAlamat['city_code'] ?? $cityCode;
$districtCode = $cekAlamat['district_code'] ?? $districtCode; $districtCode = $cekAlamat['district_code'] ?? $districtCode;
// Ambil data menggunakan kode yang telah ditentukan
} }
$cities = City::where('province_code', $provinceCode)->get(); $cities = City::where('province_code', $provinceCode)->get();

View File

@@ -59,7 +59,7 @@
Liquidasi (%) Liquidasi (%)
</label> </label>
<div class="flex flex-wrap items-baseline w-full"> <div class="flex flex-wrap items-baseline w-full">
<input type="text" name="liquidasi" max="100" min="0" id="liquidasi" class="persen input w-full @error('liquidasi') border-danger bg-danger-light @enderror" value="{{ old('liquidasi', $lpj->liquidasi ?? '') }}" placeholder="Masukkan Persentase Liquidasi"> <input type="text" name="liquidasi" max="100" min="0" id="liquidasi" class="persen input w-full @error('liquidasi') border-danger bg-danger-light @enderror" value="{{ old('liquidasi', $lpj->likuidasi ?? '') }}" placeholder="Masukkan Persentase Liquidasi">
@error('liquidasi') @error('liquidasi')
<em class="alert text-danger text-sm">{{ $message }}</em> <em class="alert text-danger text-sm">{{ $message }}</em>
@enderror @enderror
@@ -71,7 +71,7 @@
Nilai Liquidasi Nilai Liquidasi
</label> </label>
<div class="flex flex-wrap items-baseline w-full"> <div class="flex flex-wrap items-baseline w-full">
<input type="text" name="nilai_liquidasi" id="nilai_liquidasi" class="currency input w-full @error('nilai_liquidasi') border-danger bg-danger-light @enderror" placeholder="Nilai Liquidasi"> <input type="text" name="nilai_liquidasi" id="nilai_liquidasi" class="currency input w-full @error('nilai_liquidasi') border-danger bg-danger-light @enderror" placeholder="Nilai Liquidasi" value="{{ old('nilai_liquidasi', $lpj->likuidasi_nilai_2 ?? '') }}">
@error('nilai_liquidasi') @error('nilai_liquidasi')
<em class="alert text-danger text-sm">{{ $message }}</em> <em class="alert text-danger text-sm">{{ $message }}</em>
@enderror @enderror

View File

@@ -27,8 +27,8 @@
} }
#header { #header {
/* position: fixed; */ position: fixed;
/* top: -100px; */ top: -100px;
/* Posisi header di luar konten */ /* Posisi header di luar konten */
left: 0; left: 0;
right: 0; right: 0;
@@ -65,18 +65,22 @@
} }
.content { .content {
margin-top: 20px; margin-top: 10px;
} }
.page-break { .page-break {
page-break-after: always; page-break-after: always;
} }
footer { #footer {
position: fixed; position: fixed;
bottom: 0cm; bottom: -50px;
left: 0cm; left: 0;
right: 0cm; right: 0;
height: 50px;
text-align: left;
border-top: 1px solid #ddd;
padding-top: 10px;
} }
body { body {
@@ -114,6 +118,13 @@
<td style="width: 20%; text-align: left;" class="header-left"> <td style="width: 20%; text-align: left;" class="header-left">
@include('lpj::component.logo-bag') @include('lpj::component.logo-bag')
</td> </td>
<td style="text-align: right;">
<div style="">
<p>Tanggal: {{ date('Y-m-d') }}</p>
<p>Waktu: {{ date('H:i:s') }}</p>
<p>User: {{ Auth::user()->name }}</p>
</div>
</td>
</tr> </tr>
</table> </table>
</header> </header>
@@ -198,14 +209,19 @@
<td style="width: 79%; padding: 2px;"> <td style="width: 79%; padding: 2px;">
@if (isset($detail->dokumen_jaminan)) @if (isset($detail->dokumen_jaminan))
@php @php
$dokumen_jaminan = is_array(json_decode($detail->dokumen_jaminan)) $dokumen_jaminan = is_string($detail->dokumen_jaminan)
? json_decode($detail->dokumen_jaminan) ? json_decode($detail->dokumen_jaminan, true)
: [];
$dokumen_jaminan = is_array($dokumen_jaminan)
? $dokumen_jaminan
: [$detail->dokumen_jaminan]; : [$detail->dokumen_jaminan];
$dokumen_nomor = is_array(json_decode($detail->dokumen_nomor))
? json_decode($detail->dokumen_nomor) $dokumen_nomor = is_string($detail->dokumen_nomor)
: ($detail->dokumen_nomor ? json_decode($detail->dokumen_nomor, true)
? [$detail->dokumen_nomor] : [];
: []); $dokumen_nomor = is_array($dokumen_nomor)
? $dokumen_nomor
: [$detail->dokumen_nomor];
@endphp @endphp
@foreach ($dokumen_jaminan as $index => $dokumen) @foreach ($dokumen_jaminan as $index => $dokumen)
@@ -241,7 +257,7 @@
@endforeach @endforeach
@endif @endif
@if (isset($forminspeksi['perizinan']) && count($forminspeksi['perizinan']) > 0) @if (isset($forminspeksi['perizinan']) && is_array($forminspeksi['perizinan']) && count($forminspeksi['perizinan']) > 0)
@foreach ($forminspeksi['perizinan'] as $perizinan) @foreach ($forminspeksi['perizinan'] as $perizinan)
<tr> <tr>
<td style="width: 20%; padding: 2px;">Perizinan</td> <td style="width: 20%; padding: 2px;">Perizinan</td>
@@ -252,14 +268,14 @@
@endif @endif
@if (isset($forminspeksi['brosur_price_list']) && count($forminspeksi['brosur_price_list']) > 0) @if (isset($forminspeksi['brosur_price_list']) && count($forminspeksi['brosur_price_list']) > 0)
@foreach ($forminspeksi['brosur_price_list'] as $perizinan) @foreach ($forminspeksi['brosur_price_list'] as $perizinan)
<tr> <tr>
<td style="width: 20%; padding: 2px;">Brosur & Pricelist</td> <td style="width: 20%; padding: 2px;">Brosur & Pricelist</td>
<td style="width: 1%; padding: 2px;">:</td> <td style="width: 1%; padding: 2px;">:</td>
<td style="width: 79%; padding: 2px;">{{ $perizinan['jenis'] }}</td> <td style="width: 79%; padding: 2px;">{{ $perizinan['jenis'] }}</td>
</tr> </tr>
@endforeach @endforeach
@endif @endif
</table> </table>
@@ -331,23 +347,27 @@
</table> </table>
<h2 style="text-transform: uppercase;">PARTISI BANGUNAN</h2> @isset($forminspeksi['partisi'])
<table> <h2 style="text-transform: uppercase;">PARTISI BANGUNAN</h2>
@isset($forminspeksi['partisi']) <table>
@foreach ($forminspeksi['partisi'] as $key => $item) @if (is_array($forminspeksi['partisi']))
<tr> @foreach ($forminspeksi['partisi'] as $key => $item)
<td> @if (is_array($item))
{{ $item['nama'] }} <tr>
</td> <td>
</tr> {{ $item['nama'] ?? '' }}
<tr> </td>
<td> </tr>
{{ $item['value'] }} <tr>
</td> <td>
</tr> {{ $item['value'] ?? '' }}
@endforeach </td>
@endisset </tr>
</table> @endif
@endforeach
@endif
</table>
@endisset
<h2 style="text-transform: uppercase;">JUMLAH UNIT, BLOK, TYPE DAN LUAS BANGUNAN</h2> <h2 style="text-transform: uppercase;">JUMLAH UNIT, BLOK, TYPE DAN LUAS BANGUNAN</h2>
<table> <table>
@@ -459,103 +479,106 @@
]; ];
@endphp @endphp
@foreach ($informasi as $key) @if (isset($forminspeksi['fakta']) && is_array($forminspeksi['fakta']))
@if (isset($forminspeksi['fakta'][$key]) && $forminspeksi['fakta'][$key] !== '-') @foreach ($informasi as $key)
<p> - {{ ucfirst(str_replace('_', ' ', $key)) }}: @if (isset($forminspeksi['fakta'][$key]) && $forminspeksi['fakta'][$key] !== '-')
{{ $forminspeksi['fakta'][$key] }}</p> <p> - {{ ucfirst(str_replace('_', ' ', $key)) }}:
@endif {{ $forminspeksi['fakta'][$key] }}</p>
@endif
@endforeach
@endif
</table>
<h2 style="text-transform: uppercase;">CATATAN LAINNYA</h2>
<table>
@foreach ($forminspeksi['fakta']['keterangan'] ?? [] as $keterangan)
<tr>
<td>
<p>{!! nl2br(e($keterangan)) !!}</p>
</td>
</tr>
@endforeach @endforeach
<h2 style="text-transform: uppercase;">CATATAN LAINNYA</h2>
<table>
@foreach ($forminspeksi['fakta']['keterangan'] ?? [] as $keterangan)
<tr>
<td>
<p>{!! nl2br(e($keterangan)) !!}</p>
</td>
</tr>
@endforeach
</table>
<p>Demikian kami sampaikan, atas perhatiannya kami ucapkan terima kasih.</p>
<table style="width: 100%; text-align: center;">
@php
use Modules\Usermanagement\Models\User;
$penilaiUser = User::where('id', $penilai->userPenilaiTeam->id)->first();
$imagePathPenilai = storage_path(
'app/public/signatures/' . $penilaiUser->id . '/' . $penilaiUser->sign,
);
$soUser = User::where('id', $senior_officer->id)->first();
$imagePathSo = storage_path('app/public/signatures/' . $soUser->id . '/' . $soUser->sign);
</table> $imagePathDD = storage_path(
'app/public/signatures/' .
User::role('DD Appraisal')->first()->id .
'/' .
User::role('DD Appraisal')->first()->sign,
);
@endphp
<tr>
<td style="height: 50px;"></td>
<td style="height: 50px;">
@if (file_exists($imagePathDD))
<img src="{{ $imagePathDD }}" alt="{{ $imagePathDD }}" width="80px">
@endif
</td>
<td style="height: 50px;">
@if (file_exists($imagePathSo))
<img src="{{ $imagePathSo }}" alt="{{ $imagePathSo }}" width="80px">
@endif
</td>
<td style="height: 50px;">
@if (file_exists($imagePathPenilai))
<img src="{{ $imagePathPenilai }}" alt="{{ $imagePathPenilai }}" width="80px">
@endif
</td>
<p>Demikian kami sampaikan, atas perhatiannya kami ucapkan terima kasih.</p> </tr>
<table style="width: 100%; text-align: center;"> <tr>
@php <td></td>
use Modules\Usermanagement\Models\User; <td>{{ $penilai->userPenilaiTeam->name ?? '' }}
$penilaiUser = User::where('id', $penilai->userPenilaiTeam->id)->first(); <br>{{ ucwords(strtolower('PENILAI')) }}
$imagePathPenilai = storage_path( </td>
'app/public/signatures/' . $penilaiUser->id . '/' . $penilaiUser->sign, <td>
); @if ($permohonan->approval_eo != null)
$soUser = User::where('id', $senior_officer->id)->first(); {{ $senior_officer->name ?? '' }}
$imagePathSo = storage_path('app/public/signatures/' . $soUser->id . '/' . $soUser->sign); <br> {{ ucwords(strtolower('SENIOR OFFICER')) }}
@endif
</td>
$imagePathDD = storage_path( <td>
'app/public/signatures/' . @if ($permohonan->approval_dd != null)
User::role('DD Appraisal')->first()->id . {{ User::role('DD Appraisal')->first()->name ?? '' }}
'/' . <br>{{ ucwords(strtolower('DEPUTY DIRECTOR')) }}
User::role('DD Appraisal')->first()->sign, @endif
); </td>
@endphp </tr>
<tr> </table>
<td style="height: 50px;"></td>
<td style="height: 50px;">
@if (file_exists($imagePathDD))
<img src="{{ $imagePathDD }}" alt="{{ $imagePathDD }}" width="80px">
@endif
</td>
<td style="height: 50px;">
@if (file_exists($imagePathSo))
<img src="{{ $imagePathSo }}" alt="{{ $imagePathSo }}" width="80px">
@endif
</td>
<td style="height: 50px;">
@if (file_exists($imagePathPenilai))
<img src="{{ $imagePathPenilai }}" alt="{{ $imagePathPenilai }}" width="80px">
@endif
</td>
</tr> <div class="page-break"></div>
<tr> <div class="section">
<td></td> <div class="judul">
<td>{{ $penilai->userPenilaiTeam->name ?? '' }} <h6 class="border" style="text-align: center">
<br>{{ ucwords(strtolower('PENILAI')) }} FOTO JAMINAN
</td> </h6>
<td>
@if ($permohonan->approval_eo != null)
{{ $senior_officer->name ?? '' }}
<br> {{ ucwords(strtolower('SENIOR OFFICER')) }}
@endif
</td>
<td>
@if ($permohonan->approval_dd != null)
{{ User::role('DD Appraisal')->first()->name ?? '' }}
<br>{{ ucwords(strtolower('DEPUTY DIRECTOR')) }}
@endif
</td>
</tr>
</table>
<div class="page-break"></div>
<div class="section">
<div class="judul">
<h6 class="border" style="text-align: center">
FOTO JAMINAN
</h6>
</div>
@include('lpj::penilai.components.foto-jaminan')
</div> </div>
@include('lpj::penilai.components.foto-jaminan')
</div>
</main> </main>
<footer></footer> <footer id="footer">
Cabang : {{ $permohonan->debiture->branch->name ?? '' }}
</footer>
<script> <script>
const data = @json($forminspeksi); const data = @json($forminspeksi);

View File

@@ -328,15 +328,16 @@
@if (isset($detail->details)) @if (isset($detail->details))
@if (json_decode($detail->details)) @if (json_decode($detail->details))
@foreach (json_decode($detail->details) as $key => $value) @foreach (json_decode($detail->details) as $key => $value)
@if (!is_null($value) && $value !== '') @if (!is_null($value) && $value !== '')
<td style=" padding: 2px;">{{ ucwords(str_replace('_', ' ', $key)) ?? '' }}</td> <td style=" padding: 2px;">
<td style=" padding: 2px;">:</td> {{ ucwords(str_replace('_', ' ', $key)) ?? '' }}</td>
<td style=" padding: 2px;">{{ $value }} <td style=" padding: 2px;">:</td>
@if ($key == 'luas_bangunan' || $key == 'luas_tanah') <td style=" padding: 2px;">{{ $value }}
<sup>m2</sup> @if ($key == 'luas_bangunan' || $key == 'luas_tanah')
<sup>m2</sup>
@endif
</td>
@endif @endif
</td>
@endif
@endforeach @endforeach
@endif @endif
@endif @endif
@@ -344,11 +345,13 @@
@endforeach @endforeach
@endif @endif
<tr> @if (isset($forminspeksi['asset']['nomor_nib']))
<td style=" padding: 2px;">Nomor NIB</td> <tr>
<td style=" padding: 2px;">:</td> <td style=" padding: 2px;">Nomor NIB</td>
<td style=" padding: 2px;">{{ $forminspeksi['asset']['nomor_nib']}}</td> <td style=" padding: 2px;">:</td>
</tr> <td style=" padding: 2px;">{{ $forminspeksi['asset']['nomor_nib'] ?? '' }}</td>
</tr>
@endif
<tr> <tr>
<td style=" padding: 2px;">Atas Nama</td> <td style=" padding: 2px;">Atas Nama</td>
<td style=" padding: 2px;">:</td> <td style=" padding: 2px;">:</td>