From 27e53431d028beb75aa01c39469ee99a9b3cb932 Mon Sep 17 00:00:00 2001 From: majid Date: Wed, 18 Dec 2024 16:58:32 +0700 Subject: [PATCH 1/4] update memo, lpj, resume, dan perbaikan form inspeksi --- app/Http/Controllers/PenilaiController.php | 188 ++++++- app/Http/Controllers/SurveyorController.php | 28 +- app/Models/DokumenJaminan.php | 4 + app/Models/Penilai.php | 42 ++ ...2024_12_17_025938_create_penilai_table.php | 44 ++ ...024_12_17_074223_update_inspeksi_table.php | 44 ++ .../views/component/kertas-kerja.blade.php | 2 - .../components/informasi-pembanding.blade.php | 124 ++--- .../lpj-sederhana-standard.blade.php | 319 +++++++++++- .../views/penilai/components/memo.blade.php | 458 ++++++++++++++++++ .../penilai/components/paparan.blade.php | 0 .../views/penilai/components/resume.blade.php | 228 ++++++--- resources/views/penilai/show.blade.php | 287 ++++++++--- .../components/apartemen-kantor.blade.php | 12 +- .../surveyor/components/card-tambah.blade.php | 20 +- .../components/data-pembanding.blade.php | 25 +- .../views/surveyor/components/denah.blade.php | 2 +- .../views/surveyor/components/foto.blade.php | 2 +- .../surveyor/components/informasi.blade.php | 10 +- .../surveyor/components/inspeksi.blade.php | 2 +- resources/views/surveyor/detail.blade.php | 4 +- routes/web.php | 21 +- 22 files changed, 1556 insertions(+), 310 deletions(-) create mode 100644 app/Models/Penilai.php create mode 100644 database/migrations/2024_12_17_025938_create_penilai_table.php create mode 100644 database/migrations/2024_12_17_074223_update_inspeksi_table.php create mode 100644 resources/views/penilai/components/paparan.blade.php diff --git a/app/Http/Controllers/PenilaiController.php b/app/Http/Controllers/PenilaiController.php index e6a578e..7a69240 100644 --- a/app/Http/Controllers/PenilaiController.php +++ b/app/Http/Controllers/PenilaiController.php @@ -5,6 +5,7 @@ namespace Modules\Lpj\Http\Controllers; use Illuminate\Http\Request; use Modules\Lpj\Models\Permohonan; use Modules\Lpj\Models\Inspeksi; +use Modules\Lpj\Models\Penilai; use App\Http\Controllers\Controller; use Illuminate\Support\Facades\Auth; use Maatwebsite\Excel\Facades\Excel; @@ -15,6 +16,13 @@ class PenilaiController extends Controller { public $user; + protected $surveyorController; + + public function __construct(SurveyorController $surveyorController) + { + $this->surveyorController = $surveyorController; + } + /** * Display a listing of the resource. */ @@ -30,9 +38,9 @@ class PenilaiController extends Controller { $permohonan = Permohonan::with('debiture.documents')->find($id); - $jaminanId = $permohonan->debiture->documents->first()->jenis_jaminan_id; + $documentId = $request->query('documentId'); - $inpeksi = Inspeksi::where('permohonan_id', $id)->where('jenis_jaminan_id', $jaminanId)->first(); + $inpeksi = Inspeksi::where('permohonan_id', $id)->where('dokument_id', $jaminanId)->first(); $formFoto = null; if ($inpeksi) { @@ -56,14 +64,20 @@ class PenilaiController extends Controller // } - public function sederhana($id) + public function sederhana(Request $request,$id) { - $data = new SurveyorController(); - $basicData = $data->getCommonData(); - $permohonan = Permohonan::with(['debiture.documents.jenisjaminan', 'region.teams.teamsUsers.user', 'penilaian'])->find($id); - $jaminanId = $permohonan->debiture->documents->first()->jenis_jaminan_id; - $inspeksi = Inspeksi::where('permohonan_id', $id)->where('jenis_jaminan_id', $jaminanId)->first(); + $basicData = $this->surveyorController->getCommonData(); + + $documentId = $request->query('documentId'); + $inspeksiId = $request->query('inspeksiId'); + $jaminanId = $request->query('jaminanId'); + + $permohonan = $this->surveyorController->getPermohonanJaminanId($id, $documentId, $jaminanId); + + + + $inspeksi = Inspeksi::where('permohonan_id', $id)->where('dokument_id', $documentId)->first(); $forminspeksi = null; if ($inspeksi) { $forminspeksi = json_decode($inspeksi->data_form, true); @@ -71,33 +85,55 @@ class PenilaiController extends Controller return view('lpj::penilai.components.lpj-sederhana-standard', compact('permohonan', 'basicData', 'forminspeksi', 'inspeksi')); } - public function standard($id) + public function standard(Request $request, $id) { - $permohonan = Permohonan::with(['debiture.documents.jenisjaminan', 'region.teams.teamsUsers.user', 'penilaian'])->find($id); - $jaminanId = $permohonan->debiture->documents->first()->jenis_jaminan_id; + $documentId = $request->query('documentId'); + $jaminanId = $request->query('jaminanId'); - $inspeksi = Inspeksi::where('permohonan_id', $id)->where('jenis_jaminan_id', $jaminanId)->first(); + $permohonan = $this->surveyorController->getPermohonanJaminanId($id, $documentId, $jaminanId); + $basicData = $this->surveyorController->getCommonData(); + + $inspeksi = Inspeksi::where('permohonan_id', $id)->where('dokument_id', $documentId)->first(); $forminspeksi = null; if ($inspeksi) { $forminspeksi = json_decode($inspeksi->data_form, true); } - $data = new SurveyorController(); - $basicData = $data->getCommonData(); + + return view('lpj::penilai.components.lpj-sederhana-standard', compact('permohonan', 'forminspeksi', 'basicData', 'inspeksi')); } - public function resume($id) + public function resume(Request $request) { - $permohonan = Permohonan::with(['debiture.documents.jenisjaminan', 'region.teams.teamsUsers.user', 'penilaian'])->find($id); + $permohonanId = $request->query('permohonanId'); + $permohonan = Permohonan::with(['debiture.documents.jenisjaminan', 'region.teams.teamsUsers.user', 'penilaian'])->find($permohonanId); return view('lpj::penilai.components.resume', compact('permohonan')); } - public function memo() + public function memo(Request $request) { - return view('lpj::resume.index'); + $permohonanId = $request->query('permohonanId'); + $documentId = $request->query('documentId'); + $inspeksiId = $request->query('inspeksiId'); + $jaminanId = $request->query('jaminanId'); + + $permohonan = $this->surveyorController->getPermohonanJaminanId($permohonanId, $documentId, $jaminanId); + $inspeksi = Inspeksi::where('permohonan_id', $permohonanId)->where('dokument_id', $documentId)->first(); + + $formFoto = null; + $formPeta = null; + if ($inspeksi) { + $formFoto = json_decode($inspeksi->foto_form, true); + $formPeta = json_decode($inspeksi->data_form, true); + + } + + + + return view('lpj::penilai.components.memo', compact('permohonan', 'formFoto', 'formPeta')); } @@ -106,7 +142,7 @@ class PenilaiController extends Controller */ public function show($id) { - $permohonan = Permohonan::with(['debiture.documents.jenisjaminan', 'region.teams.teamsUsers.user', 'penilaian'])->find($id); + $permohonan = Permohonan::with(['debiture.documents.jenisjaminan', 'region.teams.teamsUsers.user', 'penilaian', 'documents.inspeksi'])->find($id); // return response()->json(['permohonan' => $permohonan]); return view('lpj::penilai.show', compact('permohonan')); @@ -123,11 +159,20 @@ class PenilaiController extends Controller /** * Update the specified resource in storage. */ - public function update(Request $request, $id) + public function paparan(Request $request) { - // + $permohonanId = $request->query('permohonanId'); + return view('lpj::penilai.components.paparan'); } + + public function rap(Request $request) + { + $permohonanId = $request->query('permohonanId'); + return view('lpj::penilai.components.paparan'); + } + + /** * Remove the specified resource from storage. */ @@ -160,7 +205,7 @@ class PenilaiController extends Controller // Apply whereHas to check penilai_id, role, and user_id specifically for 'penilai' role $query->whereHas('penilaian.userPenilai', function ($q) { $q->where('role', 'penilai') // Ensure the role is 'penilai' - ->where('user_id', 12); // Ganti dengan Auth::user()->id jika dinamis + ->where('user_id', Auth::user()->id); // Ganti dengan Auth::user()->id jika dinamis }); // Apply sorting if provided @@ -213,9 +258,9 @@ class PenilaiController extends Controller ]); } - public function kertas_kerja($id, $jaminanId) + public function export_kertas_kerja($id, $jaminanId) { - $data = Inspeksi::where('permohonan_id', $id)->where('jenis_jaminan_id', $jaminanId)->first(); + $data = Inspeksi::where('permohonan_id', $id)->where('dokument_id', $jaminanId)->first(); // $data = null; // $headerInfo = [ @@ -234,5 +279,100 @@ class PenilaiController extends Controller } + public function import_kertas_kerja(Request $request) +{ + + $validatedData = $request->validate([ + 'permohonan_id' => 'required|integer', + 'document_id' => 'required|integer', + 'inspeksi_id' => 'required|integer', + 'kertas_kerja' => 'required|file|mimes:pdf,doc,docx,xls,xlsx,xlsx', + ]); + + try { + // Simpan file kertas kerja + if ($request->hasFile('kertas_kerja')) { + $file = $request->file('kertas_kerja'); + $filePath = $this->surveyorController->uploadFile($file, 'kertas_kerja'); + Penilai::updateOrCreate( + [ + 'permohonan_id' => $validatedData['permohonan_id'], + 'dokument_id' => $validatedData['document_id'], + 'inspeksi_id' => $validatedData['inspeksi_id'], + ], + [ + 'kertas_kerja' => $filePath, + ] + ); + + return response()->json(['success' => true, 'message' => 'Kertas kerja berhasil diunggah.']); + } + + return response()->json(['success' => false, 'message' => 'File kertas kerja tidak ditemukan.'], 400); + } catch (\Exception $e) { + return response()->json(['success' => false, 'message' => 'Terjadi kesalahan: ' . $e->getMessage()], 500); + } +} + + + public function status($id) + { + $penilai = Penilai::find($id); + return response()->json(['data' => $penilai]); + } + + public function checkStatusLpj(Request $request) + { + $permohonanId = $request->query('permohonanId'); + $documentId = $request->query('documentId'); + $inspeksiId = $request->query('inspeksiId'); + + $statusLpj = Penilai::where('permohonan_id', $permohonanId) + ->where('dokument_id', $documentId) + ->where('inspeksi_id', $inspeksiId) + ->first(); + + return response()->json(['status' => $statusLpj ? $statusLpj->type : null]); + } + + public function saveStatusLpj(Request $request) + { + + Penilai::updateOrCreate( + [ + 'permohonan_id' => $request->permohonan_id, + 'dokument_id' => $request->document_id, + 'inspeksi_id' => $request->inspeksi_id, + ], + [ + 'type' => $request->type, + ] + ); + + return response()->json(['success' => true]); + } + + + public function storePenilaian($id){ + try { + $permohonan = Permohonan::findOrFail($id); + $permohonan->update([ + 'status' => 'proses-laporan', + ]); + + return response()->json([ + 'success' => true, + 'message' => 'Berhasil menyimpan penilaian' + ], 200); + + } catch (\Exception $e) { + return response()->json([ + 'success' => false, + 'message' => 'Terjadi kesalahan', + 'error' => $e->getMessage() + ], 500); + } + } + } diff --git a/app/Http/Controllers/SurveyorController.php b/app/Http/Controllers/SurveyorController.php index da3ceb5..e730a54 100644 --- a/app/Http/Controllers/SurveyorController.php +++ b/app/Http/Controllers/SurveyorController.php @@ -723,15 +723,33 @@ class SurveyorController extends Controller // Fields untuk tanah if (in_array($field, ['luas_tanah'])) { - $cekLuas = $dataForm['tanah']['luas_tanah'] == 'sesuai' ? 'sesuai' : 'tidak sesuai'; - $dataForm['tanah'][$field][$cekLuas] = $newValue; + // Pastikan struktur array ada sebelum diakses + if (!isset($dataForm['tanah']['luas_tanah'])) { + $dataForm['tanah']['luas_tanah'] = []; + } + + $cekLuas = isset($dataForm['tanah']['luas_tanah']['sesuai']) && $dataForm['tanah']['luas_tanah']['sesuai'] === 'sesuai' + ? 'sesuai' + : 'tidak sesuai'; + + $dataForm['tanah']['luas_tanah'][$cekLuas] = $newValue; + $needsSave = true; } + // Fields untuk bangunan elseif (in_array($field, ['luas_tanah_bagunan'])) { + if (!isset($dataForm['bangunan']['luas_tanah_bagunan'])) { + $dataForm['bangunan']['luas_tanah_bagunan'] = []; + } - $cekBanguan = $dataForm['bangunan']['luas_tanah_bagunan'] == 'sesuai' ? 'sesuai' : 'tidak sesuai'; - $dataForm['bangunan'][$field][$cekBanguan] = $newValue; + $cekBanguan = isset($dataForm['bangunan']['luas_tanah_bagunan']['sesuai']) && $dataForm['bangunan']['luas_tanah_bagunan']['sesuai'] === 'sesuai' + ? 'sesuai' + : 'tidak sesuai'; + + $dataForm['bangunan']['luas_tanah_bagunan'][$cekBanguan] = $newValue; + $needsSave = true; } + // Fields untuk alamat dalam asset elseif (in_array($field, ['address', 'village_code', 'district_code', 'city_code', 'province_code'])) { @@ -2306,7 +2324,7 @@ class SurveyorController extends Controller */ - private function uploadFile($file, $type) + public function uploadFile($file, $type) { if (!$file->isValid()) { throw new Exception("Invalid file upload for {$type}"); diff --git a/app/Models/DokumenJaminan.php b/app/Models/DokumenJaminan.php index 3454dc9..e3a958e 100644 --- a/app/Models/DokumenJaminan.php +++ b/app/Models/DokumenJaminan.php @@ -67,4 +67,8 @@ public function detail(){ return $this->hasMany(DetailDokumenJaminan::class, 'dokumen_jaminan_id', 'id'); } + public function inspeksi() + { + return $this->hasMany(Inspeksi::class, 'dokument_id', 'id'); + } } diff --git a/app/Models/Penilai.php b/app/Models/Penilai.php new file mode 100644 index 0000000..cc5eed5 --- /dev/null +++ b/app/Models/Penilai.php @@ -0,0 +1,42 @@ +belongsTo(DokumenJaminan::class); + } + public function permohonan(){ + return $this->belongsTo(Permohonan::class); + } + public function inspeksi(){ + return $this->belongsTo(Inspeksi::class); + } + +} diff --git a/database/migrations/2024_12_17_025938_create_penilai_table.php b/database/migrations/2024_12_17_025938_create_penilai_table.php new file mode 100644 index 0000000..0a5fc7e --- /dev/null +++ b/database/migrations/2024_12_17_025938_create_penilai_table.php @@ -0,0 +1,44 @@ +id(); + $table->string('type')->nullable(); + $table->json('lpj')->nullable(); + $table->json('resume')->nullable(); + $table->json('memo')->nullable(); + $table->string('kertas_kerja')->nullable(); + $table->unsignedBigInteger('dokument_id')->nullable(); + $table->unsignedBigInteger('permohonan_id')->nullable(); + $table->unsignedBigInteger('inspeksi_id')->nullable(); + $table->timestamps(); + $table->timestamp('authorized_at')->nullable(); + $table->char('authorized_status', 1)->nullable(); + $table->softDeletes(); + $table->unsignedBigInteger('created_by')->nullable(); + $table->unsignedBigInteger('updated_by')->nullable(); + $table->unsignedBigInteger('deleted_by')->nullable(); + $table->unsignedBigInteger('authorized_by')->nullable(); + $table->foreign('dokument_id')->references('id')->on('dokumen_jaminan')->onDelete('set null'); + $table->foreign('permohonan_id')->references('id')->on('permohonan')->onDelete('set null'); + $table->foreign('inspeksi_id')->references('id')->on('inspeksi')->onDelete('set null'); + }); + } + + /** + * Reverse the migrations. + */ + public function down(): void + { + Schema::dropIfExists('penilai'); + } +}; diff --git a/database/migrations/2024_12_17_074223_update_inspeksi_table.php b/database/migrations/2024_12_17_074223_update_inspeksi_table.php new file mode 100644 index 0000000..e17d9ab --- /dev/null +++ b/database/migrations/2024_12_17_074223_update_inspeksi_table.php @@ -0,0 +1,44 @@ +dropForeign(['jenis_jaminan_id']); + } + + if (Schema::hasColumn('inspeksi', 'jenis_jaminan_id')) { + $table->dropColumn('jenis_jaminan_id'); + } + + $table->unsignedBigInteger('dokument_id')->nullable()->after('permohonan_id'); + $table->foreign('dokument_id')->references('id')->on('dokumen_jaminan')->onDelete('cascade'); + + }); + } + + /** + * Reverse the migrations. + */ + public function down(): void + { + + Schema::table('inspeksi', function (Blueprint $table) { + + $table->dropForeign(['dokument_id']); + $table->dropColumn('dokument_id'); + + $table->unsignedBigInteger('jenis_jaminan_id')->nullable()->after('permohonan_id'); + $table->foreign('jenis_jaminan_id')->references('id')->on('jenis_jaminan')->onDelete('cascade'); + }); + + } +}; diff --git a/resources/views/component/kertas-kerja.blade.php b/resources/views/component/kertas-kerja.blade.php index 8e197cf..411aa9d 100644 --- a/resources/views/component/kertas-kerja.blade.php +++ b/resources/views/component/kertas-kerja.blade.php @@ -538,8 +538,6 @@ @endforeach - - diff --git a/resources/views/penilai/components/informasi-pembanding.blade.php b/resources/views/penilai/components/informasi-pembanding.blade.php index e0a65a2..a65fa57 100644 --- a/resources/views/penilai/components/informasi-pembanding.blade.php +++ b/resources/views/penilai/components/informasi-pembanding.blade.php @@ -4,68 +4,70 @@ $informasiPembanding = isset($inspeksi->data_pembanding) ? json_decode($inspeksi->data_pembanding, true) : []; @endphp - @foreach ($informasiPembanding['data_pembanding'] as $key => $item) -
-
-
- - Gambar foto_objek + @if (isset($informasiPembanding['data_pembanding'])) + @foreach ($informasiPembanding['data_pembanding'] as $key => $item) +
+
+
+ + Gambar foto_objek +
+
+
+ +
+ {{ $item['jenis_aset'] }} +
+
+ +
+ +
+ {{ $item['harga_diskon'] }} +
+
+ +
+ +
+ {{ $item['harga'] }} +
+
+ +
+ +
+ {{ $item['harga'] }} +
+
+ +
+ +
+ {{ $item['luas_tanah'] }} +
+
+ +
+ +
+ {{ $item['luas_bangunan'] }} +
+
+ +
+ +
+ {{ $item['kordinat_lat'] }} , {{ $item['kordinat_lng'] }} +
+
+ +
-
-
- -
- {{ $item['jenis_aset'] }} -
-
-
- -
- {{ $item['harga_diskon'] }} -
-
- -
- -
- {{ $item['harga'] }} -
-
- -
- -
- {{ $item['harga'] }} -
-
- -
- -
- {{ $item['luas_tanah'] }} -
-
- -
- -
- {{ $item['luas_bangunan'] }} -
-
- -
- -
- {{ $item['kordinat_lat'] }} , {{ $item['kordinat_lng'] }} -
-
- -
- -
- @endforeach + @endforeach + @endif
diff --git a/resources/views/penilai/components/lpj-sederhana-standard.blade.php b/resources/views/penilai/components/lpj-sederhana-standard.blade.php index ea6f1f2..404c1c8 100644 --- a/resources/views/penilai/components/lpj-sederhana-standard.blade.php +++ b/resources/views/penilai/components/lpj-sederhana-standard.blade.php @@ -35,7 +35,7 @@
@foreach ($permohonan->debiture->documents as $dokumen) - {{formatAlamat($dokumen->pemilik)}} + {{ formatAlamat($dokumen->pemilik) }} @endforeach
@@ -82,7 +82,34 @@ Identitas Cadeb/Debitur
-
+
+ +
+ +
+ + @if (isset($permohonan->debiture)) +

{{ $permohonan->debiture->name }}

+ @endif + +
+
+ +
+ +
+ + {{ $forminspeksi['asset']['debitur_perwakilan'][0] ?? '' }} + +
+
+ +
+ +
+ +
+
@@ -94,7 +121,61 @@ Deskripsi dan Alamat Aset -
+
+ +
+ + @php + $statusKey = isset($forminspeksi['asset']['jenis_asset']['sesuai']) ? 'sesuai' : 'tidak sesuai'; + $selectedValue = $forminspeksi['asset']['jenis_asset'][$statusKey] ?? null; + @endphp +
+ {{ $selectedValue }} +
+
+ +
+ @php + $statusKey = isset($forminspeksi['asset']['alamat']['sesuai']) ? 'sesuai' : 'tidak sesuai'; + $selectedValue = $forminspeksi['asset']['alamat'][$statusKey] ?? null; + @endphp + +
+ {{ $selectedValue['address'] ?? '' }} +
+
+ +
+ +
+ +
+
+ +
+ +
+ +
+
+ +
+ +
+ +
+
+ +
+ +
+ +
+
@@ -106,7 +187,98 @@
+
+ @foreach ($permohonan->debiture->documents as $dokumen) +
+ + +
+ @endforeach +
+ @include('lpj::component.pdfviewer')
@@ -116,15 +288,38 @@ Hubungan Cadeb/Debitur dengan pemilik dan penghuni + @php + $statusKey = isset($forminspeksi['asset']['hub_cadeb']['sesuai']) ? 'sesuai' : 'tidak sesuai'; + $selectedData = $forminspeksi['asset']['hub_cadeb'][$statusKey] ?? null; + @endphp
- @include('lpj::surveyor.components.tanah') - @include('lpj::surveyor.components.bangunan') - @include('lpj::surveyor.components.lingkungan') - @include('lpj::surveyor.components.fakta') - @include('lpj::surveyor.components.informasi') + @foreach ($permohonan->debiture->documents as $dokumen) + @if ($dokumen->jenisJaminan) + @php + $formKategori = json_decode($dokumen->jenisJaminan->form_kategori, true); + @endphp + @if (isset($formKategori) && $formKategori) + @php + $kategoriArray = is_array($formKategori) ? $formKategori : [$formKategori]; + $kategoriUnik = array_unique($kategoriArray); + @endphp + + + + + @foreach ($kategoriUnik as $kategori) + {{-- Tampilkan komponen sesuai kategori --}} + @include('lpj::surveyor.components.' . str_replace('-', '-', $kategori), [ + 'dokumen' => $dokumen, + ]) + @endforeach + @endif + @endif + @endforeach +
@@ -142,17 +337,114 @@ total nilai pasar wajar
-
+
+
+ +
+
+
+ + +
+
+ + +
+
+ + +
+
+ +
+
+ + +
+
+ + +
+
+ + +
+
+ +
+
+ + +
+
+ + +
+
+ + +
+
+
+
+ +
+ +
+
+
+ +
+
+ + +
+
+
+ + +
+
+ + +
+
+ +
+
+

- nilai asuransi + nilai asuransi

+
+ +
+
+
+ + +
+
+ + +
+ +
+ + +
+ + +
+
+
@@ -165,11 +457,4 @@
- - @endsection diff --git a/resources/views/penilai/components/memo.blade.php b/resources/views/penilai/components/memo.blade.php index e69de29..e963b37 100644 --- a/resources/views/penilai/components/memo.blade.php +++ b/resources/views/penilai/components/memo.blade.php @@ -0,0 +1,458 @@ +@extends('layouts.main') + +@section('breadcrumbs') + {{-- {{ Breadcrumbs::render(request()->route()->getName()) }} + --}} + Resume +@endsection + +@section('content') + @include('lpj::assetsku.includenya') +
+
+
+

+ Memo Antar Kantor +

+
+ + Back + +
+
+
+
+ +
+ +
+
+
+ +
+ +
+
+
+ +
+ +
+
+ + + +
+ +
+ +
+
+ +
+ +
+ +
+
+
+
+ +
+
+

Sehubungan dengan permintaan BAGI Cabang ............., untuk dilakukan survey untuk penilaian baru/review, calon debitur/debitur an …............., + dengan deskripsi sebagai berikut : +

+
+
+
+
+ + +
+ + + {{-- --}} + +
+ + +
+ +
+
+
+ +
+ +
+
+ +
+ +
+ +
+
+ +
+ +
+ +
+
+ +
+ +
+ +
+
+ +
+ +
+ +
+
+ +
+ +
+ +
+
+ +
+ +
+ +
+
+ +
+
+ + +
+
+
+ + + +
+
+

+ Dokument +

+
+
+ +
+ +
+ +
+ +
+ +
+
+ +
+ +
+ @if (!empty($forminspeksi['fakta']['hasil_survey'])) + @foreach ($forminspeksi['fakta']['hasil_survey'] as $index => $positif) +
+ + +
+ @endforeach + @else +
+ + +
+ @endif + +
+
+ + +
+ +
+ @if (!empty($forminspeksi['fakta']['fakta_negatif'])) + @foreach ($forminspeksi['fakta']['fakta_negatif'] as $index => $negatif) +
+ + +
+ @endforeach + @else +
+ + + +
+ @endif + +
+
+
+
+ + + +
+
+

+ Peta lokasi +

+
+
+
+
+

+ Rute Menuju Lokasi +

+
+
+ @if (isset($formPeta)) + @php + $foto = [ + 'foto_gistaru', + 'foto_bhumi', + 'foto_argis_region', + 'foto_tempat', + ] + @endphp + + @foreach ($foto as $item) + @if (isset($formPeta[$item]) && $formPeta[$item]) +
+
+

+ {{ ucwords(str_replace('_', ' ', $item)) }} +

+
+ {{ $item }} +
+
+
+ @endif + @endforeach + @endif +
+ +
+
+
+ + +
+
+

+ Foto jaminan +

+
+
+
+
+

+ Rute Menuju Lokasi +

+
+
+ @if (isset($formFoto)) + @foreach ($formFoto['rute_menuju_lokasi'] as $item) +
+
+

+ {{ $item['name_rute'] . ' ' . $loop->index + 1 }} +

+
+ + + + +
+
+
+ @endforeach + @endif +
+
+ + +
+
+

+ Object Jaminan +

+
+
+ @if (isset($formFoto['object_jaminan'])) + @foreach ($formFoto['object_jaminan'] as $item) +
+
+

+ {{ $item['name_objek'] }} +

+
+ + + + +
+
+
+ @endforeach + @endif +
+
+ + @if (isset($formFoto['foto_basement'])) +
+
+

+ Basement +

+
+
+
+
+

+ Basemnt +

+
+ + + + +
+
+
+ +
+
+ @endif + + @if (isset($formFoto['foto_gerbang'])) +
+
+

+ Gerbang +

+
+
+ + +
+
+

+ Gerbang +

+
+ + + + +
+
+
+ +
+
+ @endif + + + @if (isset($formFoto['pendamping'])) +
+
+

+ Pendamping +

+
+
+ + +
+
+

+ Pendamping +

+
+ + + + +
+
+
+ +
+
+ @endif +
+
+ +
+ + SAVE + +
+
+@endsection +@include('lpj::surveyor.js.utils') + + + diff --git a/resources/views/penilai/components/paparan.blade.php b/resources/views/penilai/components/paparan.blade.php new file mode 100644 index 0000000..e69de29 diff --git a/resources/views/penilai/components/resume.blade.php b/resources/views/penilai/components/resume.blade.php index ad89007..745824d 100644 --- a/resources/views/penilai/components/resume.blade.php +++ b/resources/views/penilai/components/resume.blade.php @@ -109,7 +109,6 @@ -
@@ -141,54 +140,129 @@
-
-
-

- KESIMPULAN NILAI PASAR WAJAR -

-
-
+
+
+

+ KESIMPULAN NILAI PASAR WAJAR +

+
+
-
- -
- - - - - - - +
+ +
+
SertipikatLuas TanahLuas BangunanNilai Pasar Wajar
+ + + + + + - - - - - - - - - - - -
SertipikatLuas TanahLuas BangunanNilai Pasar Wajar
- - - - - -
+ + + + + + + + + + + + + + + + + + +
+
+ +
+ +
+ + + + + + + + + + + + + + + + + + + + +
SertipikatLuas TanahLuas BangunanNilai Pasar Wajar
+ + + + + + + +
+
+
+ +
+ +
+ +
+ +
+ + +
+ +
-
- -
+
+ +
+ + +
+ +
+@endsection +@include('lpj::surveyor.js.utils') + diff --git a/resources/views/penilai/show.blade.php b/resources/views/penilai/show.blade.php index 2f40adf..b176782 100644 --- a/resources/views/penilai/show.blade.php +++ b/resources/views/penilai/show.blade.php @@ -5,6 +5,7 @@ @endsection @section('content') +@include('lpj::assetsku.includenya')
@@ -174,8 +175,6 @@

- -
@@ -188,7 +187,7 @@ KERTAS KERJA - + PAPARAN @@ -196,10 +195,17 @@ + @php + $inspeksiId = null; + foreach ($dokumen->inspeksi as $item) { + $inspeksiId = $item->id; + } + @endphp
- + @@ -210,7 +216,8 @@
- + @@ -220,20 +227,21 @@
-
- - - - - - - LPJ - + +
+ + + + + LPJ
+
- + @@ -249,15 +257,10 @@
- - SAVE - REPORT - - PRINT OUT @@ -265,9 +268,14 @@
+
@endforeach - +
+ + SAVE + +
@@ -285,26 +293,35 @@
+ @php + $jenisJaminanId = null; + $inspeksiId = null; + $documentId = null; + foreach ($permohonan->debiture->documents as $item) { + $documentId = $item->id; + } + foreach ($dokumen->inspeksi as $item) { + $inspeksiId = $item->id; + } + @endphp + @foreach ($permohonan->debiture->documents as $document) + @if ($document->jenisjaminan) + @php + $jenisJaminanId = $document->jenisjaminan->id; + @endphp + @endif + @endforeach
- + + onclick="uploadKertasKerja({{ $permohonan->id }}, '{{ $documentId }}', '{{ $inspeksiId }}', '{{ $jenisJaminanId }}')">Upload
- @php - $jenisJaminanId = null; - @endphp - @foreach ($permohonan->debiture->documents as $document) - @if ($document->jenisjaminan) - @php - $jenisJaminanId = $document->jenisjaminan->id; - @endphp - @endif - @endforeach + @if ($jenisJaminanId) @@ -325,42 +342,184 @@ @include('lpj::surveyor.js.utils') diff --git a/resources/views/surveyor/components/apartemen-kantor.blade.php b/resources/views/surveyor/components/apartemen-kantor.blade.php index aea642c..1cbad67 100644 --- a/resources/views/surveyor/components/apartemen-kantor.blade.php +++ b/resources/views/surveyor/components/apartemen-kantor.blade.php @@ -15,10 +15,10 @@ @php $luas = $item->detail; $details = json_decode($luas[0]->details, true); - $luas_unit = isset($details['luas_unit']) ? $details['luas_unit'] : 'N/A'; + $luas_units = isset($details['luas_unit']) ? $details['luas_unit'] : 'N/A'; @endphp - -

{{ $luas_unit }} m2

+ +

{{ $luas_units }} m2

@endforeach @endif @@ -29,19 +29,19 @@ + {{ old('luas_unit', isset($forminspeksi['luas_unit']['sesuai'])) ? 'checked' : ''}}> Sesuai
+ style="{{ old('luas_unit', isset($forminspeksi['luas_unit']['tidak sesuai'])) ? '' : 'display: none;' }}"> diff --git a/resources/views/surveyor/components/card-tambah.blade.php b/resources/views/surveyor/components/card-tambah.blade.php index 510c28a..16b79be 100644 --- a/resources/views/surveyor/components/card-tambah.blade.php +++ b/resources/views/surveyor/components/card-tambah.blade.php @@ -1,7 +1,7 @@
@foreach ($permohonan->debiture->documents as $dokumen) @php - $jaminanId = $dokumen->jenisJaminan->id; + $jaminanId = $dokumen->id; $currentInspeksi = $inspeksiData[$jaminanId] ?? null; $tanahBangunanTypes = ['KAPAL', 'PESAWAT', 'KENDARAAN', 'ALAT BERAT']; @@ -11,8 +11,7 @@ 'label' => 'form inspeksi', 'url' => route('surveyor.inspeksi', [ 'id' => $permohonan->id, - 'jaminanId' => $jaminanId, - ]) . "?form=create-inspeksi&inspeksi={$permohonan->id}&jenis_jaminan={$jaminanId}", + ]) . "?form=create-inspeksi&inspeksi={$permohonan->id}&dokument={$jaminanId}&jenisjaminan={$dokumen->jenisJaminan->id}", 'show' => true, 'icon' => !empty($currentInspeksi['data_form']), ], @@ -22,9 +21,8 @@ $href[] = [ 'label' => 'denah tanah dan bangunan', 'url' => route('surveyor.denah', [ - 'id' => $permohonan->id, - 'jaminanId' => $jaminanId, - ]) . "?form=create-denah&denah={$permohonan->id}&jenis_jaminan={$jaminanId}", + 'id' => $permohonan->id + ]) . "?form=create-denah&denah={$permohonan->id}&dokument={$jaminanId}&jenisjaminan={$dokumen->jenisJaminan->id}", 'show' => true, 'icon' => !empty($currentInspeksi['denah_form']), ]; @@ -34,18 +32,16 @@ [ 'label' => 'foto', 'url' => route('surveyor.foto', [ - 'id' => $permohonan->id, - 'jaminanId' => $jaminanId, - ]) . "?form=create-foto&foto={$permohonan->id}&jenis_jaminan={$jaminanId}", + 'id' => $permohonan->id + ]) . "?form=create-foto&foto={$permohonan->id}&dokument={$jaminanId}&jenisjaminan={$dokumen->jenisJaminan->id}", 'show' => true, 'icon' => !empty($currentInspeksi['foto_form']), ], [ 'label' => 'data pembanding', 'url' => route('surveyor.data-pembanding', [ - 'id' => $permohonan->id, - 'jaminanId' => $jaminanId, - ]) . "?form=data-pembanding&pembanding={$permohonan->id}&jenis_jaminan={$jaminanId}", + 'id' => $permohonan->id + ]) . "?form=data-pembanding&pembanding={$permohonan->id}&dokument={$jaminanId}&jenisjaminan={$dokumen->jenisJaminan->id}", 'show' => true, 'icon' => !empty($currentInspeksi['data_pembanding']), ], diff --git a/resources/views/surveyor/components/data-pembanding.blade.php b/resources/views/surveyor/components/data-pembanding.blade.php index dae8677..10b4be6 100644 --- a/resources/views/surveyor/components/data-pembanding.blade.php +++ b/resources/views/surveyor/components/data-pembanding.blade.php @@ -14,7 +14,7 @@ @csrf - +
@@ -111,16 +111,6 @@ - @php - $apartemenKantorData = explode(',', $inspeksi->name); - $isApartemenKantor = array_intersect($apartemenKantorData, [ - 'tanah', - 'bangunan', - ]); - - @endphp - - @if ($isApartemenKantor) Luas Tanah (m²) @php @@ -153,19 +143,6 @@ class="input number-format"> - @else - - Luas Unit (m²) - - - - - - - - @endif diff --git a/resources/views/surveyor/components/denah.blade.php b/resources/views/surveyor/components/denah.blade.php index 58c783f..1b311ca 100644 --- a/resources/views/surveyor/components/denah.blade.php +++ b/resources/views/surveyor/components/denah.blade.php @@ -137,7 +137,7 @@ @csrf - +
diff --git a/resources/views/surveyor/components/foto.blade.php b/resources/views/surveyor/components/foto.blade.php index a1b306d..7c87ee9 100644 --- a/resources/views/surveyor/components/foto.blade.php +++ b/resources/views/surveyor/components/foto.blade.php @@ -76,7 +76,7 @@
- +
diff --git a/resources/views/surveyor/components/informasi.blade.php b/resources/views/surveyor/components/informasi.blade.php index 611e844..141c7e1 100644 --- a/resources/views/surveyor/components/informasi.blade.php +++ b/resources/views/surveyor/components/informasi.blade.php @@ -128,9 +128,9 @@ Foto Bhumi + style="{{ isset($forminspeksi['foto_gistaru']) ? '' : 'display: none;' }} max-width: 30rem;" /> + -
@@ -154,7 +154,7 @@ Foto Bhumi + style="{{ isset($forminspeksi['foto_bhumi']) ? ' ' : 'display: none;' }} max-width: 30rem;" />
Bhumi @@ -176,7 +176,7 @@ Foto Argis Region + style="{{ isset($forminspeksi['foto_argis_region']) ? '' : 'display: none;' }} max-width: 30rem;">
@@ -205,7 +205,7 @@ Foto Argis Region + style="{{ isset($forminspeksi['foto_tempat']) ? '' : 'display: none;' }} max-width: 30rem;">
diff --git a/resources/views/surveyor/components/inspeksi.blade.php b/resources/views/surveyor/components/inspeksi.blade.php index 7eb2fa2..ab93e87 100644 --- a/resources/views/surveyor/components/inspeksi.blade.php +++ b/resources/views/surveyor/components/inspeksi.blade.php @@ -10,7 +10,7 @@ @csrf - + @foreach ($permohonan->debiture->documents as $dokumen) @if ($dokumen->jenisJaminan) @php diff --git a/resources/views/surveyor/detail.blade.php b/resources/views/surveyor/detail.blade.php index 9b1896a..571fdab 100644 --- a/resources/views/surveyor/detail.blade.php +++ b/resources/views/surveyor/detail.blade.php @@ -86,7 +86,7 @@ }, success: function(response) { if (response.success) { - // window.location.href = "{{ route('surveyor.index') }}"; + window.location.href = "{{ route('surveyor.index') }}"; toastrSuccessBuild(response.message); } }, @@ -98,7 +98,7 @@ toastrErrorBuild('Terjadi kesalahan'); } - + } }); } diff --git a/routes/web.php b/routes/web.php index 971e6df..11e321a 100644 --- a/routes/web.php +++ b/routes/web.php @@ -525,10 +525,10 @@ Route::middleware(['auth'])->group(function () { Route::get('checkButtonStatus/{id}', [SurveyorController::class, 'checkButtonStatus'])->name('checkButtonStatus'); Route::get('datatables', [SurveyorController::class, 'dataForDatatables'])->name('datatables'); - Route::get('inspeksi/{id}/{jaminanId}', [SurveyorController::class, 'formInspeksi'])->name('inspeksi'); - Route::get('denah/{id}/{jaminanId}', [SurveyorController::class, 'denah'])->name('denah'); - Route::get('foto/{id}/{jaminanId}', [SurveyorController::class, 'foto'])->name('foto'); - Route::get('data-pembanding/{id}/{jaminanId}', [SurveyorController::class, 'dataPembanding'])->name('data-pembanding'); + Route::get('inspeksi/{id}', [SurveyorController::class, 'formInspeksi'])->name('inspeksi'); + Route::get('denah/{id}', [SurveyorController::class, 'denah'])->name('denah'); + Route::get('foto/{id}', [SurveyorController::class, 'foto'])->name('foto'); + Route::get('data-pembanding/{id}', [SurveyorController::class, 'dataPembanding'])->name('data-pembanding'); Route::post('submitSurveyor/{id}', [SurveyorController::class, 'submitSurveyor'])->name('submitSurveyor'); Route::post('update_analisa/{id}', [SurveyorController::class, 'update_analisa'])->name('update_analisa'); @@ -540,12 +540,19 @@ Route::middleware(['auth'])->group(function () { Route::get('datatables', [PenilaiController::class, 'dataForDatatables'])->name('dataForTables'); Route::get('lampiran/{id}', [PenilaiController::class, 'lampiran'])->name('lampiran'); - Route::get('export/kertas-kerja/{id}/{jaminanId}', [PenilaiController::class, 'kertas_kerja'])->name('export.kertas-kerja'); + Route::get('export/kertas-kerja/{id}/{jaminanId}', [PenilaiController::class, 'export_kertas_kerja'])->name('export.kertas-kerja'); + + 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('resume/{id}', [PenilaiController::class, 'resume'])->name('resume'); - Route::get('memo/{id}', [PenilaiController::class, 'standard'])->name('memo'); + Route::get('resume', [PenilaiController::class, 'resume'])->name('resume'); + Route::get('memo', [PenilaiController::class, 'memo'])->name('memo'); + Route::get('paparan', [PenilaiController::class, 'paparan'])->name('paparan'); + Route::get('rap', [PenilaiController::class, 'rap'])->name('rap'); + Route::get('/check-status-lpj', [PenilaiController::class, 'checkStatusLpj'])->name('check.status.lpj'); + Route::post('/save-status-lpj', [PenilaiController::class, 'saveStatusLpj'])->name('save.status.lpj'); + Route::post('/preoses-laporan/{id}', [PenilaiController::class, 'storePenilaian'])->name('proses.laporan'); }); From ea5f8dd3354ef803b0a5d0ea707dbc6718724a07 Mon Sep 17 00:00:00 2001 From: majid Date: Thu, 19 Dec 2024 10:14:34 +0700 Subject: [PATCH 2/4] perbaikan lampiran dokument, dan memo, lpj sederhana dan standart, resume --- app/Http/Controllers/PenilaiController.php | 222 ++++- .../lpj-sederhana-standard.blade.php | 294 ++++--- .../views/penilai/components/memo.blade.php | 817 ++++++++++-------- .../views/penilai/components/resume.blade.php | 534 +++++++----- resources/views/penilai/show.blade.php | 19 +- routes/web.php | 4 + 6 files changed, 1163 insertions(+), 727 deletions(-) diff --git a/app/Http/Controllers/PenilaiController.php b/app/Http/Controllers/PenilaiController.php index 7a69240..6290518 100644 --- a/app/Http/Controllers/PenilaiController.php +++ b/app/Http/Controllers/PenilaiController.php @@ -11,6 +11,7 @@ use Illuminate\Support\Facades\Auth; use Maatwebsite\Excel\Facades\Excel; use Modules\Lpj\Exports\KertasKerjaExport; use Modules\Lpj\Http\Controllers\SurveyorController; +use Modules\Location\Models\Province; class PenilaiController extends Controller { @@ -34,20 +35,21 @@ class PenilaiController extends Controller /** * Show the form for creating a new resource. */ - public function lampiran($id) + public function lampiran(Request $request, $id) { - $permohonan = Permohonan::with('debiture.documents')->find($id); + $permohonanId = $request->query('permohonanId'); $documentId = $request->query('documentId'); + $jaminanId = $request->query('jaminanId'); - $inpeksi = Inspeksi::where('permohonan_id', $id)->where('dokument_id', $jaminanId)->first(); + $permohonan = $this->surveyorController->getPermohonanJaminanId($id, $documentId, $jaminanId); + $inpeksi = Inspeksi::where('permohonan_id', $id)->where('dokument_id', $documentId)->first(); $formFoto = null; if ($inpeksi) { $formFoto = json_decode($inpeksi->foto_form, true); } - return view('lpj::penilai.lampiran', compact('permohonan', 'formFoto')); } @@ -64,7 +66,7 @@ class PenilaiController extends Controller // } - public function sederhana(Request $request,$id) + public function sederhana(Request $request, $id) { $basicData = $this->surveyorController->getCommonData(); @@ -78,11 +80,18 @@ class PenilaiController extends Controller $inspeksi = Inspeksi::where('permohonan_id', $id)->where('dokument_id', $documentId)->first(); - $forminspeksi = null; + $lpj = Penilai::where('permohonan_id', $id)->where('dokument_id', $documentId)->first(); + + $lpjData = null; if ($inspeksi) { $forminspeksi = json_decode($inspeksi->data_form, true); } - return view('lpj::penilai.components.lpj-sederhana-standard', compact('permohonan', 'basicData', 'forminspeksi', 'inspeksi')); + + if ($lpj) { + $lpjData = json_decode($lpj->lpj, true); + } + + return view('lpj::penilai.components.lpj-sederhana-standard', compact('permohonan', 'basicData', 'forminspeksi', 'inspeksi', 'lpjData')); } public function standard(Request $request, $id) @@ -95,22 +104,39 @@ class PenilaiController extends Controller $basicData = $this->surveyorController->getCommonData(); $inspeksi = Inspeksi::where('permohonan_id', $id)->where('dokument_id', $documentId)->first(); + $lpj = Penilai::where('permohonan_id', $id)->where('dokument_id', $documentId)->first(); + $forminspeksi = null; + $lpjData = null; if ($inspeksi) { $forminspeksi = json_decode($inspeksi->data_form, true); } + if ($lpj) { + $lpjData = json_decode($lpj->lpj, true); + } - - - return view('lpj::penilai.components.lpj-sederhana-standard', compact('permohonan', 'forminspeksi', 'basicData', 'inspeksi')); + return view('lpj::penilai.components.lpj-sederhana-standard', compact('permohonan', 'forminspeksi', 'basicData', 'inspeksi', 'lpjData')); } public function resume(Request $request) { $permohonanId = $request->query('permohonanId'); - $permohonan = Permohonan::with(['debiture.documents.jenisjaminan', 'region.teams.teamsUsers.user', 'penilaian'])->find($permohonanId); - return view('lpj::penilai.components.resume', compact('permohonan')); + $documentId = $request->query('documentId'); + $inspeksiId = $request->query('inspeksiId'); + $jaminanId = $request->query('jaminanId'); + + $permohonan = $this->surveyorController->getPermohonanJaminanId($permohonanId, $documentId, $jaminanId); + $inspeksi = Inspeksi::where('permohonan_id', $permohonanId)->where('dokument_id', $documentId)->first(); + + + $resume = Penilai::where('permohonan_id', $permohonanId)->where('dokument_id', $documentId)->first(); + $lpjData = null; + if ($resume) { + $resumeData = json_decode($resume->resume, true); + } + + return view('lpj::penilai.components.resume', compact('permohonan', 'resumeData')); } public function memo(Request $request) @@ -123,6 +149,9 @@ class PenilaiController extends Controller $permohonan = $this->surveyorController->getPermohonanJaminanId($permohonanId, $documentId, $jaminanId); $inspeksi = Inspeksi::where('permohonan_id', $permohonanId)->where('dokument_id', $documentId)->first(); + $provinces = Province::all(); + $basicData = $this->surveyorController->getCommonData(); + $formFoto = null; $formPeta = null; if ($inspeksi) { @@ -133,7 +162,7 @@ class PenilaiController extends Controller - return view('lpj::penilai.components.memo', compact('permohonan', 'formFoto', 'formPeta')); + return view('lpj::penilai.components.memo', compact('permohonan', 'formFoto', 'formPeta', 'provinces', 'basicData')); } @@ -280,39 +309,39 @@ class PenilaiController extends Controller public function import_kertas_kerja(Request $request) -{ + { - $validatedData = $request->validate([ - 'permohonan_id' => 'required|integer', - 'document_id' => 'required|integer', - 'inspeksi_id' => 'required|integer', - 'kertas_kerja' => 'required|file|mimes:pdf,doc,docx,xls,xlsx,xlsx', - ]); + $validatedData = $request->validate([ + 'permohonan_id' => 'required|integer', + 'document_id' => 'required|integer', + 'inspeksi_id' => 'required|integer', + 'kertas_kerja' => 'required|file|mimes:pdf,doc,docx,xls,xlsx,xlsx', + ]); - try { - // Simpan file kertas kerja - if ($request->hasFile('kertas_kerja')) { - $file = $request->file('kertas_kerja'); - $filePath = $this->surveyorController->uploadFile($file, 'kertas_kerja'); - Penilai::updateOrCreate( - [ - 'permohonan_id' => $validatedData['permohonan_id'], - 'dokument_id' => $validatedData['document_id'], - 'inspeksi_id' => $validatedData['inspeksi_id'], - ], - [ - 'kertas_kerja' => $filePath, - ] - ); + try { + // Simpan file kertas kerja + if ($request->hasFile('kertas_kerja')) { + $file = $request->file('kertas_kerja'); + $filePath = $this->surveyorController->uploadFile($file, 'kertas_kerja'); + Penilai::updateOrCreate( + [ + 'permohonan_id' => $validatedData['permohonan_id'], + 'dokument_id' => $validatedData['document_id'], + 'inspeksi_id' => $validatedData['inspeksi_id'], + ], + [ + 'kertas_kerja' => $filePath, + ] + ); - return response()->json(['success' => true, 'message' => 'Kertas kerja berhasil diunggah.']); + return response()->json(['success' => true, 'message' => 'Kertas kerja berhasil diunggah.']); + } + + return response()->json(['success' => false, 'message' => 'File kertas kerja tidak ditemukan.'], 400); + } catch (\Exception $e) { + return response()->json(['success' => false, 'message' => 'Terjadi kesalahan: ' . $e->getMessage()], 500); } - - return response()->json(['success' => false, 'message' => 'File kertas kerja tidak ditemukan.'], 400); - } catch (\Exception $e) { - return response()->json(['success' => false, 'message' => 'Terjadi kesalahan: ' . $e->getMessage()], 500); } -} public function status($id) @@ -353,7 +382,8 @@ class PenilaiController extends Controller } - public function storePenilaian($id){ + public function storePenilaian($id) + { try { $permohonan = Permohonan::findOrFail($id); $permohonan->update([ @@ -374,5 +404,113 @@ class PenilaiController extends Controller } } + public function storeResume(Request $request) + { + try { + + // dd($request->all()); + $validatedData = $request->validate([ + 'permohonan_id' => 'required', + 'document_id' => 'required', + 'inspeksi_id' => 'required', + 'resume' => 'required|array', + ]); + + // Simpan atau update data + Penilai::updateOrCreate( + [ + 'permohonan_id' => $validatedData['permohonan_id'], + 'dokument_id' => $validatedData['document_id'], + 'inspeksi_id' => $validatedData['inspeksi_id'], + ], + [ + 'resume' => json_encode($validatedData['resume']), + ] + ); + + + return response()->json([ + 'success' => true, + 'message' => 'Berhasil saved resume' + ], 200); + } catch (\Exception $e) { + return response()->json([ + 'success' => false, + 'message' => 'Terjadi kesalahan', + 'error' => $e->getMessage() + ], 500); + } + } + + + 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 storeLpjSederhanadanStandard(Request $request){ + + try { + + $validatedData = $request->validate([ + 'permohonan_id' => 'required|integer', + 'document_id' => 'required|integer', + 'inspeksi_id' => 'required|integer', + 'lpj' => 'required', + ]); + Penilai::updateOrCreate( + [ + 'permohonan_id' => $validatedData['permohonan_id'], + 'dokument_id' => $validatedData['document_id'], + 'inspeksi_id' => $validatedData['inspeksi_id'], + ], + [ + 'lpj' => json_encode($validatedData['lpj']), + ] + ); + + + return response()->json([ + 'success' => true, + 'message' => 'Berhasil saved lpj' + ], 200); + } catch (\Exception $e) { + return response()->json([ + 'success' => false, + 'message' => 'Terjadi kesalahan', + 'error' => $e->getMessage() + ], 500); + } + } } diff --git a/resources/views/penilai/components/lpj-sederhana-standard.blade.php b/resources/views/penilai/components/lpj-sederhana-standard.blade.php index 404c1c8..089ca48 100644 --- a/resources/views/penilai/components/lpj-sederhana-standard.blade.php +++ b/resources/views/penilai/components/lpj-sederhana-standard.blade.php @@ -331,130 +331,218 @@
-
-
-

- total nilai pasar wajar -

-
-
-
- -
-
-
- - + +
+
+

+ total nilai pasar wajar +

+
+
+
+ +
+
+
+ + +
+
+ + +
+
+ + +
-
- - + +
+
+ + +
+
+ + +
+
+ + +
-
- - + +
+
+ + +
+
+ + +
+
+ + +
+
-
-
- - -
-
- - -
-
- - -
-
+
+ +
+
+
+ +
+
+ + +
+
+
+ + +
+
+ + +
+
-
-
- - -
-
- - -
-
- -
+
-
- -
-
-
- -
-
- - -
-
+
+
+

+ nilai asuransi +

+
+
+
+ +
+
- - + +
- +
+ +
+ + +
+ +
-
-
- -
-
-

- nilai asuransi -

+
+
-
-
- -
-
-
- - -
-
- - -
- -
- - -
- - -
-
-
-
-
-
- -
+
@endsection + +@include('lpj::surveyor.js.utils') + diff --git a/resources/views/penilai/components/memo.blade.php b/resources/views/penilai/components/memo.blade.php index e963b37..c3f596f 100644 --- a/resources/views/penilai/components/memo.blade.php +++ b/resources/views/penilai/components/memo.blade.php @@ -9,450 +9,529 @@ @section('content') @include('lpj::assetsku.includenya')
-
-
-

- Memo Antar Kantor -

-
- - Back - -
-
-
-
- -
- +
+
+
+

+ Memo Antar Kantor +

+
+ + Back +
-
- -
- -
-
-
- -
- -
-
- - - -
- -
- -
-
- -
- -
- -
-
-
-
- -
-
-

Sehubungan dengan permintaan BAGI Cabang ............., untuk dilakukan survey untuk penilaian baru/review, calon debitur/debitur an …............., - dengan deskripsi sebagai berikut : -

-
-
-
+
- - -
- - - {{-- --}} - -
- - + +
+ +
-
-
-
- -
- -
-
- -
- -
- -
-
- -
- -
- -
-
- -
- -
- -
-
- -
- -
- -
-
- -
- -
- -
-
- -
- -
- -
-
- + +
+ +
+
+
+ +
+
+ +
+ +
+ +
+
+ +
+ +
+ +
+
-
+ +
+
+

Sehubungan dengan permintaan BAGI Cabang + ............., untuk dilakukan survey untuk penilaian baru/review, calon debitur/debitur an + …............., + dengan deskripsi sebagai berikut : +

+
+
+
+
+ + +
+ + +
-
-
-

- Dokument -

+ +
+ +
+
+
+ +
+ +
+
+ +
+ +
+ +
+
+ +
+ +
+ +
+
+ +
+ +
+ +
+
+ +
+ +
+ +
+
+ +
+ +
+ +
+
+ +
+ +
+ +
+
+ +
+
+ + +
+
-
-
- -
+ + +
+
+

+ Dokument +

+
+
+ +
+ +
+
-
-
- -
- @if (!empty($forminspeksi['fakta']['hasil_survey'])) - @foreach ($forminspeksi['fakta']['hasil_survey'] as $index => $positif) +
+ +
+ @if (!empty($forminspeksi['hasil_survey'])) + @foreach ($forminspeksi['hasil_survey'] as $index => $positif) +
+ + +
+ @endforeach + @else
- -
- @endforeach - @else -
- - -
- @endif - + @endif + +
-
-
- -
- @if (!empty($forminspeksi['fakta']['fakta_negatif'])) - @foreach ($forminspeksi['fakta']['fakta_negatif'] as $index => $negatif) -
- - +
+ @endforeach + @else +
+ + +
- @endforeach - @else -
- - - -
- @endif - + @endif + +
-
-
-
-

- Peta lokasi -

-
-
-
-
-

- Rute Menuju Lokasi -

+
+
+

+ Peta lokasi +

+
+
+
+
+

+ Rute Menuju Lokasi +

+
+
+ @if (isset($formPeta)) + @php + $foto = ['foto_gistaru', 'foto_bhumi', 'foto_argis_region', 'foto_tempat']; + @endphp + + @foreach ($foto as $item) + @if (isset($formPeta[$item]) && $formPeta[$item]) +
+
+

+ {{ ucwords(str_replace('_', ' ', $item)) }} +

+
+ {{ $item }} +
+
+
+ @endif + @endforeach + @endif +
+
-
- @if (isset($formPeta)) - @php - $foto = [ - 'foto_gistaru', - 'foto_bhumi', - 'foto_argis_region', - 'foto_tempat', - ] - @endphp +
+
- @foreach ($foto as $item) - @if (isset($formPeta[$item]) && $formPeta[$item]) -
+ +
+
+

+ Foto jaminan +

+
+
+
+
+

+ Rute Menuju Lokasi +

+
+
+ @if (isset($formFoto)) + @foreach ($formFoto['rute_menuju_lokasi'] as $item) +

- {{ ucwords(str_replace('_', ' ', $item)) }} + {{ $item['name_rute'] . ' ' . $loop->index + 1 }}

-
- {{ $item }} +
+ + + +
- @endif - @endforeach - @endif + @endforeach + @endif +
-
-
-
+ +
+
+

+ Object Jaminan +

+
+
+ @if (isset($formFoto['object_jaminan'])) + @foreach ($formFoto['object_jaminan'] as $item) +
+
+

+ {{ $item['name_objek'] }} +

+
-
-
-

- Foto jaminan -

-
-
-
-
-

- Rute Menuju Lokasi -

-
-
- @if (isset($formFoto)) - @foreach ($formFoto['rute_menuju_lokasi'] as $item) -
-
-

- {{ $item['name_rute'] . ' ' . $loop->index + 1 }} -

-
- - - + +
-
- @endforeach - @endif + @endforeach + @endif +
-
- -
-
-

- Object Jaminan -

-
-
- @if (isset($formFoto['object_jaminan'])) - @foreach ($formFoto['object_jaminan'] as $item) + @if (isset($formFoto['foto_basement'])) +
+
+

+ Basement +

+
+

- {{ $item['name_objek'] }} + Basemnt

- +
- @endforeach - @endif -
+ +
+
+ @endif + + @if (isset($formFoto['foto_gerbang'])) +
+
+

+ Gerbang +

+
+
+ + +
+
+

+ Gerbang +

+
+ + + + +
+
+
+ +
+
+ @endif + + + @if (isset($formFoto['pendamping'])) +
+
+

+ Pendamping +

+
+
+ + +
+
+

+ Pendamping +

+
+ + + + +
+
+
+ +
+
+ @endif
- - @if (isset($formFoto['foto_basement'])) -
-
-

- Basement -

-
-
-
-
-

- Basemnt -

-
- - - - -
-
-
- -
-
- @endif - - @if (isset($formFoto['foto_gerbang'])) -
-
-

- Gerbang -

-
-
- - -
-
-

- Gerbang -

-
- - - - -
-
-
- -
-
- @endif - - - @if (isset($formFoto['pendamping'])) -
-
-

- Pendamping -

-
-
- - -
-
-

- Pendamping -

-
- - - - -
-
-
- -
-
- @endif
-
-
- - SAVE - -
+
+ + SAVE + +
+
@endsection @include('lpj::surveyor.js.utils') diff --git a/resources/views/penilai/components/resume.blade.php b/resources/views/penilai/components/resume.blade.php index 745824d..6cec929 100644 --- a/resources/views/penilai/components/resume.blade.php +++ b/resources/views/penilai/components/resume.blade.php @@ -9,252 +9,255 @@ @section('content') @include('lpj::assetsku.includenya')
-
-
-

- Data Jaminan -

-
- - Back - -
-
-
-
- -
- @if (isset($permohonan->debiture)) -

{{ $permohonan->debiture->name }}

- @endif +
+ @csrf +
+
+

+ Data Jaminan +

+
+ + Back +
-
- -
- @foreach ($permohonan->debiture->documents as $dokumen) - - {{ formatAlamat($dokumen->pemilik) }} - - @endforeach +
+
+ +
+ @if (isset($permohonan->debiture)) +

{{ $permohonan->debiture->name }}

+ @endif +
-
-
- -
-

{{ $permohonan->nomor_registrasi }}

+
+ +
+ @foreach ($permohonan->debiture->documents as $dokumen) + + {{ formatAlamat($dokumen->pemilik) }} + + @endforeach +
+
+
+ +
+

{{ $permohonan->nomor_registrasi }}

+
-
-
- -
- @if (isset($permohonan->branch)) -

{{ $permohonan->branch->name }}

- @endif +
+ +
+ @if (isset($permohonan->branch)) +

{{ $permohonan->branch->name }}

+ @endif +
-
-
- -
-

{{ $permohonan->nomor_registrasi }}

+
+ +
+

{{ $permohonan->nomor_registrasi }}

+
-
-
- -
- @if (isset($permohonan->user)) -

{{ $permohonan->user->name }}

- @endif +
+ +
+ @if (isset($permohonan->user)) +

{{ $permohonan->user->name }}

+ @endif +
-
+ @php + print_r($resumeData); + @endphp -
-
-

- faktor -

-
-
-
- -
- @if (!empty($forminspeksi['fakta']['fakta_positif'])) - @foreach ($forminspeksi['fakta']['fakta_positif'] as $index => $positif) +
+
+

+ faktor +

+
+
+
+ +
+ @if (!empty($resumeData['fakta']['fakta_positif'])) + @foreach ($resumeData['fakta']['fakta_positif'] as $index => $positif) +
+ + +
+ @endforeach + @else
- +
- @endforeach - @else -
- - -
- @endif - + @endif + +
-
-
- -
- @if (!empty($forminspeksi['fakta']['fakta_negatif'])) - @foreach ($forminspeksi['fakta']['fakta_negatif'] as $index => $negatif) +
+ +
+ @if (!empty($forminspeksi['fakta']['fakta_negatif'])) + @foreach ($forminspeksi['fakta']['fakta_negatif'] as $index => $negatif) +
+ + +
+ @endforeach + @else
- + +
- @endforeach - @else -
- - - -
- @endif - +
+
+
+
+ + +
+
+

+ KESIMPULAN NILAI PASAR WAJAR +

+
+
+ +
+ +
+ + + + + + + + + + + + + + + + + + + +
SertipikatLuas TanahLuas BangunanNilai Pasar Wajar
+ + + + + +
+
+
+ +
+ +
+ + + + + + + + + + + + + + + + + + + + +
SertipikatLuas TanahLuas BangunanNilai Pasar Wajar
+ + + + + + + +
+
+
+ +
+
-
-
-
+
-
-
-

- KESIMPULAN NILAI PASAR WAJAR -

-
-
+
-
- -
- - - - - - - - - - - - - - - - - - - -
SertipikatLuas TanahLuas BangunanNilai Pasar Wajar
- - - - - -
+ +
+ +
-
- -
+
- - - - - - - - - - - - - - - - - - - -
SertipikatLuas TanahLuas BangunanNilai Pasar Wajar
- - - - - - - -
-
-
- -
- -
- -
- -
- - -
- -
+
- -
- - -
- - -
+
@endsection @include('lpj::surveyor.js.utils') diff --git a/resources/views/penilai/show.blade.php b/resources/views/penilai/show.blade.php index b176782..fa4ab13 100644 --- a/resources/views/penilai/show.blade.php +++ b/resources/views/penilai/show.blade.php @@ -5,7 +5,7 @@ @endsection @section('content') -@include('lpj::assetsku.includenya') + @include('lpj::assetsku.includenya')
@@ -176,11 +176,17 @@
- + @php + $inspeksiId = null; + foreach ($dokumen->inspeksi as $item) { + $inspeksiId = $item->id; + } + @endphp
- + LAMPIRAN FOTO DAN DOKUMEN @@ -195,12 +201,7 @@ - @php - $inspeksiId = null; - foreach ($dokumen->inspeksi as $item) { - $inspeksiId = $item->id; - } - @endphp +
diff --git a/routes/web.php b/routes/web.php index 11e321a..28880a9 100644 --- a/routes/web.php +++ b/routes/web.php @@ -554,6 +554,10 @@ Route::middleware(['auth'])->group(function () { Route::post('/save-status-lpj', [PenilaiController::class, 'saveStatusLpj'])->name('save.status.lpj'); Route::post('/preoses-laporan/{id}', [PenilaiController::class, 'storePenilaian'])->name('proses.laporan'); + Route::post('storeResume', [PenilaiController::class, 'storeResume'])->name('storeResume'); + Route::post('storeMemo', [PenilaiController::class, 'storeMemo'])->name('storeMemo'); + Route::post('storeLpjSederhanadanStandard', [PenilaiController::class, 'storeLpjSederhanadanStandard'])->name('storeLpjSederhanadanStandard'); + }); Route::get('persetujuan-penawaran/datatables', [PersetujuanPenawaranController::class, 'dataForDatatables']) From 90fb197b941716cfd3106a23619e5798338b58e0 Mon Sep 17 00:00:00 2001 From: majid Date: Thu, 19 Dec 2024 11:04:56 +0700 Subject: [PATCH 3/4] perbaikan konfilk lpj --- .../lpj-sederhana-standard.blade.php | 948 +++++++++--------- 1 file changed, 453 insertions(+), 495 deletions(-) diff --git a/resources/views/penilai/components/lpj-sederhana-standard.blade.php b/resources/views/penilai/components/lpj-sederhana-standard.blade.php index feae450..8fcaaa2 100644 --- a/resources/views/penilai/components/lpj-sederhana-standard.blade.php +++ b/resources/views/penilai/components/lpj-sederhana-standard.blade.php @@ -48,8 +48,6 @@
- -
@@ -177,520 +175,480 @@ value="{{ isset($permohonan->debiture->village) ? $permohonan->debiture->village->name : '' }}">
-
- -
- - @php - $statusKey = isset($forminspeksi['asset']['jenis_asset']['sesuai']) ? 'sesuai' : 'tidak sesuai'; - $selectedValue = $forminspeksi['asset']['jenis_asset'][$statusKey] ?? null; - @endphp -
- {{ $selectedValue }} -
-
- -
- @php - $statusKey = isset($forminspeksi['asset']['alamat']['sesuai']) ? 'sesuai' : 'tidak sesuai'; - $selectedValue = $forminspeksi['asset']['alamat'][$statusKey] ?? null; - @endphp - -
- {{ $selectedValue['address'] ?? '' }} -
-
- -
- -
- -
-
- -
- -
- -
-
- -
- -
- -
-
- -
- -
- -
-
- -
-
- -
-
-

- dokumen -

-
-
-
- @foreach ($permohonan->debiture->documents as $dokumen) -
- - - -
- @endforeach -
- @include('lpj::component.pdfviewer') -
- @foreach ($permohonan->debiture->documents as $dokumen) -
- - - -
- @endforeach -
- @include('lpj::component.pdfviewer') -
-
- -
-
-

- Hubungan Cadeb/Debitur dengan pemilik dan penghuni -

-
- @php - $statusKey = isset($forminspeksi['asset']['hub_cadeb']['sesuai']) ? 'sesuai' : 'tidak sesuai'; - $selectedData = $forminspeksi['asset']['hub_cadeb'][$statusKey] ?? null; - @endphp -
-
-
- - @foreach ($permohonan->debiture->documents as $dokumen) - @if ($dokumen->jenisJaminan) - @php - $formKategori = json_decode($dokumen->jenisJaminan->form_kategori, true); - @endphp - @if (isset($formKategori) && $formKategori) - @php - $kategoriArray = is_array($formKategori) ? $formKategori : [$formKategori]; - $kategoriUnik = array_unique($kategoriArray); - @endphp - - - - - @foreach ($kategoriUnik as $kategori) - {{-- Tampilkan komponen sesuai kategori --}} - @include('lpj::surveyor.components.' . str_replace('-', '-', $kategori), [ - 'dokumen' => $dokumen, - ]) - @endforeach - @endif - @endif - @endforeach - - -
-
-

- Informasi dan pembanding -

-
- @include('lpj::penilai.components.informasi-pembanding') -
- - -
-
-
-

- total nilai pasar wajar -

-
-
-
- -
-
-
- - -
-
- - -
-
- - -
-
- -
-
- - -
-
- - -
-
- - -
-
- -
-
- - -
-
- - -
-
- - -
-
-
-
- -
- -
-
-
- -
-
- - -
-
-
- - -
-
- - -
-
- -
-
-
-

- nilai asuransi + dokumen

-
- -
-
-
- - -
-
- - -
+
+ @foreach ($permohonan->debiture->documents as $dokumen) +
+ -
- - + +
+ @endforeach +
+ @include('lpj::component.pdfviewer') +
+ @foreach ($permohonan->debiture->documents as $dokumen) +
+ + + +
+ @endforeach +
+ @include('lpj::component.pdfviewer') +
+
+ +
+
+

+ Hubungan Cadeb/Debitur dengan pemilik dan penghuni +

+
+ @php + $statusKey = isset($forminspeksi['asset']['hub_cadeb']['sesuai']) ? 'sesuai' : 'tidak sesuai'; + $selectedData = $forminspeksi['asset']['hub_cadeb'][$statusKey] ?? null; + @endphp +
+
+
+ + @foreach ($permohonan->debiture->documents as $dokumen) + @if ($dokumen->jenisJaminan) + @php + $formKategori = json_decode($dokumen->jenisJaminan->form_kategori, true); + @endphp + @if (isset($formKategori) && $formKategori) + @php + $kategoriArray = is_array($formKategori) ? $formKategori : [$formKategori]; + $kategoriUnik = array_unique($kategoriArray); + @endphp + + + @foreach ($kategoriUnik as $kategori) + {{-- Tampilkan komponen sesuai kategori --}} + @include('lpj::surveyor.components.' . str_replace('-', '-', $kategori), [ + 'dokumen' => $dokumen, + ]) + @endforeach + @endif + @endif + @endforeach + + +
+
+

+ Informasi dan pembanding +

+
+ @include('lpj::penilai.components.informasi-pembanding') +
+ + + +
+
+

+ total nilai pasar wajar +

+
+
+
+ +
+
+
+ + +
+
+ + +
+
+ + +
+
+ +
+
+ + +
+
+ + +
+
+ + +
+
+ +
+
+ + +
+
+ + +
+
+ + +
+
+
+
+ +
+ +
+
+
+ +
+
+ + +
+
+
+ + +
+
+ + +
+
+ +
-
-
- -
- + +
+
+

+ nilai asuransi +

+
+
+
+ +
+
+
+ + +
+
+ + +
+ +
+ + +
+ + +
+
+
+
+
+
+ +
+ +
-@endsection + @endsection -@include('lpj::surveyor.js.utils') - + From 879d36b7408a0000c7734e711b78b75b59e98cbe Mon Sep 17 00:00:00 2001 From: majid Date: Thu, 19 Dec 2024 11:47:44 +0700 Subject: [PATCH 4/4] perbaikan form inspeksi pergantian colom jenis_jaminan_id ke dokument_id --- app/Models/Inspeksi.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/Models/Inspeksi.php b/app/Models/Inspeksi.php index 47e042a..32e9c90 100644 --- a/app/Models/Inspeksi.php +++ b/app/Models/Inspeksi.php @@ -14,7 +14,7 @@ class Inspeksi extends Model /** * The attributes that are mass assignable. */ - protected $fillable = ['data_form', 'foto_form', 'denah_form','permohonan_id', 'name', 'status', 'authorized_status', 'authorized_at', 'authorized_by', 'created_by', 'updated_by', 'deleted_by','jenis_jaminan_id','data_pembanding']; + protected $fillable = ['data_form', 'foto_form', 'denah_form','permohonan_id', 'name', 'status', 'authorized_status', 'authorized_at', 'authorized_by', 'created_by', 'updated_by', 'deleted_by','dokument_id','data_pembanding']; public function permohonan() {