From 80c3eaa30a265d4fa3b827aec6bb2eb0f241f1dd Mon Sep 17 00:00:00 2001 From: majid Date: Mon, 17 Mar 2025 13:05:43 +0700 Subject: [PATCH 1/3] fix(penilai):perbaikkan untuk penilaian unit apartement --- app/Http/Controllers/SurveyorController.php | 1 + app/Services/PermohonanHistoryService.php | 1 + app/Services/SurveyorValidateService.php | 42 +++++++++++++++++++ .../views/component/form-penilai.blade.php | 6 ++- .../components/print-out-sederhana.blade.php | 33 +++++++-------- .../components/print-out-standar.blade.php | 13 +++--- 6 files changed, 71 insertions(+), 25 deletions(-) diff --git a/app/Http/Controllers/SurveyorController.php b/app/Http/Controllers/SurveyorController.php index 546a6cd..d040145 100644 --- a/app/Http/Controllers/SurveyorController.php +++ b/app/Http/Controllers/SurveyorController.php @@ -730,6 +730,7 @@ class SurveyorController extends Controller 'lingkungan' => 'validateLingkungan', 'fakta' => 'validateFactData', 'rap' => 'validateRapData', + 'apartemen-kantor' => 'validateUnitData', ]; // Ambil data inspeksi diff --git a/app/Services/PermohonanHistoryService.php b/app/Services/PermohonanHistoryService.php index 3b9e60c..05bf609 100644 --- a/app/Services/PermohonanHistoryService.php +++ b/app/Services/PermohonanHistoryService.php @@ -10,6 +10,7 @@ class PermohonanHistoryService public function createHistory(Permohonan $permohonan, string $status, ?string $keterangan, array $beforeRequest, array $afterRequest, ?string $filePath = null) { try { + $history = PermohonanHistory::create([ 'permohonan_id' => $permohonan->id, 'status' => $status, diff --git a/app/Services/SurveyorValidateService.php b/app/Services/SurveyorValidateService.php index 8ee8506..04631e5 100644 --- a/app/Services/SurveyorValidateService.php +++ b/app/Services/SurveyorValidateService.php @@ -388,5 +388,47 @@ class SurveyorValidateService } + public function validateUnitData(array $data): array +{ + $invalidFields = []; + + // Validasi action + if (empty($data['action'])) { + $invalidFields[] = 'Action harus diisi'; + } + + // Validasi luas_unit + if (empty($data['luas_unit'])) { + $invalidFields[] = 'Luas unit harus diisi'; + } + + // Validasi kondisi_unit + if (empty($data['kondisi_unit'])) { + $invalidFields[] = 'Kondisi unit harus diisi'; + } + + // Validasi posisi_unit + if (empty($data['posisi_unit'])) { + $invalidFields[] = 'Posisi unit harus diisi'; + } + + // Validasi lantai + if (empty($data['lantai'])) { + $invalidFields[] = 'Lantai harus diisi'; + } + + // Validasi view + if (empty($data['view'])) { + $invalidFields[] = 'View harus diisi'; + } + + // Validasi bentuk_unit + if (empty($data['bentuk_unit'])) { + $invalidFields[] = 'Bentuk unit harus diisi'; + } + + return $invalidFields; +} + } diff --git a/resources/views/component/form-penilai.blade.php b/resources/views/component/form-penilai.blade.php index c45ddf4..6934bab 100644 --- a/resources/views/component/form-penilai.blade.php +++ b/resources/views/component/form-penilai.blade.php @@ -60,7 +60,7 @@ $labelNilai = [ 'bangunan' => 'Luas Bangunan', 'tanah' => 'Luas Tanah', - 'apartement-kantor' => 'Luas Apartemen/Kantor', + 'apartemen-kantor' => 'Luas Unit', 'alat-berat' => 'Luas Alat Berat', 'mesin' => 'Luas Mesin', 'kendaraan' => 'Luas Kendaraan', @@ -85,6 +85,8 @@ $luas = $forminspeksi['tanah']['luas_tanah']['tidak sesuai'] ?? ($forminspeksi['tanah']['luas_tanah']['sesuai'] ?? null); + } else if ($item === 'apartemen-kantor') { + $luas = $forminspeksi['luas_unit']['sesuai'] ?? ($forminspeksi['luas_unit']['tidak sesuai'] ?? null); } else { $luas = null; } @@ -234,7 +236,7 @@ +@endpush diff --git a/routes/breadcrumbs.php b/routes/breadcrumbs.php index ef77526..715c088 100644 --- a/routes/breadcrumbs.php +++ b/routes/breadcrumbs.php @@ -673,55 +673,58 @@ Breadcrumbs::for('noc', function (BreadcrumbTrail $trail) { $trail->push('NOC', route('noc.index')); }); - Breadcrumbs::for('noc.edit', function (BreadcrumbTrail $trail) { - $trail->parent('noc'); - $trail->push('Proses NOC'); - }); +Breadcrumbs::for('noc.edit', function (BreadcrumbTrail $trail) { + $trail->parent('noc'); + $trail->push('Proses NOC'); +}); - Breadcrumbs::for('laporan-external', function (BreadcrumbTrail $trail) { - $trail->push('Laporan External', route('laporan-external.index')); - }); +Breadcrumbs::for('laporan-external', function (BreadcrumbTrail $trail) { + $trail->push('Laporan External', route('laporan-external.index')); +}); - Breadcrumbs::for('laporan-external.show', function (BreadcrumbTrail $trail) { - $trail->parent('laporan-external'); - $trail->push('Show Laporan External'); - }); +Breadcrumbs::for('laporan-external.show', function (BreadcrumbTrail $trail) { + $trail->parent('laporan-external'); + $trail->push('Show Laporan External'); +}); - Breadcrumbs::for('laporan-external.create', function (BreadcrumbTrail $trail) { - $trail->parent('laporan-external'); - $trail->push('Tambah Laporan External', route('laporan-external.create')); - }); +Breadcrumbs::for('laporan-external.create', function (BreadcrumbTrail $trail) { + $trail->parent('laporan-external'); + $trail->push('Tambah Laporan External', route('laporan-external.create')); +}); - Breadcrumbs::for('laporan-external.edit', function (BreadcrumbTrail $trail) { - $trail->parent('laporan-external'); - $trail->push('Data Laporan External'); - }); +Breadcrumbs::for('laporan-external.edit', function (BreadcrumbTrail $trail) { + $trail->parent('laporan-external'); + $trail->push('Data Laporan External'); +}); - Breadcrumbs::for('basicdata.jenis-lampiran', function (BreadcrumbTrail $trail) { - $trail->parent('basicdata'); - $trail->push('Jenis Lampiran', route('basicdata.jenis-lampiran.index')); - }); +Breadcrumbs::for('basicdata.jenis-lampiran', function (BreadcrumbTrail $trail) { + $trail->parent('basicdata'); + $trail->push('Jenis Lampiran', route('basicdata.jenis-lampiran.index')); +}); - Breadcrumbs::for('basicdata.jenis-lampiran.create', function (BreadcrumbTrail $trail) { - $trail->parent('basicdata.jenis-lampiran'); - $trail->push('Tambah Jenis Lampiran', route('basicdata.jenis-lampiran.create')); - }); +Breadcrumbs::for('basicdata.jenis-lampiran.create', function (BreadcrumbTrail $trail) { + $trail->parent('basicdata.jenis-lampiran'); + $trail->push('Tambah Jenis Lampiran', route('basicdata.jenis-lampiran.create')); +}); - Breadcrumbs::for('basicdata.jenis-lampiran.edit', function (BreadcrumbTrail $trail, $id) { - $trail->parent('basicdata.jenis-lampiran'); - $trail->push('Edit Jenis Lampiran', route('basicdata.jenis-lampiran.edit', $id)); - }); +Breadcrumbs::for('basicdata.jenis-lampiran.edit', function (BreadcrumbTrail $trail, $id) { + $trail->parent('basicdata.jenis-lampiran'); + $trail->push('Edit Jenis Lampiran', route('basicdata.jenis-lampiran.edit', $id)); +}); - // Laporan Admin Kredit - Breadcrumbs::for('laporan-admin-kredit', function ($trail) { - $trail->push('Laporan Admin Kredit', route('laporan-admin-kredit.index')); - }); +// Laporan Admin Kredit +Breadcrumbs::for('laporan-admin-kredit', function ($trail) { + $trail->push('Laporan Admin Kredit', route('laporan-admin-kredit.index')); +}); - Breadcrumbs::for('bank-data', function ($trail) { - $trail->push('Bank Data', route('bank-data.index')); - }); +Breadcrumbs::for('bank-data', function ($trail) { + $trail->push('Bank Data', route('bank-data.index')); +}); +Breadcrumbs::for('laporan-penilai-jaminan', function ($trail) { + $trail->push('Laporan Penilai Jaminan', route('laporan-penilai-jaminan.index')); +}); // add andy require __DIR__ . '/breadcrumbs_registrasi.php'; diff --git a/routes/web.php b/routes/web.php index b6df375..a315769 100644 --- a/routes/web.php +++ b/routes/web.php @@ -3,8 +3,8 @@ use Illuminate\Support\Facades\Route; use Modules\Lpj\Http\Controllers\ActivityController; use Modules\Lpj\Http\Controllers\ArahMataAnginController; - use Modules\Lpj\Http\Controllers\BankDataController; - use Modules\Lpj\Http\Controllers\CustomFieldController; +use Modules\Lpj\Http\Controllers\BankDataController; +use Modules\Lpj\Http\Controllers\CustomFieldController; use Modules\Lpj\Http\Controllers\DebitureController; use Modules\Lpj\Http\Controllers\DokumenJaminanController; use Modules\Lpj\Http\Controllers\HubunganPemilikJaminanController; @@ -13,16 +13,16 @@ use Modules\Lpj\Http\Controllers\IjinUsahaController; use Modules\Lpj\Http\Controllers\JenisDokumenController; use Modules\Lpj\Http\Controllers\JenisFasilitasKreditController; use Modules\Lpj\Http\Controllers\JenisJaminanController; - use Modules\Lpj\Http\Controllers\JenisLampiranController; - use Modules\Lpj\Http\Controllers\JenisLaporanController; +use Modules\Lpj\Http\Controllers\JenisLampiranController; +use Modules\Lpj\Http\Controllers\JenisLaporanController; use Modules\Lpj\Http\Controllers\JenisLegalitasJaminanController; use Modules\Lpj\Http\Controllers\JenisPenilaianController; use Modules\Lpj\Http\Controllers\KJPPController; - use Modules\Lpj\Http\Controllers\LampiranDokumenController; - use Modules\Lpj\Http\Controllers\LaporanAdminKreditController; - use Modules\Lpj\Http\Controllers\LaporanController; - use Modules\Lpj\Http\Controllers\LaporanExternalController; - use Modules\Lpj\Http\Controllers\NilaiPlafondController; +use Modules\Lpj\Http\Controllers\LampiranDokumenController; +use Modules\Lpj\Http\Controllers\LaporanAdminKreditController; +use Modules\Lpj\Http\Controllers\LaporanController; +use Modules\Lpj\Http\Controllers\LaporanExternalController; +use Modules\Lpj\Http\Controllers\NilaiPlafondController; use Modules\Lpj\Http\Controllers\NocController; use Modules\Lpj\Http\Controllers\PembatalanController; use Modules\Lpj\Http\Controllers\PemilikJaminanController; @@ -39,6 +39,7 @@ use Modules\Lpj\Http\Controllers\TeamsController; use Modules\Lpj\Http\Controllers\TenderController; use Modules\Lpj\Http\Controllers\TujuanPenilaianController; use Modules\Lpj\Http\Controllers\TujuanPenilaianKJPPController; +use Modules\Lpj\Http\Controllers\LaporanPenilaiJaminanController; // use Modules\Lpj\Http\Controllers\ActivityController; @@ -667,11 +668,17 @@ Route::middleware(['auth'])->group(function () { }); Route::name('bank-data.')->prefix('bank-data')->group(function () { - Route::get('datatables', [BankDataController::class, 'dataForDatatables'])->name('datatables'); + Route::get('datatables', [BankDataController::class, 'dataForDatatables'])->name('datatables'); }); Route::resource('bank-data', BankDataController::class); + Route::name('laporan-penilai-jaminan.')->prefix('laporan-penilai-jaminan')->group(function () { + Route::get('/', [LaporanPenilaiJaminanController::class, 'index'])->name('index'); + Route::get('datatables', [LaporanPenilaiJaminanController::class, 'dataForDatatables'])->name('datatables'); + Route::get('export', [LaporanPenilaiJaminanController::class, 'export'])->name('export'); + }); + }); require __DIR__ . '/registrasi.php';