From 7b60a8413e25a317a10291eb7e889f8c0bca3341 Mon Sep 17 00:00:00 2001
From: Daeng Deni Mardaeni <ddeni05@gmail.com>
Date: Tue, 14 Jan 2025 09:23:29 +0700
Subject: [PATCH] fix(controller): perbaiki format dan penamaan fungsi dalam
 PenilaianController

- Memperbaiki penamaan dan format pada penggunaan model Penilai.
- Menyempurnakan relasi data yang diambil dalam query.
- Memperbaiki format string dalam beberapa bagian kode untuk konsistensi.
---
 app/Http/Controllers/PenilaianController.php | 31 +++++++++++++-------
 1 file changed, 21 insertions(+), 10 deletions(-)

diff --git a/app/Http/Controllers/PenilaianController.php b/app/Http/Controllers/PenilaianController.php
index 4521f3b..05d90f4 100644
--- a/app/Http/Controllers/PenilaianController.php
+++ b/app/Http/Controllers/PenilaianController.php
@@ -16,7 +16,7 @@ use Modules\Lpj\Models\Permohonan;
 use Modules\Lpj\Models\StatusPermohonan;
 use Modules\Lpj\Models\Teams;
 use Modules\Lpj\Models\Inspeksi;
-use Modules\Lpj\Models\Penilai  ;
+use Modules\Lpj\Models\Penilai;
 use Modules\Location\Models\Province;
 use Modules\Location\Models\City;
 use Modules\Location\Models\District;
@@ -351,7 +351,7 @@ class PenilaianController extends Controller
 
         $filteredRecords = $query->count();
         $data            = $query->with(
-            ['user', 'debiture', 'branch', 'tujuanPenilaian','jenisPenilaian', 'region.teams.teamsUsers.user'],
+            ['user', 'debiture', 'branch', 'tujuanPenilaian', 'jenisPenilaian', 'region.teams.teamsUsers.user'],
         )->get();
 
         $pageCount = ceil($totalRecords / $size);
@@ -416,7 +416,7 @@ class PenilaianController extends Controller
             $authorization = Authorization::with(['user'])->find($id);
             if (!$authorization) {
                 return response()->json([
-                   'message' => 'Data authorization SLA tidak ditemukan.',
+                    'message' => 'Data authorization SLA tidak ditemukan.',
                 ], 404);
             }
             $permohonan = Permohonan::find($authorization->permohonan_id);
@@ -482,7 +482,7 @@ class PenilaianController extends Controller
                     ]);
                 } elseif (Auth::user()->roles[0]->name === 'EO Appraisal' || Auth::user()->roles[0]->name === 'administrator') {
                     $status = '2';
-                    if (!in_array($permohonan->nulai_plafond_id, [1,4])) {
+                    if (!in_array($permohonan->nulai_plafond_id, [1, 4])) {
                         $status = '1';
                         $permohonan->update([
                             'status'         => $authorization->request
@@ -604,7 +604,19 @@ class PenilaianController extends Controller
         $filteredRecords = $query->count();
 
         // Ambil data dengan relasi
-        $data = $query->with(['user', 'debiture', 'branch', 'tujuanPenilaian', 'approveSo', 'approveEo', 'approveDd'])->get();
+        $data = $query->with([
+            'user',
+            'debiture',
+            'branch',
+            'tujuanPenilaian',
+            'penilaian.userPenilai' => function ($q) {
+                $q->where('role', 'penilai')->with(['user', 'team.regions'])->first();
+            },
+            'approveSo',
+            'approveEo',
+            'approveDd'
+        ])->get();
+
 
 
         // Hitung jumlah halaman
@@ -637,9 +649,9 @@ class PenilaianController extends Controller
         $provinces = Province::all();
         $inspeksi = Inspeksi::where('permohonan_id', $id)->where('dokument_id', $documentId)->first();
         $lpj = Penilai::where('permohonan_id', $id)
-        ->where('dokument_id', $documentId)
-        ->where('inspeksi_id', $inspeksi->id)
-        ->first();
+            ->where('dokument_id', $documentId)
+            ->where('inspeksi_id', $inspeksi->id)
+            ->first();
 
         $forminspeksi = null;
         $lpjData = null;
@@ -664,7 +676,7 @@ class PenilaianController extends Controller
             return redirect()->back()->with('error', 'Laporan belum dibuat');
         }
 
-        return view('lpj::'. $viewLaporan, compact('permohonan', 'forminspeksi', 'basicData', 'inspeksi', 'lpjData', 'provinces', 'resumeData', 'rap', 'memo'));
+        return view('lpj::' . $viewLaporan, compact('permohonan', 'forminspeksi', 'basicData', 'inspeksi', 'lpjData', 'provinces', 'resumeData', 'rap', 'memo'));
     }
 
     private function getViewLaporan($tipe)
@@ -747,5 +759,4 @@ class PenilaianController extends Controller
             'message' => 'Berhasil Revisi Laporan penilai',
         ], 200);
     }
-
 }