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

Simplifikasi Fungsi progres_activity di ActivityController

Browse Source 
Menggabungkan beberapa baris kode untuk menyederhanakan dan meningkatkan efisiensi pengambilan data di fungsi progres_activity. Inisialisasi variabel disingkat dan penggunaan metode chaining diterapkan untuk query Eloquent. Selain itu, penyaringan peran juga disederhanakan dengan menggunakan fungsi lambda.
This commit is contained in:
Daeng Deni Mardaeni
2024-12-04 20:53:10 +07:00
parent d1b200d9ca
commit 994da39fd7
1 changed files with 11 additions and 26 deletions
Download Patch File Download Diff File Expand all files Collapse all files

37
app/Http/Controllers/ActivityController.php
View File

@@ -33,48 +33,33 @@ class ActivityController extends Controller
public function progres_activity() public function progres_activity()
{ {
// Ambil user yang sedang login // Ambil user yang sedang login dengan roles
$user = auth()->user(); $user = auth()->user()->load('roles');
$roles = $user->load('roles');
// Inisialisasi regionId dan teamId sebagai null agar bisa dinamis // Inisialisasi regionId dan teamId
$regionId = null; $regionId = $teamId = null;
$teamId = null;
if ($roles->roles->pluck('name')->contains('senior-officer')) { if ($user->roles->pluck('name')->contains('senior-officer')) {
$userTeam = TeamsUsers::with('team') $userTeam = TeamsUsers::with('team')->firstWhere('user_id', $user->id);
->where('user_id', $user->id)
->first();
$regionId = $userTeam?->team->regions_id; $regionId = $userTeam?->team->regions_id;
$teamId = $userTeam?->teams_id; $teamId = $userTeam?->teams_id;
} }
$teamsActivity = TeamsUsers::with(['user', 'team', 'team.regions', 'user.roles']) $teamsActivity = TeamsUsers::with(['user', 'team', 'team.regions', 'user.roles'])
->whereHas('team', function ($q) use ($regionId, $teamId) { ->whereHas('team', function ($q) use ($regionId, $teamId) {
if ($regionId) { $q->when($regionId, fn($q) => $q->where('regions_id', $regionId))
$q->where('regions_id', $regionId); ->when($teamId, fn($q) => $q->where('id', $teamId));
}
if ($teamId) {
$q->where('id', $teamId); // Hanya tim yang sama
}
}) })
->where('user_id', '!=', $user->id) ->where('user_id', '!=', $user->id)
->whereHas('user.roles', function ($query) { ->whereHas('user.roles', fn($q) => $q->whereIn('name', ['surveyor', 'surveyor-penilai']))
// Filter hanya peran 'surveyor' atau 'surveyor-penilai'
$query->whereIn('name', ['surveyor', 'surveyor-penilai']);
})
->get(); ->get();
return view('lpj::activity.progres_activity.index', compact('teamsActivity')); return view('lpj::activity.progres_activity.index', compact('teamsActivity'));
} }
function updateTeamAssingment(Request $request) { function updateTeamAssingment(Request $request) {
try { try {
$id = $request->input('id'); $id = $request->input('id');
$user = PenilaianTeam::where('penilaian_id', $id)->get(); $user = PenilaianTeam::where('penilaian_id', $id)->get();
@@ -86,7 +71,7 @@ class ActivityController extends Controller
} }
return redirect()->route('activity.progres.index')->with('success', 'Surveyor berhasil diganti'); return redirect()->route('activity.progres.index')->with('success', 'Surveyor berhasil diganti');
} }
} catch (\Throwable $th) { } catch (\Throwable $th) {
return redirect()->route('activity.progres.index')->with('success', $th->getMessage()); return redirect()->route('activity.progres.index')->with('success', $th->getMessage());
} }