From 28f3b83695fd73f092b40808d9dc6be926680ac8 Mon Sep 17 00:00:00 2001 From: Daeng Deni Mardaeni Date: Mon, 10 Mar 2025 14:46:05 +0700 Subject: [PATCH 01/16] fix(lampiran_dokumen): perbaiki logika penyimpanan lampiran dokumen - Memperbaiki pengecekan peran pengguna untuk menyimpan lampiran. - Menyederhanakan pengambilan keterangan dari fileData. - Memastikan keterangan disimpan dengan benar saat membuat entri baru. --- app/Models/LampiranDokumen.php | 10 ++++------ 1 file changed, 4 insertions(+), 6 deletions(-) diff --git a/app/Models/LampiranDokumen.php b/app/Models/LampiranDokumen.php index 9c98eaa..27eb576 100644 --- a/app/Models/LampiranDokumen.php +++ b/app/Models/LampiranDokumen.php @@ -27,18 +27,16 @@ class LampiranDokumen extends Base { $user = Auth::user(); - if ($user && ($user->hasRole('penilai') || $user->hasRole('administrator'))) { + if ($user && $user->hasAnyRole(['penilai', 'administrator', 'Penilai', 'admin'])) { $file = $fileData['file']; - $keterangan = $fileData['keterangan'] ?? null; - $fileName = $fileData['nama_file'] ?? time() . '_' . $file->getClientOriginalName(); $filePath = $file->storeAs('lampiran_dokumen', $fileName, 'public'); return self::create([ 'permohonan_id' => $fileData['permohonan_id'] ?? null, - 'nama_file' => $fileName, - 'path_file' => $filePath, - 'keterangan' => $keterangan, + 'nama_file' => $fileName, + 'path_file' => $filePath, + 'keterangan' => $fileData['keterangan'] ?? null, ]); } From 446703e9f38b77ed188a8b85a91c27abed019ce4 Mon Sep 17 00:00:00 2001 From: Daeng Deni Mardaeni Date: Mon, 10 Mar 2025 14:49:59 +0700 Subject: [PATCH 02/16] fix(penilai): perbaiki penamaan 'External' menjadi 'Eksternal' - Mengubah label 'Laporan External' menjadi 'Laporan Eksternal' untuk konsistensi bahasa. - Memastikan penggunaan istilah yang tepat dalam tampilan laporan. --- resources/views/penilai/show.blade.php | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/resources/views/penilai/show.blade.php b/resources/views/penilai/show.blade.php index cb3ea4e..153fb18 100644 --- a/resources/views/penilai/show.blade.php +++ b/resources/views/penilai/show.blade.php @@ -323,11 +323,11 @@ - @if($permohonan->jenisPenilaian->name=="External") + @if($permohonan->jenisPenilaian->name=="Eksternal") @if(isset($permohonan->laporanExternal->file_resume) || isset($permohonan->laporanExternal->file_laporan))
From ea4d784182596414939e54c2313b99fd3f45c0bc Mon Sep 17 00:00:00 2001 From: Daeng Deni Mardaeni Date: Mon, 10 Mar 2025 15:23:27 +0700 Subject: [PATCH 03/16] fix(detail-jaminan): tambahkan peran 'surveyor' untuk akses form upload lampiran - Memperbarui kondisi pengecekan peran pengguna untuk menyertakan 'surveyor'. - Memastikan pengguna dengan peran 'surveyor' dapat mengakses form upload lampiran. --- resources/views/component/detail-jaminan.blade.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/resources/views/component/detail-jaminan.blade.php b/resources/views/component/detail-jaminan.blade.php index b1c1825..d7d2882 100644 --- a/resources/views/component/detail-jaminan.blade.php +++ b/resources/views/component/detail-jaminan.blade.php @@ -390,7 +390,7 @@ @endforelse
- @if(Auth::user()->hasRole(['Penilai', 'administrator','penilai','admin'])) + @if(Auth::user()->hasRole(['Penilai', 'administrator','penilai','admin','surveyor']))
@csrf From ce792474c621598ec8bafa0fb6a71e414abffe3f Mon Sep 17 00:00:00 2001 From: Daeng Deni Mardaeni Date: Tue, 11 Mar 2025 10:35:25 +0700 Subject: [PATCH 04/16] fix(dokumen): perbaiki logika penyimpanan dan penghapusan dokumen jaminan - Memperbaiki penyimpanan dokumen baru yang diupload. - Menangani penghapusan dokumen dari storage jika file dihapus. - Menambahkan logika untuk memperbarui nomor dokumen yang tidak diubah. - Memastikan detail dokumen yang diupload disimpan dengan benar. - Menambahkan tombol untuk menghapus input file jika lebih dari satu. --- .../Controllers/DokumenJaminanController.php | 61 +++++++++++++------ .../debitur/components/dokumen.blade.php | 2 + 2 files changed, 46 insertions(+), 17 deletions(-) diff --git a/app/Http/Controllers/DokumenJaminanController.php b/app/Http/Controllers/DokumenJaminanController.php index d7bd597..b3d2398 100644 --- a/app/Http/Controllers/DokumenJaminanController.php +++ b/app/Http/Controllers/DokumenJaminanController.php @@ -9,6 +9,7 @@ use Illuminate\Support\Collection; use Illuminate\Support\Facades\DB; use Illuminate\Support\Facades\Storage; + use Illuminate\Http\UploadedFile; use Log; use Modules\Location\Models\City; use Modules\Location\Models\District; @@ -249,7 +250,7 @@ 'jenis_legalitas_jaminan_id' => $value, 'name' => $request->name[$key], 'keterangan' => $request->keterangan[$key], - 'details' => isset($request->custom_field[$key]) ? json_encode($request->custom_field[$key]) : '' + 'details' => isset($request->custom_field[$key]) ? json_encode(array_values($request->custom_field[$key])) : '' ]; $dokumenJaminan = []; @@ -279,7 +280,6 @@ } - // Setelah loop, periksa apakah ada dokumen yang dihapus $existingDetail = $existingDetails->get($request->detail_dokumen_jaminan_id[$key] ?? null); @@ -287,26 +287,53 @@ $existingDokumen = json_decode($existingDetail->dokumen_jaminan, true) ?? []; $existingNomor = json_decode($existingDetail->dokumen_nomor, true) ?? []; + $newDokumenJaminan = []; + $newDokumenNomor = []; - - // Jika jumlah dokumen berkurang, berarti ada yang dihapus - if (count($existingDokumen) > count($dokumenJaminan)) { - $dokumenJaminan = $existingDokumen; - $dokumenNomor = $existingNomor; - foreach ($request->dokumen_jaminan[$key] as $index => $file) { - if ($file === null) { - // Hapus dokumen yang tidak ada lagi - unset($dokumenJaminan[$index]); - unset($dokumenNomor[$index]); + foreach ($existingDokumen as $index => $existingFile) { + if (isset($request->dokumen_jaminan[$key][$index])) { + $file = $request->dokumen_jaminan[$key][$index]; + if ($file instanceof \Illuminate\Http\UploadedFile) { + // File baru diupload + $file_name = $file->getClientOriginalName(); + $file->storeAs('public/jaminan/' . $debitur->id . '/' . $document->id . '/', $file_name); + $newDokumenJaminan[] = 'jaminan/' . $debitur->id . '/' . $document->id . '/' . $file_name; + $newDokumenNomor[] = $request->dokumen_nomor[$key][$index] ?? '-'; } elseif (is_string($file) && !empty($file)) { - // Update nomor dokumen untuk file yang tidak diubah - $dokumenNomor[$index] = $request->dokumen_nomor[$key][$index] ?? '-'; + // File tidak diubah + $newDokumenJaminan[] = $existingFile; + $newDokumenNomor[] = $request->dokumen_nomor[$key][$index] ?? $existingNomor[$index]; + } + // Jika $file adalah null, berarti file dihapus dan tidak perlu ditambahkan ke array baru + } else { + // File dihapus, hapus dari storage jika ada + if (Storage::exists('public/' . $existingFile)) { + Storage::delete('public/' . $existingFile); } } - // Reset array keys - $dokumenJaminan = array_values($dokumenJaminan); - $dokumenNomor = array_values($dokumenNomor); } + + //dd($request->dokumen_jaminan[$key]); + + // Tambahkan file baru yang mungkin ditambahkan + foreach ($request->dokumen_jaminan[$key] ?? [] as $index => $file) { + + if ($file instanceof UploadedFile) { + $file_name = $file->getClientOriginalName(); + $path = 'jaminan/' . $debitur->id . '/' . $document->id . '/' . $file_name; + if (!in_array($path, $newDokumenJaminan)) { + $file->storeAs('public/' . dirname($path), $file_name); + $newDokumenJaminan[] = $path; + $newDokumenNomor[] = $request->dokumen_nomor[$key][$index] ?? '-'; + } + } elseif (is_string($file) && !empty($file) && !in_array($file, $newDokumenJaminan)) { + $newDokumenJaminan[] = $file; + $newDokumenNomor[] = $request->dokumen_nomor[$key][$index] ?? '-'; + } + } + + $dokumenJaminan = $newDokumenJaminan; + $dokumenNomor = $newDokumenNomor; } diff --git a/resources/views/debitur/components/dokumen.blade.php b/resources/views/debitur/components/dokumen.blade.php index 2debb71..5179f00 100644 --- a/resources/views/debitur/components/dokumen.blade.php +++ b/resources/views/debitur/components/dokumen.blade.php @@ -307,7 +307,9 @@ + @if($loop->index > 0) + @endif
@if($detail->details) From 059f58842eaf9d529d4fdee238c8b4c5315329b4 Mon Sep 17 00:00:00 2001 From: Daeng Deni Mardaeni Date: Tue, 11 Mar 2025 10:48:35 +0700 Subject: [PATCH 05/16] fix(dokumen): perbaiki logika penyimpanan dokumen jaminan - Tambahkan pengecekan untuk menentukan apakah semua file telah dihapus. - Sesuaikan logika penyimpanan dokumen dan nomor dokumen berdasarkan kondisi file yang ada. - Perbaiki tampilan tombol hapus file agar selalu ditampilkan. --- .../Controllers/DokumenJaminanController.php | 22 ++++++++++++++----- .../debitur/components/dokumen.blade.php | 3 +-- 2 files changed, 17 insertions(+), 8 deletions(-) diff --git a/app/Http/Controllers/DokumenJaminanController.php b/app/Http/Controllers/DokumenJaminanController.php index b3d2398..f12ae72 100644 --- a/app/Http/Controllers/DokumenJaminanController.php +++ b/app/Http/Controllers/DokumenJaminanController.php @@ -290,8 +290,11 @@ $newDokumenJaminan = []; $newDokumenNomor = []; + $allFilesDeleted = true; + foreach ($existingDokumen as $index => $existingFile) { if (isset($request->dokumen_jaminan[$key][$index])) { + $allFilesDeleted = false; $file = $request->dokumen_jaminan[$key][$index]; if ($file instanceof \Illuminate\Http\UploadedFile) { // File baru diupload @@ -304,7 +307,6 @@ $newDokumenJaminan[] = $existingFile; $newDokumenNomor[] = $request->dokumen_nomor[$key][$index] ?? $existingNomor[$index]; } - // Jika $file adalah null, berarti file dihapus dan tidak perlu ditambahkan ke array baru } else { // File dihapus, hapus dari storage jika ada if (Storage::exists('public/' . $existingFile)) { @@ -313,12 +315,10 @@ } } - //dd($request->dokumen_jaminan[$key]); - // Tambahkan file baru yang mungkin ditambahkan foreach ($request->dokumen_jaminan[$key] ?? [] as $index => $file) { - if ($file instanceof UploadedFile) { + $allFilesDeleted = false; $file_name = $file->getClientOriginalName(); $path = 'jaminan/' . $debitur->id . '/' . $document->id . '/' . $file_name; if (!in_array($path, $newDokumenJaminan)) { @@ -327,19 +327,29 @@ $newDokumenNomor[] = $request->dokumen_nomor[$key][$index] ?? '-'; } } elseif (is_string($file) && !empty($file) && !in_array($file, $newDokumenJaminan)) { + $allFilesDeleted = false; $newDokumenJaminan[] = $file; $newDokumenNomor[] = $request->dokumen_nomor[$key][$index] ?? '-'; } } - $dokumenJaminan = $newDokumenJaminan; - $dokumenNomor = $newDokumenNomor; + if ($allFilesDeleted) { + $dokumenJaminan = []; + $dokumenNomor = []; + } else { + $dokumenJaminan = $newDokumenJaminan; + $dokumenNomor = $newDokumenNomor; + } } + if (!empty($dokumenJaminan)) { $detailData['dokumen_jaminan'] = json_encode($dokumenJaminan); $detailData['dokumen_nomor'] = json_encode($dokumenNomor); + } else if(empty($dokumenJaminan)){ + $detailData['dokumen_jaminan'] = null; + $detailData['dokumen_nomor'] = null; } if (isset($request->detail_dokumen_jaminan_id[$key])) { diff --git a/resources/views/debitur/components/dokumen.blade.php b/resources/views/debitur/components/dokumen.blade.php index 5179f00..4532394 100644 --- a/resources/views/debitur/components/dokumen.blade.php +++ b/resources/views/debitur/components/dokumen.blade.php @@ -307,9 +307,8 @@ - @if($loop->index > 0) - @endif +
@if($detail->details) From 06e12225b244c8cdfab4d2fa47edbda99f95285a Mon Sep 17 00:00:00 2001 From: Daeng Deni Mardaeni Date: Tue, 11 Mar 2025 11:46:17 +0700 Subject: [PATCH 06/16] fix(print): perbaiki format tanggal dan optimalkan tampilan alamat - Menambahkan format tanggal Indonesia untuk field yang mengandung 'tanggal'. - Mengoptimalkan tampilan alamat dengan menggunakan loop untuk mengurangi duplikasi kode. --- .../component/print-out-dokument.blade.php | 10 +++-- .../penilai/components/print-memo.blade.php | 45 ++++++++----------- 2 files changed, 26 insertions(+), 29 deletions(-) diff --git a/resources/views/component/print-out-dokument.blade.php b/resources/views/component/print-out-dokument.blade.php index 1d8be54..11d37b7 100644 --- a/resources/views/component/print-out-dokument.blade.php +++ b/resources/views/component/print-out-dokument.blade.php @@ -22,9 +22,13 @@ : - {{ $item }} - @if ($key == 'luas_bangunan' || $key == 'luas_tanah') - m2 + @if (strpos(strtolower($key), 'tanggal') !== false) + {{ formatTanggalIndonesia($item) }} + @else + {{ $item }} + @if ($key == 'luas_bangunan' || $key == 'luas_tanah') + m2 + @endif @endif diff --git a/resources/views/penilai/components/print-memo.blade.php b/resources/views/penilai/components/print-memo.blade.php index 9f9d27e..62b20ec 100644 --- a/resources/views/penilai/components/print-memo.blade.php +++ b/resources/views/penilai/components/print-memo.blade.php @@ -98,7 +98,6 @@ @include('lpj::component.print-out-dokument') - Atas Nama : @@ -106,31 +105,25 @@ @if (!empty($memo['lokasi']['address'])) - - Terletak di - : - {{ $alamat['address'] ?? '' }} - - - Desa/Kelurahan - : - {{ $alamat['village_code'] ?? '' }} - - - Kecamatan - : - {{ $alamat['district_code'] ?? '' }} - - - Kabupaten/Kota - : - {{ $alamat['city_code'] ?? '' }} - - - Provinsi - : - {{ $alamat['province_code'] ?? '' }} - + @php + $alamatFields = [ + 'Terletak di' => 'address', + 'Desa/Kelurahan' => 'village_code', + 'Kecamatan' => 'district_code', + 'Kabupaten/Kota' => 'city_code', + 'Provinsi' => 'province_code' + ]; + @endphp + + @foreach ($alamatFields as $label => $field) + @if (!empty($alamat[$field])) + + {{ $label }} + : + {{ $alamat[$field] }} + + @endif + @endforeach @endif From 5a8b93b5f74f6701de8c073456c8b138f27761f0 Mon Sep 17 00:00:00 2001 From: majid Date: Tue, 11 Mar 2025 11:51:01 +0700 Subject: [PATCH 07/16] fix(penilai): perbaikkan keterangan freeze dan ubah name kjjp ke kjpp, handle key foto memo --- app/Http/Controllers/PenilaiController.php | 51 +---- app/Http/Controllers/PenilaianController.php | 19 +- app/Http/Controllers/SurveyorController.php | 12 +- .../penilai/components/print-memo.blade.php | 6 +- resources/views/penilai/index.blade.php | 4 +- .../penilaian/otorisator/index-sla.blade.php | 2 +- .../views/penilaian/otorisator/sla.blade.php | 203 +++++++++++++----- .../surveyor/components/inspeksi.blade.php | 4 +- .../components/print-out/main.blade.php | 8 +- 9 files changed, 196 insertions(+), 113 deletions(-) diff --git a/app/Http/Controllers/PenilaiController.php b/app/Http/Controllers/PenilaiController.php index 5d32d87..a09c926 100644 --- a/app/Http/Controllers/PenilaiController.php +++ b/app/Http/Controllers/PenilaiController.php @@ -570,7 +570,7 @@ class PenilaiController extends Controller }); } - $query->whereRaw('LOWER(status) IN (?, ?, ?, ?, ?, ?,?, ?)', ['assign', 'survey-completed', 'proses-laporan', 'paparan', 'proses-paparan', 'paparan', 'revisi-laporan', 'revisi-paparan']); + $query->whereRaw('LOWER(status) IN (?, ?, ?, ?, ?, ?,?, ?, ?, ?, ?)', ['assign', 'survey-completed', 'proses-laporan', 'paparan', 'proses-paparan', 'paparan', 'revisi-laporan', 'revisi-paparan', 'request-freeze', 'freeze', 'reject-freeze']); if (!Auth::user()->hasRole('administrator')) { $query->whereHas('penilaian.userPenilai', function ($q) { @@ -963,41 +963,6 @@ class PenilaiController extends Controller } - public function storeMemo(Request $request) - { - try { - - $validatedData = $request->validate([ - 'permohonan_id' => 'required|integer', - 'document_id' => 'required|integer', - 'inspeksi_id' => 'required|integer', - 'memo' => 'required', - ]); - Penilai::updateOrCreate( - [ - 'permohonan_id' => $validatedData['permohonan_id'], - 'dokument_id' => $validatedData['document_id'], - 'inspeksi_id' => $validatedData['inspeksi_id'], - ], - [ - 'memo' => json_encode($validatedData['memo']), - ] - ); - - - return response()->json([ - 'success' => true, - 'message' => 'Berhasil saved memo' - ], 200); - } catch (\Exception $e) { - return response()->json([ - 'success' => false, - 'message' => 'Terjadi kesalahan', - 'error' => $e->getMessage() - ], 500); - } - } - public function storeMemoWithPhotos(Request $request) { try { @@ -1021,6 +986,8 @@ class PenilaiController extends Controller ] ); + $existingPhotos = isset($memo->memo) ? json_decode($memo->memo)->foto : []; + dd($existingPhotos); // Simpan foto-foto if ($request->hasFile('foto_0')) { $photoUrls = []; @@ -1033,11 +1000,15 @@ class PenilaiController extends Controller $index++; } - // Tambahkan URL foto ke data memo - $memoData['foto'] = $photoUrls; - $memo->memo = json_encode($memoData); - $memo->save(); + $memoData['foto'] = array_merge($existingPhotos, $photoUrls); + + }else{ + $memoData['foto'] = $existingPhotos; } + // Tambahkan URL foto ke data memo + $memoData['foto'] = $photoUrls; + $memo->memo = json_encode($memoData); + $memo->save(); return response()->json([ 'success' => true, diff --git a/app/Http/Controllers/PenilaianController.php b/app/Http/Controllers/PenilaianController.php index 4655298..aabb59b 100644 --- a/app/Http/Controllers/PenilaianController.php +++ b/app/Http/Controllers/PenilaianController.php @@ -450,7 +450,7 @@ class PenilaianController extends Controller public function otorisatorUpdate(Request $request, $id, $context) { - if ($context === 'SLA') { + if ($context === 'Freze SLA') { $authorization = Authorization::with(['user'])->find($id); if (!$authorization) { return response()->json([ @@ -513,7 +513,7 @@ class PenilaianController extends Controller } break; - case 'sla': + case 'freze sla': if (Auth::user()->roles[0]->name === 'senior-officer' || Auth::user()->roles[0]->name === 'administrator' && $authorization->approve_so === null) { $authorization->update([ 'status' => '3', @@ -633,7 +633,7 @@ class PenilaianController extends Controller 'Pelaporan' => 'proses-laporan', 'Pembayaran' => 'proses', 'Pembatalan' => 'batal', - 'SLA' => 'freeze', + 'SLA' => 'request-freeze', 'Paparan' => 'proses-paparan', default => '', }; @@ -665,7 +665,7 @@ class PenilaianController extends Controller $query->whereRaw('LOWER(status) = ?', [strtolower($status)]); } elseif ($status == 'batal') { $query->whereRaw('LOWER(status) = ?', [strtolower($status)]); - } elseif ($status == 'freeze') { + } elseif ($status == 'request-freeze') { $query->whereRaw('LOWER(status) = ?', [strtolower($status)]); } elseif ($status == 'proses-paparan') { $query->whereRaw('LOWER(status) IN (?, ?)', ['proses-paparan', 'paparan']); @@ -891,7 +891,8 @@ class PenilaianController extends Controller public function revisiLaporan(Request $request, $id) { - if($request->dataHeader=='Paparan'){ + // dd($request->all()); + if($request->dataHeader=='Paparan' || $request->dataHeader=='Freze SLA'){ $authorization = Authorization::find($id); $permohonan = Permohonan::find($authorization->permohonan_id); } else { @@ -905,7 +906,13 @@ class PenilaianController extends Controller } $status = 'revisi-paparan'; - } elseif ($permohonan->status === 'proses-laporan' && $userRole === 'EO Appraisal') { + }else if($permohonan->status === 'freeze'){ + if ($authorization) { + $authorization->delete(); + } + + $status = 'reject-freeze'; + }elseif ($permohonan->status === 'proses-laporan' && $userRole === 'EO Appraisal') { $permohonan->update([ 'approval_so' => 0, 'approval_so_at' => null, diff --git a/app/Http/Controllers/SurveyorController.php b/app/Http/Controllers/SurveyorController.php index 2b22ff9..cbd8afc 100644 --- a/app/Http/Controllers/SurveyorController.php +++ b/app/Http/Controllers/SurveyorController.php @@ -914,10 +914,16 @@ class SurveyorController extends Controller try { $permohonan = Permohonan::findOrFail($id); + $permohonan->update([ + 'keterangan' => $request->keterangan, + 'status' => 'request-freeze', + ]); + Authorization::updateOrCreate([ 'permohonan_id' => $permohonan->id, - 'jenis' => 'sla' + 'jenis' => 'sla', ], [ + 'keterangan' => $request->keterangan, 'request' => 'freeze', 'user_id' => Auth::user()->id ]); @@ -2422,7 +2428,7 @@ class SurveyorController extends Controller $validator = Validator::make($request->all(), [ 'signature' => 'required', - 'type' => 'required|in:penilai,cabang,debitur,kjjp', + 'type' => 'required|in:penilai,cabang,debitur,kjpp', 'name' => 'nullable|string', 'document_id' => 'nullable|string' ]); @@ -2529,7 +2535,7 @@ class SurveyorController extends Controller { try { $validator = Validator::make($request->all(), [ - 'type' => 'required|in:penilai,cabang,debitur,kjjp' + 'type' => 'required|in:penilai,cabang,debitur,kjpp' ]); if ($validator->fails()) { diff --git a/resources/views/penilai/components/print-memo.blade.php b/resources/views/penilai/components/print-memo.blade.php index 9f9d27e..635fe5f 100644 --- a/resources/views/penilai/components/print-memo.blade.php +++ b/resources/views/penilai/components/print-memo.blade.php @@ -295,9 +295,11 @@
+@if (isset($memo['foto'])) + @foreach ($memo['foto'] as $item) - @php + @php $cleanedPath = str_replace('/storage/', '', $item); $imagePath = storage_path('app/public/' . $cleanedPath); @endphp @@ -307,7 +309,7 @@ @endforeach -
+@endif @include('lpj::penilai.components.footer') diff --git a/resources/views/penilai/index.blade.php b/resources/views/penilai/index.blade.php index cd076ef..ecfa4c7 100644 --- a/resources/views/penilai/index.blade.php +++ b/resources/views/penilai/index.blade.php @@ -232,7 +232,7 @@ actions: { title: 'Action', render: (item, data) => { - if (data.status === 'survey-completed' || data.status === 'proses-laporan' || data.status === 'paparan' || data.status === 'proses-paparan' || data.status === 'paparan' || data.status == 'revisi-laporan' || data.status === 'done' || data.status === 'revisi-paparan') { + if (data.status === 'survey-completed' || data.status === 'proses-laporan' || data.status === 'paparan' || data.status === 'proses-paparan' || data.status === 'paparan' || data.status == 'revisi-laporan' || data.status === 'done' || data.status === 'revisi-paparan' || data.status === 'reject-freeze' || data.status === 'freeze' || data.status === 'request-freeze') { return `
@@ -298,7 +298,7 @@ Swal.fire({ url: `/surveyor/storeFreeze/${permohonanId}`, type: 'POST', data: { - message: userMessage + keterangan: userMessage }, success: (response) => { Swal.fire('Berhasil!', diff --git a/resources/views/penilaian/otorisator/index-sla.blade.php b/resources/views/penilaian/otorisator/index-sla.blade.php index a6b91b2..37fd065 100644 --- a/resources/views/penilaian/otorisator/index-sla.blade.php +++ b/resources/views/penilaian/otorisator/index-sla.blade.php @@ -183,7 +183,7 @@ return `${data.permohonan.debiture.name}`; }, }, - alasan: { + keterangan: { title: 'Alasan', }, request: { diff --git a/resources/views/penilaian/otorisator/sla.blade.php b/resources/views/penilaian/otorisator/sla.blade.php index f6f1375..c0e960e 100644 --- a/resources/views/penilaian/otorisator/sla.blade.php +++ b/resources/views/penilaian/otorisator/sla.blade.php @@ -78,7 +78,7 @@
- {{ $authorization->alasan ?? ''}} + {{ $authorization->keterangan ?? ''}} @@ -87,7 +87,7 @@ - + @@ -163,21 +163,21 @@ @endif @if(Auth::user()->hasAnyRole(['administrator','senior-officer']) && $authorization->approve_so==null) - @endif @if(Auth::user()->hasAnyRole(['administrator','EO Appraisal']) && $authorization->approve_so && $authorization->approve_eo==null) - @endif - @if(Auth::user()->hasAnyRole(['administrator','DD Appraisal']) && $authorization->approve_eo && $authorization->approve_dd==null && in_array($permohonan->nilai_plafond_id,[1,4])) - @@ -188,52 +188,149 @@ @endsection @push('scripts') - + return alasan; + } + }).then((rejectResult) => { + if (rejectResult.isConfirmed) { + handleAjaxRequest( + `/otorisator/revisi-laporan/${dataId}`, { + keterangan: rejectResult.value, + dataHeader: dataHeader + }, + 'Data berhasil ditolak.', + 'Terjadi kesalahan saat melakukan penolakan.' + ); + } + }); + }; + + const showSwalConfirmation = ( + title, text, html, confirmText, denyText, cancelText, preConfirm, icon = 'question' + ) => { + return Swal.fire({ + title: title, + text: text, + html: html, + icon: icon, + focusConfirm: false, + preConfirm: preConfirm, + showCancelButton: true, + showDenyButton: !!denyText, + confirmButtonColor: '#3085d6', + cancelButtonColor: '#d33', + denyButtonColor: '#f39c12', + confirmButtonText: confirmText, + denyButtonText: denyText, + cancelButtonText: cancelText, + }); + }; + + const handleAjaxRequest = (url, data, successMessage, errorMessage) => { + $.ajaxSetup({ + headers: { + 'X-CSRF-TOKEN': '{{ csrf_token() }}' + }, + }); + $.ajax({ + url: url, + type: 'POST', + data: data, + success: () => { + Swal.fire('Berhasil!', successMessage, 'success').then(() => { + const dataHeader = @json($header); + const redirectUrl = `/otorisator/sla`; + window.location.href = redirectUrl; + }); + }, + error: (error) => { + console.error('Error:', error); + Swal.fire('Gagal!', errorMessage, 'error'); + } + }); + }; + + function otorisatorData(dataId, role = '') { + const dataHeader = @json($header); + const isPaparanSO = dataHeader === 'SLA' && role === 'SO'; + + const swalHtml = isPaparanSO ? ` +
+

Untuk melakukan otorisasi ${dataHeader}!

+
+ + +
+
+ + +
+
` : ''; + + showSwalConfirmation( + 'Apakah Anda yakin?', + `Untuk melakukan otorisasi ${dataHeader}!`, + swalHtml, + 'Ya, Lanjutkan!', + 'Tolak', + 'Batal', + () => { + if (isPaparanSO) { + const message = document.getElementById('swal-keterangan')?.value; + const tanggalPaparan = document.getElementById('swal-tanggal-paparan').value; + + if (!message || !tanggalPaparan) { + Swal.showValidationMessage('Keterangan dan Tanggal Paparan harus diisi!'); + return false; + } + + return { + message, + tanggalPaparan + }; + } else { + return { + message: 'Ya, lanjutkan.' + }; + } + }, + 'question' + ).then((result) => { + if (result.isConfirmed) { + const requestData = isPaparanSO ? { + keterangan: result.value.message, + tanggalPaparan: result.value.tanggalPaparan + } : { + keterangan: result.value.message + }; + + handleAjaxRequest( + `/otorisator/otorisator/${dataId}/${dataHeader}`, + requestData, + 'Data berhasil diotorisasi.', + 'Terjadi kesalahan saat melakukan otorisasi.' + ); + } else if (result.isDenied) { + handleRejection(dataId,dataHeader); + } + }); + } + @endpush diff --git a/resources/views/surveyor/components/inspeksi.blade.php b/resources/views/surveyor/components/inspeksi.blade.php index 108249e..9bcef2a 100644 --- a/resources/views/surveyor/components/inspeksi.blade.php +++ b/resources/views/surveyor/components/inspeksi.blade.php @@ -54,7 +54,7 @@
- @foreach (['penilai', 'cabang', 'debitur', 'kjjp'] as $type) + @foreach (['penilai', 'cabang', 'debitur', 'kjpp'] as $type) @include('lpj::component.signature-pad', ['type' => $type]) @endforeach @@ -95,7 +95,7 @@ console.log(datas); document.addEventListener('DOMContentLoaded', function() { const signaturePads = {}; - const types = ['penilai', 'cabang', 'debitur', 'kjjp']; + const types = ['penilai', 'cabang', 'debitur', 'kjpp']; // Initialize all signature pads types.forEach(type => initSignaturePad(type)); diff --git a/resources/views/surveyor/components/print-out/main.blade.php b/resources/views/surveyor/components/print-out/main.blade.php index e7401a4..7f69ede 100644 --- a/resources/views/surveyor/components/print-out/main.blade.php +++ b/resources/views/surveyor/components/print-out/main.blade.php @@ -574,10 +574,10 @@ @endif - @if (isset($forminspeksi['signature']['kjjp'])) + @if (isset($forminspeksi['signature']['kjpp']))
@endif @@ -605,9 +605,9 @@ {{ ucwords(strtolower('DEBITUR/PERWAKILAN')) }} @endif - @if (isset($forminspeksi['signature']['kjjp']['name'])) + @if (isset($forminspeksi['signature']['kjpp']['name'])) From ef7a47ebb9f28e0a2db4050249f1a4109e3d3795 Mon Sep 17 00:00:00 2001 From: majid Date: Tue, 11 Mar 2025 13:15:51 +0700 Subject: [PATCH 08/16] fix(penilai): perbaikkan luas tanah, bangunan, dan print out sederhana, dan rap --- app/Helpers/Lpj.php | 54 +++++++++++++++- app/Http/Controllers/PenilaiController.php | 12 ++-- app/Http/Controllers/PenilaianController.php | 4 +- .../components/print-out-rap.blade.php | 62 +++++++++---------- .../components/print-out-sederhana.blade.php | 13 ++-- .../components/print-pembanding.blade.php | 3 + .../surveyor/components/bangunan.blade.php | 2 +- .../views/surveyor/components/tanah.blade.php | 3 +- 8 files changed, 101 insertions(+), 52 deletions(-) diff --git a/app/Helpers/Lpj.php b/app/Helpers/Lpj.php index 0855bb3..4b182f0 100644 --- a/app/Helpers/Lpj.php +++ b/app/Helpers/Lpj.php @@ -485,7 +485,7 @@ function calculateSLA($permohonan, $type) * @param int $jenisLegalitas * @return int */ -function calculateTotalLuas($detailsArray, $key, $jenisLegalitas) +function calculateTotalLuas($detailsArray, $key, $jenisLegalitas, $defaultJenisLegalitas) { $total = 0; @@ -503,7 +503,57 @@ function calculateTotalLuas($detailsArray, $key, $jenisLegalitas) } } } + + // Jika total masih 0, gunakan jenis jaminan ppjb + if ($total === 0) { + foreach ($detailsArray as $item) { + if (isset($item->jenis_legalitas_jaminan_id) && $item->jenis_legalitas_jaminan_id === $defaultJenisLegalitas) { + $details = json_decode($item->details, true); + + if (is_array($details)) { + foreach ($details as $detail) { + if (isset($detail[$key]) && $detail[$key] !== null) { + $total += (int) $detail[$key]; + } + } + } + } + } + } + + // jika total masih kosong juga maka gunakan ppb + if ($total === 0 && $fallbackJenisLegalitas !== null) { + foreach ($detailsArray as $item) { + if (isset($item->jenis_legalitas_jaminan_id) && $item->jenis_legalitas_jaminan_id === $fallbackJenisLegalitas) { + $details = json_decode($item->details, true); + + if (is_array($details)) { + foreach ($details as $detail) { + if (isset($detail[$key]) && $detail[$key] !== null) { + $total += (int) $detail[$key]; + } + } + } + } + } + } } - return $total; + return $total > 0 ? $total : 0; +} + + +function ubahNomorHp($nomorHp) { + + $nomorHp = preg_replace('/\D/', '', $nomorHp); + if (strpos($nomorHp, '62') === 0) { + $nomorBaru = substr($nomorHp, 0, 5) . "xxxxx"; + return '+' . $nomorBaru; + } elseif (strpos($nomorHp, '0') === 0) { + + $nomorBaru = substr($nomorHp, 0, 5) . "xxxxxx"; + return $nomorBaru; + } else { + return "Nomor HP tidak valid"; + } } diff --git a/app/Http/Controllers/PenilaiController.php b/app/Http/Controllers/PenilaiController.php index a09c926..e61863d 100644 --- a/app/Http/Controllers/PenilaiController.php +++ b/app/Http/Controllers/PenilaiController.php @@ -144,10 +144,10 @@ class PenilaiController extends Controller } } - return view('lpj::penilai.components.lpj-sederhana-standard', compact('permohonan', 'forminspeksi', 'basicData', 'inspeksi', 'lpjData', 'provinces', 'cekAlamat', 'cities', 'districts', 'villages')); + return view('lpj::penilai.components.lpj-sederhana-standar', compact('permohonan', 'forminspeksi', 'basicData', 'inspeksi', 'lpjData', 'provinces', 'cekAlamat', 'cities', 'districts', 'villages')); } - public function standard(Request $request, $id) + public function standar(Request $request, $id) { $documentId = $request->query('documentId'); @@ -167,7 +167,7 @@ class PenilaiController extends Controller 'inspeksi_id' => $inspeksiId, ], [ - 'type_penilai' => 'standard', + 'type_penilai' => 'standar', ] ); @@ -212,7 +212,7 @@ class PenilaiController extends Controller } } - return view('lpj::penilai.components.lpj-sederhana-standard', compact('permohonan', 'forminspeksi', 'basicData', 'inspeksi', 'lpjData', 'provinces', 'cekAlamat', 'cities', 'districts', 'villages')); + return view('lpj::penilai.components.lpj-sederhana-standar', compact('permohonan', 'forminspeksi', 'basicData', 'inspeksi', 'lpjData', 'provinces', 'cekAlamat', 'cities', 'districts', 'villages')); } public function resume(Request $request) @@ -1358,7 +1358,7 @@ class PenilaiController extends Controller { $viewMap = [ 'sederhana' => 'penilai.components.print-out-sederhana', - 'standard' => 'penilai.components.print-out-standard', + 'standar' => 'penilai.components.print-out-standar', 'resume' => 'penilai.components.print-resume', 'memo' => 'penilai.components.print-memo', 'rap' => 'penilai.components.print-out-rap', @@ -1421,7 +1421,7 @@ class PenilaiController extends Controller } - if ($type === 'standard' || $type === 'sederhana') { + if ($type === 'standar' || $type === 'sederhana') { return $this->checkDataLpj($type, $statusLpj); } diff --git a/app/Http/Controllers/PenilaianController.php b/app/Http/Controllers/PenilaianController.php index aabb59b..11da675 100644 --- a/app/Http/Controllers/PenilaianController.php +++ b/app/Http/Controllers/PenilaianController.php @@ -825,8 +825,8 @@ class PenilaianController extends Controller private function getViewLaporan($tipe) { $viewMap = [ - 'sederhana' => 'penilai.components.lpj-sederhana-standard', - 'standard' => 'penilai.components.lpj-sederhana-standard', + 'sederhana' => 'penilai.components.lpj-sederhana-standar', + 'standar' => 'penilai.components.lpj-sederhana-standar', 'resume' => 'penilai.components.resume', 'memo' => 'penilai.components.memo', 'rap' => 'penilai.components.rap-penilai', diff --git a/resources/views/penilai/components/print-out-rap.blade.php b/resources/views/penilai/components/print-out-rap.blade.php index 19a768d..32e7432 100644 --- a/resources/views/penilai/components/print-out-rap.blade.php +++ b/resources/views/penilai/components/print-out-rap.blade.php @@ -28,32 +28,26 @@ $data = rtrim($data, ', '); @endphp
-
Alasan{{ $authorization->alasan }}{{ $authorization->keterangan }}
Tanggal Permohonan KJPP + src="{{ $forminspeksi['signature']['kjpp']['image'] }}" alt="KJPP">
- {{ ucwords(strtolower($forminspeksi['signature']['kjjp']['name'])) }} + {{ ucwords(strtolower($forminspeksi['signature']['kjpp']['name'])) }}
{{ strtoupper('K.J.P.P') }}
- - - -
-

Report Analisa Property

-
+
+

Report Analisa Property + {{ $data }}

+

NO: {{ $nomorLaporan }}

+
+
- + - + - - - - - - + @@ -77,7 +71,7 @@ - + @@ -87,7 +81,7 @@

NAMA DEVELOPER

KepadaKepada : {{ $rap['kepada'] ?? '' }}
DariDari : {{ $rap['dari'] ?? '' }}
No:{{ $nomorLaporan ?? '-' }}
Tanggal SurveyTanggal Survey : {{ formatTanggalIndonesia($permohonan->penilaian->waktu_penilaian) }}
PerihalPerihal : {{ $rap['perihal'] ?? '' }}
- + @@ -96,7 +90,7 @@

NAMA PROYEK

NamaNama : {{ $permohonan->debiture->name ?? '' }}
- + @@ -104,7 +98,7 @@

ALAMAT

ProyekProyek : {{ $data ?? '' }}
- + @@ -138,7 +132,7 @@ @if (isset($forminspeksi['perizinan']) && is_array($forminspeksi['perizinan']) && count($forminspeksi['perizinan']) > 0) @foreach ($forminspeksi['perizinan'] as $perizinan) - + @@ -148,7 +142,7 @@ @if (isset($forminspeksi['brosur_price_list']) && count($forminspeksi['brosur_price_list']) > 0) @foreach ($forminspeksi['brosur_price_list'] as $perizinan) - + @@ -160,13 +154,13 @@

DESKRIPSI DEVELOPER

Terletak diTerletak di : {{ $alamat['address'] ?? '' }}
PerizinanPerizinan : {{ $perizinan['perizinan'] }}
Brosur & PricelistBrosur & Pricelist : {{ $perizinan['jenis'] }}
- - + @@ -175,7 +169,7 @@ @isset($forminspeksi['lainnya_developer']) @foreach ($forminspeksi['lainnya_developer'] as $item) - +
Pengalaman Developer & Proyek Yang Pernah + Pengalaman Developer & Proyek Yang Pernah Dibuat : {!! nl2br(e($forminspeksi['pengalaman_developer'] ?? 'Data tidak tersedia')) !!}
Apakah Developer Anggota REIApakah Developer Anggota REI : {!! nl2br(e($forminspeksi['developer_anggota'] ?? 'Data tidak tersedia')) !!}
LainnyaLainnya : {!! nl2br(e($item)) !!} @@ -187,43 +181,43 @@

KONDISI, LINGKUNGAN DAN PROGRESS PEMBANGUNAN

- - + - + - + - + - + - + - + @@ -232,7 +226,7 @@ @isset($forminspeksi['lainnya_kondisi']) @foreach ($forminspeksi['lainnya_kondisi'] as $item) - + - diff --git a/resources/views/penilai/components/print-out-sederhana.blade.php b/resources/views/penilai/components/print-out-sederhana.blade.php index acce9e1..02cee4c 100644 --- a/resources/views/penilai/components/print-out-sederhana.blade.php +++ b/resources/views/penilai/components/print-out-sederhana.blade.php @@ -8,6 +8,12 @@ @endphp
+
+

LAPORAN PENILAIAN ATAS + {{ $data }}

+

NO: {{ $nomorLaporan }}

+
+
Kapan Mulai Dibangun & Target Penyelesaian + Kapan Mulai Dibangun & Target Penyelesaian : {!! nl2br(e($forminspeksi['kapan_mulai_dibangun'] ?? 'Data tidak tersedia')) !!}
Kondisi Perumahan Saat IniKondisi Perumahan Saat Ini : {!! nl2br(e($forminspeksi['kondisi_perumahan'] ?? 'Data tidak tersedia')) !!}
Progress PembangunanProgress Pembangunan : {!! nl2br(e($forminspeksi['progres_pembangunan'] ?? 'Data tidak tersedia')) !!}
Kontraktor (internal/eksternal)Kontraktor (internal/eksternal) : {!! nl2br(e($forminspeksi['kontraktor'] ?? 'Data tidak tersedia')) !!}
Lingkungan SekitarLingkungan Sekitar : {!! nl2br(e($forminspeksi['lingkungan_sekitar'] ?? 'Data tidak tersedia')) !!}
Komplek Lain Disekitar LokasiKomplek Lain Disekitar Lokasi : {!! nl2br(e($forminspeksi['komplek_disekitar'] ?? 'Data tidak tersedia')) !!}
Pusat Keramaian Dekat LokasiPusat Keramaian Dekat Lokasi : {!! nl2br(e($forminspeksi['pusat_keramaian'] ?? 'Data tidak tersedia')) !!}
Transportasi Umum Yang TersediaTransportasi Umum Yang Tersedia : {!! nl2br(e($forminspeksi['transportasi_umum'] ?? 'Data tidak tersedia')) !!}
LainnyaLainnya : {!! nl2br(e($item)) !!} @@ -249,7 +243,7 @@ @foreach ($forminspeksi['partisi'] as $key => $item) @if (is_array($item))
+ {{ $item['nama'] ?? '' }} :
- - - - - @@ -266,7 +267,7 @@ @endphp - + diff --git a/resources/views/penilai/components/print-pembanding.blade.php b/resources/views/penilai/components/print-pembanding.blade.php index f18a495..bf342e0 100644 --- a/resources/views/penilai/components/print-pembanding.blade.php +++ b/resources/views/penilai/components/print-pembanding.blade.php @@ -44,6 +44,9 @@ @elseif($key == 'tanggal') {{ formatTanggalIndonesia($data[$key]) ?? '-' }} + @elseif($key == 'telepon') + {{ isset($data['telepon']) ? ubahNomorHp($data['telepon']) : '-' }} + @elseif($key == 'kordinat') @php $lat = $data['kordinat_lat'] ?? null; diff --git a/resources/views/surveyor/components/bangunan.blade.php b/resources/views/surveyor/components/bangunan.blade.php index 9f6e622..5778669 100644 --- a/resources/views/surveyor/components/bangunan.blade.php +++ b/resources/views/surveyor/components/bangunan.blade.php @@ -16,7 +16,7 @@ $total_luas_bangunan = 0; $jenis_legalitas_jaminan_id = 0; if (isset($item->detail)) { - $total_luas_bangunan = calculateTotalLuas($item->detail, 'luas_bangunan', 10); + $total_luas_bangunan = calculateTotalLuas($item->detail, 'luas_bangunan', 10, 27, 3); } @endphp documents)) @foreach ($permohonan->documents as $item) @php + // 27 $total_luas_tanah = 0; $jenis_legalitas_jaminan_id = 0; if (isset($item->detail)) { - $total_luas_tanah = calculateTotalLuas($item->detail, 'luas_tanah', 1); + $total_luas_tanah = calculateTotalLuas($item->detail, 'luas_tanah', 1, 27, 3); } @endphp Date: Tue, 11 Mar 2025 13:36:06 +0700 Subject: [PATCH 09/16] fix(lampiran_dokumen): tambahkan peran surveyor untuk akses file - Memperbarui kondisi pengecekan peran pengguna untuk menyertakan 'surveyor'. - Memastikan pengguna dengan peran surveyor dapat mengakses fungsionalitas terkait lampiran dokumen. --- app/Models/LampiranDokumen.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/Models/LampiranDokumen.php b/app/Models/LampiranDokumen.php index 27eb576..af514f5 100644 --- a/app/Models/LampiranDokumen.php +++ b/app/Models/LampiranDokumen.php @@ -27,7 +27,7 @@ class LampiranDokumen extends Base { $user = Auth::user(); - if ($user && $user->hasAnyRole(['penilai', 'administrator', 'Penilai', 'admin'])) { + if ($user && $user->hasAnyRole(['penilai', 'administrator', 'Penilai', 'admin','surveyor'])) { $file = $fileData['file']; $fileName = $fileData['nama_file'] ?? time() . '_' . $file->getClientOriginalName(); $filePath = $file->storeAs('lampiran_dokumen', $fileName, 'public'); From df3e59e5c662b784f83d0864f7f1c8530cb5e97f Mon Sep 17 00:00:00 2001 From: majid Date: Tue, 11 Mar 2025 13:44:03 +0700 Subject: [PATCH 10/16] fix(route): ganti nama class standard ke standar --- routes/web.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/routes/web.php b/routes/web.php index e6033c1..b497718 100644 --- a/routes/web.php +++ b/routes/web.php @@ -604,7 +604,7 @@ Route::middleware(['auth'])->group(function () { Route::post('import/kertas-kerja', [PenilaiController::class, 'import_kertas_kerja'])->name('import.kertas-kerja'); Route::get('sederhana/{id}', [PenilaiController::class, 'sederhana'])->name('sederhana'); - Route::get('standard/{id}', [PenilaiController::class, 'standard'])->name('standard'); + Route::get('standar/{id}', [PenilaiController::class, 'standar'])->name('standar'); Route::get('resume', [PenilaiController::class, 'resume'])->name('resume'); Route::get('memo', [PenilaiController::class, 'memo'])->name('memo'); Route::get('paparan', [PenilaiController::class, 'paparan'])->name('paparan'); From b692ba87f86980195b85cad64f20efda71e5e5be Mon Sep 17 00:00:00 2001 From: Daeng Deni Mardaeni Date: Tue, 11 Mar 2025 21:18:49 +0700 Subject: [PATCH 11/16] fix(lpj): perbaiki penamaan dan logika tanggal - Mengubah logika penentuan tanggal saat ini untuk mematuhi aturan yang berlaku. - Menambahkan tampilan baru untuk LPJ sederhana dan standar. - Memperbaiki penamaan rute dari 'standard' menjadi 'standar' untuk konsistensi. - Memperbaiki akses data debitur dengan menggunakan optional chaining. --- app/Helpers/Lpj.php | 4 ++-- ...ndard.blade.php => lpj-sederhana-standar.blade.php} | 0 resources/views/penilai/show.blade.php | 10 +++++----- .../views/permohonan/authorization/index.blade.php | 2 +- routes/breadcrumbs.php | 2 +- 5 files changed, 9 insertions(+), 9 deletions(-) rename resources/views/penilai/components/{lpj-sederhana-standard.blade.php => lpj-sederhana-standar.blade.php} (100%) diff --git a/app/Helpers/Lpj.php b/app/Helpers/Lpj.php index 4b182f0..18d5a4b 100644 --- a/app/Helpers/Lpj.php +++ b/app/Helpers/Lpj.php @@ -46,8 +46,8 @@ function checkActiveDateRangePenawaran($id) $start_date = strtotime($penawaran->start_date); $end_date = strtotime($penawaran->end_date); - // $todays_date = strtotime(now()); - $todays_date = strtotime("+1 day", strtotime(now())); + $todays_date = strtotime(now()); + //$todays_date = strtotime("+1 day", strtotime(now())); $allow = true; if ($todays_date >= $start_date && $todays_date <= $end_date) { diff --git a/resources/views/penilai/components/lpj-sederhana-standard.blade.php b/resources/views/penilai/components/lpj-sederhana-standar.blade.php similarity index 100% rename from resources/views/penilai/components/lpj-sederhana-standard.blade.php rename to resources/views/penilai/components/lpj-sederhana-standar.blade.php diff --git a/resources/views/penilai/show.blade.php b/resources/views/penilai/show.blade.php index 153fb18..297f1bc 100644 --- a/resources/views/penilai/show.blade.php +++ b/resources/views/penilai/show.blade.php @@ -491,10 +491,10 @@ .then(data => { if (data.status) { // Jika status LPJ sudah ada, arahkan langsung ke halaman - if (data.status === 'standard') { + if (data.status === 'standar') { showLoadingSwal('Tunggu ...'); window.location.href = - `{{ route('penilai.standard', $permohonan->id) }}?documentId=${documentId}&inspeksiId=${inspeksiId}&jaminanId=${jaminanId}`; + `{{ route('penilai.standar', $permohonan->id) }}?documentId=${documentId}&inspeksiId=${inspeksiId}&jaminanId=${jaminanId}`; } else if (data.status === 'sederhana') { showLoadingSwal('Tunggu ...'); window.location.href = @@ -524,7 +524,7 @@ denyButtonColor: '#d33', }).then((result) => { if (result.isConfirmed) { - saveStatusLpj(permohonanId, documentId, inspeksiId, 'standard', + saveStatusLpj(permohonanId, documentId, inspeksiId, 'standar', jaminanId); } else if (result.isDenied) { saveStatusLpj(permohonanId, documentId, inspeksiId, 'sederhana', @@ -556,9 +556,9 @@ }).then(response => response.json()) .then(data => { if (data.success) { - if (type === 'standard') { + if (type === 'standar') { window.location.href = - `{{ route('penilai.standard', $permohonan->id) }}?documentId=${documentId}&inspeksiId=${inspeksiId}&jaminanId=${jaminanId}`; + `{{ route('penilai.standar', $permohonan->id) }}?documentId=${documentId}&inspeksiId=${inspeksiId}&jaminanId=${jaminanId}`; } else if (type === 'sederhana') { window.location.href = `{{ route('penilai.sederhana', $permohonan->id) }}?documentId=${documentId}&inspeksiId=${inspeksiId}&jaminanId=${jaminanId}`; diff --git a/resources/views/permohonan/authorization/index.blade.php b/resources/views/permohonan/authorization/index.blade.php index 2a84158..6906698 100644 --- a/resources/views/permohonan/authorization/index.blade.php +++ b/resources/views/permohonan/authorization/index.blade.php @@ -154,7 +154,7 @@ debitur_id: { title: 'Debitur', render: (item, data) => { - return `${data.debiture.name}`; + return `${data.debiture?.name}`; }, }, tujuan_penilaian_id: { diff --git a/routes/breadcrumbs.php b/routes/breadcrumbs.php index 71a3801..b62b23d 100644 --- a/routes/breadcrumbs.php +++ b/routes/breadcrumbs.php @@ -614,7 +614,7 @@ Breadcrumbs::for('penilai.showDataPembanding', function (BreadcrumbTrail $trail) }); -Breadcrumbs::for('penilai.standard', function (BreadcrumbTrail $trail) { +Breadcrumbs::for('penilai.standar', function (BreadcrumbTrail $trail) { $trail->parent('penilai.show'); $trail->push('Standard'); }); From a12c566fbd502af27fbd8a7b2ab8f006aac0504c Mon Sep 17 00:00:00 2001 From: majid Date: Wed, 12 Mar 2025 00:57:33 +0700 Subject: [PATCH 12/16] fix(penilai/so): perbaikkan menu sla unfreeze --- app/Http/Controllers/PenilaiController.php | 2 +- app/Http/Controllers/PenilaianController.php | 14 +- app/Http/Controllers/SLAController.php | 2 +- resources/views/penilai/index.blade.php | 133 +++-- .../views/penilaian/otorisator/sla.blade.php | 534 +++++++++--------- 5 files changed, 363 insertions(+), 322 deletions(-) diff --git a/app/Http/Controllers/PenilaiController.php b/app/Http/Controllers/PenilaiController.php index e61863d..8eb6ead 100644 --- a/app/Http/Controllers/PenilaiController.php +++ b/app/Http/Controllers/PenilaiController.php @@ -570,7 +570,7 @@ class PenilaiController extends Controller }); } - $query->whereRaw('LOWER(status) IN (?, ?, ?, ?, ?, ?,?, ?, ?, ?, ?)', ['assign', 'survey-completed', 'proses-laporan', 'paparan', 'proses-paparan', 'paparan', 'revisi-laporan', 'revisi-paparan', 'request-freeze', 'freeze', 'reject-freeze']); + $query->whereRaw('LOWER(status) IN (?, ?, ?, ?, ?, ?,?, ?, ?, ?, ?, ?)', ['assign', 'survey-completed', 'proses-laporan', 'paparan', 'proses-paparan', 'paparan', 'revisi-laporan', 'revisi-paparan', 'request-freeze', 'freeze', 'reject-freeze','unfreeze-sla']); if (!Auth::user()->hasRole('administrator')) { $query->whereHas('penilaian.userPenilai', function ($q) { diff --git a/app/Http/Controllers/PenilaianController.php b/app/Http/Controllers/PenilaianController.php index 11da675..78849d4 100644 --- a/app/Http/Controllers/PenilaianController.php +++ b/app/Http/Controllers/PenilaianController.php @@ -450,7 +450,7 @@ class PenilaianController extends Controller public function otorisatorUpdate(Request $request, $id, $context) { - if ($context === 'Freze SLA') { + if ($context === 'Freze SLA' || $context === 'Unfreeze SLA') { $authorization = Authorization::with(['user'])->find($id); if (!$authorization) { return response()->json([ @@ -595,6 +595,14 @@ class PenilaianController extends Controller ]); } break; + case 'unfreeze sla': + $authorization->update([ + 'request' => 'unfreeze-sla', + ]); + $permohonan->update([ + 'status' => 'unfreeze-sla', + ]); + break; default: return response()->json([ @@ -891,7 +899,7 @@ class PenilaianController extends Controller public function revisiLaporan(Request $request, $id) { - // dd($request->all()); + // dd($id); if($request->dataHeader=='Paparan' || $request->dataHeader=='Freze SLA'){ $authorization = Authorization::find($id); $permohonan = Permohonan::find($authorization->permohonan_id); @@ -906,7 +914,7 @@ class PenilaianController extends Controller } $status = 'revisi-paparan'; - }else if($permohonan->status === 'freeze'){ + }else if($permohonan->status === 'request-freeze'){ if ($authorization) { $authorization->delete(); } diff --git a/app/Http/Controllers/SLAController.php b/app/Http/Controllers/SLAController.php index 3256aee..159995c 100644 --- a/app/Http/Controllers/SLAController.php +++ b/app/Http/Controllers/SLAController.php @@ -71,7 +71,7 @@ class SLAController extends Controller // abort(403, 'Sorry! You are not allowed to view users.'); } - $query = Authorization::query()->with('permohonan.debiture','user','approveSo','approveEo','approveDd')->where('jenis','sla'); + $query = Authorization::query()->with('permohonan.debiture', 'user', 'approveSo', 'approveEo', 'approveDd')->where('jenis', 'sla')->where('request', 'freeze'); // Pencarian berdasarkan parameter search if ($request->has('search') && !empty($request->get('search'))) { diff --git a/resources/views/penilai/index.blade.php b/resources/views/penilai/index.blade.php index ecfa4c7..a13c512 100644 --- a/resources/views/penilai/index.blade.php +++ b/resources/views/penilai/index.blade.php @@ -165,13 +165,15 @@ tujuan_penilaian_id: { title: 'Tujuan Penilaian', render: (item, data) => { - return data.tujuan_penilaian && data.tujuan_penilaian.name ? `${data.tujuan_penilaian.name}` : '-'; + return data.tujuan_penilaian && data.tujuan_penilaian.name ? + `${data.tujuan_penilaian.name}` : '-'; }, }, jenis_fasilitas_kredit_id: { title: 'Fasilitas Kredit', render: (item, data) => { - return data.jenisfasilitas_kredit && data.jenisfasilitas_kredit.name ? `${data.jenisfasilitas_kredit.name}` : '-'; + return data.jenisfasilitas_kredit && data.jenisfasilitas_kredit.name ? + `${data.jenisfasilitas_kredit.name}` : '-'; }, }, jenis_laporan: { @@ -183,7 +185,7 @@ tanggal_survei: { title: 'Tanggal Survei', render: (item, data) => { - if(data.penilaian.waktu_penilaian){ + if (data.penilaian.waktu_penilaian) { return `${formatDate(new Date(data.penilaian.waktu_penilaian))}`; } return `${formatDate(new Date(data.penilaian.created_at))}`; @@ -196,19 +198,19 @@ const tipe_laporan = data.penilai?.type; const nilai_plafond = data.penilaian.nilaiPlafond?.name; let waktu_penilaian = new Date(data.penilaian.created_at); - if(data.penilaian.waktu_penilaian){ + if (data.penilaian.waktu_penilaian) { waktu_penilaian = new Date(data.penilaian.waktu_penilaian); } - if(tujuan_penilaian.name==="RAP"){ + if (tujuan_penilaian.name === "RAP") { waktu_penilaian.setDate(waktu_penilaian.getDate() + 3); } else { - if(tipe_laporan==="sederhana"){ + if (tipe_laporan === "sederhana") { waktu_penilaian.setDate(waktu_penilaian.getDate() + 2); - } else if(tipe_laporan==="standar"){ - if(nilai_plafond==="2 M - 5 M"){ + } else if (tipe_laporan === "standar") { + if (nilai_plafond === "2 M - 5 M") { waktu_penilaian.setDate(waktu_penilaian.getDate() + 3); - } else if(nilai_plafond==="< 2M"){ + } else if (nilai_plafond === "< 2M") { waktu_penilaian.setDate(waktu_penilaian.getDate() + 3); } else { waktu_penilaian.setDate(waktu_penilaian.getDate() + 5); @@ -232,7 +234,10 @@ actions: { title: 'Action', render: (item, data) => { - if (data.status === 'survey-completed' || data.status === 'proses-laporan' || data.status === 'paparan' || data.status === 'proses-paparan' || data.status === 'paparan' || data.status == 'revisi-laporan' || data.status === 'done' || data.status === 'revisi-paparan' || data.status === 'reject-freeze' || data.status === 'freeze' || data.status === 'request-freeze') { + if (data.status === 'survey-completed' || data.status === 'proses-laporan' || data + .status === 'paparan' || data.status === 'proses-paparan' || data.status === + 'paparan' || data.status == 'revisi-laporan' || data.status === 'done' || data + .status === 'revisi-paparan' || data.status === 'unfreeze-sla') { return `
@@ -245,9 +250,17 @@
`; - } else { + } else if (data.status === 'freeze' || data.status === 'request-freeze') { + return ` +
+ + + +
`; + } else + { return `
- +
` @@ -268,56 +281,56 @@ -@endpush + + @endpush From e2465c98fa3d92de8eaa539eb6d0b42ce299b20f Mon Sep 17 00:00:00 2001 From: majid Date: Wed, 12 Mar 2025 01:27:05 +0700 Subject: [PATCH 13/16] fix(penilai/surveyor): perbaikkan print out laporan judul di tengah dan tanggal submit surveyor/penilai --- app/Http/Controllers/SurveyorController.php | 8 ++++- .../views/penilai/components/footer.blade.php | 2 +- .../views/penilai/components/header.blade.php | 8 ++--- .../penilai/components/print-memo.blade.php | 31 ++++++++--------- .../print-out-call-report.blade.php | 33 ++++++++++--------- .../components/print-out/main.blade.php | 4 +-- 6 files changed, 45 insertions(+), 41 deletions(-) diff --git a/app/Http/Controllers/SurveyorController.php b/app/Http/Controllers/SurveyorController.php index 8cbdafe..2cc6438 100644 --- a/app/Http/Controllers/SurveyorController.php +++ b/app/Http/Controllers/SurveyorController.php @@ -766,9 +766,15 @@ class SurveyorController extends Controller $permohonan->update([ 'status' => 'survey-completed', - 'submitted_at' => now() ]); + $penilaian = Penilaian::where('nomor_registrasi', $permohonan->nomor_registrasi)->first(); + + $penilaian->update([ + 'status' => 'survey-completed', + ]); + + if($permohonan->jenisPenilaian->name=="External") { LaporanExternal::updateOrCreate( ['permohonan_id' => $permohonan->id], diff --git a/resources/views/penilai/components/footer.blade.php b/resources/views/penilai/components/footer.blade.php index e91d01d..5f521a1 100644 --- a/resources/views/penilai/components/footer.blade.php +++ b/resources/views/penilai/components/footer.blade.php @@ -43,7 +43,7 @@ 'foto_gistaru' => 'Gistaru', 'foto_bhumi' => 'Bhumi', 'foto_argis_region' => 'Blad Tata Ruang ', - 'foto_tempat' => 'Tempat', + 'foto_tempat' => 'Peta Lokasi', ]; // Memindahkan foto_tempat ke depan jika ada if (($key = array_search('upload_gs', $fotoTypes)) !== false) { diff --git a/resources/views/penilai/components/header.blade.php b/resources/views/penilai/components/header.blade.php index b16c777..3d1829b 100644 --- a/resources/views/penilai/components/header.blade.php +++ b/resources/views/penilai/components/header.blade.php @@ -123,7 +123,7 @@ } } use Modules\Usermanagement\Models\User; - $surveyorUser = User::where('id', $surveyor->userPenilaiTeam->id)->first(); + $penilaiUser = User::where('id', $penilai->userPenilaiTeam->id)->first(); $data = rtrim($data, ', '); @endphp @@ -138,12 +138,12 @@
@@ -99,11 +105,6 @@ : {{ $senior_officer->name ?? '' }}
No Laporan:{{ $nomorLaporan ?? '' }}
Tanggal Laporan :Luas Tanah :{{ $luas ?? '' }}{{ $luas ?? '' }} m2
Bentuk Tanah

- Tanggal: {{ \Carbon\Carbon::parse($permohonan->penilaian->waktu_penilaian)->format('d-m-Y') }} + Tanggal: {{ \Carbon\Carbon::parse($permohonan->penilaian->updated_at)->format('d-m-Y') }}

- Waktu: {{ \Carbon\Carbon::parse($permohonan->penilaian->waktu_penilaian)->format('H:i') }} + Waktu: {{ \Carbon\Carbon::parse($permohonan->penilaian->updated_at)->format('H:i') }}

-

User: {{ $surveyorUser->name }}

+

User: {{ $penilaiUser->name }}
diff --git a/resources/views/penilai/components/print-memo.blade.php b/resources/views/penilai/components/print-memo.blade.php index 8dea9cd..a6e0aa2 100644 --- a/resources/views/penilai/components/print-memo.blade.php +++ b/resources/views/penilai/components/print-memo.blade.php @@ -35,32 +35,29 @@

MEMO ANTAR KANTOR

+

NO: {{ $nomorLaporan ?? '' }}
+
- + - + - - - - - - + - + @@ -86,12 +83,12 @@
KepadaKepada : {{ $memo['kepada'] ?? '' }}
DariDari : {{ $memo['dari'] ?? '' }}
No memo:{{ $nomorLaporan ?? '-' }}
TanggalTanggal : {{ formatTanggalIndonesia($memo['tanggal']) }}
PerihalPerihal : {{ $memo['perihal'] ?? '' }}
- + - + @@ -99,7 +96,7 @@ @include('lpj::component.print-out-dokument') - + @@ -118,7 +115,7 @@ @foreach ($alamatFields as $label => $field) @if (!empty($alamat[$field])) - + @@ -139,25 +136,25 @@
Nama Calon DebiturNama Calon Debitur : {{ $permohonan->debiture->name ?? '' }}
Jenis AsetJenis Aset : {{ $data ?? '' }}
Atas NamaAtas Nama : {{ $permohonan->debiture->name ?? '' }}
{{ $label }}{{ $label }} : {{ $alamat[$field] }}
- + - + - + - + diff --git a/resources/views/penilai/components/print-out-call-report.blade.php b/resources/views/penilai/components/print-out-call-report.blade.php index 8a8fe03..00303af 100644 --- a/resources/views/penilai/components/print-out-call-report.blade.php +++ b/resources/views/penilai/components/print-out-call-report.blade.php @@ -39,25 +39,26 @@
Tanggal KunjunganTanggal Kunjungan : {{ formatTanggalIndonesia($permohonan->penilaian->tanggal_kunjungan) }}
SurveyorSurveyor : {{ $surveyor->userPenilaiTeam->name ?? '' }}
Pihak PemohonPihak Pemohon : {{ $permohonan->user->name ?? '' }} - {{ $permohonan->debiture->branch->name ?? '' }}
Pihak Cadeb/DebiturPihak Cadeb/Debitur : {{ $permohonan->debiture->name ?? '' }}
+
- + - + - + - + @@ -75,24 +76,24 @@
KepadaKepada : {{ $report['kepada'] ?? '' }}
DariDari : {{ $report['dari'] ?? '' }}
TanggalTanggal : {{ formatTanggalIndonesia($report['tanggal']) }}
PerihalPerihal : {{ $report['perihal'] ?? '' }}
- + - + - + @if (!empty($report['lokasi']['address'])) - + - + - + - + - @@ -142,25 +143,25 @@
Nama DebiturNama Debitur : {{ $permohonan->debiture->name ?? '' }}
KJPPKJPP : {{ preg_replace('/^K\\d+ - /', '', $permohonan->penawaran->nama_kjpp_sebelumnya ?? '-') }}
Jenis AsetJenis Aset : {{ $data ?? '' }}
Lokasi Objek PenilaianLokasi Objek Penilaian : {{ $report['lokasi']['address'] ?? '' }}, {{ $alamat['village_code'] ?? '' }} {{ $alamat['district_code'] ?? '' }}, @@ -103,22 +104,22 @@ @include('lpj::component.print-out-dokument')
Tanggal PenilaianTanggal Penilaian : {{ isset($permohonan->penilaian->tanggal_kunjungan) ? formatTanggalIndonesia($permohonan->penilaian->tanggal_kunjungan) : '' }}
Lelang keLelang ke : {{ $report['lelang_kjpp'] ?? '' }}
Nilai Pasar Wajar (NPW)Nilai Pasar Wajar (NPW) : {{ isset($report['nilai_pasar_kjpp']) ? formatRupiah($report['nilai_pasar_kjpp']) : '-' }}
+ Nilai Likuidasi {{ isset($report['persentase_likuidasi_kjpp']) ? '(' . $report['persentase_likuidasi_kjpp'] . '%)' : '-' }}
- + - + - + - + diff --git a/resources/views/surveyor/components/print-out/main.blade.php b/resources/views/surveyor/components/print-out/main.blade.php index 7f69ede..39e8bd2 100644 --- a/resources/views/surveyor/components/print-out/main.blade.php +++ b/resources/views/surveyor/components/print-out/main.blade.php @@ -203,10 +203,10 @@
Staf Subdit Appraisal Staf Subdit Appraisal : {{ formatTanggalIndonesia($permohonan->penilaian->tanggal_kunjungan) }}
Pihak KJPPPihak KJPP : {{ $forminspeksi['signature']['kjjp']['name'] ?? $report['pihak_kjjpp'] ?? '' }}
Pihak BAGI Cab Pihak BAGI Cab : {{ $permohonan->user->name ?? '' }} - {{ $permohonan->debiture->branch->name ?? '' }}
Debitur/perwakilan debitur Debitur/perwakilan debitur : {{ $permohonan->debiture->name ?? '' }}

- Tanggal: {{ \Carbon\Carbon::parse($permohonan->penilaian->waktu_penilaian)->format('d-m-Y') }} + Tanggal: {{ \Carbon\Carbon::parse($permohonan->penilaian->updated_at)->format('d-m-Y') }}

- Waktu: {{ \Carbon\Carbon::parse($permohonan->penilaian->waktu_penilaian)->format('H:i') }} + Waktu: {{ \Carbon\Carbon::parse($permohonan->penilaian->updated_at)->format('H:i') }}

User: {{ $surveyorUser->name }}

From 72f7a13897aa03e23e63d07718c1d57e482ba5d9 Mon Sep 17 00:00:00 2001 From: majid Date: Wed, 12 Mar 2025 00:57:33 +0700 Subject: [PATCH 14/16] fix(penilai/so): perbaikkan menu sla unfreeze --- app/Http/Controllers/PenilaiController.php | 2 +- app/Http/Controllers/PenilaianController.php | 14 +- app/Http/Controllers/SLAController.php | 2 +- resources/views/penilai/index.blade.php | 133 +++-- .../views/penilaian/otorisator/sla.blade.php | 534 +++++++++--------- 5 files changed, 363 insertions(+), 322 deletions(-) diff --git a/app/Http/Controllers/PenilaiController.php b/app/Http/Controllers/PenilaiController.php index e61863d..8eb6ead 100644 --- a/app/Http/Controllers/PenilaiController.php +++ b/app/Http/Controllers/PenilaiController.php @@ -570,7 +570,7 @@ class PenilaiController extends Controller }); } - $query->whereRaw('LOWER(status) IN (?, ?, ?, ?, ?, ?,?, ?, ?, ?, ?)', ['assign', 'survey-completed', 'proses-laporan', 'paparan', 'proses-paparan', 'paparan', 'revisi-laporan', 'revisi-paparan', 'request-freeze', 'freeze', 'reject-freeze']); + $query->whereRaw('LOWER(status) IN (?, ?, ?, ?, ?, ?,?, ?, ?, ?, ?, ?)', ['assign', 'survey-completed', 'proses-laporan', 'paparan', 'proses-paparan', 'paparan', 'revisi-laporan', 'revisi-paparan', 'request-freeze', 'freeze', 'reject-freeze','unfreeze-sla']); if (!Auth::user()->hasRole('administrator')) { $query->whereHas('penilaian.userPenilai', function ($q) { diff --git a/app/Http/Controllers/PenilaianController.php b/app/Http/Controllers/PenilaianController.php index 11da675..78849d4 100644 --- a/app/Http/Controllers/PenilaianController.php +++ b/app/Http/Controllers/PenilaianController.php @@ -450,7 +450,7 @@ class PenilaianController extends Controller public function otorisatorUpdate(Request $request, $id, $context) { - if ($context === 'Freze SLA') { + if ($context === 'Freze SLA' || $context === 'Unfreeze SLA') { $authorization = Authorization::with(['user'])->find($id); if (!$authorization) { return response()->json([ @@ -595,6 +595,14 @@ class PenilaianController extends Controller ]); } break; + case 'unfreeze sla': + $authorization->update([ + 'request' => 'unfreeze-sla', + ]); + $permohonan->update([ + 'status' => 'unfreeze-sla', + ]); + break; default: return response()->json([ @@ -891,7 +899,7 @@ class PenilaianController extends Controller public function revisiLaporan(Request $request, $id) { - // dd($request->all()); + // dd($id); if($request->dataHeader=='Paparan' || $request->dataHeader=='Freze SLA'){ $authorization = Authorization::find($id); $permohonan = Permohonan::find($authorization->permohonan_id); @@ -906,7 +914,7 @@ class PenilaianController extends Controller } $status = 'revisi-paparan'; - }else if($permohonan->status === 'freeze'){ + }else if($permohonan->status === 'request-freeze'){ if ($authorization) { $authorization->delete(); } diff --git a/app/Http/Controllers/SLAController.php b/app/Http/Controllers/SLAController.php index 3256aee..159995c 100644 --- a/app/Http/Controllers/SLAController.php +++ b/app/Http/Controllers/SLAController.php @@ -71,7 +71,7 @@ class SLAController extends Controller // abort(403, 'Sorry! You are not allowed to view users.'); } - $query = Authorization::query()->with('permohonan.debiture','user','approveSo','approveEo','approveDd')->where('jenis','sla'); + $query = Authorization::query()->with('permohonan.debiture', 'user', 'approveSo', 'approveEo', 'approveDd')->where('jenis', 'sla')->where('request', 'freeze'); // Pencarian berdasarkan parameter search if ($request->has('search') && !empty($request->get('search'))) { diff --git a/resources/views/penilai/index.blade.php b/resources/views/penilai/index.blade.php index ecfa4c7..a13c512 100644 --- a/resources/views/penilai/index.blade.php +++ b/resources/views/penilai/index.blade.php @@ -165,13 +165,15 @@ tujuan_penilaian_id: { title: 'Tujuan Penilaian', render: (item, data) => { - return data.tujuan_penilaian && data.tujuan_penilaian.name ? `${data.tujuan_penilaian.name}` : '-'; + return data.tujuan_penilaian && data.tujuan_penilaian.name ? + `${data.tujuan_penilaian.name}` : '-'; }, }, jenis_fasilitas_kredit_id: { title: 'Fasilitas Kredit', render: (item, data) => { - return data.jenisfasilitas_kredit && data.jenisfasilitas_kredit.name ? `${data.jenisfasilitas_kredit.name}` : '-'; + return data.jenisfasilitas_kredit && data.jenisfasilitas_kredit.name ? + `${data.jenisfasilitas_kredit.name}` : '-'; }, }, jenis_laporan: { @@ -183,7 +185,7 @@ tanggal_survei: { title: 'Tanggal Survei', render: (item, data) => { - if(data.penilaian.waktu_penilaian){ + if (data.penilaian.waktu_penilaian) { return `${formatDate(new Date(data.penilaian.waktu_penilaian))}`; } return `${formatDate(new Date(data.penilaian.created_at))}`; @@ -196,19 +198,19 @@ const tipe_laporan = data.penilai?.type; const nilai_plafond = data.penilaian.nilaiPlafond?.name; let waktu_penilaian = new Date(data.penilaian.created_at); - if(data.penilaian.waktu_penilaian){ + if (data.penilaian.waktu_penilaian) { waktu_penilaian = new Date(data.penilaian.waktu_penilaian); } - if(tujuan_penilaian.name==="RAP"){ + if (tujuan_penilaian.name === "RAP") { waktu_penilaian.setDate(waktu_penilaian.getDate() + 3); } else { - if(tipe_laporan==="sederhana"){ + if (tipe_laporan === "sederhana") { waktu_penilaian.setDate(waktu_penilaian.getDate() + 2); - } else if(tipe_laporan==="standar"){ - if(nilai_plafond==="2 M - 5 M"){ + } else if (tipe_laporan === "standar") { + if (nilai_plafond === "2 M - 5 M") { waktu_penilaian.setDate(waktu_penilaian.getDate() + 3); - } else if(nilai_plafond==="< 2M"){ + } else if (nilai_plafond === "< 2M") { waktu_penilaian.setDate(waktu_penilaian.getDate() + 3); } else { waktu_penilaian.setDate(waktu_penilaian.getDate() + 5); @@ -232,7 +234,10 @@ actions: { title: 'Action', render: (item, data) => { - if (data.status === 'survey-completed' || data.status === 'proses-laporan' || data.status === 'paparan' || data.status === 'proses-paparan' || data.status === 'paparan' || data.status == 'revisi-laporan' || data.status === 'done' || data.status === 'revisi-paparan' || data.status === 'reject-freeze' || data.status === 'freeze' || data.status === 'request-freeze') { + if (data.status === 'survey-completed' || data.status === 'proses-laporan' || data + .status === 'paparan' || data.status === 'proses-paparan' || data.status === + 'paparan' || data.status == 'revisi-laporan' || data.status === 'done' || data + .status === 'revisi-paparan' || data.status === 'unfreeze-sla') { return `
@@ -245,9 +250,17 @@
`; - } else { + } else if (data.status === 'freeze' || data.status === 'request-freeze') { + return ` +
+ + + +
`; + } else + { return `
- +
` @@ -268,56 +281,56 @@ -@endpush + + @endpush From 01de1b5b5e9eef7e81f5de160668aa3e4e1fdb2a Mon Sep 17 00:00:00 2001 From: majid Date: Wed, 12 Mar 2025 01:27:05 +0700 Subject: [PATCH 15/16] fix(penilai/surveyor): perbaikkan print out laporan judul di tengah dan tanggal submit surveyor/penilai --- app/Http/Controllers/SurveyorController.php | 8 ++++- .../views/penilai/components/footer.blade.php | 2 +- .../views/penilai/components/header.blade.php | 8 ++--- .../penilai/components/print-memo.blade.php | 31 ++++++++--------- .../print-out-call-report.blade.php | 33 ++++++++++--------- .../components/print-out/main.blade.php | 4 +-- 6 files changed, 45 insertions(+), 41 deletions(-) diff --git a/app/Http/Controllers/SurveyorController.php b/app/Http/Controllers/SurveyorController.php index 8cbdafe..2cc6438 100644 --- a/app/Http/Controllers/SurveyorController.php +++ b/app/Http/Controllers/SurveyorController.php @@ -766,9 +766,15 @@ class SurveyorController extends Controller $permohonan->update([ 'status' => 'survey-completed', - 'submitted_at' => now() ]); + $penilaian = Penilaian::where('nomor_registrasi', $permohonan->nomor_registrasi)->first(); + + $penilaian->update([ + 'status' => 'survey-completed', + ]); + + if($permohonan->jenisPenilaian->name=="External") { LaporanExternal::updateOrCreate( ['permohonan_id' => $permohonan->id], diff --git a/resources/views/penilai/components/footer.blade.php b/resources/views/penilai/components/footer.blade.php index e91d01d..5f521a1 100644 --- a/resources/views/penilai/components/footer.blade.php +++ b/resources/views/penilai/components/footer.blade.php @@ -43,7 +43,7 @@ 'foto_gistaru' => 'Gistaru', 'foto_bhumi' => 'Bhumi', 'foto_argis_region' => 'Blad Tata Ruang ', - 'foto_tempat' => 'Tempat', + 'foto_tempat' => 'Peta Lokasi', ]; // Memindahkan foto_tempat ke depan jika ada if (($key = array_search('upload_gs', $fotoTypes)) !== false) { diff --git a/resources/views/penilai/components/header.blade.php b/resources/views/penilai/components/header.blade.php index b16c777..3d1829b 100644 --- a/resources/views/penilai/components/header.blade.php +++ b/resources/views/penilai/components/header.blade.php @@ -123,7 +123,7 @@ } } use Modules\Usermanagement\Models\User; - $surveyorUser = User::where('id', $surveyor->userPenilaiTeam->id)->first(); + $penilaiUser = User::where('id', $penilai->userPenilaiTeam->id)->first(); $data = rtrim($data, ', '); @endphp @@ -138,12 +138,12 @@

- Tanggal: {{ \Carbon\Carbon::parse($permohonan->penilaian->waktu_penilaian)->format('d-m-Y') }} + Tanggal: {{ \Carbon\Carbon::parse($permohonan->penilaian->updated_at)->format('d-m-Y') }}

- Waktu: {{ \Carbon\Carbon::parse($permohonan->penilaian->waktu_penilaian)->format('H:i') }} + Waktu: {{ \Carbon\Carbon::parse($permohonan->penilaian->updated_at)->format('H:i') }}

-

User: {{ $surveyorUser->name }}

+

User: {{ $penilaiUser->name }}
diff --git a/resources/views/penilai/components/print-memo.blade.php b/resources/views/penilai/components/print-memo.blade.php index 8dea9cd..a6e0aa2 100644 --- a/resources/views/penilai/components/print-memo.blade.php +++ b/resources/views/penilai/components/print-memo.blade.php @@ -35,32 +35,29 @@

MEMO ANTAR KANTOR

+

NO: {{ $nomorLaporan ?? '' }}

+
- + - + - - - - - - + - + @@ -86,12 +83,12 @@
KepadaKepada : {{ $memo['kepada'] ?? '' }}
DariDari : {{ $memo['dari'] ?? '' }}
No memo:{{ $nomorLaporan ?? '-' }}
TanggalTanggal : {{ formatTanggalIndonesia($memo['tanggal']) }}
PerihalPerihal : {{ $memo['perihal'] ?? '' }}
- + - + @@ -99,7 +96,7 @@ @include('lpj::component.print-out-dokument') - + @@ -118,7 +115,7 @@ @foreach ($alamatFields as $label => $field) @if (!empty($alamat[$field])) - + @@ -139,25 +136,25 @@
Nama Calon DebiturNama Calon Debitur : {{ $permohonan->debiture->name ?? '' }}
Jenis AsetJenis Aset : {{ $data ?? '' }}
Atas NamaAtas Nama : {{ $permohonan->debiture->name ?? '' }}
{{ $label }}{{ $label }} : {{ $alamat[$field] }}
- + - + - + - + diff --git a/resources/views/penilai/components/print-out-call-report.blade.php b/resources/views/penilai/components/print-out-call-report.blade.php index 8a8fe03..00303af 100644 --- a/resources/views/penilai/components/print-out-call-report.blade.php +++ b/resources/views/penilai/components/print-out-call-report.blade.php @@ -39,25 +39,26 @@
Tanggal KunjunganTanggal Kunjungan : {{ formatTanggalIndonesia($permohonan->penilaian->tanggal_kunjungan) }}
SurveyorSurveyor : {{ $surveyor->userPenilaiTeam->name ?? '' }}
Pihak PemohonPihak Pemohon : {{ $permohonan->user->name ?? '' }} - {{ $permohonan->debiture->branch->name ?? '' }}
Pihak Cadeb/DebiturPihak Cadeb/Debitur : {{ $permohonan->debiture->name ?? '' }}
+
- + - + - + - + @@ -75,24 +76,24 @@
KepadaKepada : {{ $report['kepada'] ?? '' }}
DariDari : {{ $report['dari'] ?? '' }}
TanggalTanggal : {{ formatTanggalIndonesia($report['tanggal']) }}
PerihalPerihal : {{ $report['perihal'] ?? '' }}
- + - + - + @if (!empty($report['lokasi']['address'])) - + - + - + - + - @@ -142,25 +143,25 @@
Nama DebiturNama Debitur : {{ $permohonan->debiture->name ?? '' }}
KJPPKJPP : {{ preg_replace('/^K\\d+ - /', '', $permohonan->penawaran->nama_kjpp_sebelumnya ?? '-') }}
Jenis AsetJenis Aset : {{ $data ?? '' }}
Lokasi Objek PenilaianLokasi Objek Penilaian : {{ $report['lokasi']['address'] ?? '' }}, {{ $alamat['village_code'] ?? '' }} {{ $alamat['district_code'] ?? '' }}, @@ -103,22 +104,22 @@ @include('lpj::component.print-out-dokument')
Tanggal PenilaianTanggal Penilaian : {{ isset($permohonan->penilaian->tanggal_kunjungan) ? formatTanggalIndonesia($permohonan->penilaian->tanggal_kunjungan) : '' }}
Lelang keLelang ke : {{ $report['lelang_kjpp'] ?? '' }}
Nilai Pasar Wajar (NPW)Nilai Pasar Wajar (NPW) : {{ isset($report['nilai_pasar_kjpp']) ? formatRupiah($report['nilai_pasar_kjpp']) : '-' }}
+ Nilai Likuidasi {{ isset($report['persentase_likuidasi_kjpp']) ? '(' . $report['persentase_likuidasi_kjpp'] . '%)' : '-' }}
- + - + - + - + diff --git a/resources/views/surveyor/components/print-out/main.blade.php b/resources/views/surveyor/components/print-out/main.blade.php index 7f69ede..39e8bd2 100644 --- a/resources/views/surveyor/components/print-out/main.blade.php +++ b/resources/views/surveyor/components/print-out/main.blade.php @@ -203,10 +203,10 @@
Staf Subdit Appraisal Staf Subdit Appraisal : {{ formatTanggalIndonesia($permohonan->penilaian->tanggal_kunjungan) }}
Pihak KJPPPihak KJPP : {{ $forminspeksi['signature']['kjjp']['name'] ?? $report['pihak_kjjpp'] ?? '' }}
Pihak BAGI Cab Pihak BAGI Cab : {{ $permohonan->user->name ?? '' }} - {{ $permohonan->debiture->branch->name ?? '' }}
Debitur/perwakilan debitur Debitur/perwakilan debitur : {{ $permohonan->debiture->name ?? '' }}

- Tanggal: {{ \Carbon\Carbon::parse($permohonan->penilaian->waktu_penilaian)->format('d-m-Y') }} + Tanggal: {{ \Carbon\Carbon::parse($permohonan->penilaian->updated_at)->format('d-m-Y') }}

- Waktu: {{ \Carbon\Carbon::parse($permohonan->penilaian->waktu_penilaian)->format('H:i') }} + Waktu: {{ \Carbon\Carbon::parse($permohonan->penilaian->updated_at)->format('H:i') }}

User: {{ $surveyorUser->name }}

From 67cffeb4afb4b612988689d47f7d4273df96940e Mon Sep 17 00:00:00 2001 From: majid Date: Thu, 13 Mar 2025 08:28:48 +0700 Subject: [PATCH 16/16] fix(surveyor): perbaikkan param hitung total luas di apartement --- resources/views/surveyor/components/apartemen-kantor.blade.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/resources/views/surveyor/components/apartemen-kantor.blade.php b/resources/views/surveyor/components/apartemen-kantor.blade.php index 7c4c08a..1034935 100644 --- a/resources/views/surveyor/components/apartemen-kantor.blade.php +++ b/resources/views/surveyor/components/apartemen-kantor.blade.php @@ -16,7 +16,7 @@ $total_luas_unit = 0; $jenis_legalitas_jaminan_id = 0; if (isset($item->detail)) { - $total_luas_unit = calculateTotalLuas($item->detail, 'luas_tanah', 1); + $total_luas_unit = calculateTotalLuas($item->detail, 'luas_tanah', 1, 27, 3); } @endphp