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

Merge branch 'staging' into fix/save-penilai

Browse Source
This commit is contained in:
majid
2025-03-14 10:40:16 +07:00
parent a4d0a5d942 eb8b67a11f
commit ea18cf2fba
7 changed files with 119 additions and 90 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -772,6 +772,7 @@ class SurveyorController extends Controller
$penilaian->update([ $penilaian->update([
'status' => 'survey-completed', 'status' => 'survey-completed',
'updated_at' => now(),
]); ]);

0
resources/views/penilai/components/print-out-standard.blade.php → resources/views/penilai/components/print-out-standar.blade.php
View File

4
resources/views/penilai/show.blade.php
View File

@@ -92,7 +92,7 @@
</label> </label>
<div class="flex flex-wrap items-baseline w-full"> <div class="flex flex-wrap items-baseline w-full">
<p class="flex w-full text-gray-600 font-medium text-sm"> <p class="flex w-full text-gray-600 font-medium text-sm">
{{ formatTanggalIndonesia($permohonan->penilaian->tanggal_kunjungan) ?? '' }}</p> {{ formatTanggalIndonesia($permohonan->penilaian->waktu_penilaian) ?? '' }}</p>
</div> </div>
@if (!in_array(strtolower($permohonan->tujuanPenilaian->name), ['penilaian ulang', 'asuransi', 'lelang'])) @if (!in_array(strtolower($permohonan->tujuanPenilaian->name), ['penilaian ulang', 'asuransi', 'lelang']))
@@ -167,7 +167,7 @@
</label> </label>
<div class="flex flex-wrap items-baseline w-full"> <div class="flex flex-wrap items-baseline w-full">
<p class="flex w-full text-gray-600 font-medium text-sm"> <p class="flex w-full text-gray-600 font-medium text-sm">
{{ formatTanggalIndonesia($permohonan->penilaian->waktu_penilaian) }}</p> {{ formatTanggalIndonesia($permohonan->penilaian->updated_at) }}</p>
</div> </div>
</div> </div>
<div class="flex items-baseline flex-wrap lg:flex-nowrap gap-2.5"> <div class="flex items-baseline flex-wrap lg:flex-nowrap gap-2.5">

196
resources/views/surveyor/components/print-out/apartement-kantor.blade.php
View File

@@ -10,24 +10,75 @@
</td> </td>
</tr> </tr>
</table> </table>
<table> <table>
<tr> <tr>
@php
$cekLuas = isset($forminspeksi['luas_unit']['tidak sesuai']) ? 'tidak sesuai' : 'sesuai';
@php
$cekLuas =
old('luas_unit_radio') ??
(isset($forminspeksiluas_unit['luas_unit']['tidak sesuai']) ? 'tidak sesuai' : 'sesuai');
$luasSesuai = $forminspeksiluas_unit['luas_unit']['sesuai'] ?? null;
$luasTidakSesuai = $forminspeksiluas_unit['luas_unit']['tidak sesuai'] ?? null;
@endphp
<td style="padding: 2px;">Luas Unit</td>
<td style="padding: 2px;">:</td>
<td width="" style="text-align: left">
<table>
<tr>
<td>
<label>
<input type="radio" name="luas_tanah_radio" value="sesuai"
{{ $cekLuas == 'sesuai' ? 'checked' : '' }}>
Sesuai {{ $luasSesuai ? '- ' . $luasSesuai . ' m²' : '' }}
</label>
</td>
</tr>
<tr>
<td>
<label>
<input type="radio" name="luas_tanah_radio" value="tidak sesuai"
{{ $cekLuas == 'tidak sesuai' ? 'checked' : '' }}>
Tidak Sesuai {{ $luasTidakSesuai ? '- ' . $luasTidakSesuai . ' m² (luas fisik)' : '' }}
</label>
</td>
</tr>
</table>
</td>
</tr>
<tr>
<td><strong>Bentuk Unit</strong></td>
<td>
@if (isset($basicData['bentukUnit']))
<table class="checkbox-list">
<tr>
@foreach ($basicData['bentukUnit'] as $index => $item)
@if ($index % 3 == 0 && $index > 0)
</tr>
<tr>
@endif
<td class="checkbox-item">
<label class="checkbox-label">
<input type="checkbox"
{{ isset($forminspeksi['bentuk_unit']) && in_array($item->name, $forminspeksi['bentuk_unit']) ? 'checked' : '' }}>
{{ $item->name }}
</label>
</td>
@endforeach
</tr>
</table>
@endif
$luas = $forminspeksi['luas_unit'][$cekLuas] ?? null;
@endphp
<td style="padding: 2px;">Luas Unit</td>
<td style="padding: 2px;">:</td>
<td style="padding: 2px;">{{ $luas ?? '' }}</td>
</tr>
<tr> <tr>
<td><strong>Bentuk Unit</strong></td> <td><strong>Kondisi Unit</strong></td>
<td> <td>
@if (isset($basicData['bentukUnit'])) @if (isset($basicData['kondisiUnit']))
<table class="checkbox-list"> <table class="checkbox-list">
<tr> <tr>
@foreach ($basicData['bentukUnit'] as $index => $item) @foreach ($basicData['kondisiUnit'] as $index => $item)
@if ($index % 3 == 0 && $index > 0) @if ($index % 3 == 0 && $index > 0)
</tr> </tr>
<tr> <tr>
@@ -35,80 +86,57 @@
<td class="checkbox-item"> <td class="checkbox-item">
<label class="checkbox-label"> <label class="checkbox-label">
<input type="checkbox" <input type="checkbox"
{{ isset($forminspeksi['bentuk_unit']) && in_array($item->name, $forminspeksi['bentuk_unit']) ? 'checked' : '' }}> {{ isset($forminspeksi['kondisi_unit']) && in_array($item->name, $forminspeksi['kondisi_unit']) ? 'checked' : '' }}>
{{ $item->name }} {{ $item->name }}
</label> </label>
</td> </td>
@endforeach @endforeach
</tr> </tr>
</table> </table>
@endif @endif
<tr>
<tr> <td><strong>Posisi Unit</strong></td>
<td><strong>Kondisi Unit</strong></td> <td>
<td> @if (isset($basicData['posisiUnit']))
@if (isset($basicData['kondisiUnit'])) <table class="checkbox-list">
<table class="checkbox-list"> <tr>
<tr> @foreach ($basicData['posisiUnit'] as $index => $item)
@foreach ($basicData['kondisiUnit'] as $index => $item) @if ($index % 3 == 0 && $index > 0)
@if ($index % 3 == 0 && $index > 0) </tr>
</tr> <tr>
<tr> @endif
@endif <td class="checkbox-item">
<td class="checkbox-item"> <label class="checkbox-label">
<label class="checkbox-label"> <input type="checkbox"
<input type="checkbox" {{ isset($forminspeksi['posisi_unit']) && in_array($item->name, $forminspeksi['posisi_unit']) ? 'checked' : '' }}>
{{ isset($forminspeksi['kondisi_unit']) && in_array($item->name, $forminspeksi['kondisi_unit']) ? 'checked' : '' }}> {{ $item->name }}
{{ $item->name }} </label>
</label> </td>
</td> @endforeach
@endforeach </tr>
</tr> </table>
</table> @endif
@endif <tr>
<tr> <td><strong>View Unit</strong></td>
<td><strong>Posisi Unit</strong></td> <td>
<td> @if (isset($basicData['view']))
@if (isset($basicData['posisiUnit'])) <table class="checkbox-list">
<table class="checkbox-list"> <tr>
<tr> @foreach ($basicData['view'] as $index => $item)
@foreach ($basicData['posisiUnit'] as $index => $item) @if ($index % 3 == 0 && $index > 0)
@if ($index % 3 == 0 && $index > 0) </tr>
</tr> <tr>
<tr> @endif
@endif <td class="checkbox-item">
<td class="checkbox-item"> <label class="checkbox-label">
<label class="checkbox-label"> <input type="checkbox"
<input type="checkbox" {{ isset($forminspeksi['view']) && in_array($item->name, $forminspeksi['view']) ? 'checked' : '' }}>
{{ isset($forminspeksi['posisi_unit']) && in_array($item->name, $forminspeksi['posisi_unit']) ? 'checked' : '' }}> {{ $item->name }}
{{ $item->name }} </label>
</label> </td>
</td> @endforeach
@endforeach </tr>
</tr> </table>
</table> @endif
@endif </table>
<tr>
<td><strong>View Unit</strong></td>
<td>
@if (isset($basicData['view']))
<table class="checkbox-list">
<tr>
@foreach ($basicData['view'] as $index => $item)
@if ($index % 3 == 0 && $index > 0)
</tr>
<tr>
@endif
<td class="checkbox-item">
<label class="checkbox-label">
<input type="checkbox"
{{ isset($forminspeksi['view']) && in_array($item->name, $forminspeksi['view']) ? 'checked' : '' }}>
{{ $item->name }}
</label>
</td>
@endforeach
</tr>
</table>
@endif
</table>
</div> </div>

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

@@ -274,7 +274,7 @@
Tanggal Survey</td> Tanggal Survey</td>
<td style="width: 1%; padding: 2px;">:</td> <td style="width: 1%; padding: 2px;">:</td>
<td style="vertical-align: top; padding: 2px;"> <td style="vertical-align: top; padding: 2px;">
{{ formatTanggalIndonesia($permohonan->penilaian->tanggal_kunjungan) }}</td> {{ formatTanggalIndonesia($permohonan->penilaian->updated_at) }}</td>
</tr> </tr>
<tr> <tr>
<td style="width: 25%; padding: 2px; vertical-align: top;">Pihak Bank</td> <td style="width: 25%; padding: 2px; vertical-align: top;">Pihak Bank</td>

2
resources/views/surveyor/components/print-out/tanah.blade.php
View File

@@ -41,7 +41,7 @@
<label> <label>
<input type="radio" name="luas_tanah_radio" value="tidak sesuai" <input type="radio" name="luas_tanah_radio" value="tidak sesuai"
{{ $cekLuas == 'tidak sesuai' ? 'checked' : '' }}> {{ $cekLuas == 'tidak sesuai' ? 'checked' : '' }}>
Tidak Sesuai {{ $luasTidakSesuai ? '- ' . $luasTidakSesuai . ' m²' : '' }} Tidak Sesuai {{ $luasTidakSesuai ? '- ' . $luasTidakSesuai . ' m² (luas fisik)' : '' }}
</label> </label>
</td> </td>
</tr> </tr>

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

@@ -186,12 +186,12 @@
@if (strcasecmp($item->name, 'Lebih Tinggi') == 0) @if (strcasecmp($item->name, 'Lebih Tinggi') == 0)
<input id="input-lebih-tinggi" type="text" <input id="input-lebih-tinggi" type="text"
style="{{ isset($forminspeksi['tanah']['ketinggian_tanah']['lebih_tinggi']) && $forminspeksi['tanah']['ketinggian_tanah']['lebih_tinggi'] ? '' : 'display: none;' }}" style="{{ isset($forminspeksi['tanah']['ketinggian_tanah']['lebih_tinggi']) && $forminspeksi['tanah']['ketinggian_tanah']['lebih_tinggi'] ? '' : 'display: none;' }}"
name="ketinggian_lebih_tinggi" class="input w-full mt-2" placeholder="m" name="ketinggian_lebih_tinggi" class="input w-full mt-2" placeholder="Masukkan Ketinggian..."
value="{{ old('ketinggian_lebih_tinggi', $forminspeksi['tanah']['ketinggian_tanah']['lebih_tinggi'] ?? '') }}" /> value="{{ old('ketinggian_lebih_tinggi', $forminspeksi['tanah']['ketinggian_tanah']['lebih_tinggi'] ?? '') }}" />
@elseif (strcasecmp($item->name, 'Lebih Rendah') == 0) @elseif (strcasecmp($item->name, 'Lebih Rendah') == 0)
<input id="input-lebih-rendah" type="text" <input id="input-lebih-rendah" type="text"
style="{{ isset($forminspeksi['tanah']['ketinggian_tanah']['lebih_rendah']) && $forminspeksi['tanah']['ketinggian_tanah']['lebih_rendah'] ? '' : 'display: none;' }}" style="{{ isset($forminspeksi['tanah']['ketinggian_tanah']['lebih_rendah']) && $forminspeksi['tanah']['ketinggian_tanah']['lebih_rendah'] ? '' : 'display: none;' }}"
name="ketinggian_lebih_rendah" class="input w-full mt-2" placeholder="m" name="ketinggian_lebih_rendah" class="input w-full mt-2" placeholder="Masukkan Ketinggian..."
value="{{ old('ketinggian_lebih_rendah', $forminspeksi['tanah']['ketinggian_tanah']['lebih_rendah'] ?? '') }}" /> value="{{ old('ketinggian_lebih_rendah', $forminspeksi['tanah']['ketinggian_tanah']['lebih_rendah'] ?? '') }}" />
@endif @endif