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

app/Http/Controllers/PenilaiController.php

@@ -247,6 +247,31 @@ class PenilaiController extends Controller
         return view('lpj::edit');
     }
 
+
+    public function storePaparan($id)
+    {
+        try {
+            $permohonan = Permohonan::findOrFail($id);
+
+            $permohonan->update([
+                'status' => 'proses-paparan'
+            ]);
+
+            return response()->json([
+                'success' => true,
+                'message' => 'diperbarui ke status paparan dan dikirim ke So untuk proses lebih lanjut.'
+            ], 200);
+
+        } catch (\Exception $e) {
+            return response()->json([
+                'success' => false,
+                'message' => 'Terjadi kesalahan saat memproses permohonan.',
+                'error' => $e->getMessage()
+            ], 500);
+        }
+    }
+
+
     /**
      * Update the specified resource in storage.
      */
@@ -267,7 +292,7 @@ class PenilaiController extends Controller
             $forminspeksi = json_decode($inspeksi->data_form, true);
         }
 
-        return view('lpj::penilai.components.paparan', compact('permohonan', 'formFoto', 'penilai', 'forminspeksi'));
+        return view('lpj::penilai.components.paparan', compact('permohonan', 'formFoto', 'penilai', 'forminspeksi','inspeksi'));
     }
 
 
@@ -566,14 +591,14 @@ class PenilaiController extends Controller
                     !empty($item->resume) ||
                     !empty($item->lpj) ||
                     !empty($item->rap)
-                );
+                ) && !empty($item->kertas_kerja);
             });
 
 
             if (!$allComplete) {
                 return response()->json([
                     'success' => false,
-                    'message' => 'Harap Mengisi laporan terlebih dahulu',
+                    'message' => 'Harap Mengisi laporan terlebih dahulu atau kertas kerja',
                 ], 400);
             }
 

app/Http/Controllers/PenilaianController.php

@@ -377,14 +377,20 @@ class PenilaianController extends Controller
             'pembayaran' => 'Pembayaran',
             'pembatalan' => 'Pembatalan',
             'sla'        => 'SLA',
+            'paparan' => 'Paparan'
         ];
 
         $header = $headers[$type] ?? 'Pelaporan';
 
-        if ($header === 'SLA') {
-            return view('lpj::penilaian.otorisator.index-sla', compact('header'));
+        switch ($header) {
+            case 'SLA':
+                return view('lpj::penilaian.otorisator.index-sla', compact('header'));
+            case 'Paparan':
+                return view('lpj::penilaian.paparan-so', compact('header'));
+            default:
+                return view('lpj::penilaian.otorisator.index', compact('header'));
         }
-        return view('lpj::penilaian.otorisator.index', compact('header'));
+
     }
 
     public function show($id, $type)
@@ -394,6 +400,7 @@ class PenilaianController extends Controller
             'Pembayaran' => 'Pembayaran',
             'Pembatalan' => 'Pembatalan',
             'SLA'        => 'SLA',
+            'Paparan' => 'Paparan'
         ];
 
         $header     = $headers[$type] ?? 'Pelaporan';
@@ -407,6 +414,9 @@ class PenilaianController extends Controller
         if ($header === 'SLA') {
             return view('lpj::penilaian.otorisator.sla', compact('permohonan', 'header', 'authorization'));
         }
+        if ($header === 'Paparan') {
+            return view('lpj::penilaian.otorisator.show', compact('permohonan', 'header', 'authorization'));
+        }
         return view('lpj::penilaian.otorisator.show', compact('permohonan', 'header', 'authorization'));
     }
 
@@ -508,8 +518,13 @@ class PenilaianController extends Controller
                     ]);
                 }
                 break;
+            case 'paparan':
+                $permohonan->update([
+                    'status'     => 'paparan',
+                    'keterangan' => $request->message,
+                ]);
+                break;
             default:
-
                 return response()->json([
                     'message' => 'Konteks otorisasi tidak valid.',
                 ], 400);
@@ -536,6 +551,7 @@ class PenilaianController extends Controller
             'Pembayaran' => 'proses',
             'Pembatalan' => 'batal',
             'SLA'        => 'freeze',
+            'Paparan' => 'proses-paparan',
             default      => '',
         };
 
@@ -566,6 +582,8 @@ class PenilaianController extends Controller
                 $query->whereRaw('LOWER(status) = ?', [strtolower($status)]);
             } elseif ($status == 'freeze') {
                 $query->whereRaw('LOWER(status) = ?', [strtolower($status)]);
+            } elseif ($status == 'proses-paparan') {
+                $query->whereRaw('LOWER(status) IN (?, ?)', ['proses-paparan', 'paparan']);
             }
         }
 
@@ -609,6 +627,7 @@ class PenilaianController extends Controller
             'debiture',
             'branch',
             'tujuanPenilaian',
+            'nilaiPlafond',
             'penilaian.userPenilai' => function ($q) {
                 $q->where('role', 'penilai')->with(['user', 'team.regions'])->first();
             },