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

fix(penilai): perbaikkan save penilai dan free text jenis asset lainnya

Browse Source
This commit is contained in:
majid
2025-03-08 03:36:34 +07:00
committed by putrakuningan
parent b24f55e4b4
commit 0976794aa2
5 changed files with 1220 additions and 1180 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -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 = [

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

File diff suppressed because it is too large Load Diff

1060
app/Services/SaveFormInspesksiService.php Normal file
View File

File diff suppressed because it is too large Load Diff

27
resources/views/surveyor/components/header.blade.php
View File

@@ -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;' }}">
<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>
@@ -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')

15
resources/views/surveyor/components/print-out/main.blade.php
View File

@@ -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>
@@ -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>