fix(surveyor/penilai): perbaikan satuan luas tanah, bangunan dan penambahan total luas di denah
This commit is contained in:
@@ -27,7 +27,7 @@
|
|||||||
@else
|
@else
|
||||||
{{ $item }}
|
{{ $item }}
|
||||||
@if ($key == 'luas_bangunan' || $key == 'luas_tanah')
|
@if ($key == 'luas_bangunan' || $key == 'luas_tanah')
|
||||||
<sup>m2</sup>
|
<span>m²</span>
|
||||||
@endif
|
@endif
|
||||||
@endif
|
@endif
|
||||||
</td>
|
</td>
|
||||||
|
|||||||
@@ -18,7 +18,7 @@
|
|||||||
@endphp
|
@endphp
|
||||||
<td style="width: 25%; padding: 2px; vertical-align: top;">Luas Unit</td>
|
<td style="width: 25%; padding: 2px; vertical-align: top;">Luas Unit</td>
|
||||||
<td style="width: 1%; padding: 2px; vertical-align: top;">:</td>
|
<td style="width: 1%; padding: 2px; vertical-align: top;">:</td>
|
||||||
<td style="width: 74%; padding: 2px; vertical-align: top;">{{ $luas ?? '' }}</td>
|
<td style="width: 74%; padding: 2px; vertical-align: top;">{{ $luas ?? '' }} <span>m²</span></td>
|
||||||
</tr>
|
</tr>
|
||||||
<tr>
|
<tr>
|
||||||
<td style="width: 25%; padding: 2px; vertical-align: top;">Bentuk Unit</td>
|
<td style="width: 25%; padding: 2px; vertical-align: top;">Bentuk Unit</td>
|
||||||
|
|||||||
@@ -22,7 +22,7 @@
|
|||||||
: '-');
|
: '-');
|
||||||
@endphp
|
@endphp
|
||||||
|
|
||||||
{{ $output }} <sup>m2</sup>
|
{{ $output }} <span>m²</span>
|
||||||
</td>
|
</td>
|
||||||
|
|
||||||
</tr>
|
</tr>
|
||||||
|
|||||||
@@ -16,7 +16,7 @@
|
|||||||
@endphp
|
@endphp
|
||||||
<td style="width: 25%; padding: 2px; vertical-align: top;">Luas Tanah</td>
|
<td style="width: 25%; padding: 2px; vertical-align: top;">Luas Tanah</td>
|
||||||
<td style=" width:1%; padding: 2px; vertical-align: top;">:</td>
|
<td style=" width:1%; padding: 2px; vertical-align: top;">:</td>
|
||||||
<td style="width: 74%; padding: 2px; vertical-align: top;">{{ $luas ?? '' }} <sup>m2</sup></td>
|
<td style="width: 74%; padding: 2px; vertical-align: top;">{{ $luas ?? '' }} <span>m²</span></td>
|
||||||
</tr>
|
</tr>
|
||||||
<tr>
|
<tr>
|
||||||
@php
|
@php
|
||||||
|
|||||||
@@ -270,7 +270,7 @@
|
|||||||
@endphp
|
@endphp
|
||||||
<td style="padding: 2px; vertical-align: top;">Luas Tanah</td>
|
<td style="padding: 2px; vertical-align: top;">Luas Tanah</td>
|
||||||
<td style="padding: 2px; vertical-align: top;">:</td>
|
<td style="padding: 2px; vertical-align: top;">:</td>
|
||||||
<td style="padding: 2px; vertical-align: top;">{{ $luas ?? '' }} <sup>m2</sup></td>
|
<td style="padding: 2px; vertical-align: top;">{{ $luas ?? '' }} <span>m²</span></td>
|
||||||
</tr>
|
</tr>
|
||||||
<tr>
|
<tr>
|
||||||
<td style="padding: 2px; vertical-align: top;">Bentuk Tanah</td>
|
<td style="padding: 2px; vertical-align: top;">Bentuk Tanah</td>
|
||||||
@@ -373,7 +373,7 @@
|
|||||||
: '-');
|
: '-');
|
||||||
@endphp
|
@endphp
|
||||||
|
|
||||||
{{ $output }} <sup>m2</sup>
|
{{ $output }} <span>m²</span>
|
||||||
</td>
|
</td>
|
||||||
|
|
||||||
</tr>
|
</tr>
|
||||||
|
|||||||
@@ -94,7 +94,7 @@
|
|||||||
<div class="flex flex-wrap gap-4">
|
<div class="flex flex-wrap gap-4">
|
||||||
<div class="flex w-full items-center justify-center gap-4">
|
<div class="flex w-full items-center justify-center gap-4">
|
||||||
<label class="form-label max-w-56">
|
<label class="form-label max-w-56">
|
||||||
<span class="form-label">Total Luas</span>
|
<span class="form-label"> Luas</span>
|
||||||
</label>
|
</label>
|
||||||
<input type="text" name="luas_denah[]"
|
<input type="text" name="luas_denah[]"
|
||||||
class="input w-full number-format"
|
class="input w-full number-format"
|
||||||
@@ -151,7 +151,7 @@
|
|||||||
<div class="flex flex-wrap gap-4">
|
<div class="flex flex-wrap gap-4">
|
||||||
<div class="flex w-full items-center justify-center gap-4">
|
<div class="flex w-full items-center justify-center gap-4">
|
||||||
<label class="form-label max-w-56">
|
<label class="form-label max-w-56">
|
||||||
<span class="form-label">Total Luas</span>
|
<span class="form-label"> Luas</span>
|
||||||
</label>
|
</label>
|
||||||
<input type="text" name="luas_denah[]" class="input w-full number-format"
|
<input type="text" name="luas_denah[]" class="input w-full number-format"
|
||||||
onkeyup="formatNumber(this)">
|
onkeyup="formatNumber(this)">
|
||||||
@@ -164,6 +164,17 @@
|
|||||||
</div>
|
</div>
|
||||||
|
|
||||||
|
|
||||||
|
<div class="w-full p-4">
|
||||||
|
<div class="flex flex-wrap gap-4">
|
||||||
|
<div class="flex w-full items-center justify-center gap-4">
|
||||||
|
<label class="form-label max-w-56">
|
||||||
|
<span class="form-label">Total Luas</span>
|
||||||
|
</label>
|
||||||
|
<input type="text" name="total_luas" id="totalLuas" class="input w-full number-format" readonly>
|
||||||
|
|
||||||
|
</div>
|
||||||
|
</div>
|
||||||
|
</div>
|
||||||
<div class="flex justify-end gap-2" style="margin-right: 20px; margin-top: 20px">
|
<div class="flex justify-end gap-2" style="margin-right: 20px; margin-top: 20px">
|
||||||
<button type="button" class="btn btn-success" id="saveButton" onclick="submitDenah()">
|
<button type="button" class="btn btn-success" id="saveButton" onclick="submitDenah()">
|
||||||
<span id="saveButtonText">Save</span>
|
<span id="saveButtonText">Save</span>
|
||||||
@@ -229,6 +240,32 @@
|
|||||||
});
|
});
|
||||||
});
|
});
|
||||||
|
|
||||||
|
function calculateTotalLuas() {
|
||||||
|
let totalLuas = 0;
|
||||||
|
|
||||||
|
const luasInputs = document.querySelectorAll('input[name="luas_denah[]"]');
|
||||||
|
luasInputs.forEach(input => {
|
||||||
|
const value = parseFloat(input.value.replace(/[^0-9.]/g, ''));
|
||||||
|
if (!isNaN(value)) {
|
||||||
|
totalLuas += value;
|
||||||
|
}
|
||||||
|
});
|
||||||
|
|
||||||
|
const totalLuasInput = document.getElementById('totalLuas');
|
||||||
|
totalLuasInput.value = totalLuas ? `${totalLuas.toLocaleString()} m²` : '';
|
||||||
|
}
|
||||||
|
|
||||||
|
// Tambahkan event listener untuk setiap input luas_denah[]
|
||||||
|
document.addEventListener('input', function (e) {
|
||||||
|
if (e.target && e.target.name === 'luas_denah[]') {
|
||||||
|
calculateTotalLuas();
|
||||||
|
}
|
||||||
|
});
|
||||||
|
|
||||||
|
// Jalankan hitung ulang saat halaman dimuat (jika ada nilai default)
|
||||||
|
document.addEventListener('DOMContentLoaded', calculateTotalLuas);
|
||||||
|
|
||||||
|
|
||||||
function createDenahElement(index) {
|
function createDenahElement(index) {
|
||||||
const denahItem = document.createElement('div');
|
const denahItem = document.createElement('div');
|
||||||
denahItem.className = 'denah-item grid gap-5 mb-5 border p-4 rounded';
|
denahItem.className = 'denah-item grid gap-5 mb-5 border p-4 rounded';
|
||||||
@@ -267,7 +304,7 @@
|
|||||||
<div class="flex flex-wrap gap-4">
|
<div class="flex flex-wrap gap-4">
|
||||||
<div class="flex w-full items-center justify-center gap-4">
|
<div class="flex w-full items-center justify-center gap-4">
|
||||||
<label class="form-label max-w-56">
|
<label class="form-label max-w-56">
|
||||||
<span class="form-label">Total Luas</span>
|
<span class="form-label"> Luas</span>
|
||||||
</label>
|
</label>
|
||||||
<input type="text" name="luas_denah[]"
|
<input type="text" name="luas_denah[]"
|
||||||
class="input w-full number-format"
|
class="input w-full number-format"
|
||||||
|
|||||||
Reference in New Issue
Block a user