perbaikan tampilan basic data (batas batas, saran pelengkap, dan fasilitas dekat objek)

This commit is contained in:
majid
2024-12-18 11:05:25 +07:00
parent 562f1fb846
commit eaffe2805f
4 changed files with 141 additions and 133 deletions

View File

@@ -258,33 +258,21 @@
<!-- Sarana pelengkap -->
<div class="flex items-baseline flex-wrap lg:flex-nowrap gap-2.5">
<label class="form-label max-w-56">Sarana pelengkap</label>
<label class="form-label max-w-56">Sarana Pelengkap</label>
<div class="flex-wrap items-stretch">
<div class="flex flex-col items-start gap-4">
@if (isset($basicData['saranaPelengkap']))
@foreach ($basicData['saranaPelengkap'] as $item)
@php
$isChecked = false;
$inputValue = '';
if (isset($forminspeksi['bangunan']['sarana_pelengkap'])) {
foreach ($forminspeksi['bangunan']['sarana_pelengkap'] as $key => $value) {
if ($key === $item->name) {
$isChecked = true;
$inputValue = $value;
break;
}
}
}
@endphp
<div class="flex items-baseline flex-wrap lg:flex-nowrap gap-2.5">
<label class="form-label max-w-56 gap-2.5" style="width: 500px">
<input class="checkbox" name="sarana_pelengkap[]" type="checkbox"
value="{{ $item->name }}" {{ $isChecked ? 'checked' : '' }} />
value="{{ $item->name }}"
{{ in_array($item->name, old('sarana_pelengkap', $forminspeksi['bangunan']['sarana_pelengkap'] ?? [])) ? 'checked' : '' }} />
{{ $item->name }}
</label>
<input type="text" name="sarana_pelengkap_input[]" class="input w-full"
placeholder="Masukkan {{ $item->name }}..." value="{{ $inputValue }}">
placeholder="Masukkan {{ $item->name }}..."
value="{{ old('sarana_pelengkap_input.' . $loop->index, $forminspeksi['bangunan']['sarana_pelengkap_input'][$loop->index] ?? '') }}">
</div>
@endforeach
@endif
@@ -293,6 +281,7 @@
</div>
</div>
</div>
</div>
</div>

View File

@@ -16,9 +16,9 @@
<div class="fakta_positif flex items-center gap-2 mt-2 textarea-group w-full">
<textarea class="textarea mt-2" name="fakta_positif[]" rows="3">{{ old("fakta_positif.$index", $positif) }}</textarea>
<button class="btn btn-danger btn-sm remove-btn" type="button"
style="display: none;">
<i class="ki-outline ki-trash"></i>
</button>
style="display: none;">
<i class="ki-outline ki-trash"></i>
</button>
</div>
@endforeach
@else
@@ -77,24 +77,20 @@
</div>
<div class="flex items-baseline flex-wrap lg:flex-nowrap gap-2.5">
<label class="form-label max-w-56">Batas batas</label>
<label class="form-label max-w-56">Batas Batas</label>
<div class="flex flex-wrap items-baseline w-full">
<div class="grid grid-cols-1 gap-4 items-center w-full">
@if (isset($basicData['arahMataAngin']))
@foreach ($basicData['arahMataAngin'] as $item)
@php
$isChecked = false;
$inputValue = '';
if (isset($forminspeksi['fakta']['batas_batas'])) {
foreach ($forminspeksi['fakta']['batas_batas'] as $key => $value) {
if ($key === $item->name) {
$isChecked = true;
$inputValue = $value;
break;
}
}
}
$isChecked = in_array(
$item->name,
old('batas_batas', $forminspeksi['fakta']['batas_batas'] ?? []),
);
$inputValue = old(
'batas_batas_input.' . $item->name,
$forminspeksi['fakta']['batas_batas_input'][$item->name] ?? '',
);
@endphp
<div class="flex items-baseline flex-wrap lg:flex-nowrap gap-2.5">
<label class="form-label max-w-56 gap-2.5" style="width: 500px">
@@ -102,8 +98,8 @@
value="{{ $item->name }}" {{ $isChecked ? 'checked' : '' }} />
{{ $item->name }}
</label>
<input type="text" name="batas_batas_input[]" class="input w-full"
placeholder="Masukkan Batas {{ $item->name }}..."
<input type="text" name="batas_batas_input[{{ $item->name }}]"
class="input w-full" placeholder="Masukkan Batas {{ $item->name }}..."
value="{{ $inputValue }}">
</div>
@endforeach

View File

@@ -369,35 +369,27 @@
@if (isset($basicData['fasilitasObjek']))
@foreach ($basicData['fasilitasObjek'] as $item)
@php
$isChecked = false;
$inputValue = '';
// Cek old input terlebih dahulu
if (old('fasilitas_dekat_object') && in_array($item->name, old('fasilitas_dekat_object'))) {
$isChecked = true;
$oldInputIndex = array_search($item->name, old('fasilitas_dekat_object'));
$inputValue = old('fasilitas_dekat_object_input')[$oldInputIndex] ?? '';
}
elseif (isset($forminspeksi['lingkungan']['fasilitas_dekat_object'])) {
foreach ($forminspeksi['lingkungan']['fasilitas_dekat_object'] as $key => $value) {
if ($key === $item->name) {
$isChecked = true;
$inputValue = $value;
break;
}
}
}
$isChecked = in_array(
$item->name,
old(
'fasilitas_dekat_object',
$forminspeksi['lingkungan']['fasilitas_dekat_object'] ?? [],
),
);
$inputValue = old(
'fasilitas_dekat_object_input.' . $item->name,
$forminspeksi['lingkungan']['fasilitas_dekat_object_input'][$item->name] ?? '',
);
@endphp
<div class="flex items-baseline flex-wrap lg:flex-nowrap gap-2.5">
<label class="form-label max-w-56 gap-2.5" style="width: 500px">
<input class="checkbox" name="fasilitas_dekat_object[]" type="checkbox"
value="{{ $item->name }}"
{{ $isChecked ? 'checked' : '' }} />
value="{{ $item->name }}" {{ $isChecked ? 'checked' : '' }} />
{{ $item->name }}
</label>
<input type="text" name="fasilitas_dekat_object_input[]" class="input w-full"
placeholder="Masukkan fasilitas {{ $item->name }}..."
<input type="text" name="fasilitas_dekat_object_input[{{ $item->name }}]"
class="input w-full" placeholder="Masukkan fasilitas {{ $item->name }}..."
value="{{ $inputValue }}">
</div>
@endforeach