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

Merge remote-tracking branch 'composer/feature/senior-officer' into staging

Browse Source
This commit is contained in:
Daeng Deni Mardaeni
2024-12-31 16:41:41 +07:00
parent cba3dee0b4 0a5afe39e0
commit 7156e4ba64
8 changed files with 213 additions and 151 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
app/Http/Controllers/PenilaiController.php
View File

@@ -571,7 +571,7 @@ class PenilaiController extends Controller
try {
$validatedRequest = app(FormSurveyorRequest::class);
$this->surveyorController->store($validatedRequest);
$data = [
'luas_tanah' => $request->input('luas_tanah'),
'nilai_tanah_1' => $request->input('nilai_tanah_1'),
@@ -590,10 +590,10 @@ class PenilaiController extends Controller
'asuransi_nilai_1' => $request->input('asuransi_nilai_1'),
'asuransi_nilai_2' => $request->input('asuransi_nilai_2'),
];
$npwData = [];
$npwCounter = 1;
while ($request->has("name_npw_{$npwCounter}")) {
$npwData[] = [
@@ -604,11 +604,11 @@ class PenilaiController extends Controller
];
$npwCounter++;
}
if (!empty($npwData)) {
$data['npw_tambahan'] = $npwData;
}
// Update atau buat data baru
$penilai = Penilai::updateOrCreate(
[
@@ -620,7 +620,7 @@ class PenilaiController extends Controller
'lpj' => json_encode($data),
]
);
return response()->json([
'success' => true,
'message' => 'Berhasil menyimpan LPJ',
@@ -635,7 +635,7 @@ class PenilaiController extends Controller
], 500);
}
}
public function print_out(Request $request)

8
resources/views/penilai/components/foto-jaminan.blade.php
View File

@@ -55,8 +55,8 @@
@endif
@if (isset($formFoto['foto_lantai_unit']['foto_lantai_unit'] ))
@foreach ($formFoto['foto_lantai_unit']['foto_lantai_unit'] as $index => $floorPhotos)
@if (isset($formFoto['foto_lantai_unit'] ))
@foreach ($formFoto['foto_lantai_unit'] as $index => $floorPhotos)
@foreach ($floorPhotos as $index => $item)
<div class="border photo-item">
<h2 class="text-gray-600 font-semibold text-xl">
@@ -75,7 +75,7 @@
@endforeach
@endif
{{-- @if (isset($formFoto['foto_lingkungan']['foto_lingkungan']))
@if (isset($formFoto['foto_lingkungan']['foto_lingkungan']))
@foreach ($formFoto['foto_lingkungan']['foto_lingkungan'][0] as $index => $item)
<div class="border photo-item">
<h2 class="text-gray-600 font-semibold text-xl">
@@ -91,7 +91,7 @@
@endif
</div>
@endforeach
@endif --}}
@endif
@if (isset($formFoto['foto_basement']))
<div class="border photo-item">

10
resources/views/penilai/components/foto-lampiran.blade.php
View File

@@ -23,6 +23,7 @@
</div>
</div>
@if (isset($formFoto['foto_rute_lainnya']))
<div class="card">
<div class="card-header" id="basic_settings">
<h3 class="card-title">
@@ -47,7 +48,7 @@
@endif
</div>
</div>
@endif
<div class="card">
<div class="card-header bg-agi-50" id="basic_settings">
@@ -74,13 +75,14 @@
</div>
</div>
@if (isset($formFoto['foto_lantai_unit']))
<div class="card">
<div class="card-header" id="basic_settings">
<h3 class="card-title">Lantai</h3>
</div>
<div class="card-body">
@if (isset($formFoto['foto_lantai_unit']['foto_lantai_unit']))
@foreach ($formFoto['foto_lantai_unit']['foto_lantai_unit'] as $floorIndex => $floorPhotos)
@if (isset($formFoto['foto_lantai_unit']))
@foreach ($formFoto['foto_lantai_unit'] as $floorIndex => $floorPhotos)
<div class="mt-5">
@foreach ($floorPhotos as $index => $item)
<div class="flex items-center justify-between mt-3">
@@ -102,7 +104,7 @@
@endif
</div>
</div>
@endif
<div class="card">
<div class="card-header" id="basic_settings">

309
resources/views/penilai/components/print-out-standard.blade.php
View File

@@ -498,9 +498,11 @@
<tr>
@php
$cekHub = isset($forminspeksi['asset']['hub_cadeb']) && $forminspeksi['asset']['hub_cadeb'] === 'sesuai'
? 'sesuai'
: 'tidak sesuai';
$cekHub =
isset($forminspeksi['asset']['hub_cadeb']) &&
$forminspeksi['asset']['hub_cadeb'] === 'sesuai'
? 'sesuai'
: 'tidak sesuai';
$hubCadeb = isset($forminspeksi['asset']['hub_cadeb'][$cekHub])
? $forminspeksi['asset']['hub_cadeb'][$cekHub]
@@ -523,48 +525,49 @@
@php $count++; @endphp
@if ($count % 3 === 0)
</tr><tr> <!-- Membuka baris baru setelah 3 kolom -->
@endif
@endforeach
{{-- Isi kolom kosong jika tidak genap --}}
@if ($count % 3 !== 0)
@for ($i = 0; $i < (3 - $count % 3); $i++)
<td></td>
@endfor
@endif
</tr>
</table>
<tr> <!-- Membuka baris baru setelah 3 kolom -->
@endif
</td>
@endforeach
{{-- Isi kolom kosong jika tidak genap --}}
@if ($count % 3 !== 0)
@for ($i = 0; $i < 3 - ($count % 3); $i++)
<td></td>
@endfor
@endif
</tr>
</table>
@endif
</td>
</tr>
<tr>
@php
<tr>
@php
$cekHub =
isset($forminspeksi['asset']['hub_cadeb_penghuni']) &&
$forminspeksi['asset']['hub_cadeb_penghuni'] === 'sesuai'
? 'sesuai'
: 'tidak sesuai';
$cekHub =
isset($forminspeksi['asset']['hub_cadeb_penghuni']) &&
$forminspeksi['asset']['hub_cadeb_penghuni'] === 'sesuai'
? 'sesuai'
: 'tidak sesuai';
$hubCadeb = isset($forminspeksi['asset']['hub_cadeb_penghuni'][$cekHub])
? $forminspeksi['asset']['hub_cadeb_penghuni']['tidak sesuai']
: $forminspeksi['asset']['hub_cadeb_penghuni']['sesuai'];
@endphp
<td><strong>Hubungan Penghuni Jaminan dengan Debitur</strong></td>
<td>
@if (isset($basicData['hubPenghuni']))
<table class="checkbox-table">
<tr>
<td>
{{ $hubCadeb ?? '' }}
</td>
</tr>
</table>
@endif
</td>
</tr>
$hubCadeb = isset($forminspeksi['asset']['hub_cadeb_penghuni'][$cekHub])
? $forminspeksi['asset']['hub_cadeb_penghuni']['tidak sesuai']
: $forminspeksi['asset']['hub_cadeb_penghuni']['sesuai'];
@endphp
<td><strong>Hubungan Penghuni Jaminan dengan Debitur</strong></td>
<td>
@if (isset($basicData['hubPenghuni']))
<table class="checkbox-table">
<tr>
<td>
{{ $hubCadeb ?? '' }}
</td>
</tr>
</table>
@endif
</td>
</tr>
</table>
@@ -836,44 +839,48 @@
<!-- Spesifikasi Bangunan -->
@if (isset($basicData['spekKategoriBangunan']))
@foreach ($basicData['spekKategoriBangunan'] as $index => $spesifikasi)
<tr>
<td><strong>{{ $spesifikasi->name }}</strong></td>
<td>
<table class="checkbox-list">
@if (isset($basicData['spekBangunan']))
@php $count = 0; @endphp
<tr> <!-- Start row for checkboxes -->
@foreach ($basicData['spekBangunan'] as $kategori)
@if ($kategori->spek_kategori_bangunan_id == $spesifikasi->id)
<td class="checkbox-item">
<label class="checkbox-label">
<input
type="checkbox"
style="margin-right: 3px;"
name="spesifikasi_bangunan[{{ $index }}][{{ $spesifikasi->name }}][]"
value="{{ $kategori->name }}"
{{ isset($forminspeksi['bangunan']['spesifikasi_bangunan'][$index]['spek_kategori_bangunan'][$spesifikasi->name]) &&
in_array($kategori->name, $forminspeksi['bangunan']['spesifikasi_bangunan'][$index]['spek_kategori_bangunan'][$spesifikasi->name])
? 'checked'
: '' }}>
{{ $kategori->name }}
</label>
</td>
@php $count++; @endphp
@foreach ($basicData['spekKategoriBangunan'] as $index => $spesifikasi)
<tr>
<td><strong>{{ $spesifikasi->name }}</strong></td>
<td>
<table class="checkbox-list">
@if (isset($basicData['spekBangunan']))
@php $count = 0; @endphp
<tr> <!-- Start row for checkboxes -->
@foreach ($basicData['spekBangunan'] as $kategori)
@if ($kategori->spek_kategori_bangunan_id == $spesifikasi->id)
<td class="checkbox-item">
<label class="checkbox-label">
<input type="checkbox" style="margin-right: 3px;"
name="spesifikasi_bangunan[{{ $index }}][{{ $spesifikasi->name }}][]"
value="{{ $kategori->name }}"
{{ isset(
$forminspeksi['bangunan']['spesifikasi_bangunan'][$index]['spek_kategori_bangunan'][$spesifikasi->name],
) &&
in_array(
$kategori->name,
$forminspeksi['bangunan']['spesifikasi_bangunan'][$index]['spek_kategori_bangunan'][$spesifikasi->name],
)
? 'checked'
: '' }}>
{{ $kategori->name }}
</label>
</td>
@php $count++; @endphp
@if ($count % 3 == 0)
</tr><tr> <!-- Start a new row every 3 items -->
@endif
@endif
@endforeach
</tr> <!-- Close last row -->
@if ($count % 3 == 0)
</tr>
<tr> <!-- Start a new row every 3 items -->
@endif
@endif
@endforeach
</tr> <!-- Close last row -->
@endif
</table>
</td>
</tr>
@endforeach
@endif
</td>
</tr>
@endforeach
@endif
@@ -893,7 +900,7 @@
</td>
</tr>
</table>
@elseif ($kategori === 'apartemen-kantor')
@elseif ($kategori === 'apartemen-kantor')
<table>
<tr>
@php
@@ -1270,53 +1277,85 @@
</td>
</tr>
{{-- Faktor Negatif --}}
<tr>
<td width="25%" style="vertical-align: top;"><strong>Faktor Negatif</strong></td>
<td>
@isset($forminspeksi['fakta']['fakta_negatif'])
@php
$faktaNegatif = $forminspeksi['fakta']['fakta_negatif'] ?? [];
$faktaNegatifFiltered = is_array($faktaNegatif)
? array_filter($faktaNegatif, function ($item) {
return !empty(trim($item));
})
: [];
@endphp
@if (!empty($faktaNegatifFiltered))
<table style="width: 100%; border-collapse: collapse;">
@foreach ($forminspeksi['fakta']['fakta_negatif'] as $key => $item)
@foreach ($faktaNegatifFiltered as $key => $item)
<tr>
<td>[{{ $key }}] {{ $item }}</td>
<td>[{{ $key + 1 }}] {{ $item }}</td>
</tr>
@endforeach
</table>
@endisset
@else
<p>Tidak ada faktor negatif yang teridentifikasi.</p>
@endif
</td>
</tr>
{{-- Lain-lain --}}
<tr>
<td width="25%" style="vertical-align: top;"><strong>Lain - lain :</strong></td>
<td>
<p>- Berdasarkan hasil kunjungan di lapangan dapat disampaikan sebagai berikut :</p>
@isset($forminspeksi['fakta'])
@foreach ($forminspeksi['fakta'] as $key => $item)
@if (
!in_array($key, [
'fakta_positif',
'fakta_negatif',
'rute_menuju',
'batas_batas',
'batas_batas_input',
'kondisi_lingkungan',
'kondisi_lain_bangunan',
'informasi_dokument',
]))
@php
$excludedKeys = [
'fakta_positif',
'fakta_negatif',
'rute_menuju',
'batas_batas',
'batas_batas_input',
'kondisi_lingkungan',
'kondisi_lain_bangunan',
'informasi_dokument',
];
$additionalFakta = [];
if (isset($forminspeksi['fakta']) && is_array($forminspeksi['fakta'])) {
foreach ($forminspeksi['fakta'] as $key => $item) {
// Cek apakah key tidak ada di daftar yang dikecualikan
if (!in_array($key, $excludedKeys)) {
// Pastikan item bukan array kosong atau null
if (!empty($item) && (!is_array($item) || count($item) > 0)) {
$additionalFakta[$key] = $item;
}
}
}
}
@endphp
@if (!empty($additionalFakta))
@foreach ($additionalFakta as $key => $item)
@if (is_array($item))
<p>{{ $key }}: {{ implode(', ', array_filter($item)) }}</p>
@else
<p>{{ $item }}</p>
@endif
@endforeach
@endisset
@else
<p>Tidak ada informasi tambahan yang dapat disampaikan.</p>
@endif
</td>
</tr>
<tr>
<td>2. Informasi Harga:</td>
</tr>
<tr>
<td width="25%" style="vertical-align: top;"><strong>Lain - lain :</strong></td>
<td>
</td>
</tr>
<tr>
@@ -1371,17 +1410,23 @@
<tr>
<td>Catatan yang Perlu Diperhatikan:</td>
<td>
@isset($forminspeksi['fakta']['keterangan'])
@php
$keterangan = $forminspeksi['fakta']['keterangan'] ?? '';
if (is_array($keterangan)) {
$keterangan = implode(', ', array_filter($keterangan));
}
@endphp
@if (!empty($keterangan))
<table style="width: 100%; border-collapse: collapse;">
<tr>
<td>{{ $forminspeksi['fakta']['keterangan'] ?? '' }}</td>
<td>{{ $keterangan }}</td>
</tr>
</table>
@endisset
@endif
</td>
</tr>
</table>
@@ -1418,54 +1463,54 @@
</table>
</div>
</div>
<div class="page-break"></div>
<div class="section">
<div class="judul">
<h6 class="border">
PETA
</h6>
</div>
<div class="page-break"></div>
<div>
@php
$fotoTypes = ['foto_gistaru', 'foto_bhumi', 'foto_argis_region', 'foto_tempat'];
if (($key = array_search('foto_tempat', $fotoTypes)) !== false) {
unset($fotoTypes[$key]);
array_unshift($fotoTypes, 'foto_tempat');
}
@endphp
<div class="section">
<div class="judul">
<h6 class="border">
PETA
</h6>
</div>
<div>
@php
$fotoTypes = ['foto_gistaru', 'foto_bhumi', 'foto_argis_region', 'foto_tempat'];
if (($key = array_search('foto_tempat', $fotoTypes)) !== false) {
unset($fotoTypes[$key]);
array_unshift($fotoTypes, 'foto_tempat');
}
@endphp
@if (isset($forminspeksi))
@forelse ($fotoTypes as $type)
@if (isset($forminspeksi))
@forelse ($fotoTypes as $type)
<div class="border photo-item">
@php
$imagePath = $forminspeksi[$type] ?? null;
@endphp
@if ($imagePath && file_exists(storage_path('app/public/' . $imagePath)))
<img src="{{ storage_path('app/public/' . $imagePath) }}" alt="{{ $type }}"
class="photo-image">
<img src="{{ storage_path('app/public/' . $imagePath) }}"
alt="{{ $type }}" class="photo-image">
@endif
<p class="mt-2 text-sm">{{ Str::title(str_replace('_', ' ', $type)) }}</p>
</div>
@empty
<p>Tidak ada tipe foto yang tersedia</p>
@endforelse
@endif
</div>
@endif
</div>
</div>
<div class="section">
<div class="judul">
<h6 class="border">
FOTO JAMINAN
</h6>
</div>
<div class="section">
<div class="judul">
<h6 class="border">
FOTO JAMINAN
</h6>
</div>
@include('lpj::penilai.components.foto-jaminan')
</div>
@include('lpj::penilai.components.foto-jaminan')
</div>
</div>
</main>

5
resources/views/surveyor/components/apartemen-kantor.blade.php
View File

@@ -42,9 +42,12 @@
<div id="luas_unit_tidak_sesuai" class="flex items-baseline gap-2"
style="{{ old('luas_unit', isset($forminspeksi['luas_unit']['tidak sesuai'])) ? '' : 'display: none;' }}">
<div class="input">
<input id="analisa_luas_unit_tidak_sesuai" type="text" name="luas_unit_tidak_sesuai"
class="input w-full" placeholder="Masukan Luas Tanah"
class="number-format w-full" placeholder="Masukan Luas Tanah"
value="{{ old('luas_unit_tidak_sesuai', $forminspeksi['luas_unit_tidak_sesuai'] ?? '') }}">
<i>M<sup>2</sup></i>
</div>
<button type="button" class="btn btn-md btn-primary"
onclick="updateAnalisa('analisa_unit')">Save</button>
</div>

5
resources/views/surveyor/components/bangunan.blade.php
View File

@@ -47,10 +47,13 @@
<div id="luas_tanah_bagunan_tidak_sesuai" class="flex items-baseline gap-2"
style="{{ old('luas_tanah_bagunan_tidak_sesuai', $selectedData) ? '' : 'display: none' }}">
<div class="input">
<input type="text" id="analisa_bangunan_tidak_sesuai"
name="luas_tanah_bagunan_tidak_sesuai" class="input w-full"
name="luas_tanah_bagunan_tidak_sesuai" class="w-full number-format"
placeholder="Masukan Luas Bangunan Tidak Sesuai..."
value="{{ old('luas_tanah_bagunan_tidak_sesuai', $forminspeksi['bangunan']['luas_tanah_bagunan']['tidak sesuai'] ?? '') }}">
<i>M<sup>2</sup></i>
</div>
<button type="button" class="btn btn-md btn-primary"
onclick="updateAnalisa('analisa_bangunan')">
Save

6
resources/views/surveyor/components/inspeksi.blade.php
View File

@@ -244,6 +244,12 @@
this.closest('.perwakilan').remove();
});
});
document.querySelectorAll('.number-format').forEach(input => {
input.addEventListener('input', function() {
formatNumber(this);
});
});
});

7
resources/views/surveyor/components/tanah.blade.php
View File

@@ -38,9 +38,12 @@
</label>
<div id="luas_tanah_tidak_sesuai" class="flex items-baseline gap-2"
style="{{ old('luas_tanah', isset($forminspeksi['tanah']['luas_tanah']['tidak sesuai'])) ? '' : 'display: none;' }}">
<input id="analisa_tanah_tidak_sesuai" type="text" name="luas_tanah_tidak_sesuai"
class="input w-full" placeholder="Masukan Luas Tanah"
<div class="input">
<input id="analisa_tanah_tidak_sesuai" type="text" name="luas_tanah_tidak_sesuai"
class="w-full number-format" placeholder="Masukan Luas Tanah"
value="{{ old('luas_tanah_tidak_sesuai', $forminspeksi['tanah']['luas_tanah']['tidak sesuai'] ?? '') }}">
<i>M<sup>2</sup></i>
</div>
<button type="button" class="btn btn-md btn-primary"
onclick="updateAnalisa('analisa_tanah')">Save
</button>