fix(so): perbaikan filter laporan
This commit is contained in:
@@ -667,25 +667,25 @@ class PenilaianController extends Controller
|
||||
}
|
||||
|
||||
// Filter berdasarkan region user yang login
|
||||
if ($status == 'proses-laporan') {
|
||||
$requestedRegion = $request->get('search');
|
||||
// if ($status == 'proses-laporan') {
|
||||
// $requestedRegion = $request->get('search');
|
||||
|
||||
if ($requestedRegion) {
|
||||
$query->whereHas('region', function ($q) use ($requestedRegion) {
|
||||
$q->where('name', $requestedRegion);
|
||||
});
|
||||
} else {
|
||||
$query->whereHas('region.teams.teamsUsers', function ($q) {
|
||||
$q->where('user_id', Auth::id());
|
||||
});
|
||||
}
|
||||
} else {
|
||||
// if ($requestedRegion) {
|
||||
// $query->whereHas('region', function ($q) use ($requestedRegion) {
|
||||
// $q->where('name', $requestedRegion);
|
||||
// });
|
||||
// } else {
|
||||
// $query->whereHas('region.teams.teamsUsers', function ($q) {
|
||||
// $q->where('user_id', Auth::id());
|
||||
// });
|
||||
// }
|
||||
// } else {
|
||||
if (Auth::user()->hasRole('senior-officer')) {
|
||||
$query->whereHas('region.teams.teamsUsers', function ($q) {
|
||||
$q->where('user_id', Auth::id());
|
||||
});
|
||||
}
|
||||
}
|
||||
// }
|
||||
|
||||
|
||||
|
||||
|
||||
Reference in New Issue
Block a user