new chnage

This commit is contained in:
Fayyazi
2020-01-13 11:20:05 +03:30
parent 86a3479c9a
commit 7a3611ce55
8 changed files with 157 additions and 78 deletions
+39 -21
View File
@@ -6,26 +6,36 @@ use Illuminate\Http\Request;
use App\Http\Requests\StoreLabelRequest;
use App\Label;
use App\Package;
use App\User;
class LabelController extends Controller
{
public function index(Request $request)
{
$user = auth('api')->user();
$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;
}
// 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) {
if ($user->hasRole('User')) {
$query->where('user_id', $user->id);
when($user->cant('showAll'), function($query) use ($user, $admin_users) {
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);
});
}
})
->when($request->has('sterilizer_id') && $request->sterilizer_id != '', function($query) use($request){
@@ -40,11 +50,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($request){
$query->whereHas('user', function($query) use($request){
$query->where('medical_center_id', $request->medical_center_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);
// });
// })
->with('user', 'user.medical_center')->paginate(10);
return \MessageResponse::data($Labels);
}
@@ -88,10 +98,6 @@ class LabelController extends Controller
if (auth('api')->user()->cant('delete', $Label)) {
return \MessageResponse::error(trans('messages.access_denied'));
}
// if(count($Label->packages))
// {
// $Label->packages()->detach();
// }
if(count($Label->cycles))
{
$Label->cycles()->detach();
@@ -101,7 +107,19 @@ class LabelController extends Controller
}
public function getLabels()
{
$Labels = Label::with('user')->get();
$user = auth('api')->user();
$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) {
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);
});
}
})->get();
return \MessageResponse::data($Labels);
}