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