fix(survyor/penilai): perbaikan view print-resume, lampiran, foto-lampiran, foto, header, main dan controller penilai dan surveyor
This commit is contained in:
majid
@@ -194,14 +194,13 @@
|
||||
<th class="text-center">Luas Tanah</th>
|
||||
<th class="text-center">Luas Bangunan</th>
|
||||
<th class="text-center">Nilai Pasar Wajar</th>
|
||||
<th class="text-center">Nilai Likuidasi(%)</th>
|
||||
<th class="text-center">Total Nilai Likuidasi</th>
|
||||
|
||||
</tr>
|
||||
</thead>
|
||||
</thead>
|
||||
<tbody>
|
||||
@if (!empty($resumeData['fisik']))
|
||||
@foreach ($resumeData['fisik'] as $item)
|
||||
@if (!empty($resumeData['sesuai_imb']))
|
||||
@foreach ($resumeData['sesuai_imb'] as $item)
|
||||
<tr>
|
||||
<td class="text-center">
|
||||
<input type="text" name="fisik_sertifikat[]"
|
||||
@@ -217,18 +216,9 @@
|
||||
<td class="text-center">
|
||||
<input type="text" name="fisik_nilai[]"
|
||||
class="input currency-format nilai-pasar"
|
||||
value="{{ $item['nilai'] }}" onkeyup="calculateTotal(this)">
|
||||
</td>
|
||||
<td class="text-center">
|
||||
<input type="text" name="likuidasi[]" class="input likuidasi"
|
||||
value="{{ $item['likuidasi'] ?? 0 }}"
|
||||
onkeyup="calculateTotal(this)">
|
||||
</td>
|
||||
<td class="text-center">
|
||||
<input type="text" name="total_nilai_likuidasi[]"
|
||||
class="input currency-format total-likuidasi"
|
||||
value="{{ $item['total_likuidasi'] ?? 0 }}" readonly>
|
||||
value="{{ $item['nilai'] }}" >
|
||||
</td>
|
||||
|
||||
</tr>
|
||||
@endforeach
|
||||
@else
|
||||
@@ -277,16 +267,9 @@
|
||||
<td class="text-center">
|
||||
<input type="text" name="fisik_nilai[]"
|
||||
class="input currency-format nilai-pasar"
|
||||
onkeyup="calculateTotal(this)">
|
||||
</td>
|
||||
<td class="text-center">
|
||||
<input type="text" name="likuidasi[]" class="input likuidasi"
|
||||
onkeyup="calculateTotal(this)">
|
||||
</td>
|
||||
<td class="text-center">
|
||||
<input type="text" name="total_nilai_likuidasi[]"
|
||||
class="input currency-format total-likuidasi" readonly>
|
||||
>
|
||||
</td>
|
||||
|
||||
</tr>
|
||||
@endif
|
||||
</tbody>
|
||||
@@ -306,8 +289,7 @@
|
||||
<th class="text-center">Luas Tanah</th>
|
||||
<th class="text-center">Luas Bangunan</th>
|
||||
<th class="text-center">Nilai Pasar Wajar</th>
|
||||
<th class="text-center">Nilai Likuidasi (%)</th>
|
||||
<th class="text-center">Total Nilai Likuidasi</th>
|
||||
|
||||
</tr>
|
||||
</thead>
|
||||
</thead>
|
||||
@@ -330,18 +312,9 @@
|
||||
<td class="text-center">
|
||||
<input type="text" name="sesuai_nilai[]"
|
||||
class="input currency-format nilai-pasar"
|
||||
value="{{ $item['nilai'] }}" onkeyup="calculateTotal(this)">
|
||||
</td>
|
||||
<td class="text-center">
|
||||
<input type="text" name="sesuai_likuidasi[]"
|
||||
class="input likuidasi" value="{{ $item['likuidasi'] ?? '' }}"
|
||||
onkeyup="calculateTotal(this)">
|
||||
</td>
|
||||
<td class="text-center">
|
||||
<input type="text" name="sesuai_total_likuidasi[]"
|
||||
class="input currency-format total-likuidasi"
|
||||
value="{{ $item['total_likuidasi'] ?? 0 }}">
|
||||
value="{{ $item['nilai'] }}" >
|
||||
</td>
|
||||
|
||||
</tr>
|
||||
@endforeach
|
||||
@else
|
||||
@@ -360,17 +333,9 @@
|
||||
</td>
|
||||
<td class="text-center">
|
||||
<input type="text" name="sesuai_nilai[]" class="input currency-format"
|
||||
onkeyup="calculateTotal(this)">
|
||||
</td>
|
||||
<td class="text-center">
|
||||
<input type="text" name="sesuai_likuidasi[]" class="input likuidasi"
|
||||
value="{{ $item['likuidasi'] ?? 0 }}" onkeyup="calculateTotal(this)">
|
||||
</td>
|
||||
<td class="text-center">
|
||||
<input type="text" name="sesuai_total_likuidasi[]"
|
||||
class="input currency-format total-likudasi"
|
||||
value="{{ $item['total_likuidasi'] ?? 0 }}">
|
||||
>
|
||||
</td>
|
||||
|
||||
</tr>
|
||||
@endif
|
||||
</tbody>
|
||||
@@ -398,8 +363,7 @@
|
||||
<th class="text-center">Luas Tanah</th>
|
||||
<th class="text-center">Luas Bangunan</th>
|
||||
<th class="text-center">Nilai Pasar Wajar</th>
|
||||
<th class="text-center">Nilai Likuidasi (%)</th>
|
||||
<th class="text-center">Total Nilai Likuidasi</th>
|
||||
|
||||
</tr>
|
||||
</thead>
|
||||
</thead>
|
||||
@@ -421,18 +385,9 @@
|
||||
<td class="text-center">
|
||||
<input type="text" name="tambahan_nilai[]"
|
||||
class="input currency-format nilai-pasar"
|
||||
value="{{ $item['nilai'] }}" onkeyup="calculateTotal(this)">
|
||||
</td>
|
||||
<td class="text-center">
|
||||
<input type="text" name="tambahan_nilai_likuidasi[]"
|
||||
class="input likuidasi " value="{{ $item['likuidasi'] ?? 0 }}"
|
||||
onkeyup="calculateTotal(this)">
|
||||
</td>
|
||||
<td class="text-center">
|
||||
<input type="text" name="tambahan_total_likuidasi[]"
|
||||
class="input currency-format total-likuidasi"
|
||||
value="{{ $item['total_likuidasi'] ?? 0 }}">
|
||||
value="{{ $item['nilai'] }}" >
|
||||
</td>
|
||||
|
||||
</tr>
|
||||
|
||||
</tbody>
|
||||
@@ -441,7 +396,7 @@
|
||||
</div>
|
||||
@endforeach
|
||||
@endif
|
||||
<div id="kesimpulans" class="grid gap-5 w-full"></div>
|
||||
<div id="kesimpulan" class="grid gap-5 w-full"></div>
|
||||
<div>
|
||||
<button type="button" class="btn btn-primary btn-sm mt-5" onclick="tambahKesimpulanNilai()">
|
||||
<i class="ki-outline ki-plus"></i>
|
||||
@@ -519,7 +474,7 @@
|
||||
let counter = 3;
|
||||
|
||||
function tambahKesimpulanNilai() {
|
||||
const kesimpulan = document.getElementById('kesimpulans');
|
||||
const kesimpulan = document.getElementById('kesimpulan');
|
||||
|
||||
kesimpulan.innerHTML += `
|
||||
<div class="grid gap-5 w-full mt-5" id="kesimpulan-${counter}">
|
||||
@@ -541,8 +496,7 @@
|
||||
<th class="text-center">Luas Tanah</th>
|
||||
<th class="text-center">Luas Bangunan</th>
|
||||
<th class="text-center">Nilai Pasar Wajar</th>
|
||||
<th class="text-center">Nilai Likuidasi (%)</th>
|
||||
<th class="text-center">Total Nilai Likuidasi</th>
|
||||
|
||||
<th class="text-center">Aksi</th>
|
||||
</tr>
|
||||
</thead>
|
||||
@@ -564,15 +518,8 @@
|
||||
<input type="text" name="tambahan_nilai[]"
|
||||
class="input currency-format nilai-pasar">
|
||||
</td>
|
||||
<td class="text-center">
|
||||
<input type="text" name="tambahan_nilai_likuidasi[]"
|
||||
class="input likuidasi"
|
||||
onkeyup="calculateTotal(this)">
|
||||
</td>
|
||||
<td class="text-center">
|
||||
<input type="text" name="tambahan_total_likuidasi[]"
|
||||
class="input currency-format total-likuidasi" >
|
||||
</td>
|
||||
|
||||
|
||||
<td class="text-center">
|
||||
<button type="button" class="btn btn-danger" onclick="deleteRow(this)">Delete</button>
|
||||
</td>
|
||||
@@ -617,7 +564,7 @@
|
||||
|
||||
const formElement = document.querySelector('form');
|
||||
const jsonData = formToJson(formElement);
|
||||
console.log('Data dalam format JSON:', JSON.stringify(formElement, null, 2));
|
||||
console.log('Data dalam format JSON:', JSON.stringify(jsonData, null, 2));
|
||||
|
||||
const urlParams = new URLSearchParams(window.location.search); // Mengambil query parameters dari URL
|
||||
const permohonanId = urlParams.get('permohonanId');
|
||||
@@ -714,10 +661,7 @@
|
||||
sertifikat: row.querySelector('input[name="fisik_sertifikat[]"]')?.value || "",
|
||||
luas_tanah: row.querySelector('input[name="fisik_luas_tanah[]"]')?.value || "",
|
||||
luas_bangunan: row.querySelector('input[name="fisik_luas_bangunan[]"]')?.value || "",
|
||||
nilai: cleanCurrencyValue(row.querySelector('input[name="fisik_nilai[]"]')?.value || ""),
|
||||
likuidasi: row.querySelector('input[name="likuidasi[]"]')?.value || "",
|
||||
total_likuidasi: cleanCurrencyValue(row.querySelector(
|
||||
'input[name="total_nilai_likuidasi[]"]')?.value || "")
|
||||
nilai: cleanCurrencyValue(row.querySelector('input[name="fisik_nilai[]"]')?.value || "")
|
||||
};
|
||||
if (fisikData.sertifikat) {
|
||||
jsonData.fisik.push(fisikData);
|
||||
@@ -730,10 +674,7 @@
|
||||
sertifikat: row.querySelector('input[name="sesuai_sertifikat[]"]')?.value || "",
|
||||
luas_tanah: row.querySelector('input[name="sesuai_luas_tanah[]"]')?.value || "",
|
||||
luas_bangunan: row.querySelector('input[name="sesuai_luas_bangunan[]"]')?.value || "",
|
||||
nilai: cleanCurrencyValue(row.querySelector('input[name="sesuai_nilai[]"]')?.value || ""),
|
||||
likuidasi: row.querySelector('input[name="sesuai_likuidasi[]"]')?.value || "",
|
||||
total_likuidasi: cleanCurrencyValue(row.querySelector(
|
||||
'input[name="sesuai_total_likuidasi[]"]')?.value || "")
|
||||
nilai: cleanCurrencyValue(row.querySelector('input[name="sesuai_nilai[]"]')?.value || "")
|
||||
};
|
||||
if (imbData.sertifikat) {
|
||||
jsonData.sesuai_imb.push(imbData);
|
||||
@@ -747,10 +688,7 @@
|
||||
sertifikat: row.querySelector('input[name="tambahan_sertifikat[]"]')?.value || "",
|
||||
luas_tanah: row.querySelector('input[name="tambahan_luas_tanah[]"]')?.value || "",
|
||||
luas_bangunan: row.querySelector('input[name="tambahan_luas_bangunan[]"]')?.value || "",
|
||||
nilai: cleanCurrencyValue(row.querySelector('input[name="tambahan_nilai[]"]')?.value || ""),
|
||||
likuidasi: row.querySelector('input[name="tambahan_nilai_likuidasi[]"]')?.value || "",
|
||||
total_likuidasi: cleanCurrencyValue(row.querySelector(
|
||||
'input[name="tambahan_total_likuidasi[]"]')?.value || "")
|
||||
nilai: cleanCurrencyValue(row.querySelector('input[name="tambahan_nilai[]"]')?.value || "")
|
||||
};
|
||||
console.log(imbData);
|
||||
if (imbData.sertifikat) {
|
||||
@@ -784,37 +722,6 @@
|
||||
|
||||
|
||||
|
||||
function calculateTotal(element) {
|
||||
|
||||
|
||||
const row = element.closest('tr');
|
||||
|
||||
const nilaiPasarInput = row.querySelector('.nilai-pasar');
|
||||
let likuidasiInput = row.querySelector('.likuidasi');
|
||||
|
||||
const totalLikuidasiInput = row.querySelector('.total-likuidasi');
|
||||
|
||||
const cleanNilaiPasar = cleanCurrencyValue(nilaiPasarInput.value);
|
||||
let cleanLikuidasi = cleanCurrencyValue(likuidasiInput.value);
|
||||
|
||||
// Batasi likuidasi maksimal hingga 100
|
||||
cleanLikuidasi = Math.min(parseFloat(cleanLikuidasi) || 0, 100);
|
||||
|
||||
// Format nilai likuidasi dengan simbol %
|
||||
likuidasiInput.value = cleanLikuidasi;
|
||||
|
||||
// Konversi ke angka untuk perhitungan
|
||||
const nilaiPasar = parseFloat(cleanNilaiPasar) || 0;
|
||||
const likuidasi = cleanLikuidasi / 100; // Konversi persentase ke desimal
|
||||
|
||||
// Hitung total likuidasi
|
||||
const totalLikuidasi = nilaiPasar * likuidasi;
|
||||
|
||||
// Tampilkan hasil dengan format yang benar
|
||||
totalLikuidasiInput.value = formatCurrency(totalLikuidasi.toString());
|
||||
|
||||
|
||||
}
|
||||
|
||||
|
||||
</script>
|
||||
|
||||
Reference in New Issue
Block a user