Merge branch 'feature/senior-officer' into fix/save-penilai

This commit is contained in:
majid
2025-03-13 08:29:33 +07:00
30 changed files with 649 additions and 439 deletions

View File

@@ -16,7 +16,7 @@
$total_luas_unit = 0;
$jenis_legalitas_jaminan_id = 0;
if (isset($item->detail)) {
$total_luas_unit = calculateTotalLuas($item->detail, 'luas_tanah', 1);
$total_luas_unit = calculateTotalLuas($item->detail, 'luas_tanah', 1, 27, 3);
}
@endphp
<input type="hidden" id="jenis_legalistas_jaminan_unit_id" name="jenis_legalistas_jaminan_unit_id"

View File

@@ -16,7 +16,7 @@
$total_luas_bangunan = 0;
$jenis_legalitas_jaminan_id = 0;
if (isset($item->detail)) {
$total_luas_bangunan = calculateTotalLuas($item->detail, 'luas_bangunan', 10);
$total_luas_bangunan = calculateTotalLuas($item->detail, 'luas_bangunan', 10, 27, 3);
}
@endphp
<input type="hidden" id="jenis_legalistas_jaminan_bangunan_id"

View File

@@ -54,7 +54,7 @@
</div>
<div class="card-body">
<div class="flex items-baseline justify-between flex-wrap lg:flex-nowrap">
@foreach (['penilai', 'cabang', 'debitur', 'kjjp'] as $type)
@foreach (['penilai', 'cabang', 'debitur', 'kjpp'] as $type)
@include('lpj::component.signature-pad', ['type' => $type])
@endforeach
@@ -95,7 +95,7 @@
console.log(datas);
document.addEventListener('DOMContentLoaded', function() {
const signaturePads = {};
const types = ['penilai', 'cabang', 'debitur', 'kjjp'];
const types = ['penilai', 'cabang', 'debitur', 'kjpp'];
// Initialize all signature pads
types.forEach(type => initSignaturePad(type));

View File

@@ -203,10 +203,10 @@
<td style="text-align: right;">
<div style="">
<p style="margin: 0; padding:0; font-size:10px;">
Tanggal: {{ \Carbon\Carbon::parse($permohonan->penilaian->waktu_penilaian)->format('d-m-Y') }}
Tanggal: {{ \Carbon\Carbon::parse($permohonan->penilaian->updated_at)->format('d-m-Y') }}
</p>
<p style="margin: 0; padding:0; font-size:10px;">
Waktu: {{ \Carbon\Carbon::parse($permohonan->penilaian->waktu_penilaian)->format('H:i') }}
Waktu: {{ \Carbon\Carbon::parse($permohonan->penilaian->updated_at)->format('H:i') }}
</p>
<p style="margin: 0; padding:0; font-size:10px;">User: {{ $surveyorUser->name }}</p>
</div>
@@ -574,10 +574,10 @@
@endif
<!-- K.J.P.P -->
@if (isset($forminspeksi['signature']['kjjp']))
@if (isset($forminspeksi['signature']['kjpp']))
<td style="width: 100px;">
<img style="width: 100px;"
src="{{ $forminspeksi['signature']['kjjp']['image'] }}" alt="KJPP">
src="{{ $forminspeksi['signature']['kjpp']['image'] }}" alt="KJPP">
</td>
@endif
</tr>
@@ -605,9 +605,9 @@
<span>{{ ucwords(strtolower('DEBITUR/PERWAKILAN')) }}</span>
</td>
@endif
@if (isset($forminspeksi['signature']['kjjp']['name']))
@if (isset($forminspeksi['signature']['kjpp']['name']))
<td style=" text-align: center">
<span>{{ ucwords(strtolower($forminspeksi['signature']['kjjp']['name'])) }}</span>
<span>{{ ucwords(strtolower($forminspeksi['signature']['kjpp']['name'])) }}</span>
<br />
<span>{{ strtoupper('K.J.P.P') }}</span>
</td>

View File

@@ -14,10 +14,11 @@
@if (isset($permohonan->documents))
@foreach ($permohonan->documents as $item)
@php
// 27
$total_luas_tanah = 0;
$jenis_legalitas_jaminan_id = 0;
if (isset($item->detail)) {
$total_luas_tanah = calculateTotalLuas($item->detail, 'luas_tanah', 1);
$total_luas_tanah = calculateTotalLuas($item->detail, 'luas_tanah', 1, 27, 3);
}
@endphp
<input type="hidden" id="jenis_legalistas_jaminan_tanah_id"