diff --git a/app/Http/Controllers/PenilaianController.php b/app/Http/Controllers/PenilaianController.php index bd4c3ec..3f1b3c1 100644 --- a/app/Http/Controllers/PenilaianController.php +++ b/app/Http/Controllers/PenilaianController.php @@ -838,7 +838,7 @@ class PenilaianController extends Controller { $permohonan = Permohonan::findOrFail($id); $permohonan->update([ - 'status' => 'done', + 'status' => 'revisi-laporan', 'keterangan' => $request->message, 'submitted_at' => now() ]); diff --git a/app/Http/Controllers/RegistrasiController.php b/app/Http/Controllers/RegistrasiController.php index c6e80b2..676051e 100644 --- a/app/Http/Controllers/RegistrasiController.php +++ b/app/Http/Controllers/RegistrasiController.php @@ -29,7 +29,9 @@ } // Retrieve data from the database - $query = Permohonan::query()->where('status', '=', 'preregister'); + $query = Permohonan::query() + ->whereIn('status', ['preregister', 'revisi']); + // Apply search filter if provided if ($request->has('search') && !empty($request->get('search'))) { diff --git a/app/Http/Controllers/SurveyorController.php b/app/Http/Controllers/SurveyorController.php index 08cca8f..22c602d 100644 --- a/app/Http/Controllers/SurveyorController.php +++ b/app/Http/Controllers/SurveyorController.php @@ -2016,7 +2016,7 @@ class SurveyorController extends Controller }); } - $query->whereRaw('LOWER(status) IN (?, ?, ?, ?, ?, ? ,?)', ['assign', 'survey', 'proses-survey', 'request-reschedule', 'reschedule', 'rejected-reschedule', 'approved-reschedule' ]); + $query->whereRaw('LOWER(status) IN (?, ?, ?, ?, ?, ? ,?,?)', ['assign', 'survey', 'proses-survey', 'request-reschedule', 'reschedule', 'rejected-reschedule', 'approved-reschedule', 'revisi-laporan' ]); if (!Auth::user()->hasRole('administrator')) { diff --git a/resources/views/penilai/components/print-memo.blade.php b/resources/views/penilai/components/print-memo.blade.php index f480a37..f45c59e 100644 --- a/resources/views/penilai/components/print-memo.blade.php +++ b/resources/views/penilai/components/print-memo.blade.php @@ -157,13 +157,31 @@ @if (!empty($memo['lokasi']['address'])) - - Lokasi Jaminan - : - {{ $memo['lokasi']['address'] ?? '' }}, - {{ $alamat['village_code'] ?? '' }} {{ $alamat['district_code'] ?? '' }}, - {{ $alamat['city_code'] ?? '' }}, {{ $alamat['province_code'] ?? '' }} - + + Terletak di + : + {{ $alamat['address'] ?? '' }} + + + Desa/Kelurahan + : + {{ $alamat['village_code'] ?? '' }} + + + Kecamatan + : + {{ $alamat['district_code'] ?? '' }} + + + Kabupaten/Kota + : + {{ $alamat['city_code'] ?? '' }} + + + Provinsi + : + {{ $alamat['province_code'] ?? '' }} + @endif diff --git a/resources/views/penilai/components/print-out-rap.blade.php b/resources/views/penilai/components/print-out-rap.blade.php index de39cd0..b6c1bd8 100644 --- a/resources/views/penilai/components/print-out-rap.blade.php +++ b/resources/views/penilai/components/print-out-rap.blade.php @@ -1,4 +1,32 @@ @include('lpj::penilai.components.header') +@php +$data = ''; +foreach ($permohonan->documents as $dokumen) { + $data .= $dokumen->jenisJaminan->name . ', '; + + $penilai = $permohonan->penilaian->userPenilai->where('role', 'penilai')->first(); + $surveyor = $permohonan->penilaian->userPenilai->where('role', 'surveyor')->first(); + $teams = $permohonan->region->teams; + + if ($teams) { + foreach ($teams as $team) { + $team_users = $team->teamsUsers; + // print_r($team_users); + if ($team_users) { + foreach ($team_users as $team_user) { + $user = $team_user->user; + + if ($user && $user->hasRole('senior-officer')) { + $senior_officer = $user; + break 3; + } + } + } + } + } +} +$data = rtrim($data, ', '); +@endphp
@@ -7,7 +35,7 @@
- + @@ -25,10 +53,28 @@ - + + {{ formatTanggalIndonesia($permohonan->penilaian->waktu_penilaian) }} + + + + + + + + + + + + + + + @@ -38,36 +84,54 @@
Kepada{{ $nomorLaporan ?? '-' }}
TanggalTanggal Survey : - {{ formatTanggalIndonesia($permohonan->penilaian->tanggal_kunjungan) }}
Cabang/Pemohon: + {{ $permohonan->debiture->branch->name ?? '' }} +
Ao:{{ $permohonan->user->name ?? '' }}
Perwakilan Developer:{{ $forminspeksi['asset']['pihak_bank'] ?? '' }} +
Perihal
+

NAMA DEVELOPER

+ + + + + + +
Nama:{{ $permohonan->debiture->name ?? '' }}
+

NAMA PROYEK

+ + + + + + +
Proyek:{{ $data ?? '' }}
+

ALAMAT

+ + + + + + + + + + + + + + + + + + + + + + + + + + +
Terletak di: {{ $alamat['address'] ?? '' }}
Desa/Kelurahan:{{ $alamat['village_code'] ?? '' }}
Kecamatan:{{ $alamat['district_code'] ?? '' }}
Kabupaten/Kota: {{ $alamat['city_code'] ?? '' }}
Provinsi:{{ $alamat['province_code'] ?? '' }}

DOKUMEN TERLAMPIR

- @foreach ($permohonan->documents as $dokumen) - @php - $senior_officer = null; - $penilai = $permohonan->penilaian->userPenilai->where('role', 'penilai')->first(); - $teams = $permohonan->region->teams; - - $teams = $permohonan->region->teams; - - if ($teams) { - foreach ($teams as $team) { - $team_users = $team->teamsUsers; - // print_r($team_users); - if ($team_users) { - foreach ($team_users as $team_user) { - $user = $team_user->user; - - if ($user && $user->hasRole('senior-officer')) { - $senior_officer = $user; - break 3; - } - } - } - } - } - - @endphp - @endforeach + @if (@isset($dokumen)) @foreach ($dokumen->detail as $detail) diff --git a/resources/views/penilai/components/print-out-sederhana.blade.php b/resources/views/penilai/components/print-out-sederhana.blade.php index 0e65870..54b8b27 100644 --- a/resources/views/penilai/components/print-out-sederhana.blade.php +++ b/resources/views/penilai/components/print-out-sederhana.blade.php @@ -144,7 +144,7 @@ - + @@ -154,12 +154,12 @@ - + - + diff --git a/resources/views/penilai/components/print-out-standard.blade.php b/resources/views/penilai/components/print-out-standard.blade.php index 22016d1..f2e13e0 100644 --- a/resources/views/penilai/components/print-out-standard.blade.php +++ b/resources/views/penilai/components/print-out-standard.blade.php @@ -129,7 +129,7 @@ - + @@ -139,12 +139,12 @@ - + - + diff --git a/resources/views/penilai/components/print-resume.blade.php b/resources/views/penilai/components/print-resume.blade.php index f7db545..55342c9 100644 --- a/resources/views/penilai/components/print-resume.blade.php +++ b/resources/views/penilai/components/print-resume.blade.php @@ -56,16 +56,12 @@ - - - - - - - - + + + + + @@ -127,6 +123,31 @@ @endforeach @endif + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/resources/views/penilai/components/resume.blade.php b/resources/views/penilai/components/resume.blade.php index f8833aa..0d03500 100644 --- a/resources/views/penilai/components/resume.blade.php +++ b/resources/views/penilai/components/resume.blade.php @@ -202,7 +202,7 @@ class="input number-format"> @endforeach @@ -231,10 +231,7 @@ break; } - if ( - isset($luas->name) && - $luas->name === 'IMB' - ) { + if (isset($luas->name) && $luas->name === 'IMB') { $details = json_decode($luas->details, true); $luas_bangunan = isset($details['luas_bangunan']) ? $details['luas_bangunan'] @@ -253,7 +250,7 @@ @endif @@ -296,7 +293,7 @@ @endforeach @@ -315,7 +312,8 @@ class="input number-format"> @endif @@ -350,7 +348,7 @@ @if (!empty($resumeData['tambahan'])) - {{-- @foreach ($resumeData['tambahan'] as $item) --}} + @foreach ($resumeData['tambahan'] as $item) + @endforeach @endif
{{ $alamat['address'] ?? '' }}
KelurahanDesa/Kelurahan : {{ $alamat['village_code'] ?? '' }}
{{ $alamat['district_code'] ?? '' }}
KabupatenKabupaten/Kota : {{ $alamat['city_code'] ?? '' }}
PropinsiProvinsi : {{ $alamat['province_code'] ?? '' }}
{{ $alamat['address'] ?? '' }}
KelurahanDesa/Kelurahan : {{ $alamat['village_code'] ?? '' }}
{{ $alamat['district_code'] ?? '' }}
KotamadyaKabupaten/Kota : {{ $alamat['city_code'] ?? '' }}
PropinsiProvinsi : {{ $alamat['province_code'] ?? '' }}
{{ $permohonan->debiture->name ?? '' }}
Aset:{{ $data ?? '' }}
Lokasi Objek:{{ $alamat['village_code'] ?? '' }}, {{ $alamat['district_code'] ?? '' }}, - {{ $alamat['city_code'] ?? '' }}, {{ $alamat['province_code'] ?? '' }}Aset:{{ $data ?? '' }}
Legalitas :
Terletak di: {{ $alamat['address'] ?? '' }}
Desa/Kelurahan:{{ $alamat['village_code'] ?? '' }}
Kecamatan:{{ $alamat['district_code'] ?? '' }}
Kabupaten/Kota: {{ $alamat['city_code'] ?? '' }}
Provinsi:{{ $alamat['province_code'] ?? '' }}
Tanggal Survey : + class="input currency-format" value="{{ $item['nilai'] }}">
- +
+ class="input currency-format" value="{{ $item['nilai'] }}">
- +
@@ -370,9 +368,10 @@ + class="input currency-format" value="{{ $item['nilai'] }}">
@@ -436,8 +435,8 @@ href="{{ route('penilai.lampiran') }}?permohonanId={{ request('permohonanId') }}&documentId={{ request('documentId') }}&inspeksiId={{ request('inspeksiId') }}&jaminanId={{ request('jaminanId') }}&statusLpj=1"> LAMPIRAN FOTO DAN DOKUMEN - + Hasil Inspeksi + let counter = 3; function tambahKesimpulanNilai() { @@ -495,7 +495,7 @@ + class="input currency-format"> @@ -507,6 +507,18 @@ `; + + const newCurrencyInputs = kesimpulan.querySelectorAll(`#kesimpulan-${counter} .currency-format`); + newCurrencyInputs.forEach(input => { + input.addEventListener('input', function() { + handleCurrencyInput(this); + }); + + // Format initial value jika ada + if (input.value) { + input.value = formatCurrency(input.value); + } + }); counter++; } @@ -529,7 +541,7 @@ const formElement = document.querySelector('form'); const jsonData = formToJson(formElement); - console.log('Data dalam format JSON:', JSON.stringify(jsonData, null, 2)); + console.log('Data dalam format JSON:', JSON.stringify(formElement, null, 2)); const urlParams = new URLSearchParams(window.location.search); // Mengambil query parameters dari URL const permohonanId = urlParams.get('permohonanId'); @@ -626,7 +638,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: row.querySelector('input[name="fisik_nilai[]"]')?.value || "" + nilai: cleanCurrencyValue(row.querySelector('input[name="fisik_nilai[]"]')?.value || "") }; if (fisikData.sertifikat) { jsonData.fisik.push(fisikData); @@ -639,7 +651,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: row.querySelector('input[name="sesuai_nilai[]"]')?.value || "" + nilai: cleanCurrencyValue(row.querySelector('input[name="sesuai_nilai[]"]')?.value || "") }; if (imbData.sertifikat) { jsonData.sesuai_imb.push(imbData); @@ -653,13 +665,13 @@ 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: row.querySelector('input[name="tambahan_nilai[]"]')?.value || "" + nilai: cleanCurrencyValue(row.querySelector('input[name="tambahan_nilai[]"]')?.value || "") }; console.log(imbData); if (imbData.sertifikat) { jsonData.tambahan.push(imbData); } - }); + }); // Ambil keterangan const keterangan = formElement.querySelector('textarea[name="keterangan"]')?.value || ""; @@ -671,5 +683,28 @@ return jsonData; } - // Cara Penggunaan + document.addEventListener('DOMContentLoaded', function() { + // Initialize currency format for existing inputs + document.querySelectorAll('.currency-format').forEach(input => { + input.addEventListener('input', function() { + handleCurrencyInput(this); + }); + + // Format initial values if they exist + if (input.value) { + input.value = formatCurrency(input.value); + } + }); + }); + + function handleCurrencyInput(input) { + const value = input.value.replace(/[^\d]/g, ''); + input.value = formatCurrency(value); + } + function cleanCurrencyValue(value) { + return value.replace(/[^\d]/g, ''); +} + + + diff --git a/resources/views/surveyor/components/bangunan.blade.php b/resources/views/surveyor/components/bangunan.blade.php index 7b2e2fa..7d7892d 100644 --- a/resources/views/surveyor/components/bangunan.blade.php +++ b/resources/views/surveyor/components/bangunan.blade.php @@ -13,12 +13,12 @@ @if (isset($permohonan->documents)) @foreach ($permohonan->documents as $item) @php - $luas_bangunan = 'N/A'; + $luas_bangunan = 0; if ($item->detail) { foreach ($item->detail as $luas) { if (isset($luas->name) && $luas->jenis_legalitas_jaminan_id === 10) { $details = json_decode($luas->details, true); - $luas_bangunan = isset($details['luas_bangunan']) ? $details['luas_bangunan'] : 'N/A'; + $luas_bangunan = isset($details['luas_bangunan']) ? $details['luas_bangunan'] : 0; break; } } diff --git a/resources/views/surveyor/components/denah.blade.php b/resources/views/surveyor/components/denah.blade.php index 7bc8f4d..668ec21 100644 --- a/resources/views/surveyor/components/denah.blade.php +++ b/resources/views/surveyor/components/denah.blade.php @@ -20,7 +20,7 @@

Denah

- + Back
@@ -98,7 +98,7 @@
@@ -191,14 +191,34 @@ input.addEventListener('input', function() { formatNumber(this); }); + input.addEventListener('focus', function() { + if (this.value === 'm²') { + this.setSelectionRange(0, 0); // Kursor di awal + } + }); }); + + // Tambah Denah document.getElementById('tambahDenah').addEventListener('click', function() { const denahContainer = document.getElementById('denah-container'); const newDenah = createDenahElement(denahIndex); denahContainer.appendChild(newDenah); denahIndex++; + + const newInputs = newDenah.querySelectorAll('.number-format'); + newInputs.forEach(input => { + input.addEventListener('input', function() { + formatNumber(this); + }); + + input.addEventListener('focus', function() { + if (this.value === 'm²') { + this.setSelectionRange(0, 0); // Kursor di awal + } + }); + }); }); // Event delegation untuk tombol hapus denah @@ -303,6 +323,12 @@ function submitDenah() { showLoadingSwal('Mengirim data ke server...'); + document.querySelectorAll('.number-format').forEach(input => { + if (input.value.includes('m²')) { + input.value = input.value.replace('m²', '').trim(); + } + }); + const formElement = $('#formDenah')[0]; const formData = new FormData(formElement); diff --git a/resources/views/surveyor/components/header.blade.php b/resources/views/surveyor/components/header.blade.php index 40d1c94..0173111 100644 --- a/resources/views/surveyor/components/header.blade.php +++ b/resources/views/surveyor/components/header.blade.php @@ -471,7 +471,7 @@
+ value="{{ isset($permohonan->debiture->city) ? $permohonan->debiture->city->name : '' }}">
- +