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

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

Browse Source
This commit is contained in:
majid
2025-03-14 14:02:33 +07:00
parent aa8f184b38 6fd0f35934
commit 05d63fe6eb
10 changed files with 3823 additions and 51 deletions
Download Patch File Download Diff File Expand all files Collapse all files

27
app/Http/Controllers/SurveyorController.php
View File

@@ -1551,7 +1551,7 @@ class SurveyorController extends Controller
// Jika alamat tidak sesuai, override dengan kode dari alamat
$cekAlamat = $forminspeksi['asset']['alamat']['tidak sesuai'] ?? null;
$cekAlamat = $forminspeksi['asset']['alamat']['tidak sesuai'] ?? $forminspeksi['asset']['alamat']['sesuai'] ?? [];
if ($cekAlamat) {
$provinceCode = $cekAlamat['province_code'] ?? $provinceCode;
@@ -2646,10 +2646,27 @@ class SurveyorController extends Controller
return redirect()->back()->with('error', 'Silahkan isi terlebih dahulu form inspeksi.');
}
// Pilih template PDF berdasarkan nama inspeksi
$templateView = strtolower($inspeksi->name) === 'rap'
? 'lpj::surveyor.components.print-out.main'
: 'lpj::surveyor.components.print-out.main';
$templateView = '';
switch (strtolower($inspeksi->name)) {
case 'rap':
$templateView = 'lpj::surveyor.components.print-out.main';
break;
case 'mesin':
$templateView = 'lpj::surveyor.components.print-out.mesin';
break;
case 'kendaraan':
$templateView = 'lpj::surveyor.components.print-out.kendaraan';
break;
case 'pesawat':
$templateView = 'lpj::surveyor.components.print-out.pesawat';
break;
case 'alat-berat':
$templateView = 'lpj::surveyor.components.print-out.alat-berat';
break;
default:
$templateView = 'lpj::surveyor.components.print-out.main';
break;
}
// Generate PDF
$pdf = PDF::loadView($templateView, compact('permohonan', 'basicData', 'forminspeksi', 'alamat'));

30
app/Services/SaveFormInspesksiService.php
View File

@@ -567,9 +567,11 @@ class SaveFormInspesksiService
'perumahan_gang' => $data['perumahan_gang'] ?? null,
'blok_nomor' => $data['blok_nomor'] ?? null,
'bandara' => $data['bandara'] ?? null,
'alamat' => [
'sesuai' => $alamatData
],
'asset' => [
'alamat' => [
'sesuai' => $alamatData
],
],
'jenis_kapal' => $data['jenis_kapal'] ?? null,
'jenis_kapal_lainnya' => $data['jenis_kapal_lainnya'] ?? null,
'size' => $data['size'] ?? null,
@@ -670,9 +672,11 @@ class SaveFormInspesksiService
'nama_jalan' => $data['nama_jalan'] ?? null,
'perumahan_gang' => $data['perumahan_gang'] ?? null,
'blok_nomor' => $data['blok_nomor'] ?? null,
'alamat' => [
'sesuai' => $alamatData
],
'asset' => [
'alamat' => [
'sesuai' => $alamatData
],
],
'masa_stnk' => $data['masa_stnk'] ?? null,
'masa_pajak' => $data['masa_pajak'] ?? null,
'kendaraan' => $data['kendaraan'] ?? null,
@@ -790,8 +794,10 @@ class SaveFormInspesksiService
'nama_jalan' => $data['nama_jalan'] ?? null,
'perumahan_gang' => $data['perumahan_gang'] ?? null,
'blok_nomor' => $data['blok_nomor'] ?? null,
'alamat' => [
'sesuai' => $alamatData
'asset' => [
'alamat' => [
'sesuai' => $alamatData
],
],
'jenis_model' => $data['jenis_model'] ?? null,
'nomor_lambung' => $data['nomor_lambung'] ?? null,
@@ -862,9 +868,11 @@ class SaveFormInspesksiService
'perumahan_gang' => $data['perumahan_gang'] ?? null,
'blok_nomor' => $data['blok_nomor'] ?? null,
'bandara' => $data['bandara'] ?? null,
'alamat' => [
'sesuai' => $alamatData
],
'asset' => [
'alamat' => [
'sesuai' => $alamatData
],
],
'jenis_pesawat' => $data['jenis_pesawat'] ?? null,
'jenis_pesawat_lainnya' => $data['jenis_pesawat_lainnya'] ?? null,