diff --git a/app/Http/Controllers/PenilaiController.php b/app/Http/Controllers/PenilaiController.php index ed0eecf..948cc97 100644 --- a/app/Http/Controllers/PenilaiController.php +++ b/app/Http/Controllers/PenilaiController.php @@ -567,53 +567,75 @@ class PenilaiController extends Controller } public function storeLpjSederhanadanStandard(Request $request) -{ - try { - $validatedRequest = app(FormSurveyorRequest::class); - $this->surveyorController->store($validatedRequest); + { + try { + $validatedRequest = app(FormSurveyorRequest::class); + $this->surveyorController->store($validatedRequest); + + $data = [ + 'luas_tanah' => $request->input('luas_tanah'), + 'nilai_tanah_1' => $request->input('nilai_tanah_1'), + 'nilai_tanah_2' => $request->input('nilai_tanah_2'), + 'luas_bangunan' => $request->input('luas_bangunan'), + 'nilai_bangunan_1' => $request->input('nilai_bangunan_1'), + 'nilai_bangunan_2' => $request->input('nilai_bangunan_2'), + 'sarana_pelengkap_penilai' => $request->input('sarana_pelengkap_penilai'), + 'nilai_sarana_pelengkap_1' => $request->input('nilai_sarana_pelengkap_1'), + 'nilai_sarana_pelengkap_2' => $request->input('nilai_sarana_pelengkap_2'), + 'total_nilai_pasar_wajar' => $request->input('total_nilai_pasar_wajar'), + 'likuidasi' => $request->input('likuidasi'), + 'likuidasi_nilai_1' => $request->input('likuidasi_nilai_1'), + 'likuidasi_nilai_2' => $request->input('likuidasi_nilai_2'), + 'asuransi_luas_bangunan' => $request->input('asuransi_luas_bangunan'), + 'asuransi_nilai_1' => $request->input('asuransi_nilai_1'), + 'asuransi_nilai_2' => $request->input('asuransi_nilai_2'), + ]; + + $npwData = []; + $npwCounter = 1; + - $data = [ - 'luas_tanah' => $request->input('luas_tanah'), - 'nilai_tanah_1' => $request->input('nilai_tanah_1'), - 'nilai_tanah_2' => $request->input('nilai_tanah_2'), - 'luas_bangunan' => $request->input('luas_bangunan'), - 'nilai_bangunan_1' => $request->input('nilai_bangunan_1'), - 'nilai_bangunan_2' => $request->input('nilai_bangunan_2'), - 'sarana_pelengkap_penilai' => $request->input('sarana_pelengkap_penilai'), - 'nilai_sarana_pelengkap_1' => $request->input('nilai_sarana_pelengkap_1'), - 'nilai_sarana_pelengkap_2' => $request->input('nilai_sarana_pelengkap_2'), - 'total_nilai_pasar_wajar' => $request->input('total_nilai_pasar_wajar'), - 'likuidasi' => $request->input('likuidasi'), - 'likuidasi_nilai_1' => $request->input('likuidasi_nilai_1'), - 'likuidasi_nilai_2' => $request->input('likuidasi_nilai_2'), - 'asuransi_luas_bangunan' => $request->input('asuransi_luas_bangunan'), - 'asuransi_nilai_1' => $request->input('asuransi_nilai_1'), - 'asuransi_nilai_2' => $request->input('asuransi_nilai_2'), - ]; - - // Update atau buat data baru - Penilai::updateOrCreate( - [ - 'permohonan_id' => $request->permohonanId, - 'dokument_id' => $request->documentId, - 'inspeksi_id' => $request->inspeksiId, - ], - [ - 'lpj' => json_encode($data), - ] - ); - return response()->json([ - 'success' => true, - 'message' => 'Berhasil menyimpan LPJ', - ], 200); - } catch (\Throwable $e) { - return response()->json([ - 'success' => false, - 'message' => 'Terjadi kesalahan saat menyimpan LPJ', - 'error' => $e->getMessage(), - ], 500); + while ($request->has("name_npw_{$npwCounter}")) { + $npwData[] = [ + 'name' => $request->input("name_npw_{$npwCounter}"), + 'luas' => $request->input("luas_npw_{$npwCounter}"), + 'nilai_1' => $request->input("nilai_npw_{$npwCounter}_1"), + 'nilai_2' => $request->input("nilai_npw_{$npwCounter}_2") + ]; + $npwCounter++; + } + + if (!empty($npwData)) { + $data['npw_tambahan'] = $npwData; + } + + // Update atau buat data baru + $penilai = Penilai::updateOrCreate( + [ + 'permohonan_id' => $request->permohonanId, + 'dokument_id' => $request->documentId, + 'inspeksi_id' => $request->inspeksiId, + ], + [ + 'lpj' => json_encode($data), + ] + ); + + return response()->json([ + 'success' => true, + 'message' => 'Berhasil menyimpan LPJ', + 'data' => $penilai + ], 200); + } catch (\Throwable $e) { + return response()->json([ + 'success' => false, + 'message' => 'Terjadi kesalahan saat menyimpan LPJ', + 'error' => $e->getMessage(), + 'trace' => $e->getTraceAsString() + ], 500); + } } -} + public function print_out(Request $request) diff --git a/resources/views/component/form-penilai.blade.php b/resources/views/component/form-penilai.blade.php index d121879..8ff072d 100644 --- a/resources/views/component/form-penilai.blade.php +++ b/resources/views/component/form-penilai.blade.php @@ -1,4 +1,3 @@ -
@@ -158,9 +157,7 @@
@php - $statusKey = isset($forminspeksi['asset']['alamat']['sesuai']) - ? 'sesuai' - : 'tidak sesuai'; + $statusKey = isset($forminspeksi['asset']['alamat']['sesuai']) ? 'sesuai' : 'tidak sesuai'; $address = $forminspeksi['asset']['alamat'][$statusKey] ?? null; @endphp @@ -186,8 +183,8 @@
- Ditempati Sendiri @@ -314,9 +310,7 @@ @php - $statusKey = isset( - $forminspeksi['asset']['hub_cadeb_penghuni']['sesuai'], - ) + $statusKey = isset($forminspeksi['asset']['hub_cadeb_penghuni']['sesuai']) ? 'sesuai' : 'tidak sesuai'; $selectedData = @@ -346,18 +340,18 @@

- {{$title ?? 'Data Jaminan' }} + {{ $title ?? 'Data Jaminan' }}

@if (isset($id)) - - Back - - @else - - Back - - @endif + + Back + + @else + + Back + + @endif
@@ -552,6 +546,7 @@ @php $kategoriArray = is_array($formKategori) ? $formKategori : [$formKategori]; $kategoriUnik = array_unique($kategoriArray); + print_r($kategoriUnik); @endphp @@ -577,213 +572,455 @@ @include('lpj::penilai.components.informasi-pembanding')
-
-
-

- total nilai pasar wajar -

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

+ total nilai pasar wajar +

+
+
+
+ +
+ @php + $labelNilai = [ + 'bangunan' => 'Luas Bangunan', + 'tanah' => 'Luas Tanah', + 'apartement-kantor' => 'Luas Apartemen/Kantor', + 'alat-berat' => 'Luas Alat Berat', + 'mesin' => 'Luas Mesin', + 'kendaraan' => 'Luas Kendaraan', + 'pesawat' => 'Luas Pesawat', + 'kapal' => 'Luas Kapal', + ]; + @endphp + @foreach ($kategoriUnik as $item) + @if (isset($labelNilai[$item])) +
- + + +
+
+ -
-
- -
+ @endif + @endforeach + +
+
+
+
+ +
+
+ +
-
- -
-
-
- + +
+ +
+ +
+ +
+
+
+ +
+
+ +
+ +
+
- + -
-
-
- -
- +
+
+
-
-
-

- nilai asuransi -

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

+ nilai asuransi +

+
+
+
+ +
+
+
+ +
+
+ + +
+ +
+ +
+ +
+
+ diff --git a/resources/views/penilai/components/lpj-sederhana-standard.blade.php b/resources/views/penilai/components/lpj-sederhana-standard.blade.php index c699dfb..212979f 100644 --- a/resources/views/penilai/components/lpj-sederhana-standard.blade.php +++ b/resources/views/penilai/components/lpj-sederhana-standard.blade.php @@ -3,7 +3,6 @@ @section('breadcrumbs') {{-- {{ Breadcrumbs::render(request()->route()->getName()) }} --}} - Standard @endsection @section('content') @@ -11,6 +10,7 @@
+ @include('lpj::component.form-penilai')
- @@ -38,140 +38,4 @@ @endsection - @include('lpj::surveyor.js.utils')