|
|
@ -33,6 +33,9 @@ function admin_free()
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
$angelType = $request->input('angeltype', '');
|
|
|
|
$angelType = $request->input('angeltype', '');
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
$users = [];
|
|
|
|
|
|
|
|
if ($request->has('submit')) {
|
|
|
|
$query = User::with('personalData')
|
|
|
|
$query = User::with('personalData')
|
|
|
|
->select('users.*')
|
|
|
|
->select('users.*')
|
|
|
|
->leftJoin('ShiftEntry', 'users.id', 'ShiftEntry.UID')
|
|
|
|
->leftJoin('ShiftEntry', 'users.id', 'ShiftEntry.UID')
|
|
|
@ -59,11 +62,9 @@ function admin_free()
|
|
|
|
->orWhere('AngelTypes.restricted', '=', '0');
|
|
|
|
->orWhere('AngelTypes.restricted', '=', '0');
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
if ($request->has('submit')) {
|
|
|
|
|
|
|
|
$users = $query->get();
|
|
|
|
$users = $query->get();
|
|
|
|
} else {
|
|
|
|
|
|
|
|
$users = [];
|
|
|
|
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
$free_users_table = [];
|
|
|
|
$free_users_table = [];
|
|
|
|
if ($search == '') {
|
|
|
|
if ($search == '') {
|
|
|
|
$tokens = [];
|
|
|
|
$tokens = [];
|
|
|
|