Merge pull request 'feature/senior-officer' (#91) from feature/senior-officer into staging

Reviewed-on: #91
This commit is contained in:
putrakuningan
2025-02-11 02:50:05 +01:00
9 changed files with 1467 additions and 1356 deletions

View File

@@ -11,6 +11,10 @@ use Modules\Lpj\Models\JenisDokumen;
use Modules\Lpj\Models\TeamsUsers;
use Modules\Lpj\Models\Laporan;
use Modules\Usermanagement\Models\User;
use Modules\Location\Models\Province;
use Modules\Location\Models\City;
use Modules\Location\Models\District;
use Modules\Location\Models\Village;
function formatTanggalIndonesia($date, $time = false)
{
@@ -373,3 +377,36 @@ function getCustomField($param){
return null;
}
}
function getWilayahName($code, $type)
{
try {
$wilayah = null;
if (!$code) {
return null;
}
switch ($type) {
case 'province':
$wilayah = Province::where('code', $code)->first();
return $wilayah ? $wilayah->name : null;
case 'city':
$wilayah = City::where('code', $code)->first();
return $wilayah ? $wilayah->name : null;
case 'district':
$wilayah = District::where('code', $code)->first();
return $wilayah ? $wilayah->name : null;
case 'village':
$wilayah = Village::where('code', $code)->first();
return $wilayah ? $wilayah->name : null;
default:
return null;
}
} catch (\Exception $e) {
return null;
}
}

View File

@@ -1032,10 +1032,10 @@ class PenilaiController extends Controller
$alamat = [
'address' => $inputAddress['address'] ?? null,
'village_code' => $this->getWilayahName($inputAddress['village_code'] ?? null, 'village'),
'district_code' => $this->getWilayahName($inputAddress['district_code'] ?? null, 'district'),
'city_code' => $this->getWilayahName($inputAddress['city_code'] ?? null, 'city'),
'province_code' => $this->getWilayahName($inputAddress['province_code'] ?? null, 'province')
'village_code' => getWilayahName($inputAddress['village_code'] ?? null, 'village'),
'district_code' => getWilayahName($inputAddress['district_code'] ?? null, 'district'),
'city_code' => getWilayahName($inputAddress['city_code'] ?? null, 'city'),
'province_code' => getWilayahName($inputAddress['province_code'] ?? null, 'province')
];
$viewLaporan = $this->getViewLaporan($tipeLaporan);
@@ -1112,39 +1112,6 @@ class PenilaiController extends Controller
return $viewMap[$tipe] ?? 'penilai.components.print-resume';
}
public function getWilayahName($code, $type)
{
try {
$wilayah = null;
if (!$code) {
return null;
}
switch ($type) {
case 'province':
$wilayah = Province::where('code', $code)->first();
return $wilayah ? $wilayah->name : null;
case 'city':
$wilayah = City::where('code', $code)->first();
return $wilayah ? $wilayah->name : null;
case 'district':
$wilayah = District::where('code', $code)->first();
return $wilayah ? $wilayah->name : null;
case 'village':
$wilayah = Village::where('code', $code)->first();
return $wilayah ? $wilayah->name : null;
default:
return null;
}
} catch (\Exception $e) {
return null;
}
}
// mengambil data dari fungsi permohonan di surveyor, dan table
@@ -1322,8 +1289,7 @@ class PenilaiController extends Controller
'resume' => [
'fakta.fakta_positif',
'fakta.fakta_negatif',
'fisik',
'keterangan'
'fisik'
],
];

View File

@@ -80,6 +80,7 @@ use Modules\Lpj\Models\SpekBagunanAnalisaDetail;
use Modules\Lpj\Http\Requests\SurveyorRequest;
use Modules\Lpj\Http\Requests\FormSurveyorRequest;
use Modules\Lpj\Emails\SendJadwalKunjunganEmail;
use App\Helpers\Lpj;
class SurveyorController extends Controller
{
@@ -3303,6 +3304,7 @@ class SurveyorController extends Controller
$validator = Validator::make($request->all(), [
'signature' => 'required',
'type' => 'required|in:penilai,cabang,debitur,kjjp',
'name' => 'nullable|string',
'document_id' => 'nullable|string'
]);
@@ -3338,6 +3340,7 @@ class SurveyorController extends Controller
// Simpan atau update signature berdasarkan type
$dataForm['signature'][$request->type] = [
'image' => $request->signature,
'name' => $request->name,
'created_at' => now()->toDateTimeString(),
'updated_at' => now()->toDateTimeString()
];
@@ -3381,6 +3384,7 @@ class SurveyorController extends Controller
'data' => [
'signature' => $dataForm['signature'][$type]['image'],
'type' => $type,
'name' => $dataForm['signature'][$type]['name'] ?? '',
'created_at' => $dataForm['signature'][$type]['created_at'],
'updated_at' => $dataForm['signature'][$type]['updated_at']
]
@@ -3495,6 +3499,25 @@ class SurveyorController extends Controller
return redirect()->back()->with('error', 'Data inspeksi tidak ditemukan.');
}
$forminspeksi = json_decode($inspeksi->data_form, true);
if (!$forminspeksi) {
// Redirect jika data form inspeksi kosong
return redirect()->back()->with('error', 'Silahkan isi terlebih dahulu form inspeksi.');
}
$inputAddress = $forminspeksi['asset']['alamat']['sesuai'] ?? $forminspeksi['asset']['alamat']['tidak sesuai'] ?? [];
$alamat = [
'address' => $inputAddress['address'] ?? null,
'village_code' => getWilayahName($inputAddress['village_code'] ?? null, 'village'),
'district_code' => getWilayahName($inputAddress['district_code'] ?? null, 'district'),
'city_code' => getWilayahName($inputAddress['city_code'] ?? null, 'city'),
'province_code' => getWilayahName($inputAddress['province_code'] ?? null, 'province')
];
// Decode data form inspeksi
$forminspeksi = json_decode($inspeksi->data_form, true);
@@ -3509,7 +3532,7 @@ class SurveyorController extends Controller
: 'lpj::surveyor.components.print-out.main';
// Generate PDF
$pdf = PDF::loadView($templateView, compact('permohonan', 'basicData', 'forminspeksi'));
$pdf = PDF::loadView($templateView, compact('permohonan', 'basicData', 'forminspeksi','alamat'));
$pdf->setPaper('A4', 'portrait');
// Tentukan nama file PDF

View File

@@ -525,13 +525,6 @@
</div>
<div class="card-body">
@include('lpj::component.detail-jaminan', ['status' => true])
<div class="flex items-baseline flex-wrap lg:flex-nowrap gap-2.5 w-full">
<label class="form-label font-medium max-w-56">Nomor NIB</label>
<div class="flex flex-wrap items-baseline w-full">
<input type="text" name="nomor_nib" class="input w-full"
value="{{ $forminspeksi['asset']['nomor_nib'] ?? '' }}" placeholder="Masukkan Nomor NIB">
</div>
</div>
</div>
</div>

View File

@@ -1,19 +1,38 @@
<!-- resources/views/signatures/components/signature-pad.blade.php -->
<div class="text-center border">
<h3 class="signature-title">{{ ucfirst($type) }}</h3>
@if (($type === 'penilai' && Auth::user()->sign))
<img src="{{ $type === 'penilai'
? asset('storage/signatures/' . Auth::user()->id . '/' . Auth::user()->sign)
: asset('storage/signatures/' . $user->id . '/' . $user->sign) }}"
alt="E-Sign" class="signature-pad" style="width: 400px; height: 220px;">
@else
<canvas id="signature-pad-{{ $type }}" class="signature-pad" width="400" height="200"></canvas>
<div class="button-container py-2">
<button type="button" id="save-{{ $type }}" class="btn btn-xs btn-primary">Save</button>
<button type="button" id="clear-{{ $type }}" class="btn btn-xs btn-secondary">Clear</button>
<button type="button" id="delete-{{$type}}" class="btn btn-xs btn-danger">Delete</button>
<div class="signature-pad-container mx-auto border p-4 max-w-md sm:max-w-lg lg:max-w-xl">
<h3 class="signature-title text-lg sm:text-xl font-semibold mb-2">{{ ucfirst($type) }}</h3>
<canvas
id="signature-pad-{{ $type }}"
class="signature-pad w-full h-48 sm:h-56 bg-white border rounded"
></canvas>
<input
type="text"
class="input w-full border p-2 mt-2 rounded"
name="name-{{ $type }}"
id="name-{{ $type }}"
placeholder="Enter your name"
/>
<div class="button-container flex justify-between py-4">
<button
type="button"
id="save-{{ $type }}"
class="btn btn-primary px-4 py-2 rounded "
>
Save
</button>
<button
type="button"
id="clear-{{ $type }}"
class="btn btn-light px-4 py-2 rounded"
>
Clear
</button>
<button
type="button"
id="delete-{{ $type }}"
class="btn btn-danger text-white px-4 py-2 rounded hover:bg-red-600"
>
Delete
</button>
</div>
<div id="status-{{ $type }}" class="status-message"></div>
@endif
<div id="status-{{ $type }}" class="status-message text-sm text-gray-600 mt-2"></div>
</div>

View File

@@ -28,7 +28,8 @@
<tr>
<td style="padding: 2px; vertical-align: top;">Permintaan Cabang</td>
<td style="padding: 2px; vertical-align: top;">:</td>
<td style="padding: 2px; vertical-align: top;">{{ $permohonan->debiture->branch->name ?? '' }}</td>
<td style="padding: 2px; vertical-align: top;">{{ $permohonan->debiture->branch->name ?? '' }}
</td>
</tr>
<tr>
<td style="padding: 2px; vertical-align: top;">Permintaan (AO)</td>
@@ -43,7 +44,8 @@
<tr>
<td style="padding: 2px; vertical-align: top;">Tanggal Order</td>
<td style="padding: 2px; vertical-align: top;">:</td>
<td style="padding: 2px; vertical-align: top;">{{ formatTanggalIndonesia($permohonan->created_at) }}</td>
<td style="padding: 2px; vertical-align: top;">
{{ formatTanggalIndonesia($permohonan->created_at) }}</td>
</tr>
<tr>
<td style="padding: 2px; vertical-align: top;">Tanggal Survey</td>
@@ -105,7 +107,8 @@
<tr>
<td style="padding: 2px; vertical-align: top;">Tanggal Laporan</td>
<td style="padding: 2px; vertical-align: top;">:</td>
<td style="padding: 2px; vertical-align: top;">{{ formatTanggalIndonesia($tanggalLaporan) ?? '' }}</td>
<td style="padding: 2px; vertical-align: top;">
{{ formatTanggalIndonesia($tanggalLaporan) ?? '' }}</td>
</tr>
<tr>
<td style="padding: 2px; vertical-align: top;">Waktu Penyelesaian</td>
@@ -120,7 +123,8 @@
<tr>
<td style=" padding: 2px; vertical-align: top;">Fasilitas Kredit</td>
<td style=" padding: 2px; vertical-align: top;">:</td>
<td style=" padding: 2px; vertical-align: top;">{{ $permohonan->jenisFasilitasKredit->name ?? '' }}</td>
<td style=" padding: 2px; vertical-align: top;">
{{ $permohonan->jenisFasilitasKredit->name ?? '' }}</td>
</tr>
<tr>
@@ -131,7 +135,8 @@
<tr>
<td style=" padding: 2px; vertical-align: top;">Tujuan Penilaian</td>
<td style=" padding: 2px; vertical-align: top;">:</td>
<td style=" padding: 2px; vertical-align: top;">{{ $permohonan->tujuanPenilaian->name ?? '' }}</td>
<td style=" padding: 2px; vertical-align: top;">{{ $permohonan->tujuanPenilaian->name ?? '' }}
</td>
</tr>
<tr>
<td style=" padding: 2px; vertical-align: top;">Terletak di</td>
@@ -217,7 +222,8 @@
<tr>
<td style=" padding: 2px; vertical-align: top;">Nomor NIB</td>
<td style=" padding: 2px; vertical-align: top;">:</td>
<td style=" padding: 2px; vertical-align: top;">{{ $forminspeksi['asset']['nomor_nib'] ?? '' }}</td>
<td style=" padding: 2px; vertical-align: top;">
{{ $forminspeksi['asset']['nomor_nib'] ?? '' }}</td>
</tr>
@endif
<tr>
@@ -304,9 +310,7 @@
<table>
<tr>
@php
$cekLuas = isset(
$forminspeksi['tanah']['luas_tanah']['tidak sesuai'],
)
$cekLuas = isset($forminspeksi['tanah']['luas_tanah']['tidak sesuai'])
? 'tidak sesuai'
: 'sesuai';
@@ -326,16 +330,14 @@
)
? $forminspeksi['tanah']['bentuk_tanah']['bentuk_tanah']
: [];
$lainnya = isset(
$forminspeksi['tanah']['bentuk_tanah']['lainnya'],
)
$lainnya = isset($forminspeksi['tanah']['bentuk_tanah']['lainnya'])
? $forminspeksi['tanah']['bentuk_tanah']['lainnya']
: null;
@endphp
{{ !empty($bentukTanah) ? implode(', ', $bentukTanah) : 'Data tidak tersedia' }}
{{ !empty($bentukTanah) ? implode(', ', $bentukTanah) : '' }}
@if (in_array('Lainnya', $bentukTanah) && $lainnya)
@if (in_array('lainnya', array_map('strtolower', $bentukTanah)) && !empty($lainnya))
({{ $lainnya }})
@endif
</td>
@@ -379,7 +381,8 @@
<tr>
<td style="padding: 2px; vertical-align: top;">Peruntukan Tanah</td>
<td style="padding: 2px; vertical-align: top;">:</td>
<td style="padding: 2px; vertical-align: top;">Perumahan bukan Real Estate</td>
<td style="padding: 2px; vertical-align: top;">Perumahan bukan Real Estate
</td>
</tr>
<tr>
<td style="padding: 2px; vertical-align: top;">Fisik Tanah</td>
@@ -391,13 +394,15 @@
'kondisi_fisik_tanah'
][0] ?? '-';
$lainnya =
$forminspeksi['tanah']['kondisi_fisik_tanah']['lainnya'];
$forminspeksi['tanah']['kondisi_fisik_tanah']['lainnya'] ??
null;
@endphp
{{ $kondisiFisikTanah }}
@if ($kondisiFisikTanah === 'Lainnya' && $lainnya)
@if (strcasecmp($kondisiFisikTanah, 'Lainnya') === 0 && $lainnya)
({{ $lainnya }})
@endif
</td>
</tr>
@@ -425,8 +430,7 @@
<td style="padding: 2px; vertical-align: top;">:</td>
<td style="padding: 2px; vertical-align: top;">
@php
$jenisBangunan =
$forminspeksi['bangunan']['jenis_bangunan'] ?? [];
$jenisBangunan = $forminspeksi['bangunan']['jenis_bangunan'] ?? [];
@endphp
@if (!empty($jenisBangunan))
@@ -505,7 +509,8 @@
@foreach ($spekKategori as $kategori => $nilaiKategori)
@if (!empty($nilaiKategori))
<tr>
<td style="padding: 2px; vertical-align: top;">{{ $kategori }}</td>
<td style="padding: 2px; vertical-align: top;">
{{ $kategori }}</td>
<td style="padding: 2px; vertical-align: top;">:</td>
<td style="padding: 2px; vertical-align: top;">
{{ implode(', ', $nilaiKategori) }}</td>
@@ -515,7 +520,8 @@
@endforeach
@else
<tr>
<td colspan="3" style="padding: 2px; vertical-align: top;">Tidak ada data
<td colspan="3" style="padding: 2px; vertical-align: top;">Tidak
ada data
spesifikasi bangunan</td>
</tr>
@endif
@@ -613,12 +619,14 @@
<tr>
<td style="padding: 2px; vertical-align: top;">Jarak Jalan Utama</td>
<td style="padding: 2px; vertical-align: top;">:</td>
<td style="padding: 2px; vertical-align: top;">{{ $lingkungan['jarak_jalan_utama'] ?? '-' }} m</td>
<td style="padding: 2px; vertical-align: top;">{{ $lingkungan['jarak_jalan_utama'] ?? '-' }} m
</td>
</tr>
<tr>
<td style="padding: 2px; vertical-align: top;">Jalan Lingkungan</td>
<td style="padding: 2px; vertical-align: top;">:</td>
<td style="padding: 2px; vertical-align: top;">{{ $lingkungan['jalan_linkungan'] ?? '-' }} m</td>
<td style="padding: 2px; vertical-align: top;">{{ $lingkungan['jalan_linkungan'] ?? '-' }} m
</td>
<tr>
<td style="padding: 2px; vertical-align: top;">Jarak CBD</td>
@@ -629,7 +637,8 @@
<tr>
<td style="padding: 2px; vertical-align: top;">Lebar Perkerasan Jalan</td>
<td style="padding: 2px; vertical-align: top;">:</td>
<td style="padding: 2px; vertical-align: top;">{{ $lingkungan['lebar_perkerasan_jalan'] ?? '-' }} m</td>
<td style="padding: 2px; vertical-align: top;">
{{ $lingkungan['lebar_perkerasan_jalan'] ?? '-' }} m</td>
</tr>
<tr>
<td style="padding: 2px; vertical-align: top;">Perkerasan Jalan</td>
@@ -643,18 +652,21 @@
<tr>
<td style="padding: 2px; vertical-align: top;">Lalu Lintas</td>
<td style="padding: 2px; vertical-align: top;">:</td>
<td style="padding: 2px; vertical-align: top;">{{ implode(', ', $lingkungan['lalu_lintas'] ?? ['-']) }}</td>
<td style="padding: 2px; vertical-align: top;">
{{ implode(', ', $lingkungan['lalu_lintas'] ?? ['-']) }}</td>
</tr>
<tr>
<td style="padding: 2px; vertical-align: top;">Golongan Masyarakat Sekitar</td>
<td style="padding: 2px; vertical-align: top;">:</td>
<td style="padding: 2px; vertical-align: top;">{{ implode(', ', $lingkungan['gol_mas_sekitar'] ?? ['-']) }}
<td style="padding: 2px; vertical-align: top;">
{{ implode(', ', $lingkungan['gol_mas_sekitar'] ?? ['-']) }}
</td>
</tr>
<tr>
<td style="padding: 2px; vertical-align: top;">Tingkat Keramaian</td>
<td style="padding: 2px; vertical-align: top;">:</td>
<td style="padding: 2px; vertical-align: top;">{{ implode(', ', $lingkungan['tingkat_keramaian'] ?? ['-']) }}
<td style="padding: 2px; vertical-align: top;">
{{ implode(', ', $lingkungan['tingkat_keramaian'] ?? ['-']) }}
</td>
</tr>
<tr>
@@ -667,20 +679,23 @@
<tr>
<td style="padding: 2px; vertical-align: top;">Kondisi Bangunan Sekitar</td>
<td style="padding: 2px; vertical-align: top;">:</td>
<td style="padding: 2px; vertical-align: top;">{{ $lingkungan['kondisi_bagunan_disekitar_lokasi'] ?? '-' }}
<td style="padding: 2px; vertical-align: top;">
{{ $lingkungan['kondisi_bagunan_disekitar_lokasi'] ?? '-' }}
</td>
</tr>
<tr>
<td style="padding: 2px; vertical-align: top;">Sifat Bangunan Sekitar</td>
<td style="padding: 2px; vertical-align: top;">:</td>
<td style="padding: 2px; vertical-align: top;">{{ $lingkungan['sifat_bagunan_disekitar_lokasi'] ?? '-' }}</td>
<td style="padding: 2px; vertical-align: top;">
{{ $lingkungan['sifat_bagunan_disekitar_lokasi'] ?? '-' }}</td>
</tr>
@if ($lingkungan['dekat_makam'] == 'ya')
<tr>
<td style="padding: 2px; vertical-align: top;">Dekat Makam</td>
<td style="padding: 2px; vertical-align: top;">:</td>
<td style="padding: 2px; vertical-align: top;">Ya, Jarak {{ $lingkungan['jarak_makam'] ?? '-' }} m
<td style="padding: 2px; vertical-align: top;">Ya, Jarak
{{ $lingkungan['jarak_makam'] ?? '-' }} m
({{ $lingkungan['nama_makam'] ?? '-' }})
</td>
</tr>
@@ -690,7 +705,8 @@
<tr>
<td style="padding: 2px; vertical-align: top;">Dekat TPS</td>
<td style="padding: 2px; vertical-align: top;">:</td>
<td style="padding: 2px; vertical-align: top;">Ya, Jarak {{ $lingkungan['jarak_tps'] ?? '-' }} m
<td style="padding: 2px; vertical-align: top;">Ya, Jarak
{{ $lingkungan['jarak_tps'] ?? '-' }} m
({{ $lingkungan['nama_tps'] ?? '-' }})</td>
</tr>
@endif
@@ -698,7 +714,8 @@
<tr>
<td style="padding: 2px; vertical-align: top;">Daerah</td>
<td style="padding: 2px; vertical-align: top;">:</td>
<td style="padding: 2px; vertical-align: top;">{{ implode(', ', $lingkungan['merupakan_daerah'] ?? ['-']) }}
<td style="padding: 2px; vertical-align: top;">
{{ implode(', ', $lingkungan['merupakan_daerah'] ?? ['-']) }}
</td>
</tr>
@@ -732,7 +749,8 @@
</tr>
@if (!empty($lpjData['asuransi_luas_bangunan']))
<tr>
<td><table border="1" style="width: 100%; border-collapse: collapse; margin-bottom: 10px;">
<td>
<table border="1" style="width: 100%; border-collapse: collapse; margin-bottom: 10px;">
<tr>
<td style="border: 1px solid #000; padding: 4px;">Luas Bangunan</td>
@@ -741,10 +759,13 @@
</tr>
<tr>
<td style="border: 1px solid #000; padding: 4px;">{{ $lpjData['asuransi_luas_bangunan'] ?? '' }}</td>
<td style="border: 1px solid #000; padding: 4px;">
{{ $lpjData['asuransi_luas_bangunan'] ?? '' }}</td>
<td style="border: 1px solid #000; padding: 4px;">{{ formatRupiah($lpjData['asuransi_nilai_1']) ?? '' }}</td>
<td style="border: 1px solid #000; padding: 4px;">{{ formatRupiah($lpjData['asuransi_nilai_2']) ?? '' }}</td>
<td style="border: 1px solid #000; padding: 4px;">
{{ formatRupiah($lpjData['asuransi_nilai_1']) ?? '' }}</td>
<td style="border: 1px solid #000; padding: 4px;">
{{ formatRupiah($lpjData['asuransi_nilai_2']) ?? '' }}</td>
</tr>
</table>
@@ -998,7 +1019,8 @@
@if (!empty($forminspeksi['fakta']['keterangan']))
<tr>
<td width="25%" style="vertical-align: top;"><strong>Catatan yang Perlu Diperhatikan</strong></td>
<td width="25%" style="vertical-align: top;"><strong>Catatan yang Perlu
Diperhatikan</strong></td>
<td>
@php
$keterangan = $forminspeksi['fakta']['keterangan'] ?? '';
@@ -1177,7 +1199,8 @@
}
// Filter fotoTypes untuk memastikan hanya yang memiliki imagePath valid
$validPhotoTypes = array_filter($fotoTypes, function ($type) use ($forminspeksi) {
return isset($forminspeksi[$type]) && file_exists(storage_path('app/public/' . $forminspeksi[$type]));
return isset($forminspeksi[$type]) &&
file_exists(storage_path('app/public/' . $forminspeksi[$type]));
});
@endphp
@@ -1188,13 +1211,15 @@
$type = reset($validPhotoTypes);
$imagePath = $forminspeksi[$type] ?? null;
@endphp
<td style="width: 100%; vertical-align: top; text-align: center" colspan="2" class="photo-item border">
<td style="width: 100%; vertical-align: top; text-align: center" colspan="2"
class="photo-item border">
<p style="margin: 0; font-size: 10px; text-align: center;">
{{ Str::title(str_replace('_', ' ', $type)) }}
</p>
@if ($imagePath)
<img src="{{ storage_path('app/public/' . $imagePath) }}" alt="{{ $imagePath }}"
class="photo-image" style="width: 100%; max-width: 300px;">
<img src="{{ storage_path('app/public/' . $imagePath) }}"
alt="{{ $imagePath }}" class="photo-image"
style="width: 100%; max-width: 300px;">
@endif
</td>
@else
@@ -1208,8 +1233,9 @@
{{ Str::title(str_replace('_', ' ', $type)) }}
</p>
@if ($imagePath && file_exists(storage_path('app/public/' . $imagePath)))
<img src="{{ storage_path('app/public/' . $imagePath) }}" alt="{{ $imagePath }}"
class="photo-image" style="width: 100%; max-width: 300px;">
<img src="{{ storage_path('app/public/' . $imagePath) }}"
alt="{{ $imagePath }}" class="photo-image"
style="width: 100%; max-width: 300px;">
@endif
</td>
@endisset

View File

@@ -206,24 +206,21 @@
<i class="ki-outline ki-abstract-33"></i> Camera
</button>
</div>
@if ($forminspeksi)
@php
$fotoTempat = $forminspeksi['foto_tempat'] ?? null;
$fotoSrc = '';
if (is_array($fotoTempat)) {
$fotoSrc = asset('storage/' . $fotoTempat[0]);
} elseif (!empty($fotoTempat)) {
$fotoSrc = asset('storage/' . $fotoTempat);
}
@endphp
@if (is_array($fotoTempat) && count($fotoTempat) > 0)
<img id="foto_tempat-preview"
src="{{ isset($forminspeksi['foto_tempat']) ? asset('storage/' . (is_array($forminspeksi['foto_tempat']) ? $forminspeksi['foto_tempat'][0] : $forminspeksi['foto_tempat'])) : '' }}"
<img id="foto_tempat-preview" src="{{ $fotoSrc ?: asset('images/default-placeholder.png') }}"
alt="Foto Tempat" class="mt-2 max-w-full h-auto"
style="{{ isset($forminspeksi['foto_tempat']) ? '' : 'display: none;' }}
@else
<img id="foto_tempat-preview"
src="{{ asset('storage/' . (isset($forminspeksi['foto_tempat']) ? $forminspeksi['foto_tempat'] : '')) }}"
alt="Foto Tempat" class="mt-2 max-w-full h-auto"
style="{{ isset($forminspeksi['foto_tempat']) ? '' : 'display: none;' }} max-width: 30rem;">
@endif
@endif
style="max-width: 30rem; {{ $fotoSrc ? '' : 'display: none;' }}">
</div>
</div>

View File

@@ -60,6 +60,9 @@
</div>
</div>
<div class="card-footer">
<span class="text-sm text-danger">* Harap Menyimpan tanda tangan terlebih dahulu</span>
</div>
</div>
<div class="flex justify-end gap-2" style="margin-right: 20px; margin-top: 20px">
@@ -67,8 +70,6 @@
<i class="ki-filled ki-save-2"></i>
<span id="saveButtonText">Save</span>
</button>
<a href="{{ route('surveyor.print_out_inspeksi', ['permohonan_id' => $permohonan->id, 'dokument_id' => request('dokument'), 'jenis_jaminan_id' => request('jenis_jaminan')]) }}"
class="btn btn-info" id="saveButton">
<a href="{{ route('surveyor.print_out_inspeksi', ['permohonan_id' => $permohonan->id, 'dokument_id' => request('dokument'), 'jenis_jaminan_id' => request('jenis_jaminan')]) }}"
class="btn btn-info" id="saveButton">
<i class="ki-filled ki-printer"></i>
@@ -78,6 +79,13 @@
</div>
</form>
</div>
@php
use Modules\Usermanagement\Models\User;
$cabangUser = User::where('id', $permohonan->user->id)->first();
// print_r($cabangUser->sign);
@endphp
@endsection
@push('scripts')
@@ -85,54 +93,91 @@
<script type="text/javascript">
const datas = @json($forminspeksi ?? '');
console.log(datas);
document.addEventListener('DOMContentLoaded', function() {
const signaturePads = {};
const types = ['penilai', 'cabang', 'debitur', 'kjjp'];
// Inisialisasi semua signature pad
types.forEach(type => {
initSignaturePad(type);
});
types.forEach(type => initSignaturePad(type));
function initSignaturePad(type) {
const canvas = document.getElementById(`signature-pad-${type}`);
if (!canvas) return;
// Set ukuran canvas yang responsif
canvas.width = canvas.offsetWidth;
canvas.height = canvas.offsetHeight;
setCanvasSize(canvas);
signaturePads[type] = new SignaturePad(canvas, {
const signaturePad = new SignaturePad(canvas, {
backgroundColor: 'rgba(255, 255, 255, 0)',
penColor: 'rgb(0, 0, 0)',
minWidth: 0.5,
maxWidth: 2.5
});
signaturePads[type] = signaturePad;
// Load existing signature
loadSignature(type);
// Load tanda tangan yang ada
if (type === 'penilai' || type === 'cabang') {
loadPenilaiAndCabangSignature(type, signaturePad);
} else {
loadSignature(type, signaturePad);
}
// Event listeners
const saveBtn = document.getElementById(`save-${type}`);
const clearBtn = document.getElementById(`clear-${type}`);
const deleteBtn = document.getElementById(`delete-${type}`);
if (saveBtn) {
saveBtn.addEventListener('click', () => saveSignature(type));
}
if (clearBtn) {
clearBtn.addEventListener('click', () => clearSignature(type));
}
if (deleteBtn) {
deleteBtn.addEventListener('click', () => deleteSignature(type));
}
addEventListeners(type, signaturePad);
}
function saveSignature(type) {
const signaturePad = signaturePads[type];
function setCanvasSize(canvas) {
const ratio = Math.max(window.devicePixelRatio || 1, 1);
canvas.width = canvas.offsetWidth * ratio;
canvas.height = canvas.offsetHeight * ratio;
canvas.getContext('2d').scale(ratio, ratio);
}
if (!signaturePad || signaturePad.isEmpty()) {
function addEventListeners(type, signaturePad) {
document.getElementById(`save-${type}`)?.addEventListener('click', () => saveSignature(type,
signaturePad));
document.getElementById(`clear-${type}`)?.addEventListener('click', () => clearSignature(
signaturePad));
document.getElementById(`delete-${type}`)?.addEventListener('click', () => deleteSignature(type,
signaturePad));
}
function loadPenilaiAndCabangSignature(type, signaturePad) {
const nameInputElement = document.getElementById(`name-${type}`);
const params = new URLSearchParams({
document_id: document.getElementById('dokument_id')?.value,
permohonan_id: document.getElementById('permohonan_id')?.value
});
fetch(`{{ url('/surveyor/signatures/${type}') }}?${params}`)
.then(response => response.json())
.then(data => {
if (data.success && data.data?.signature) {
drawSignature(signaturePad, data.data.signature);
if (nameInputElement) {
nameInputElement.value = data.data.name || '';
}
} else {
const signUrl = type === 'penilai' ?
`{{ asset('storage/signatures/' . Auth::user()->id . '/' . Auth::user()->sign) }}` :
`{{ asset('storage/signatures/' . $cabangUser->id . '/' . $cabangUser->sign) }}`;
drawSignature(signaturePad, signUrl);
const defaultName = type === 'penilai' ?
`{{ Auth::user()->name }}` :
`{{ $cabangUser->name }}`;
if (nameInputElement) {
nameInputElement.value = defaultName;
}
}
})
.catch(error => console.error(`Error loading ${type} signature:`, error));
}
function saveSignature(type, signaturePad) {
if (signaturePad.isEmpty() && type !== 'penilai' && type !== 'cabang') {
Swal.fire({
icon: 'warning',
title: 'Peringatan',
@@ -141,22 +186,26 @@
return;
}
const signatureDataUrl = signaturePad.isEmpty()
? (type === 'penilai'
? `{{ asset('storage/signatures/' . Auth::user()->id . '/' . Auth::user()->sign) }}`
: (type === 'cabang'
? `{{ asset('storage/signatures/' . $cabangUser->id . '/' . $cabangUser->sign) }}`
: ''))
: signaturePad.toDataURL('image/png');
const data = {
signature: signaturePad.toDataURL('image/png'),
signature: signatureDataUrl,
type: type,
name: document.getElementById(`name-${type}`)?.value,
document_id: document.getElementById('dokument_id')?.value,
permohonan_id: document.getElementById('permohonan_id')?.value
};
console.log(data);
// Tampilkan loading
Swal.fire({
title: 'Menyimpan...',
allowOutsideClick: false,
didOpen: () => {
Swal.showLoading();
}
didOpen: () => Swal.showLoading()
});
fetch(`{{ url('/surveyor/signatures') }}`, {
@@ -177,7 +226,6 @@
text: 'Tanda tangan berhasil disimpan!',
timer: 1500
});
} else {
throw new Error(data.message || 'Terjadi kesalahan');
}
@@ -188,40 +236,41 @@
title: 'Error',
text: error.message || 'Terjadi kesalahan saat menyimpan tanda tangan'
});
});
}
function loadSignature(type) {
function loadSignature(type, signaturePad) {
const nameInputElement = document.getElementById(`name-${type}`);
const params = new URLSearchParams({
document_id: document.getElementById('dokument_id')?.value,
permohonan_id: document.getElementById('permohonan_id')?.value
});
fetch(`{{ url('/surveyor/signatures/${type}?${params}') }}`)
fetch(`{{ url('/surveyor/signatures/${type}') }}?${params}`)
.then(response => response.json())
.then(data => {
if (data.success && data.data?.signature) {
const canvas = document.getElementById(`signature-pad-${type}`);
if (!canvas) return;
const signaturePad = signaturePads[type];
const image = new Image();
image.onload = function() {
const context = canvas.getContext('2d');
context.clearRect(0, 0, canvas.width, canvas.height);
context.drawImage(image, 0, 0, canvas.width, canvas.height);
};
image.src = data.data.signature;
drawSignature(signaturePad, data.data.signature);
}
if (nameInputElement) {
nameInputElement.value = data.data?.name || '';
}
})
.catch(error => {
console.error('Error loading signature:', error);
});
.catch(error => console.error('Error loading signature:', error));
}
function deleteSignature(type) {
function drawSignature(signaturePad, imageUrl) {
const image = new Image();
image.onload = function() {
const ctx = signaturePad.canvas.getContext('2d');
ctx.clearRect(0, 0, signaturePad.canvas.width, signaturePad.canvas.height);
ctx.drawImage(image, 0, 0, signaturePad.canvas.width, signaturePad.canvas.height);
};
image.src = imageUrl;
}
function deleteSignature(type, signaturePad) {
Swal.fire({
title: 'Konfirmasi',
text: 'Apakah Anda yakin ingin menghapus tanda tangan ini?',
@@ -248,7 +297,7 @@
.then(response => response.json())
.then(data => {
if (data.success) {
clearSignature(type);
clearSignature(signaturePad);
Swal.fire({
icon: 'success',
title: 'Berhasil',
@@ -266,26 +315,13 @@
text: error.message ||
'Terjadi kesalahan saat menghapus tanda tangan'
});
console.error('Error:', error);
});
}
});
}
function clearSignature(type) {
const signaturePad = signaturePads[type];
if (signaturePad) {
function clearSignature(signaturePad) {
signaturePad.clear();
updateStatus(type, '');
}
}
function updateStatus(type, message, status = '') {
const statusElement = document.getElementById(`status-${type}`);
if (statusElement) {
statusElement.textContent = message;
statusElement.className = `status-message ${status}`;
}
}
// Handle window resize untuk canvas responsif
@@ -293,22 +329,18 @@
types.forEach(type => {
const canvas = document.getElementById(`signature-pad-${type}`);
if (canvas) {
const ratio = Math.max(window.devicePixelRatio || 1, 1);
canvas.width = canvas.offsetWidth * ratio;
canvas.height = canvas.offsetHeight * ratio;
canvas.getContext('2d').scale(ratio, ratio);
// Reload signature jika ada
loadSignature(type);
setCanvasSize(canvas);
const signaturePad = signaturePads[type];
if (type === 'penilai' || type === 'cabang') {
loadPenilaiAndCabangSignature(type, signaturePad);
} else {
loadSignature(type, signaturePad);
}
}
});
});
});
function submitData() {
showLoadingSwal('Mengirim data ke server...');
const form = document.querySelector('form');
@@ -399,7 +431,5 @@
});
});
</script>
<script></script>
@include('lpj::surveyor.js.utils')
@endpush

View File

@@ -627,26 +627,43 @@
</tr>
</table>
<table style="width: 100%; border-collapse: collapse; text-align: center;">
<tr>
<!-- PENILAI -->
@if (isset($forminspeksi['signature']['penilai']))
@if (isset($forminspeksi['signature']['penilai']['image']) && !empty($forminspeksi['signature']['penilai']['image']))
@php
$imagePath = $forminspeksi['signature']['penilai']['image'];
$isBase64 = str_starts_with($imagePath, 'data:image');
if (!$isBase64) {
$relativePath = str_replace(url('storage') . '/', '', $imagePath);
$absolutePath = storage_path('app/public/' . $relativePath);
} else {
$absolutePath = $imagePath;
}
@endphp
<td style="width: 100px;">
<img style="width: 100px;" src="{{ $forminspeksi['signature']['penilai']['image'] }}"
alt="Penilai">
<img style="width: 100px;" src="{{ $absolutePath }}" alt="">
</td>
@else
<td style="width: 100px;">-</td>
@endif
@if (isset($forminspeksi['signature']['cabang']))
@php
$imagePath = $forminspeksi['signature']['cabang']['image'];
$isBase64 = str_starts_with($imagePath, 'data:image');
if (!$isBase64) {
$relativePath = str_replace(url('storage') . '/', '', $imagePath);
$absolutePath = storage_path('app/public/' . $relativePath);
} else {
$absolutePath = $imagePath;
}
@endphp
<td style="width: 100px;">
<img style="width: 100px;" src="{{ $forminspeksi['signature']['cabang']['image'] }}"
alt="Cabang">
<img style="width: 100px;" src="{{ $absolutePath }}" alt="">
</td>
@else
<td style="width: 100px;">-</td>
@endif
@@ -655,8 +672,6 @@
<img style="width: 100px;" src="{{ $forminspeksi['signature']['debitur']['image'] }}"
alt="Debitur/Perwakilan">
</td>
@else
<td style="width: 100px;">-</td>
@endif
<!-- K.J.P.P -->
@@ -665,30 +680,41 @@
<img style="width: 100px;" src="{{ $forminspeksi['signature']['kjjp']['image'] }}"
alt="KJPP">
</td>
@else
<td style="width: 100px;">-</td>
@endif
</tr>
<tr>
<td style="padding: 4px;">
@if (isset($forminspeksi['signature']['penilai']['name']))
<td style=" text-align: center">
<span>{{ ucwords(strtolower($forminspeksi['signature']['penilai']['name'])) }}</span>
<br />
<span>{{ ucwords(strtolower('PENILAI')) }}</span>
</td>
<td style="padding: 4px;">
@endif
@if (isset($forminspeksi['signature']['cabang']['name']))
<td style=" text-align: center">
<span>{{ ucwords(strtolower($forminspeksi['signature']['cabang']['name'])) }}</span>
<br />
<span>{{ ucwords(strtolower('CABANG')) }}</span>
</td>
<td style="padding: 4px;">
@endif
@if (isset($forminspeksi['signature']['debitur']['name']))
<td style=" text-align: center">
<span>{{ ucwords(strtolower($forminspeksi['signature']['debitur']['name'])) }}</span>
<br />
<span>{{ ucwords(strtolower('DEBITUR/PERWAKILAN')) }}</span>
</td>
<td style="padding: 4px;">
@endif
@if (isset($forminspeksi['signature']['kjjp']['name']))
<td style=" text-align: center">
<span>{{ ucwords(strtolower($forminspeksi['signature']['kjjp']['name'])) }}</span>
<br />
<span>{{ strtoupper('K.J.P.P') }}</span>
</td>
@endif
</tr>
</table>
</td>
</tr>
@@ -699,12 +725,6 @@
<footer id="footer">
Cabang : {{ $permohonan->debiture->branch->name ?? '' }}
</footer>
<script>
const datas = @json($forminspeksi)
console.log(datas);
</script>
</body>
</html>