daengdeni/lpj
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

fix(controller): perbaiki format dan penamaan fungsi dalam PenilaianController

Browse Source 
- Memperbaiki penamaan dan format pada penggunaan model Penilai.
- Menyempurnakan relasi data yang diambil dalam query.
- Memperbaiki format string dalam beberapa bagian kode untuk konsistensi.
This commit is contained in:
Daeng Deni Mardaeni
2025-01-14 09:23:29 +07:00
parent 5e7cdcd164
commit 7b60a8413e
1 changed files with 21 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

31
app/Http/Controllers/PenilaianController.php
View File

@@ -16,7 +16,7 @@ use Modules\Lpj\Models\Permohonan;
use Modules\Lpj\Models\StatusPermohonan; use Modules\Lpj\Models\StatusPermohonan;
use Modules\Lpj\Models\Teams; use Modules\Lpj\Models\Teams;
use Modules\Lpj\Models\Inspeksi; use Modules\Lpj\Models\Inspeksi;
use Modules\Lpj\Models\Penilai ; use Modules\Lpj\Models\Penilai;
use Modules\Location\Models\Province; use Modules\Location\Models\Province;
use Modules\Location\Models\City; use Modules\Location\Models\City;
use Modules\Location\Models\District; use Modules\Location\Models\District;
@@ -351,7 +351,7 @@ class PenilaianController extends Controller
$filteredRecords = $query->count(); $filteredRecords = $query->count();
$data = $query->with( $data = $query->with(
['user', 'debiture', 'branch', 'tujuanPenilaian','jenisPenilaian', 'region.teams.teamsUsers.user'], ['user', 'debiture', 'branch', 'tujuanPenilaian', 'jenisPenilaian', 'region.teams.teamsUsers.user'],
)->get(); )->get();
$pageCount = ceil($totalRecords / $size); $pageCount = ceil($totalRecords / $size);
@@ -416,7 +416,7 @@ class PenilaianController extends Controller
$authorization = Authorization::with(['user'])->find($id); $authorization = Authorization::with(['user'])->find($id);
if (!$authorization) { if (!$authorization) {
return response()->json([ return response()->json([
'message' => 'Data authorization SLA tidak ditemukan.', 'message' => 'Data authorization SLA tidak ditemukan.',
], 404); ], 404);
} }
$permohonan = Permohonan::find($authorization->permohonan_id); $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') { } elseif (Auth::user()->roles[0]->name === 'EO Appraisal' || Auth::user()->roles[0]->name === 'administrator') {
$status = '2'; $status = '2';
if (!in_array($permohonan->nulai_plafond_id, [1,4])) { if (!in_array($permohonan->nulai_plafond_id, [1, 4])) {
$status = '1'; $status = '1';
$permohonan->update([ $permohonan->update([
'status' => $authorization->request 'status' => $authorization->request
@@ -604,7 +604,19 @@ class PenilaianController extends Controller
$filteredRecords = $query->count(); $filteredRecords = $query->count();
// Ambil data dengan relasi // 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 // Hitung jumlah halaman
@@ -637,9 +649,9 @@ class PenilaianController extends Controller
$provinces = Province::all(); $provinces = Province::all();
$inspeksi = Inspeksi::where('permohonan_id', $id)->where('dokument_id', $documentId)->first(); $inspeksi = Inspeksi::where('permohonan_id', $id)->where('dokument_id', $documentId)->first();
$lpj = Penilai::where('permohonan_id', $id) $lpj = Penilai::where('permohonan_id', $id)
->where('dokument_id', $documentId) ->where('dokument_id', $documentId)
->where('inspeksi_id', $inspeksi->id) ->where('inspeksi_id', $inspeksi->id)
->first(); ->first();
$forminspeksi = null; $forminspeksi = null;
$lpjData = null; $lpjData = null;
@@ -664,7 +676,7 @@ class PenilaianController extends Controller
return redirect()->back()->with('error', 'Laporan belum dibuat'); 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) private function getViewLaporan($tipe)
@@ -747,5 +759,4 @@ class PenilaianController extends Controller
'message' => 'Berhasil Revisi Laporan penilai', 'message' => 'Berhasil Revisi Laporan penilai',
], 200); ], 200);
} }
} }