new update

This commit is contained in:
Fateme
2020-04-05 12:07:12 +04:30
parent d654566a1b
commit 91f954c9dd
18 changed files with 371 additions and 356 deletions
+5 -19
View File
@@ -16,20 +16,6 @@ class LabelController extends Controller
$admin_users = User::role('Admin')->get()->pluck('id')->toArray();
$admin_users[] = $user->id;
// if ($user->hasRole('Supervisor|User')) {
// $medical_center_id = $user->medical_center_id;
// }
// elseif($request->has('medical_center_id') && $request->medical_center_id != '') {
// $medical_center_id = $request->medical_center_id;
// } else {
// $medical_center_id = null;
// }
// $medical_center_id = null;
// if($request->has('medical_center_id') && $request->medical_center_id != '') {
// $medical_center_id = $request->medical_center_id;
// }
$Labels = Label::
when($user->cant('showAll'), function($query) use ($user, $admin_users) {
if ($user->hasRole('Supervisor|User')) {
@@ -50,11 +36,11 @@ class LabelController extends Controller
->when($request->has('label_id') && $request->label_id != '', function($query) use($request){
$query->where('id', $request->label_id);
})
// ->when($medical_center_id, function($query) use($medical_center_id){
// $query->whereHas('user', function($query) use($medical_center_id){
// $query->where('medical_center_id', $medical_center_id);
// });
// })
->when($request->has('medical_center_id') && $request->medical_center_id != '', function($query) use($request){
$query->whereHas('user', function($query) use ($request) {
$query->where('medical_center_id', $request->medical_center_id);
});
})
->with('user', 'user.medical_center')->paginate(10);
return \MessageResponse::data($Labels);
}