perbaikana perhitungan npw dan nl otomatis, dan perbaikan otorisator

app/Http/Controllers/LaporanController.php

@@ -11,6 +11,12 @@ class LaporanController extends Controller
     /**
      * Display a listing of the resource.
      */
+
+    public function index()
+    {
+        return view('lpj::laporan.index');
+    }
+
     public function sederhana_index()
     {
         return view('lpj::laporan.sederhana_index');

app/Http/Controllers/PenilaiController.php

@@ -199,7 +199,7 @@ class PenilaiController extends Controller
 
         $permohonan = $this->surveyorController->getPermohonanJaminanId($permohonanId, $documentId, $jaminanId);
         $inspeksi = Inspeksi::where('permohonan_id', $permohonanId)->where('dokument_id', $documentId)->first();
-        
+
         return view('lpj::penilai.components.paparan');
     }
 
@@ -240,10 +240,10 @@ 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', Auth::user()->id); // Ganti dengan Auth::user()->id jika dinamis
+            $q->where('role', 'penilai')
+              ->where('user_id', Auth::user()->id);
         });
 
         // Apply sorting if provided
@@ -487,7 +487,8 @@ class PenilaiController extends Controller
         }
     }
 
-    public function storeLpjSederhanadanStandard(Request $request){
+    public function storeLpjSederhanadanStandard(Request $request)
+    {
 
         try {
 

app/Http/Controllers/PenilaianController.php

@@ -359,7 +359,7 @@ class PenilaianController extends Controller
             'pembatalan' => 'Pembatalan',
             'sla' => 'SLA',
         ];
-        
+
         $header = $headers[$type] ?? 'Pelaporan';
 
         return view('lpj::penilaian.otorisator.index', compact('header'));
@@ -380,7 +380,7 @@ class PenilaianController extends Controller
         return view('lpj::penilaian.otorisator.show', compact('permohonan', 'header'));
     }
 
-    public function otorisatorUpdate($id, $context)
+    public function otorisatorUpdate(Request $request, $id, $context)
     {
 
         $permohonan = Permohonan::find($id);
@@ -396,28 +396,30 @@ class PenilaianController extends Controller
                 $newStatus = $permohonan->status_bayar === 'sudah_bayar' ? 'belum_bayar' : 'sudah_bayar';
 
                 $permohonan->update([
-                    'status_bayar' => $newStatus
+                    'status_bayar' => $newStatus,
+                    'keterangan' => $request->message
                 ]);
                 break;
 
             case 'pembatalan':
-
                 $permohonan->update([
-                    'authorized_status' => 1,
+                    'status' => 'batal',
+                    'keterangan' => $request->message
                 ]);
                 break;
 
             case 'pelaporan':
-
                 $permohonan->update([
-                    'status' => 'disetujui',
+                    'status' => 'proses-laporan',
+                    'keterangan' => $request->message
                 ]);
                 break;
 
             case 'sla':
 
                 $permohonan->update([
-                    'status' => 'order',
+                    'status' => 'proses-sla',
+                    'keterangan' => $request->message
                 ]);
                 break;
 
@@ -449,10 +451,10 @@ class PenilaianController extends Controller
 
         // Tentukan status berdasarkan otorisator
         $status = match ($otorisator) {
-            'Pelaporan' => 'proses laporan',
+            'Pelaporan' => 'proses-laporan',
             'Pembayaran' => 'proses',
-            'Pembatalan' => 'proses',
-            'SLA' => 'proses',
+            'Pembatalan' => 'batal',
+            'SLA' => 'freeze',
             default => '',
         };
 
@@ -477,10 +479,13 @@ class PenilaianController extends Controller
         if (!empty($otorisator)) {
             if ($status == 'proses') {
                 $query->whereIn('status_bayar', ['sudah_bayar', 'belum_bayar']);
+            } elseif ($status == 'proses-laporan') {
+                $query->whereRaw('LOWER(status) = ?', [strtolower($status)]);
+            } elseif ($status == 'batal') {
+                $query->whereRaw('LOWER(status) = ?', [strtolower($status)]);
+            } elseif ($status == 'freeze') {
+                $query->whereRaw('LOWER(status) = ?', [strtolower($status)]);
             }
-            // else {
-            //     $query->whereRaw('LOWER(status) = ?', [strtolower($status)]);
-            // }
         }
 
         // Filter berdasarkan region user yang login