fix(penilai): perbaikkan save penilai dan free text jenis asset lainnya
This commit is contained in:
majid
putrakuningan
@@ -25,15 +25,19 @@ use App\Helpers\Lpj;
|
||||
use Modules\Lpj\Http\Requests\FormSurveyorRequest;
|
||||
use Modules\Lpj\Models\Authorization;
|
||||
use Modules\Lpj\Models\Debiture;
|
||||
use Modules\Lpj\Services\SaveFormInspesksiService;
|
||||
|
||||
class PenilaiController extends Controller
|
||||
{
|
||||
public $user;
|
||||
protected $surveyorController;
|
||||
protected $inspeksiService;
|
||||
|
||||
public function __construct(SurveyorController $surveyorController)
|
||||
|
||||
public function __construct(SurveyorController $surveyorController, SaveFormInspesksiService $inspeksiService)
|
||||
{
|
||||
$this->surveyorController = $surveyorController;
|
||||
$this->inspeksiService = $inspeksiService;
|
||||
}
|
||||
|
||||
/**
|
||||
@@ -108,7 +112,11 @@ class PenilaiController extends Controller
|
||||
if ($lpj) {
|
||||
$lpjData = json_decode($lpj->lpj, true);
|
||||
}
|
||||
$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;
|
||||
|
||||
if ($cekAlamat) {
|
||||
@@ -172,7 +180,11 @@ class PenilaiController extends Controller
|
||||
if ($lpj) {
|
||||
$lpjData = json_decode($lpj->lpj, true);
|
||||
}
|
||||
$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;
|
||||
|
||||
if ($cekAlamat) {
|
||||
@@ -1044,7 +1056,8 @@ class PenilaiController extends Controller
|
||||
DB::beginTransaction();
|
||||
try {
|
||||
|
||||
$result = $this->surveyorController->store($request);
|
||||
$validatedData = $request->all();
|
||||
$result = $this->inspeksiService->storeInspeksi($validatedData, $request->input('type'), $request);
|
||||
|
||||
|
||||
$data = [
|
||||
|
||||
File diff suppressed because it is too large
Load Diff
1060
app/Services/SaveFormInspesksiService.php
Normal file
1060
app/Services/SaveFormInspesksiService.php
Normal file
File diff suppressed because it is too large
Load Diff
@@ -180,11 +180,12 @@
|
||||
: 'tidak sesuai';
|
||||
$selectedValue = $forminspeksi['asset']['jenis_asset'][$statusKey] ?? null;
|
||||
@endphp
|
||||
|
||||
<div id="jenis_asset" class="flex items-baseline gap-2"
|
||||
style="{{ old('jenis_asset_tidak_sesuai', isset($forminspeksi['asset']['jenis_asset']['tidak sesuai'])) ? '' : 'display: none;' }}">
|
||||
style="{{ old('jenis_asset_tidak_sesuai', isset($forminspeksi['asset']['jenis_asset']['tidak sesuai'])) ? '' : 'display: none;' }}">
|
||||
<select id="jenis_asset_tidak_sesuai" class="input w-full"
|
||||
name="jenis_asset_tidak_sesuai">
|
||||
<option value="">Select Jenis asset</option>
|
||||
name="jenis_asset_tidak_sesuai" onchange="handleJenisAssetChange(this)">
|
||||
<option value="">Pilih Jenis Aset</option>
|
||||
@if (isset($basicData['jenisJaminan']))
|
||||
@foreach ($basicData['jenisJaminan'] as $item)
|
||||
<option value="{{ $item->name }}"
|
||||
@@ -195,13 +196,11 @@
|
||||
@endif
|
||||
</select>
|
||||
</div>
|
||||
{{-- @if (strcasecmp($item->name, 'lainnya') == 0) --}}
|
||||
<input id="jenis_asset_lainnya" type="text"
|
||||
style=""
|
||||
name="jenis_asset_lainnya" class="input w-full mt-2"
|
||||
placeholder="Masukkan Jenis asset lainnya..."
|
||||
value="" />
|
||||
{{-- @endif --}}
|
||||
<!-- Input untuk "Lainnya" -->
|
||||
<input id="jenis_asset_lainnya" type="text" name="jenis_asset_lainnya"
|
||||
class="input w-full mt-2" placeholder="Masukkan Jenis Aset Lainnya..."
|
||||
value="{{ old('jenis_asset_lainnya', isset($forminspeksi['asset']['jenis_asset']['Lainnya']) ? $forminspeksi['asset']['jenis_asset']['Lainnya'] : '') }}"
|
||||
style="{{ old('jenis_asset_lainnya', isset($forminspeksi['asset']['jenis_asset']['Lainnya'])) == 'Lainnya' ? '' : 'display: none;' }}" />
|
||||
</div>
|
||||
<em id="error-jenis_asset" class="alert text-danger text-sm"></em>
|
||||
</div>
|
||||
@@ -213,10 +212,10 @@
|
||||
<label class="form-label max-w-56">Alamat</label>
|
||||
<div class="w-full">
|
||||
@foreach ($permohonan->documents as $dokumen)
|
||||
@php
|
||||
$alamat = $dokumen;
|
||||
@endphp
|
||||
@endforeach
|
||||
@php
|
||||
$alamat = $dokumen;
|
||||
@endphp
|
||||
@endforeach
|
||||
<span class="text-2sm text-gray-700">
|
||||
{{ formatAlamat($dokumen) }}
|
||||
</span>
|
||||
@@ -601,5 +600,15 @@
|
||||
document.addEventListener('DOMContentLoaded', () => {
|
||||
loadSavedLocationData();
|
||||
});
|
||||
|
||||
function handleJenisAssetChange(select) {
|
||||
const lainnyaInput = document.getElementById('jenis_asset_lainnya');
|
||||
if (select.value === 'Lainnya') {
|
||||
lainnyaInput.style.display = 'block';
|
||||
} else {
|
||||
lainnyaInput.style.display = 'none';
|
||||
lainnyaInput.value = ''; // Reset nilai input jika bukan "lainnya"
|
||||
}
|
||||
}
|
||||
</script>
|
||||
@include('lpj::surveyor.js.utils')
|
||||
|
||||
@@ -293,15 +293,18 @@
|
||||
<table style="width: 100%">
|
||||
<tr>
|
||||
@php
|
||||
$statusKey = isset($forminspeksi['asset']['jenis_asset']['sesuai'])
|
||||
? 'sesuai'
|
||||
: 'tidak sesuai';
|
||||
$statusKey = isset($forminspeksi['asset']['jenis_asset']['sesuai']) ? 'sesuai' : 'tidak sesuai';
|
||||
$selectedData = $forminspeksi['asset']['jenis_asset'][$statusKey] ?? null;
|
||||
|
||||
$lainnya = isset($forminspeksi['asset']['jenis_asset']['Lainnya'])
|
||||
? $forminspeksi['asset']['jenis_asset']['Lainnya']
|
||||
: null;
|
||||
|
||||
@endphp
|
||||
<td width="25%" style="padding: 2px; vertical-align: top;">Jenis Aset</td>
|
||||
<td width="1%" style=" vertical-align: top;">:</td>
|
||||
<td style="vertical-align: top; width: %;">
|
||||
{{ $selectedData ?? '' }}
|
||||
{{ $selectedData ?? '' }} {{ $lainnya ?? '' }}
|
||||
</td>
|
||||
</tr>
|
||||
|
||||
@@ -359,125 +362,125 @@
|
||||
</tr>
|
||||
</table>
|
||||
<div class="no-break" style="border-bottom: 1px solid #000;">
|
||||
<table
|
||||
style="width: 100%; border-top: 1px solid #000; border-bottom: 1px solid #000; border-collapse: collapse; border-left: none; border-right: none;">
|
||||
<table
|
||||
style="width: 100%; border-top: 1px solid #000; border-bottom: 1px solid #000; border-collapse: collapse; border-left: none; border-right: none;">
|
||||
|
||||
<tr>
|
||||
<td style="text-align: center; margin-top: 5px; ">
|
||||
<h2 style=" text-transform: uppercase; text-align: center; margin: 0;">
|
||||
STATUS KEPEMILIKAN, HUBUNGAN DAN PENGHUNI
|
||||
</h2>
|
||||
</td>
|
||||
</tr>
|
||||
</table>
|
||||
<tr>
|
||||
<td style="text-align: center; margin-top: 5px; ">
|
||||
<h2 style=" text-transform: uppercase; text-align: center; margin: 0;">
|
||||
STATUS KEPEMILIKAN, HUBUNGAN DAN PENGHUNI
|
||||
</h2>
|
||||
</td>
|
||||
</tr>
|
||||
</table>
|
||||
|
||||
<table>
|
||||
<table>
|
||||
|
||||
@if (@isset($dokumen))
|
||||
@foreach ($dokumen->detail as $detail)
|
||||
@if (isset($detail->dokumen_jaminan))
|
||||
<tr>
|
||||
<td width="25%"><strong>{{ $detail->name ?? '' }}</strong></td>
|
||||
{{-- <td style="width:1%; padding: 2px; vertical-align: top;">:</td> --}}
|
||||
|
||||
</tr>
|
||||
@endif
|
||||
|
||||
@if (isset($detail->details))
|
||||
@if (json_decode($detail->details))
|
||||
@foreach (json_decode($detail->details) as $key => $value)
|
||||
@if (!is_null($value) && $value !== '')
|
||||
<tr>
|
||||
<td style="padding: 2px;">
|
||||
{{ formatLabel($key) }}
|
||||
</td>
|
||||
<td style="width:1%; padding: 2px; vertical-align: top;">:</td>
|
||||
<td style="padding: 2px;">
|
||||
{{ $value }}
|
||||
@if ($key == 'luas_bangunan' || $key == 'luas_tanah')
|
||||
<sup>m2</sup>
|
||||
@endif
|
||||
</td>
|
||||
</tr>
|
||||
@endif
|
||||
@endforeach
|
||||
@endif
|
||||
@endif
|
||||
@endforeach
|
||||
@endif
|
||||
|
||||
|
||||
<tr>
|
||||
@php
|
||||
// Ambil nilai sesuai dan tidak sesuai
|
||||
$hubCadebSesuai = $forminspeksi['asset']['hub_cadeb']['sesuai'] ?? null;
|
||||
$hubCadebTidakSesuai = $forminspeksi['asset']['hub_cadeb']['tidak sesuai'] ?? null;
|
||||
@endphp
|
||||
<td style="vertical-align: top;">Hubungan Pemilik Jaminan dengan Debitur</td>
|
||||
<td style="width:1%; padding: 2px; vertical-align: top;">:</td>
|
||||
<td>
|
||||
<div style="margin-bottom: 10px;">
|
||||
<label>
|
||||
<input type="radio" name="hubCadebStatus" value="sesuai"
|
||||
{{ $hubCadebSesuai ? 'checked' : '' }}> Sesuai
|
||||
</label>
|
||||
<label style="margin-left: 20px;">
|
||||
<input type="radio" name="hubCadebStatus" value="tidak sesuai"
|
||||
{{ $hubCadebTidakSesuai ? 'checked' : '' }}> Tidak Sesuai
|
||||
</label>
|
||||
</div>
|
||||
|
||||
@if (!empty($basicData['hubCadeb']))
|
||||
<table >
|
||||
@if (@isset($dokumen))
|
||||
@foreach ($dokumen->detail as $detail)
|
||||
@if (isset($detail->dokumen_jaminan))
|
||||
<tr>
|
||||
@php $count = 0; @endphp
|
||||
@foreach ($basicData['hubCadeb'] as $item)
|
||||
<td>
|
||||
<label >
|
||||
<input type="checkbox"
|
||||
{{ isset($item->name) && ($hubCadebSesuai === $item->name || $hubCadebTidakSesuai === $item->name) ? 'checked' : '' }}>
|
||||
{{ $item->name ?? '' }}
|
||||
</label>
|
||||
</td>
|
||||
@php $count++; @endphp
|
||||
<td width="25%"><strong>{{ $detail->name ?? '' }}</strong></td>
|
||||
{{-- <td style="width:1%; padding: 2px; vertical-align: top;">:</td> --}}
|
||||
|
||||
@if ($count % 3 === 0)
|
||||
</tr>
|
||||
<tr>
|
||||
@endif
|
||||
|
||||
@if (isset($detail->details))
|
||||
@if (json_decode($detail->details))
|
||||
@foreach (json_decode($detail->details) as $key => $value)
|
||||
@if (!is_null($value) && $value !== '')
|
||||
<tr>
|
||||
<td style="padding: 2px;">
|
||||
{{ formatLabel($key) }}
|
||||
</td>
|
||||
<td style="width:1%; padding: 2px; vertical-align: top;">:</td>
|
||||
<td style="padding: 2px;">
|
||||
{{ $value }}
|
||||
@if ($key == 'luas_bangunan' || $key == 'luas_tanah')
|
||||
<sup>m2</sup>
|
||||
@endif
|
||||
</td>
|
||||
</tr>
|
||||
@endif
|
||||
@endforeach
|
||||
@endif
|
||||
@endif
|
||||
@endforeach
|
||||
@endif
|
||||
|
||||
@if ($count % 3 !== 0)
|
||||
@for ($i = 0; $i < 3 - ($count % 3); $i++)
|
||||
<td></td>
|
||||
@endfor
|
||||
@endif
|
||||
</tr>
|
||||
</table>
|
||||
|
||||
<tr>
|
||||
@php
|
||||
// Ambil nilai sesuai dan tidak sesuai
|
||||
$hubCadebSesuai = $forminspeksi['asset']['hub_cadeb']['sesuai'] ?? null;
|
||||
$hubCadebTidakSesuai = $forminspeksi['asset']['hub_cadeb']['tidak sesuai'] ?? null;
|
||||
@endphp
|
||||
<td style="vertical-align: top;">Hubungan Pemilik Jaminan dengan Debitur</td>
|
||||
<td style="width:1%; padding: 2px; vertical-align: top;">:</td>
|
||||
<td>
|
||||
<div style="margin-bottom: 10px;">
|
||||
<label>
|
||||
<input type="radio" name="hubCadebStatus" value="sesuai"
|
||||
{{ $hubCadebSesuai ? 'checked' : '' }}> Sesuai
|
||||
</label>
|
||||
<label style="margin-left: 20px;">
|
||||
<input type="radio" name="hubCadebStatus" value="tidak sesuai"
|
||||
{{ $hubCadebTidakSesuai ? 'checked' : '' }}> Tidak Sesuai
|
||||
</label>
|
||||
</div>
|
||||
|
||||
@if (!empty($basicData['hubCadeb']))
|
||||
<table>
|
||||
<tr>
|
||||
@php $count = 0; @endphp
|
||||
@foreach ($basicData['hubCadeb'] as $item)
|
||||
<td>
|
||||
<label>
|
||||
<input type="checkbox"
|
||||
{{ isset($item->name) && ($hubCadebSesuai === $item->name || $hubCadebTidakSesuai === $item->name) ? 'checked' : '' }}>
|
||||
{{ $item->name ?? '' }}
|
||||
</label>
|
||||
</td>
|
||||
@php $count++; @endphp
|
||||
|
||||
@if ($count % 3 === 0)
|
||||
</tr>
|
||||
<tr>
|
||||
@endif
|
||||
@endforeach
|
||||
|
||||
@if ($count % 3 !== 0)
|
||||
@for ($i = 0; $i < 3 - ($count % 3); $i++)
|
||||
<td></td>
|
||||
@endfor
|
||||
@endif
|
||||
</td>
|
||||
</tr>
|
||||
</table>
|
||||
@endif
|
||||
</td>
|
||||
</tr>
|
||||
|
||||
|
||||
<tr>
|
||||
<tr>
|
||||
|
||||
@php
|
||||
$statusKey = isset($forminspeksi['asset']['hub_cadeb_penghuni']['sesuai'])
|
||||
? 'sesuai'
|
||||
: 'tidak sesuai';
|
||||
$selectedData = $forminspeksi['asset']['hub_cadeb_penghuni'][$statusKey] ?? null;
|
||||
@endphp
|
||||
@php
|
||||
$statusKey = isset($forminspeksi['asset']['hub_cadeb_penghuni']['sesuai'])
|
||||
? 'sesuai'
|
||||
: 'tidak sesuai';
|
||||
$selectedData = $forminspeksi['asset']['hub_cadeb_penghuni'][$statusKey] ?? null;
|
||||
@endphp
|
||||
|
||||
<td style="vertical-align: top; width: 20%; padding: 2px;">Hubungan Penghuni Jaminan dengan Debitur</td>
|
||||
<td style="width:1%; padding: 2px; vertical-align: top;">:</td>
|
||||
<td style="vertical-align: top;">
|
||||
@if (isset($selectedData))
|
||||
{{ $selectedData ?? '' }}
|
||||
</td>
|
||||
@endif
|
||||
</td>
|
||||
</tr>
|
||||
</table>
|
||||
<td style="vertical-align: top; width: 20%; padding: 2px;">Hubungan Penghuni Jaminan dengan Debitur</td>
|
||||
<td style="width:1%; padding: 2px; vertical-align: top;">:</td>
|
||||
<td style="vertical-align: top;">
|
||||
@if (isset($selectedData))
|
||||
{{ $selectedData ?? '' }}
|
||||
</td>
|
||||
@endif
|
||||
</td>
|
||||
</tr>
|
||||
</table>
|
||||
|
||||
</div>
|
||||
|
||||
@@ -578,8 +581,8 @@
|
||||
<!-- K.J.P.P -->
|
||||
@if (isset($forminspeksi['signature']['kjjp']))
|
||||
<td style="width: 100px;">
|
||||
<img style="width: 100px;" src="{{ $forminspeksi['signature']['kjjp']['image'] }}"
|
||||
alt="KJPP">
|
||||
<img style="width: 100px;"
|
||||
src="{{ $forminspeksi['signature']['kjjp']['image'] }}" alt="KJPP">
|
||||
</td>
|
||||
@endif
|
||||
</tr>
|
||||
|
||||
Reference in New Issue
Block a user