Merge remote-tracking branch 'composer/feature/senior-officer' into staging

# Conflicts:
#	app/Http/Controllers/PenilaianController.php
#	resources/views/penilai/components/lpj-sederhana-standard.blade.php

app/Http/Controllers/PenilaiController.php

@@ -20,11 +20,12 @@ use Modules\Location\Models\Village;
 use Illuminate\Support\Facades\Log;
 use Illuminate\Support\Facades\App;
 use App\Helpers\Lpj;
+use Modules\Lpj\Http\Requests\FormSurveyorRequest;
+
 
 class PenilaiController extends Controller
 {
     public $user;
-
     protected $surveyorController;
 
     public function __construct(SurveyorController $surveyorController)
@@ -566,40 +567,53 @@ class PenilaiController extends Controller
     }
 
     public function storeLpjSederhanadanStandard(Request $request)
-    {
+{
+    try {
+        $validatedRequest = app(FormSurveyorRequest::class);
+        $this->surveyorController->store($validatedRequest);
 
-        try {
+        $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' => $request->input('sarana_pelengkap', []),
+            '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'),
+        ];
 
-            $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);
-        }
+        // 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);
     }
+}
 
 
     public function print_out(Request $request)