perbaikana perhitungan npw dan nl otomatis, dan perbaikan otorisator

This commit is contained in:
majid
2024-12-20 07:11:41 +07:00
parent 8cc0f32410
commit b9f2e5dcf4
12 changed files with 552 additions and 769 deletions

View File

@@ -436,54 +436,115 @@
<div class="flex grid-col-3 gap-2.5 w-full">
<div class="flex items-baseline flex-wrap lg:flex-nowrap gap-2.5 w-full">
<label for="province" class="form-label max-w-56">Luas Tanah</label>
<input type="text" class="input w-full" name="luas_tanah"
value="{{ old('luas_tanah', $lpjData['luas_tanah'] ?? null) }}">
<input type="text" id="luas_tanah" class="input w-full currency-format"
name="luas_tanah"
value="{{ old('luas_tanah', $lpjData['luas_tanah'] ?? null) }}"
oninput="calculateTotal()">
</div>
<div class="flex items-baseline flex-wrap lg:flex-nowrap gap-2.5 w-full">
<label for="province" class="">Rp</label>
<input type="text" class="input w-full" name="nilai_tanah_1"
value="{{ old('nilai_tanah_1', $lpjData['nilai_tanah_1'] ?? null) }}">
<label for="province" class="">X</label>
<label class="input">
<i class="">Rp
</i>
<input type="text" id="nilai_tanah_1" class=" w-full currency-format"
name="nilai_tanah_1"
value="{{ old('nilai_tanah_1', $lpjData['nilai_tanah_1'] ?? null) }}"
oninput="calculateTotal()">
</label>
</div>
<div class="flex items-baseline flex-wrap lg:flex-nowrap gap-2.5 w-full">
<label for="province" class="">Rp</label>
<input type="text" class="input w-full" name="nilai_tanah_2"
value="{{ old('nilai_tanah_2', $lpjData['nilai_tanah_2'] ?? null) }}">
<label class="input">
<i class="">Rp
</i>
<input id="nilai_tanah_2" type="text" class=" w-full currency-format"
name="nilai_tanah_2"
value="{{ old('nilai_tanah_2', $lpjData['nilai_tanah_2'] ?? null) }}">
</label>
</div>
</div>
<div class="flex grid-col-3 gap-2.5 w-full">
<div class="flex items-baseline flex-wrap lg:flex-nowrap gap-2.5 w-full">
<label for="province" class="form-label max-w-56">Luas Bangunan</label>
<input type="text" class="input w-full" name="luas_bangunan"
value="{{ old('luas_bangunan', $lpjData['luas_bangunan'] ?? null) }}">
<input type="text" class="input w-full currency-format" id="luas_bangunan" name="luas_bangunan"
value="{{ old('luas_bangunan', $lpjData['luas_bangunan'] ?? null) }}"
oninput="calculateTotal()">
</div>
<div class="flex items-baseline flex-wrap lg:flex-nowrap gap-2.5 w-full">
<label for="province" class="">Rp</label>
<input type="text" class="input w-full" name="nilai_bangunan_1"
value="{{ old('nilai_bangunan_1', $lpjData['nilai_bangunan_1'] ?? null) }}">
<label for="province" class="">X</label>
<label class="input">
<i class="">Rp
</i>
<input type="text" class=" w-full currency-format"
id="nilai_bangunan_1"
name="nilai_bangunan_1"
value="{{ old('nilai_bangunan_1', $lpjData['nilai_bangunan_1'] ?? null) }}"
oninput="calculateTotal()">
</label>
</div>
<div class="flex items-baseline flex-wrap lg:flex-nowrap gap-2.5 w-full">
<label for="province" class="">Rp</label>
<input type="text" class="input w-full" name="nilai_bangunan_2"
value="{{ old('nilai_bangunan_2', $lpjData['nilai_bangunan_2'] ?? null) }}">
<label class="input">
<i class="">Rp
</i>
<input type="text" class=" w-full currency-format"
id="nilai_bangunan_2"
name="nilai_bangunan_2"
value="{{ old('nilai_bangunan_2', $lpjData['nilai_bangunan_2'] ?? null) }}">
</label>
</div>
</div>
<div class="flex grid-col-3 gap-2.5 w-full">
<div class="flex items-baseline flex-wrap lg:flex-nowrap gap-2.5 w-full">
<label for="province" class="form-label max-w-56">Sarana Pelengkap</label>
<input type="text" class="input w-full" name="sarana_pelengkap"
value="{{ old('sarana_pelengkap', $lpjData['sarana_pelengkap'] ?? null) }}">
<input type="text" class="input w-full currency-format"
id="sarana_pelengkap"
name="sarana_pelengkap"
value="{{ old('sarana_pelengkap', $lpjData['sarana_pelengkap'] ?? null) }}"
oninput="calculateTotal()">
</div>
<div class="flex items-baseline flex-wrap lg:flex-nowrap gap-2.5 w-full">
<label for="province" class="">Rp</label>
<input type="text" class="input w-full" name="nilai_sarana_pelengkap_1"
value="{{ old('nilai_sarana_pelengkap_1', $lpjData['nilai_sarana_pelengkap_1'] ?? null) }}">
<label for="province" class="">X</label>
<label class="input">
<i class="">Rp
</i>
<input type="text" class=" w-full currency-format"
id="nilai_sarana_pelengkap_1"
name="nilai_sarana_pelengkap_1"
value="{{ old('nilai_sarana_pelengkap_1', $lpjData['nilai_sarana_pelengkap_1'] ?? null) }}"
oninput="calculateTotal()">
>
</label>
</div>
<div class="flex items-baseline flex-wrap lg:flex-nowrap gap-2.5 w-full">
<label for="province" class="">Rp</label>
<input type="text" class="input w-full" name="nilai_sarana_pelengkap_2"
value="{{ old('nilai_sarana_pelengkap_2', $lpjData['nilai_sarana_pelengkap_2'] ?? null) }}">
<div class="grid gap-5 w-full">
<div class="flex items-baseline flex-wrap lg:flex-nowrap gap-2.5 w-full">
<label class="input">
<i class="">Rp
</i>
<input type="text" class="w-full currency-format"
id="nilai_sarana_pelengkap_2"
name="nilai_sarana_pelengkap_2"
value="{{ old('nilai_sarana_pelengkap_2', $lpjData['nilai_sarana_pelengkap_2'] ?? null) }}">
</label>
</div>
<div class="flex items-baseline flex-wrap lg:flex-nowrap gap-2.5 w-full">
<label for="province" class="input">
<i class="">Rp
</i>
<input type="text" class=" w-full currency-format"
id="total_nilai_pasar_wajar"
name="total_nilai_pasar_wajar"
value="{{ old('total_nilai_pasar_wajar', $lpjData['total_nilai_pasar_wajar'] ?? null) }}">
</label>
</div>
</div>
</div>
</div>
@@ -495,25 +556,35 @@
<div class="card-body grid gap-2.5 w-full">
<div class="flex grid-col-3 gap-2.5 w-full">
<div class="flex items-baseline flex-wrap lg:flex-nowrap gap-2.5 w-full">
<input type="text" name="likuidasi" class="input w-full"
value="{{ old('likuidasi', $lpjData['likuidasi'] ?? null) }}">
<input type="text"
id="likuidasi"
name="likuidasi" class="input w-full currency-format"
value="{{ old('likuidasi', $lpjData['likuidasi'] ?? null) }}"
oninput="calculateTotal()">
</div>
<div class="flex items-baseline flex-wrap lg:flex-nowrap gap-2.5 w-full">
<label for="province" class="">Rp</label>
<input type="text" class="input w-full" name="likuidasi_nilai_1"
value="{{ old('likuidasi_nilai_1', $lpjData['likuidasi_nilai_1'] ?? null) }}">
<label for="province" class="">X</label>
<label class="input">
<i class="">Rp
</i>
<input type="text" class=" w-full currency-format"
id="likuidasi_nilai_1"
name="likuidasi_nilai_1"
value="{{ old('likuidasi_nilai_1', $lpjData['likuidasi_nilai_1'] ?? null) }}"
oninput="calculateTotal()">
</label>
</div>
<div class="grid gap-2.5 w-full">
<div class="flex items-baseline flex-wrap lg:flex-nowrap gap-2.5 w-full">
<label for="province" class="">Rp</label>
<input type="text" class="input w-full" name="likuidasi_nilai_2"
value="{{ old('likuidasi_nilai_2', $lpjData['likuidasi_nilai_2'] ?? null) }}">
</div>
<div class="flex items-baseline flex-wrap lg:flex-nowrap gap-2.5 w-full">
<label for="province" class="">Rp</label>
<input type="text" class="input w-full" name="likuidasi_nilai_3"
value="{{ old('likuidasi_nilai_3', $lpjData['likuidasi_nilai_3'] ?? null) }}">
<label class="input">
<i class="">Rp
</i>
<input type="text" class=" w-full currency-format"
name="likuidasi_nilai_2"
value="{{ old('likuidasi_nilai_2', $lpjData['likuidasi_nilai_2'] ?? null) }}">
</div>
</div>
</div>
@@ -535,19 +606,33 @@
<div class="flex grid-col-3 gap-2.5 w-full">
<div class="flex items-baseline flex-wrap lg:flex-nowrap gap-2.5 w-full">
<label for="province" class="form-label">Luas Bangunan</label>
<input type="text" class="input w-full" name="asuransi_luas_bangunan"
value="{{ old('asuransi_luas_bangunan', $lpjData['asuransi_luas_bangunan'] ?? null) }}">
<input type="text" class="input w-full currency-format"
id="asuransi_luas_bangunan"
name="asuransi_luas_bangunan"
value="{{ old('asuransi_luas_bangunan', $lpjData['asuransi_luas_bangunan'] ?? null) }}"
oninput="calculateTotal()">
</div>
<div class="flex items-baseline flex-wrap lg:flex-nowrap gap-2.5 w-full">
<label for="province" class="">Rp</label>
<input type="text" class="input w-full" name="asuransi_nilai_1"
value="{{ old('asuransi_nilai_1', $lpjData['asuransi_nilai_1'] ?? null) }}">
<label for="province" class="">X</label>
<label class="input">
<i class="">Rp
</i>
<input type="text" class="input w-full currency-format"
id="asuransi_nilai_1"
name="asuransi_nilai_1"
value="{{ old('asuransi_nilai_1', $lpjData['asuransi_nilai_1'] ?? null) }}"
oninput="calculateTotal()">
</label>
</div>
<div class="flex items-baseline flex-wrap lg:flex-nowrap gap-2.5 w-full">
<label for="province" class="">Rp</label>
<input type="text" class="input w-full" name="asuransi_nilai_2"
<label class="input">
<i class="">Rp
</i>
<input type="text" class="input w-full currency-format"
name="asuransi_nilai_2"
value="{{ old('asuransi_nilai_2', $lpjData['asuransi_nilai_2'] ?? null) }}">
</label>
</div>
@@ -565,90 +650,164 @@
</form>
</div>
</div>
@endsection
@endsection
@include('lpj::surveyor.js.utils')
<script type="text/javascript">
function saveLpjSederhanadanStandard() {
const form = document.getElementById('form-lpj');
const formData = new FormData(form);
const jsonData = {
luas_tanah: formData.get('luas_tanah'),
nilai_tanah_1: formData.get('nilai_tanah_1'),
nilai_tanah_2: formData.get('nilai_tanah_2'),
luas_bangunan: formData.get('luas_bangunan'),
nilai_bangunan_1: formData.get('nilai_bangunan_1'),
nilai_bangunan_2: formData.get('nilai_bangunan_2'),
sarana_pelengkap: formData.get('sarana_pelengkap'),
nilai_sarana_pelengkap_1: formData.get('nilai_sarana_pelengkap_1'),
nilai_sarana_pelengkap_2: formData.get('nilai_sarana_pelengkap_2'),
likuidasi: formData.get('likuidasi'),
likuidasi_nilai_1: formData.get('likuidasi_nilai_1'),
likuidasi_nilai_2: formData.get('likuidasi_nilai_2'),
likuidasi_nilai_3: formData.get('likuidasi_nilai_3'),
asuransi_luas_bangunan: formData.get('asuransi_luas_bangunan'),
asuransi_nilai_1: formData.get('asuransi_nilai_1'),
asuransi_nilai_2: formData.get('asuransi_nilai_2')
};
showLoadingSwal('Mengirim data ke server...');
const urlParams = new URLSearchParams(window.location.search);
const permohonanId = {{ $permohonan->id }};
const documentId = urlParams.get('documentId');
const inspeksiId = urlParams.get('inspeksiId');
const requestUrl = `{{ route('penilai.storeLpjSederhanadanStandard') }}`;
$.ajax({
url: requestUrl,
type: 'POST',
data: JSON.stringify({
permohonan_id: permohonanId,
document_id: documentId,
inspeksi_id: inspeksiId,
lpj: jsonData,
}),
contentType: 'application/json',
headers: {
'X-CSRF-TOKEN': '{{ csrf_token() }}'
},
success: function(response) {
hideLoadingSwal();
if (response.success) {
Swal.fire({
title: 'Berhasil!',
text: response.message,
icon: 'success',
confirmButtonText: 'OK'
}).then((response) => {
if (response.isConfirmed) {
window.location.href =
'{{ route('penilai.show', ['id' => $permohonan->id]) }}';
}
});
} else {
Swal.fire({
title: 'Error!',
text: response.message || 'Terjadi kesalahan',
icon: 'error',
confirmButtonText: 'OK'
});
}
console.log(response);
},
error: function(xhr, status, error) {
let errors = xhr.responseJSON?.errors;
$('.alert').text('');
if (errors) {
$.each(errors, function(key, value) {
$(`#error-${key}`).text(value[0]);
toastrErrorBuild(value[0]);
});
}
hideLoadingSwal();
console.log(errors);
}
<script type="text/javascript">
document.addEventListener('DOMContentLoaded', function() {
document.querySelectorAll('.currency-format').forEach(input => {
input.addEventListener('input', function() {
formatCurrency(this);
});
}
</script>
});
document.querySelectorAll('.number-format').forEach(input => {
input.addEventListener('input', function() {
formatNumber(this);
});
});
});
function calculateTotal() {
// Fungsi untuk menghapus format ribuan/koma
const parseInput = (value) => parseFloat(value.replace(/[^0-9]/g, '')) || 0;
// Ambil elemen input dan parse nilainya
let luasTanah = parseInput(document.getElementById('luas_tanah').value);
let hargaPerMeterTanah = parseInput(document.querySelector('input[name="nilai_tanah_1"]').value);
let totalLuasTanah = document.querySelector('input[name="nilai_tanah_2"]');
let luasBangunan = parseInput(document.getElementById('luas_bangunan').value);
let hargaPerMeterBangunan = parseInput(document.querySelector('input[name="nilai_bangunan_1"]').value);
let totalLuasBangunan = document.querySelector('input[name="nilai_bangunan_2"]');
let saranaPelengkap = parseInput(document.getElementById('sarana_pelengkap').value);
let hargaPerMeterSarana = parseInput(document.querySelector('input[name="nilai_sarana_pelengkap_1"]').value);
let totalLuasSarana = document.querySelector('input[name="nilai_sarana_pelengkap_2"]');
// Bagian Likuidasi
let persentaseLikuidasi = parseInput(document.getElementById('likuidasi').value);
let totalNilaiPasarLikuidasi = document.querySelector('input[name="likuidasi_nilai_1"]');
let totalLikuidasi = document.querySelector('input[name="likuidasi_nilai_2"]');
// Bagian Asuransi
let luasBangunanAsuransi = parseInput(document.getElementById('asuransi_luas_bangunan').value);
let hargaPerMeterAsuransi = parseInput(document.querySelector('input[name="asuransi_nilai_1"]').value);
let totalNilaiAsuransi = document.querySelector('input[name="asuransi_nilai_2"]');
let total = document.querySelector('input[name="total_nilai_pasar_wajar"]');
// Hitung hasil
const hasilTanah = luasTanah * hargaPerMeterTanah;
const hasilBangunan = luasBangunan * hargaPerMeterBangunan;
const hasilSarana = saranaPelengkap * hargaPerMeterSarana;
const totalNilaiPasarWajar = hasilTanah + hasilBangunan + hasilSarana;
// Perhitungan Likuidasi
const hasilLikuidasi = (persentaseLikuidasi / 100) * totalNilaiPasarWajar;
// Perhitungan Asuransi
const hasilAsuransi = luasBangunanAsuransi * hargaPerMeterAsuransi;
// Tampilkan hasil dalam format currency
totalLuasTanah.value = formatCurrency(hasilTanah.toString());
totalLuasBangunan.value = formatCurrency(hasilBangunan.toString());
totalLuasSarana.value = formatCurrency(hasilSarana.toString());
total.value = formatCurrency(totalNilaiPasarWajar.toString());
// Tampilkan nilai likuidasi dan asuransi
totalNilaiPasarLikuidasi.value = formatCurrency(totalNilaiPasarWajar.toString());
totalNilaiAsuransi.value = formatCurrency(hasilAsuransi.toString());
// Total likuidasi (total nilai pasar wajar + nilai likuidasi)
// const totalPasarWajarDenganLikuidasi = totalNilaiPasarWajar + hasilLikuidasi;
totalLikuidasi.value = formatCurrency(hasilLikuidasi.toString());
}
function saveLpjSederhanadanStandard() {
const form = document.getElementById('form-lpj');
const formData = new FormData(form);
const jsonData = {
luas_tanah: formData.get('luas_tanah'),
nilai_tanah_1: formData.get('nilai_tanah_1'),
nilai_tanah_2: formData.get('nilai_tanah_2'),
luas_bangunan: formData.get('luas_bangunan'),
nilai_bangunan_1: formData.get('nilai_bangunan_1'),
nilai_bangunan_2: formData.get('nilai_bangunan_2'),
sarana_pelengkap: formData.get('sarana_pelengkap'),
nilai_sarana_pelengkap_1: formData.get('nilai_sarana_pelengkap_1'),
nilai_sarana_pelengkap_2: formData.get('nilai_sarana_pelengkap_2'),
total_nilai_pasar_wajar: formData.get('total_nilai_pasar_wajar'),
likuidasi: formData.get('likuidasi'),
likuidasi_nilai_1: formData.get('likuidasi_nilai_1'),
likuidasi_nilai_2: formData.get('likuidasi_nilai_2'),
asuransi_luas_bangunan: formData.get('asuransi_luas_bangunan'),
asuransi_nilai_1: formData.get('asuransi_nilai_1'),
asuransi_nilai_2: formData.get('asuransi_nilai_2')
};
showLoadingSwal('Mengirim data ke server...');
const urlParams = new URLSearchParams(window.location.search);
const permohonanId = {{ $permohonan->id }};
const documentId = urlParams.get('documentId');
const inspeksiId = urlParams.get('inspeksiId');
const requestUrl = `{{ route('penilai.storeLpjSederhanadanStandard') }}`;
$.ajax({
url: requestUrl,
type: 'POST',
data: JSON.stringify({
permohonan_id: permohonanId,
document_id: documentId,
inspeksi_id: inspeksiId,
lpj: jsonData,
}),
contentType: 'application/json',
headers: {
'X-CSRF-TOKEN': '{{ csrf_token() }}'
},
success: function(response) {
hideLoadingSwal();
if (response.success) {
Swal.fire({
title: 'Berhasil!',
text: response.message,
icon: 'success',
confirmButtonText: 'OK'
}).then((response) => {
if (response.isConfirmed) {
window.location.href =
'{{ route('penilai.show', ['id' => $permohonan->id]) }}';
}
});
} else {
Swal.fire({
title: 'Error!',
text: response.message || 'Terjadi kesalahan',
icon: 'error',
confirmButtonText: 'OK'
});
}
console.log(response);
},
error: function(xhr, status, error) {
let errors = xhr.responseJSON?.errors;
$('.alert').text('');
if (errors) {
$.each(errors, function(key, value) {
$(`#error-${key}`).text(value[0]);
toastrErrorBuild(value[0]);
});
}
hideLoadingSwal();
console.log(errors);
}
});
}
</script>
@include('lpj::surveyor.js.utils')