cssd-doc/cssd-back
1
0
Fork 0
mirror of https://git.meshkee.com/cssd/cssd-back.git synced 2026-10-11 16:01:06 +03:30
Code Issues Packages Projects Releases Wiki Activity

new correction

Browse Source
This commit is contained in:
Fateme
2020-07-04 23:26:44 +04:30
parent a74e49af6f
commit 1f1be72d74
21 changed files with 161 additions and 107 deletions
Download Patch File Download Diff File Expand all files Collapse all files
app/Http/Controllers/LabelController.php
+11 -8
View File
@@ -18,11 +18,14 @@ class LabelController extends Controller
$Labels = Label::
when($user->cant('showAll'), function($query) use ($user, $admin_users) {
if ($user->hasRole('Supervisor|User')) {
if ($user->hasRole('Supervisor')) {
$query->whereHas('user', function($query) use ($user, $admin_users) {
$query->where('medical_center_id', $user->medical_center_id)->orWhereIn('id', $admin_users);
$query->where('medical_center_id', $user->medical_center_id);
});
}
else{
$query->where('user_id', $user->id);
}
})
->when($request->has('sterilizer_id') && $request->sterilizer_id != '', function($query) use($request){
$query->where('sterilizer_id', $request->sterilizer_id);
@@ -90,7 +93,7 @@ class LabelController extends Controller
return \MessageResponse::data($Label);
}
public function update(Request $request, Label $Label)
public function update(StoreLabelRequest $request, Label $Label)
{
$Label->update($request->all());
return \MessageResponse::success(trans('messages.success'), null, $Label);
@@ -110,14 +113,14 @@ class LabelController extends Controller
public function getLabels()
{
$user = auth('api')->user();
$admin_users = User::role('Admin')->get()->pluck('id')->toArray();
$admin_users[] = $user->id;
// $admin_users = User::role('Admin')->get()->pluck('id')->toArray();
// $admin_users[] = $user->id;
$Labels = Label::
when($user->cant('showAll'), function($query) use ($user, $admin_users) {
when($user->cant('showAll'), function($query) use ($user) {
if ($user->hasRole('Supervisor|User')) {
$query->whereHas('user', function($query) use ($user, $admin_users) {
$query->where('medical_center_id', $user->medical_center_id)->orWhereIn('id', $admin_users);
$query->whereHas('user', function($query) use ($user) {
$query->where('medical_center_id', $user->medical_center_id);
});
}
})->get();