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

app/Http/Controllers/PenilaiController.php

@@ -255,7 +255,6 @@ class PenilaiController extends Controller
     }
 
 
-
     public function storePaparan(Request $request, $id)
     {
         try {
@@ -281,8 +280,8 @@ class PenilaiController extends Controller
                 $penilai = Penilai::updateOrCreate(
                     [
                         'permohonan_id' => $request->permohonan_id,
-                        'dokument_id' => $request->documentId,
-                        'inspeksi_id' => $request->inspeksiId,
+                        'dokument_id' => $request->dokument_id,
+                        'inspeksi_id' => $request->inspeksi_id,
                     ]
                 );
 
@@ -653,7 +652,7 @@ class PenilaiController extends Controller
             'permohonan_id' => 'required|integer',
             'document_id' => 'required|integer',
             'inspeksi_id' => 'required|integer',
-            'kertas_kerja' => 'required|file|mimes:pdf,doc,docx,xls,xlsx,xlsx',
+            'kertas_kerja' => 'required|file|mimes:pdf',
         ]);
 
         try {

app/Http/Controllers/PermohonanController.php

@@ -448,6 +448,7 @@ class PermohonanController extends Controller
                 'nomor_registrasi' => 'required',
                 'reschedule_note' =>  'required',
                 'reschedule_date' => 'required',
+                'keterangan' => 'required'
             ]);
 
             DB::beginTransaction();

app/Http/Controllers/SurveyorController.php

@@ -2479,6 +2479,11 @@ class SurveyorController extends Controller
             : ($data['hadap_mata_angin_tidak_sesuai'] ?? null);
         $hadap_mata_angin[$hadap_mata_angin_key] = $hasil_hadap_mata_angin;
 
+        $tusuk_sate_key = ($data['tusuk_sate'] ?? null) === 'Ya' ? 'Ya' : 'Tidak';
+
+        $tusuk_sate = [];
+        $tusuk_sate[$tusuk_sate_key] = $data['tusuk_sate_ya'] ?? null;
+
 
         return [
             'tanah' => [
@@ -2505,7 +2510,7 @@ class SurveyorController extends Controller
                     'lainnya'
                 ),
 
-                'tusuk_sate' => $data['tusuk_sate'] ?? null,
+                'tusuk_sate' => $tusuk_sate,
                 'lockland' => $data['lockland'] ?? null,
                 'kondisi_fisik_tanah' => $this->getFieldData(
                     $data,
@@ -3620,7 +3625,6 @@ class SurveyorController extends Controller
 
         // Generate PDF
         $pdf = PDF::loadView($templateView, compact('permohonan', 'basicData', 'forminspeksi', 'alamat'));
-        $pdf->setPaper('A4', 'portrait');
 
         // Tentukan nama file PDF
         $namaDebiture = $permohonan->debiture->name . '-' . $permohonan->nomor_registrasi;
@@ -3681,6 +3685,7 @@ class SurveyorController extends Controller
                 'permohonan_id' => 'required|exists:permohonan,id',
                 'rejected_note' => 'required|string|max:255',
                 'nomor_registrasi' => 'required|string',
+                'keterangan' => 'required|string',
             ]);
 
             // Memulai transaksi