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

Merge branch 'staging' of https://git.putrakuningan.com/daengdeni/lpj into tender

Browse Source
This commit is contained in:
rahmatrafli1
2025-02-14 08:51:10 +07:00
parent 571e19f11c d2805bdb2f
commit 05557433d0
17 changed files with 426 additions and 246 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
app/Http/Controllers/PenilaianController.php
View File

@@ -838,7 +838,7 @@ class PenilaianController extends Controller
{ {
$permohonan = Permohonan::findOrFail($id); $permohonan = Permohonan::findOrFail($id);
$permohonan->update([ $permohonan->update([
'status' => 'done', 'status' => 'revisi-laporan',
'keterangan' => $request->message, 'keterangan' => $request->message,
'submitted_at' => now() 'submitted_at' => now()
]); ]);

4
app/Http/Controllers/RegistrasiController.php
View File

@@ -29,7 +29,9 @@
} }
// Retrieve data from the database // Retrieve data from the database
$query = Permohonan::query()->where('status', '=', 'preregister'); $query = Permohonan::query()
->whereIn('status', ['preregister', 'revisi']);
// Apply search filter if provided // Apply search filter if provided
if ($request->has('search') && !empty($request->get('search'))) { if ($request->has('search') && !empty($request->get('search'))) {

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

@@ -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')) { if (!Auth::user()->hasRole('administrator')) {

32
resources/views/penilai/components/print-memo.blade.php
View File

@@ -157,13 +157,31 @@
</tr> </tr>
@if (!empty($memo['lokasi']['address'])) @if (!empty($memo['lokasi']['address']))
<tr> <tr>
<td style="width: 20%; padding: 2px;">Lokasi Jaminan</td> <td width="20%">Terletak di</td>
<td style="width: 1%; padding: 2px;">:</td> <td style="width: 1%; vertical-align: top;">:</td>
<td style="width: 79%; padding: 2px;">{{ $memo['lokasi']['address'] ?? '' }}, <td> {{ $alamat['address'] ?? '' }}</td>
{{ $alamat['village_code'] ?? '' }} {{ $alamat['district_code'] ?? '' }}, </tr>
{{ $alamat['city_code'] ?? '' }}, {{ $alamat['province_code'] ?? '' }} </td> <tr>
</tr> <td>Desa/Kelurahan</td>
<td style="width: 1%; vertical-align: top;">:</td>
<td>{{ $alamat['village_code'] ?? '' }}</td>
</tr>
<tr>
<td>Kecamatan</td>
<td style="width: 1%; vertical-align: top;">:</td>
<td>{{ $alamat['district_code'] ?? '' }}</td>
</tr>
<tr>
<td>Kabupaten/Kota</td>
<td style="width: 1%; vertical-align: top;">:</td>
<td> {{ $alamat['city_code'] ?? '' }}</td>
</tr>
<tr>
<td>Provinsi</td>
<td style="width: 1%; vertical-align: top;">:</td>
<td>{{ $alamat['province_code'] ?? '' }}</td>
</tr>
@endif @endif
</table> </table>

124
resources/views/penilai/components/print-out-rap.blade.php
View File

@@ -1,4 +1,32 @@
@include('lpj::penilai.components.header') @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
<main class="content"> <main class="content">
<table> <table>
<tr> <tr>
@@ -7,7 +35,7 @@
</td> </td>
</tr> </tr>
</table> </table>
<table style="width: 100%;"> <table style="width: 100%;">
<tr> <tr>
<td style="width: 20%; padding: 2px; vertical-align: top;">Kepada</td> <td style="width: 20%; padding: 2px; vertical-align: top;">Kepada</td>
@@ -25,10 +53,28 @@
<td style="width: 79%; padding: 2px;">{{ $nomorLaporan ?? '-' }}</td> <td style="width: 79%; padding: 2px;">{{ $nomorLaporan ?? '-' }}</td>
</tr> </tr>
<tr> <tr>
<td style="width: 20%; padding: 2px;">Tanggal</td> <td style="width: 20%; padding: 2px;">Tanggal Survey</td>
<td style="width: 1%; padding: 2px;">:</td> <td style="width: 1%; padding: 2px;">:</td>
<td style="width: 79%; padding: 2px;"> <td style="width: 79%; padding: 2px;">
{{ formatTanggalIndonesia($permohonan->penilaian->tanggal_kunjungan) }}</td> {{ formatTanggalIndonesia($permohonan->penilaian->waktu_penilaian) }}</td>
</tr>
<tr>
<td style="width: 25%; padding: 2px; vertical-align: top;">Cabang/Pemohon</td>
<td style="width: 1%; vertical-align: top;">:</td>
<td style="vertical-align: top; vertical-align: top;">
{{ $permohonan->debiture->branch->name ?? '' }}
</td>
</tr>
<tr>
<td style="width: 25%; padding: 2px;">Ao</td>
<td style="width: 1%; padding: 2px;">:</td>
<td style="vertical-align: top; padding: 2px;">{{ $permohonan->user->name ?? '' }}</td>
</tr>
<tr>
<td style="width: 25%; padding: 2px; vertical-align: top;">Perwakilan Developer</td>
<td style="width: 1%; vertical-align: top;">:</td>
<td style="vertical-align: top;">{{ $forminspeksi['asset']['pihak_bank'] ?? '' }}
</td>
</tr> </tr>
<tr> <tr>
<td style="width: 20%; padding: 2px;">Perihal</td> <td style="width: 20%; padding: 2px;">Perihal</td>
@@ -38,36 +84,54 @@
</table> </table>
<div style="border-top: 1px solid black; width: 100%;"></div> <div style="border-top: 1px solid black; width: 100%;"></div>
<h2 style="text-transform: uppercase;">NAMA DEVELOPER</h2>
<table style="width: 100%; ">
<tr>
<td style="width: 20%; padding: 2px;">Nama</td>
<td style="vertical-align: top; width: 1%; padding: 2px;">:</td>
<td style="width: 79%;">{{ $permohonan->debiture->name ?? '' }}</td>
</tr>
</table>
<h2 style="text-transform: uppercase;">NAMA PROYEK</h2>
<table style="width: 100%; ">
<tr>
<td style="width: 20%; padding: 2px;">Proyek</td>
<td style="vertical-align: top; width: 1%; padding: 2px;">:</td>
<td style="width: 79%;">{{ $data ?? '' }}</td>
</tr>
</table>
<h2 style="text-transform: uppercase;">ALAMAT</h2>
<table style="width: 100%; ">
<tr>
<td width="20%">Terletak di</td>
<td style="width: 1%; vertical-align: top;">:</td>
<td> {{ $alamat['address'] ?? '' }}</td>
</tr>
<tr>
<td>Desa/Kelurahan</td>
<td style="width: 1%; vertical-align: top;">:</td>
<td>{{ $alamat['village_code'] ?? '' }}</td>
</tr>
<tr>
<td>Kecamatan</td>
<td style="width: 1%; vertical-align: top;">:</td>
<td>{{ $alamat['district_code'] ?? '' }}</td>
</tr>
<tr>
<td>Kabupaten/Kota</td>
<td style="width: 1%; vertical-align: top;">:</td>
<td> {{ $alamat['city_code'] ?? '' }}</td>
</tr>
<tr>
<td>Provinsi</td>
<td style="width: 1%; vertical-align: top;">:</td>
<td>{{ $alamat['province_code'] ?? '' }}</td>
</tr>
</table>
<h2 style="text-transform: uppercase;">DOKUMEN TERLAMPIR</h2> <h2 style="text-transform: uppercase;">DOKUMEN TERLAMPIR</h2>
<table style="width: 100%;"> <table style="width: 100%;">
@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)) @if (@isset($dokumen))
@foreach ($dokumen->detail as $detail) @foreach ($dokumen->detail as $detail)
<tr> <tr>

6
resources/views/penilai/components/print-out-sederhana.blade.php
View File

@@ -144,7 +144,7 @@
<td style=" padding: 2px; vertical-align: top;">{{ $alamat['address'] ?? '' }}</td> <td style=" padding: 2px; vertical-align: top;">{{ $alamat['address'] ?? '' }}</td>
</tr> </tr>
<tr> <tr>
<td style=" padding: 2px; vertical-align: top;">Kelurahan</td> <td style=" padding: 2px; vertical-align: top;">Desa/Kelurahan</td>
<td style=" padding: 2px; vertical-align: top;">:</td> <td style=" padding: 2px; vertical-align: top;">:</td>
<td style=" padding: 2px; vertical-align: top;">{{ $alamat['village_code'] ?? '' }}</td> <td style=" padding: 2px; vertical-align: top;">{{ $alamat['village_code'] ?? '' }}</td>
</tr> </tr>
@@ -154,12 +154,12 @@
<td style=" padding: 2px; vertical-align: top;">{{ $alamat['district_code'] ?? '' }}</td> <td style=" padding: 2px; vertical-align: top;">{{ $alamat['district_code'] ?? '' }}</td>
</tr> </tr>
<tr> <tr>
<td style=" padding: 2px; vertical-align: top;">Kabupaten</td> <td style=" padding: 2px; vertical-align: top;">Kabupaten/Kota</td>
<td style=" padding: 2px; vertical-align: top;">:</td> <td style=" padding: 2px; vertical-align: top;">:</td>
<td style=" padding: 2px; vertical-align: top;">{{ $alamat['city_code'] ?? '' }}</td> <td style=" padding: 2px; vertical-align: top;">{{ $alamat['city_code'] ?? '' }}</td>
</tr> </tr>
<tr> <tr>
<td style=" padding: 2px; vertical-align: top;">Propinsi</td> <td style=" padding: 2px; vertical-align: top;">Provinsi</td>
<td style=" padding: 2px; vertical-align: top;">:</td> <td style=" padding: 2px; vertical-align: top;">:</td>
<td style=" padding: 2px; vertical-align: top;">{{ $alamat['province_code'] ?? '' }}</td> <td style=" padding: 2px; vertical-align: top;">{{ $alamat['province_code'] ?? '' }}</td>
</tr> </tr>

6
resources/views/penilai/components/print-out-standard.blade.php
View File

@@ -129,7 +129,7 @@
<td> {{ $alamat['address'] ?? '' }}</td> <td> {{ $alamat['address'] ?? '' }}</td>
</tr> </tr>
<tr> <tr>
<td>Kelurahan</td> <td>Desa/Kelurahan</td>
<td style="width: 1%; vertical-align: top;">:</td> <td style="width: 1%; vertical-align: top;">:</td>
<td>{{ $alamat['village_code'] ?? '' }}</td> <td>{{ $alamat['village_code'] ?? '' }}</td>
</tr> </tr>
@@ -139,12 +139,12 @@
<td>{{ $alamat['district_code'] ?? '' }}</td> <td>{{ $alamat['district_code'] ?? '' }}</td>
</tr> </tr>
<tr> <tr>
<td>Kotamadya</td> <td>Kabupaten/Kota</td>
<td style="width: 1%; vertical-align: top;">:</td> <td style="width: 1%; vertical-align: top;">:</td>
<td> {{ $alamat['city_code'] ?? '' }}</td> <td> {{ $alamat['city_code'] ?? '' }}</td>
</tr> </tr>
<tr> <tr>
<td>Propinsi</td> <td>Provinsi</td>
<td style="width: 1%; vertical-align: top;">:</td> <td style="width: 1%; vertical-align: top;">:</td>
<td>{{ $alamat['province_code'] ?? '' }}</td> <td>{{ $alamat['province_code'] ?? '' }}</td>
</tr> </tr>

39
resources/views/penilai/components/print-resume.blade.php
View File

@@ -56,16 +56,12 @@
<td>{{ $permohonan->debiture->name ?? '' }}</td> <td>{{ $permohonan->debiture->name ?? '' }}</td>
</tr> </tr>
<tr> <tr>
<td>Aset</td> <td idth="25%">Aset</td>
<td>:</td> <td width="1%">:</td>
<td>{{ $data ?? '' }}</td> <td >{{ $data ?? '' }}</td>
</tr>
<tr>
<td>Lokasi Objek</td>
<td>:</td>
<td>{{ $alamat['village_code'] ?? '' }}, {{ $alamat['district_code'] ?? '' }},
{{ $alamat['city_code'] ?? '' }}, {{ $alamat['province_code'] ?? '' }}</td>
</tr> </tr>
<tr> <tr>
<td style="vertical-align: top;">Legalitas</td> <td style="vertical-align: top;">Legalitas</td>
<td style="vertical-align: top;">:</td> <td style="vertical-align: top;">:</td>
@@ -127,6 +123,31 @@
@endforeach @endforeach
@endif @endif
</tr> </tr>
<tr>
<td width="25%">Terletak di</td>
<td style="width: 1%; vertical-align: top;">:</td>
<td> {{ $alamat['address'] ?? '' }}</td>
</tr>
<tr>
<td>Desa/Kelurahan</td>
<td style="width: 1%; vertical-align: top;">:</td>
<td>{{ $alamat['village_code'] ?? '' }}</td>
</tr>
<tr>
<td>Kecamatan</td>
<td style="width: 1%; vertical-align: top;">:</td>
<td>{{ $alamat['district_code'] ?? '' }}</td>
</tr>
<tr>
<td>Kabupaten/Kota</td>
<td style="width: 1%; vertical-align: top;">:</td>
<td> {{ $alamat['city_code'] ?? '' }}</td>
</tr>
<tr>
<td>Provinsi</td>
<td style="width: 1%; vertical-align: top;">:</td>
<td>{{ $alamat['province_code'] ?? '' }}</td>
</tr>
<tr> <tr>
<td>Tanggal Survey</td> <td>Tanggal Survey</td>
<td>:</td> <td>:</td>

73
resources/views/penilai/components/resume.blade.php
View File

@@ -202,7 +202,7 @@
class="input number-format"></td> class="input number-format"></td>
<td class="text-center"> <td class="text-center">
<input type="text" name="fisik_nilai[]" <input type="text" name="fisik_nilai[]"
class="input number-format" value="{{ $item['nilai'] }}"> class="input currency-format" value="{{ $item['nilai'] }}">
</td> </td>
</tr> </tr>
@endforeach @endforeach
@@ -231,10 +231,7 @@
break; break;
} }
if ( if (isset($luas->name) && $luas->name === 'IMB') {
isset($luas->name) &&
$luas->name === 'IMB'
) {
$details = json_decode($luas->details, true); $details = json_decode($luas->details, true);
$luas_bangunan = isset($details['luas_bangunan']) $luas_bangunan = isset($details['luas_bangunan'])
? $details['luas_bangunan'] ? $details['luas_bangunan']
@@ -253,7 +250,7 @@
<td class="text-center"> <input type="text" name="fisik_luas_bangunan[]" <td class="text-center"> <input type="text" name="fisik_luas_bangunan[]"
class="input number-format" value="{{ $luas_bangunan }}"></td> class="input number-format" value="{{ $luas_bangunan }}"></td>
<td class="text-center"> <td class="text-center">
<input type="text" name="fisik_nilai[]" class="input number-format"> <input type="text" name="fisik_nilai[]" class="input currency-format">
</td> </td>
</tr> </tr>
@endif @endif
@@ -296,7 +293,7 @@
</td> </td>
<td class="text-center"> <td class="text-center">
<input type="text" name="sesuai_nilai[]" <input type="text" name="sesuai_nilai[]"
class="input number-format" value="{{ $item['nilai'] }}"> class="input currency-format" value="{{ $item['nilai'] }}">
</td> </td>
</tr> </tr>
@endforeach @endforeach
@@ -315,7 +312,8 @@
class="input number-format"> class="input number-format">
</td> </td>
<td class="text-center"> <td class="text-center">
<input type="text" name="sesuai_nilai[]" class="input number-format"> <input type="text" name="sesuai_nilai[]"
class="input currency-format">
</td> </td>
</tr> </tr>
@endif @endif
@@ -350,7 +348,7 @@
</thead> </thead>
<tbody> <tbody>
@if (!empty($resumeData['tambahan'])) @if (!empty($resumeData['tambahan']))
{{-- @foreach ($resumeData['tambahan'] as $item) --}} @foreach ($resumeData['tambahan'] as $item)
<tr> <tr>
<td class="text-center"> <td class="text-center">
@@ -370,9 +368,10 @@
</td> </td>
<td class="text-center"> <td class="text-center">
<input type="text" name="tambahan_nilai[]" <input type="text" name="tambahan_nilai[]"
class="input number-format" value="{{ $item['nilai'] }}"> class="input currency-format" value="{{ $item['nilai'] }}">
</td> </td>
</tr> </tr>
@endforeach
@endif @endif
</tbody> </tbody>
</table> </table>
@@ -436,8 +435,8 @@
href="{{ route('penilai.lampiran') }}?permohonanId={{ request('permohonanId') }}&documentId={{ request('documentId') }}&inspeksiId={{ request('inspeksiId') }}&jaminanId={{ request('jaminanId') }}&statusLpj=1"> href="{{ route('penilai.lampiran') }}?permohonanId={{ request('permohonanId') }}&documentId={{ request('documentId') }}&inspeksiId={{ request('inspeksiId') }}&jaminanId={{ request('jaminanId') }}&statusLpj=1">
LAMPIRAN FOTO DAN DOKUMEN LAMPIRAN FOTO DAN DOKUMEN
</a> </a>
<a href="{{ route('surveyor.print_out_inspeksi', ['permohonan_id' => $permohonan->id, 'dokument_id' => request('documentId'), 'jenis_jaminan_id' => request('jaminanId')]) }}" class="btn btn-light" <a href="{{ route('surveyor.print_out_inspeksi', ['permohonan_id' => $permohonan->id, 'dokument_id' => request('documentId'), 'jenis_jaminan_id' => request('jaminanId')]) }}"
> class="btn btn-light">
<i class="ki-filled ki-printer"></i> Hasil Inspeksi <i class="ki-filled ki-printer"></i> Hasil Inspeksi
</a> </a>
<a class="btn btn-success" <a class="btn btn-success"
@@ -453,6 +452,7 @@
@endsection @endsection
@include('lpj::surveyor.js.utils') @include('lpj::surveyor.js.utils')
<script type="text/javascript"> <script type="text/javascript">
let counter = 3; let counter = 3;
function tambahKesimpulanNilai() { function tambahKesimpulanNilai() {
@@ -495,7 +495,7 @@
</td> </td>
<td class="text-center"> <td class="text-center">
<input type="text" name="tambahan_nilai[]" <input type="text" name="tambahan_nilai[]"
class="input number-format"> class="input currency-format">
</td> </td>
<td class="text-center"> <td class="text-center">
<button type="button" class="btn btn-danger" onclick="deleteRow(this)">Delete</button> <button type="button" class="btn btn-danger" onclick="deleteRow(this)">Delete</button>
@@ -507,6 +507,18 @@
</div> </div>
</div> </div>
`; `;
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++; counter++;
} }
@@ -529,7 +541,7 @@
const formElement = document.querySelector('form'); const formElement = document.querySelector('form');
const jsonData = formToJson(formElement); 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 urlParams = new URLSearchParams(window.location.search); // Mengambil query parameters dari URL
const permohonanId = urlParams.get('permohonanId'); const permohonanId = urlParams.get('permohonanId');
@@ -626,7 +638,7 @@
sertifikat: row.querySelector('input[name="fisik_sertifikat[]"]')?.value || "", sertifikat: row.querySelector('input[name="fisik_sertifikat[]"]')?.value || "",
luas_tanah: row.querySelector('input[name="fisik_luas_tanah[]"]')?.value || "", luas_tanah: row.querySelector('input[name="fisik_luas_tanah[]"]')?.value || "",
luas_bangunan: row.querySelector('input[name="fisik_luas_bangunan[]"]')?.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) { if (fisikData.sertifikat) {
jsonData.fisik.push(fisikData); jsonData.fisik.push(fisikData);
@@ -639,7 +651,7 @@
sertifikat: row.querySelector('input[name="sesuai_sertifikat[]"]')?.value || "", sertifikat: row.querySelector('input[name="sesuai_sertifikat[]"]')?.value || "",
luas_tanah: row.querySelector('input[name="sesuai_luas_tanah[]"]')?.value || "", luas_tanah: row.querySelector('input[name="sesuai_luas_tanah[]"]')?.value || "",
luas_bangunan: row.querySelector('input[name="sesuai_luas_bangunan[]"]')?.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) { if (imbData.sertifikat) {
jsonData.sesuai_imb.push(imbData); jsonData.sesuai_imb.push(imbData);
@@ -653,13 +665,13 @@
sertifikat: row.querySelector('input[name="tambahan_sertifikat[]"]')?.value || "", sertifikat: row.querySelector('input[name="tambahan_sertifikat[]"]')?.value || "",
luas_tanah: row.querySelector('input[name="tambahan_luas_tanah[]"]')?.value || "", luas_tanah: row.querySelector('input[name="tambahan_luas_tanah[]"]')?.value || "",
luas_bangunan: row.querySelector('input[name="tambahan_luas_bangunan[]"]')?.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); console.log(imbData);
if (imbData.sertifikat) { if (imbData.sertifikat) {
jsonData.tambahan.push(imbData); jsonData.tambahan.push(imbData);
} }
}); });
// Ambil keterangan // Ambil keterangan
const keterangan = formElement.querySelector('textarea[name="keterangan"]')?.value || ""; const keterangan = formElement.querySelector('textarea[name="keterangan"]')?.value || "";
@@ -671,5 +683,28 @@
return jsonData; 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, '');
}
</script> </script>

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

@@ -13,12 +13,12 @@
@if (isset($permohonan->documents)) @if (isset($permohonan->documents))
@foreach ($permohonan->documents as $item) @foreach ($permohonan->documents as $item)
@php @php
$luas_bangunan = 'N/A'; $luas_bangunan = 0;
if ($item->detail) { if ($item->detail) {
foreach ($item->detail as $luas) { foreach ($item->detail as $luas) {
if (isset($luas->name) && $luas->jenis_legalitas_jaminan_id === 10) { if (isset($luas->name) && $luas->jenis_legalitas_jaminan_id === 10) {
$details = json_decode($luas->details, true); $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; break;
} }
} }

30
resources/views/surveyor/components/denah.blade.php
View File

@@ -20,7 +20,7 @@
<div class="card-header bg-agi-50"> <div class="card-header bg-agi-50">
<h3 class="card-title">Denah</h3> <h3 class="card-title">Denah</h3>
<div class="flex items-center gap-2"> <div class="flex items-center gap-2">
<a href="{{ route('surveyor.show', ['id' => $permohonan->id ]) }}?form=denah" class="btn btn-xs btn-info"> <a href="{{ route('surveyor.show', ['id' => $permohonan->id]) }}?form=denah" class="btn btn-xs btn-info">
<i class="ki-filled ki-exit-left"></i> Back <i class="ki-filled ki-exit-left"></i> Back
</a> </a>
</div> </div>
@@ -98,7 +98,7 @@
</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"
value="{{ $denah['luas_denah'] ?? '' }}" value="{{ isset($denah['luas_denah']) ? $denah['luas_denah'] . ' m²' : '' }}"
onkeyup="formatNumber(this)"> onkeyup="formatNumber(this)">
</div> </div>
</div> </div>
@@ -191,14 +191,34 @@
input.addEventListener('input', function() { input.addEventListener('input', function() {
formatNumber(this); formatNumber(this);
}); });
input.addEventListener('focus', function() {
if (this.value === 'm²') {
this.setSelectionRange(0, 0); // Kursor di awal
}
});
}); });
// Tambah Denah // Tambah Denah
document.getElementById('tambahDenah').addEventListener('click', function() { document.getElementById('tambahDenah').addEventListener('click', function() {
const denahContainer = document.getElementById('denah-container'); const denahContainer = document.getElementById('denah-container');
const newDenah = createDenahElement(denahIndex); const newDenah = createDenahElement(denahIndex);
denahContainer.appendChild(newDenah); denahContainer.appendChild(newDenah);
denahIndex++; 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 // Event delegation untuk tombol hapus denah
@@ -303,6 +323,12 @@
function submitDenah() { function submitDenah() {
showLoadingSwal('Mengirim data ke server...'); 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 formElement = $('#formDenah')[0];
const formData = new FormData(formElement); const formData = new FormData(formElement);

26
resources/views/surveyor/components/header.blade.php
View File

@@ -471,7 +471,7 @@
<label for="city" class="form-label max-w-56">Kabupaten/Kota</label> <label for="city" class="form-label max-w-56">Kabupaten/Kota</label>
<div class="flex flex-wrap items-baseline w-full"> <div class="flex flex-wrap items-baseline w-full">
<input type="text" id="city" class="input w-full cursor-not-allowed" readonly <input type="text" id="city" class="input w-full cursor-not-allowed" readonly
value="{{ isset($permohonan->debiture->city) ? strtolower($permohonan->debiture->city->name) : '' }}"> value="{{ isset($permohonan->debiture->city) ? $permohonan->debiture->city->name : '' }}">
</div> </div>
</div> </div>
<input type="hidden" name="district_code" <input type="hidden" name="district_code"
@@ -546,7 +546,7 @@
</div> </div>
<div class="flex items-baseline flex-wrap lg:flex-nowrap gap-2.5 w-full"> <div class="flex items-baseline flex-wrap lg:flex-nowrap gap-2.5 w-full">
<label for="village_code" class="form-label max-w-56">Kelurahan</label> <label for="village_code" class="form-label max-w-56">Desa/Kelurahan</label>
<div class="flex flex-wrap items-baseline w-full"> <div class="flex flex-wrap items-baseline w-full">
<select id="village_code" name="village_code" class="select w-full"> <select id="village_code" name="village_code" class="select w-full">
<option value="">Pilih Kelurahan</option> <option value="">Pilih Kelurahan</option>
@@ -559,32 +559,10 @@
} }
} }
function loadCities() {
const citySelect = document.getElementById("city_code");
if (citySelect) {
// Hapus semua opsi sebelumnya
citySelect.innerHTML = '<option value="">Pilih Kota/Kabupaten</option>';
cities.forEach((city) => {
// Ubah nama kota menjadi lowercase
const cityNameLowercase = city.name.toLowerCase();
// Tambahkan opsi ke dropdown
const option = document.createElement("option");
option.value = city.code;
option.textContent = cityNameLowercase; // Nama dalam lowercase
citySelect.appendChild(option);
});
} else {
console.error("Element with ID 'city_code' not found.");
}
}
document.addEventListener('DOMContentLoaded', () => { document.addEventListener('DOMContentLoaded', () => {
loadSavedLocationData(); loadSavedLocationData();
loadCities();
}); });
</script> </script>
@include('lpj::surveyor.js.utils') @include('lpj::surveyor.js.utils')

2
resources/views/surveyor/components/inspeksi.blade.php
View File

@@ -91,8 +91,6 @@
@push('scripts') @push('scripts')
<script src="https://cdn.jsdelivr.net/npm/signature_pad@4.1.7/dist/signature_pad.umd.min.js"></script> <script src="https://cdn.jsdelivr.net/npm/signature_pad@4.1.7/dist/signature_pad.umd.min.js"></script>
<script type="text/javascript"> <script type="text/javascript">
const datas = @json($forminspeksi ?? '');
console.log(datas);
document.addEventListener('DOMContentLoaded', function() { document.addEventListener('DOMContentLoaded', function() {
const signaturePads = {}; const signaturePads = {};
const types = ['penilai', 'cabang', 'debitur', 'kjjp']; const types = ['penilai', 'cabang', 'debitur', 'kjjp'];

4
resources/views/surveyor/components/pembanding-tanah-bangunan-unit.blade.php
View File

@@ -113,7 +113,7 @@
@endphp @endphp
<td class="px-4 py-2"> <td class="px-4 py-2">
<input type="text" name="luas_tanah" class="input " <input type="text" name="luas_tanah" class="input number-format"
value="{{ $inspectionData['tanah']['luas_tanah']['sesuai'] ?? ($inspectionData['tanah']['luas_tanah']['tidak sesuai'] ?? '') }}"> value="{{ $inspectionData['tanah']['luas_tanah']['sesuai'] ?? ($inspectionData['tanah']['luas_tanah']['tidak sesuai'] ?? '') }}">
</td> </td>
<td class="px-4 py-2"> <td class="px-4 py-2">
@@ -124,7 +124,7 @@
@php @php
$luasTanahData = []; $luasTanahData = [];
$nilai = 'N/A'; $nilai = 0;
// Memeriksa apakah key 'bangunan' ada di dalam $inspectionData // Memeriksa apakah key 'bangunan' ada di dalam $inspectionData
if (isset($inspectionData['bangunan']['luas_tanah_bagunan'])) { if (isset($inspectionData['bangunan']['luas_tanah_bagunan'])) {

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

@@ -13,12 +13,12 @@
@if (isset($permohonan->documents)) @if (isset($permohonan->documents))
@foreach ($permohonan->documents as $item) @foreach ($permohonan->documents as $item)
@php @php
$luas_tanah = 'N/A'; $luas_tanah = 0;
if ($item->detail) { if ($item->detail) {
foreach ($item->detail as $luas) { foreach ($item->detail as $luas) {
if (isset($luas->name) && $luas->jenis_legalitas_jaminan_id === 1) { if (isset($luas->name) && $luas->jenis_legalitas_jaminan_id === 1) {
$details = json_decode($luas->details, true); $details = json_decode($luas->details, true);
$luas_tanah = isset($details['luas_tanah']) ? $details['luas_tanah'] : 'N/A'; $luas_tanah = isset($details['luas_tanah']) ? $details['luas_tanah'] : 0;
break; break;
} }
} }

295
resources/views/surveyor/index.blade.php
View File

@@ -71,6 +71,12 @@
</span> </span>
</th> </th>
<th class="min-w-[150px]" data-datatable-column="status">
<span class="sort"><span class="sort-label">Status</span>
<span class="sort-icon"></span>
</span>
</th>
<th class="min-w-[50px] text-center" data-datatable-column="actions">Action</th> <th class="min-w-[50px] text-center" data-datatable-column="actions">Action</th>
</tr> </tr>
</thead> </thead>
@@ -201,85 +207,41 @@
} }
function approveReschedule(penilaianId,permohonanId, noReg, debitur, reschedule_date, reschedule_note) { function approveReschedule(penilaianId, permohonanId, noReg, debitur, reschedule_date, reschedule_note) {
Swal.fire({ Swal.fire({
title: 'Konfirmasi', title: 'Konfirmasi',
html: ` html: `
<p>Yakin akan Menyetujui atau Menolak Reschedule Jadwal Kunjungan <b>${noReg}</b> untuk Debitur <b>${debitur}</b> <p>Yakin akan Menyetujui atau Menolak Reschedule Jadwal Kunjungan <b>${noReg}</b> untuk Debitur <b>${debitur}</b>
pada waktu <b>${window.formatTanggalWaktuIndonesia(reschedule_date)}</b>?</p> pada waktu <b>${window.formatTanggalWaktuIndonesia(reschedule_date)}</b>?</p>
<p><b>Catatan: </b> <br/>${reschedule_note}</p> <p><b>Catatan: </b> <br/>${reschedule_note}</p>
`, `,
icon: 'warning', icon: 'warning',
showDenyButton: true, showDenyButton: true,
showCancelButton: true,
confirmButtonColor: '#3085d6',
denyButtonColor: '#d33',
confirmButtonText: 'Approve',
denyButtonText: 'Reject'
}).then((result) => {
if (result.isConfirmed) {
// Approve action
let token = "{{ csrf_token() }}";
let useURL = "{{ URL::to('/surveyor/store-approve-reschedule') }}" + "/" + penilaianId;
var input_data = {
_token : token,
permohonan_id : permohonanId,
nomor_registrasi: noReg
}
$.ajax({
url: useURL,
type: "PUT",
cache: false,
data: input_data,
success: function(response) {
console.log(response);
if ('success' == response.status) {
Swal.fire('Sukses!', response.message, 'success').then(() => {
location.reload(true);
});
} else {
Swal.fire('Error!', response.message, 'error');
}
},
error: function(response, textStatus, errorThrown) {
console.log(response);
}
});
} else if (result.isDenied) {
// Reject action
Swal.fire({
title: 'Masukkan Keterangan',
input: 'textarea',
inputPlaceholder: 'Tuliskan alasan penolakan di sini...',
inputAttributes: {
'aria-label': 'Tuliskan alasan penolakan di sini'
},
showCancelButton: true, showCancelButton: true,
confirmButtonText: 'Submit', confirmButtonColor: '#3085d6',
cancelButtonText: 'Batal' denyButtonColor: '#d33',
}).then((rejectResult) => { confirmButtonText: 'Approve',
if (rejectResult.isConfirmed && rejectResult.value) { denyButtonText: 'Reject'
}).then((result) => {
if (result.isConfirmed) {
// Approve action
let token = "{{ csrf_token() }}"; let token = "{{ csrf_token() }}";
let useURL = "{{ URL::to('/surveyor/store-rejected-reschedule') }}" + "/" + penilaianId; let useURL = "{{ URL::to('/surveyor/store-approve-reschedule') }}" + "/" + penilaianId;
var input_data = { var input_data = {
_token : token, _token: token,
permohonan_id : permohonanId, permohonan_id: permohonanId,
nomor_registrasi: noReg, nomor_registrasi: noReg
rejected_note : rejectResult.value }
}
$.ajax({ $.ajax({
url: useURL, url: useURL,
type: "PUT", type: "PUT",
cache: false, cache: false,
data: input_data, data: input_data,
success: function(response) { success: function(response) {
console.log(response); console.log(response);
if ('success' == response.status) { if ('success' == response.status) {
Swal.fire('Ditolak!', response.message, 'success').then(() => { Swal.fire('Sukses!', response.message, 'success').then(() => {
location.reload(true); location.reload(true);
}); });
} else { } else {
@@ -290,59 +252,106 @@
console.log(response); console.log(response);
} }
}); });
} else if (rejectResult.dismiss === Swal.DismissReason.cancel) { } else if (result.isDenied) {
Swal.fire('Dibatalkan', 'Aksi penolakan dibatalkan.', 'info'); // Reject action
Swal.fire({
title: 'Masukkan Keterangan',
input: 'textarea',
inputPlaceholder: 'Tuliskan alasan penolakan di sini...',
inputAttributes: {
'aria-label': 'Tuliskan alasan penolakan di sini'
},
showCancelButton: true,
confirmButtonText: 'Submit',
cancelButtonText: 'Batal'
}).then((rejectResult) => {
if (rejectResult.isConfirmed && rejectResult.value) {
let token = "{{ csrf_token() }}";
let useURL = "{{ URL::to('/surveyor/store-rejected-reschedule') }}" + "/" +
penilaianId;
var input_data = {
_token: token,
permohonan_id: permohonanId,
nomor_registrasi: noReg,
rejected_note: rejectResult.value
}
$.ajax({
url: useURL,
type: "PUT",
cache: false,
data: input_data,
success: function(response) {
console.log(response);
if ('success' == response.status) {
Swal.fire('Ditolak!', response.message, 'success').then(
() => {
location.reload(true);
});
} else {
Swal.fire('Error!', response.message, 'error');
}
},
error: function(response, textStatus, errorThrown) {
console.log(response);
}
});
} else if (rejectResult.dismiss === Swal.DismissReason.cancel) {
Swal.fire('Dibatalkan', 'Aksi penolakan dibatalkan.', 'info');
}
});
} }
}); });
} }
});
}
function prosesSurvey(permohonanId, nomor_registrasi) { function prosesSurvey(permohonanId, nomor_registrasi) {
Swal.fire({ Swal.fire({
title: 'Konfirmasi', title: 'Konfirmasi',
text: `Yakin akan Melakukan Inspeksi dengan nomor registrasi ${nomor_registrasi}?`, text: `Yakin akan Melakukan Inspeksi dengan nomor registrasi ${nomor_registrasi}?`,
icon: 'warning', icon: 'warning',
showCancelButton: true, showCancelButton: true,
confirmButtonColor: '#3085d6', confirmButtonColor: '#3085d6',
cancelButtonColor: '#d33', cancelButtonColor: '#d33',
confirmButtonText: 'Ya, Setujui', confirmButtonText: 'Ya, Setujui',
cancelButtonText: 'Batal', cancelButtonText: 'Batal',
}).then((result) => { }).then((result) => {
if (result.isConfirmed) { if (result.isConfirmed) {
// Mendefinisikan URL dan data // Mendefinisikan URL dan data
let token = "{{ csrf_token() }}"; let token = "{{ csrf_token() }}";
let useURL = `{{ URL::to('/surveyor/store-proses-survey') }}/${permohonanId}`; let useURL = `{{ URL::to('/surveyor/store-proses-survey') }}/${permohonanId}`;
let input_data = { let input_data = {
_token: token, _token: token,
permohonan_id: permohonanId permohonan_id: permohonanId
}; };
// Melakukan AJAX request // Melakukan AJAX request
$.ajax({ $.ajax({
url: useURL, url: useURL,
type: "PUT", type: "PUT",
cache: false, cache: false,
data: input_data, data: input_data,
dataType: "json", dataType: "json",
success: function(response) { success: function(response) {
if (response.status === 'success') { if (response.status === 'success') {
// Arahkan langsung ke halaman inspeksi // Arahkan langsung ke halaman inspeksi
window.location.href = `surveyor/${permohonanId}/show?form=inspeksi`; window.location.href = `surveyor/${permohonanId}/show?form=inspeksi`;
} else { } else {
Swal.fire('Error!', response.message, 'error'); Swal.fire('Error!', response.message, 'error');
} }
}, },
error: function(response) { error: function(response) {
const errorMessage = response.responseJSON?.message || 'Terjadi kesalahan saat memproses data.'; const errorMessage = response.responseJSON?.message ||
Swal.fire('Error!', errorMessage, 'error'); 'Terjadi kesalahan saat memproses data.';
Swal.fire('Error!', errorMessage, 'error');
}
});
} }
}); });
} }
});
}
</script> </script>
<script type="module"> <script type="module">
@@ -396,24 +405,44 @@ function prosesSurvey(permohonanId, nomor_registrasi) {
title: 'Fasilitas Kredit', title: 'Fasilitas Kredit',
render: (item, data) => data.jenis_fasilitas_kredit ? `${data.jenis_fasilitas_kredit.name}` : 'N/A', render: (item, data) => data.jenis_fasilitas_kredit ? `${data.jenis_fasilitas_kredit.name}` : 'N/A',
}, },
actions: { status: {
title: 'Action', title: 'status',
render: (item, data) => { render: (item, data) => {
let actionHtml = ''; let tooltip = '';
if (data.status === 'request-reschedule') { if (data.status === 'revisi-laporan') {
actionHtml += ` tooltip = data.keterangan || '';
} else if (data.status === 'reschedule') {
tooltip = data.penilaian?.reschedule_note || '';
} else {
tooltip = '';
}
return `
<button
class="badge badge-sm badge-default uppercase flex justify-center"
title="${tooltip}">
${data.status}
</button>`;
}
},
actions: {
title: 'Action',
render: (item, data) => {
let actionHtml = '';
if (data.status === 'request-reschedule') {
actionHtml += `
<button class="btn btn-sm btn-icon btn-clear btn-success" <button class="btn btn-sm btn-icon btn-clear btn-success"
onclick="approveReschedule('${data.penilaian.id}','${data.id}', '${data.nomor_registrasi}', '${data.debiture?.name}', '${data.penilaian.reschedule_date}', '${data.penilaian.reschedule_note}')" onclick="approveReschedule('${data.penilaian.id}','${data.id}', '${data.nomor_registrasi}', '${data.debiture?.name}', '${data.penilaian.reschedule_date}', '${data.penilaian.reschedule_note}')"
title="Approve Reschedule"> title="Approve Reschedule">
<i class="ki-filled ki-double-check"></i> <i class="ki-filled ki-double-check"></i>
</button> </button>
`; `;
} else { } else {
if (data.penilaian.waktu_penilaian == null || if (data.penilaian.waktu_penilaian == null ||
(data.penilaian.waktu_penilaian && data.penilaian.authorized_status == null)) { (data.penilaian.waktu_penilaian && data.penilaian.authorized_status == null)) {
// Tombol Buat Jadwal Kunjungan actionHtml += `
actionHtml += `
<a class="btn btn-sm btn-icon btn-clear btn-primary" <a class="btn btn-sm btn-icon btn-clear btn-primary"
data-modal-toggle="#modal_jadwal" data-modal-toggle="#modal_jadwal"
onclick="jadwal(${data.penilaian.id})" onclick="jadwal(${data.penilaian.id})"
@@ -422,27 +451,27 @@ function prosesSurvey(permohonanId, nomor_registrasi) {
</a> </a>
`; `;
if (data.penilaian.waktu_penilaian && data.penilaian.authorized_status == null) { if (data.penilaian.waktu_penilaian && data.penilaian.authorized_status == null) {
// Tambahkan elemen berdampingan actionHtml += `
actionHtml += `
<span class="badge badge-xs badge-outline badge-warning text-4xs">Menunggu Pemohon</span> <span class="badge badge-xs badge-outline badge-warning text-4xs">Menunggu Pemohon</span>
`; `;
} }
} else if (data.status === 'approved-reschedule' || data.status === 'rejected-reschedule') { } else if (data.status === 'approved-reschedule' || data.status ===
actionHtml += ` 'rejected-reschedule') {
actionHtml += `
<span class="badge badge-xs badge-outline badge-warning text-4xs">Menunggu Pemohon</span> <span class="badge badge-xs badge-outline badge-warning text-4xs">Menunggu Pemohon</span>
`; `;
} else if(data.status === 'proses-survey'){ } else if (data.status === 'proses-survey') {
actionHtml += ` actionHtml += `
<a class="btn btn-sm btn-icon btn-clear btn-clarity" <a class="btn btn-sm btn-icon btn-clear btn-clarity"
onclick="prosesSurvey(${data.id}, '${data.nomor_registrasi}')" onclick="prosesSurvey(${data.id}, '${data.nomor_registrasi}')"
title="Masuk Form Inspeksi"> title="Masuk Form Inspeksi">
<i class="ki-filled ki-tablet-ok"></i> <i class="ki-filled ki-tablet-ok"></i>
</a> </a>
`; `;
}else { } else {
// Tombol Lihat Form Inspeksi dan Freeze Survey // Tombol Lihat Form Inspeksi dan Freeze Survey
actionHtml += ` actionHtml += `
<a class="btn btn-sm btn-icon btn-clear btn-warning" <a class="btn btn-sm btn-icon btn-clear btn-warning"
href="surveyor/${data.id}/show?form=inspeksi" href="surveyor/${data.id}/show?form=inspeksi"
title="Lihat Form Inspeksi"> title="Lihat Form Inspeksi">
@@ -455,12 +484,12 @@ function prosesSurvey(permohonanId, nomor_registrasi) {
<i class="ki-filled ki-arrow-circle-right"></i> <i class="ki-filled ki-arrow-circle-right"></i>
</button> </button>
`; `;
} }
} }
return actionHtml; return actionHtml;
} }
} }
} }
}; };

19
resources/views/surveyor/js/utils.blade.php
View File

@@ -26,18 +26,27 @@
} }
function formatNumber(input) { function formatNumber(input) {
let value = input.value.replace(/[^\d.]/g, ''); // Ambil posisi kursor saat ini
input.value = value; const cursorPosition = input.selectionStart;
}
// Ambil nilai input tanpa "m²" dan karakter non-angka
let value = input.value.replace(/[^\d]/g, '');
// Update nilai input dengan format angka dan "m²"
input.value = value ? value + ' m²' : 'm²';
// Atur posisi kursor di depan "m²"
input.setSelectionRange(cursorPosition, cursorPosition);
}
function formatCurrency(value, isDiskon = false) { function formatCurrency(value, isDiskon = false) {
// Ensure the value is a valid number // Ensure the value is a valid number
const numericValue = parseFloat(value); const numericValue = parseFloat(value);
if (isNaN(numericValue)) { if (isNaN(numericValue)) {
return 0; return 0;
} }
// Format the number with commas for thousands separators // Format the number with commas for thousands separators