diff --git a/skolehjem/app/Http/Controllers/UserController.php b/skolehjem/app/Http/Controllers/UserController.php index c3245c9..149dc71 100644 --- a/skolehjem/app/Http/Controllers/UserController.php +++ b/skolehjem/app/Http/Controllers/UserController.php @@ -10,6 +10,7 @@ use Illuminate\Support\Facades\Auth; use Illuminate\Support\Facades\DB; use Illuminate\Support\Facades\Hash; use Illuminate\Support\Facades\Log; +use mysql_xdevapi\Table; use Spatie\Permission\Models\Role; @@ -283,6 +284,14 @@ class UserController extends Controller ""; + //Join user and roles tables + + + + + //$users = User::query()->where('Roles', 'LIKE',$request->search.'%')->with(Spatie\Permission\Models\Role)->get(); + + //filter search if($request->isCheck === "navn") $users = User::query()->where('name_first', 'LIKE',$request->search.'%')->get(); @@ -292,13 +301,19 @@ class UserController extends Controller $users = User::query()->where('email', 'LIKE',$request->search.'%')->get(); elseif ($request->isCheck === "telefon") $users = User::query()->where('phone', 'LIKE',$request->search.'%')->get(); + elseif ($request->isCheck === "telefon") + $users = User::query()->where('phone', 'LIKE',$request->search.'%')->get(); + elseif ($request->isCheck) + $users = User::query()->where('Roles', 'LIKE',$request->search.'%')->with(Role::class)->get(); else - $users = User::query()->where('name_first', 'LIKE',$request->search.'%') - ->orWhere('name_last','LIKE', $request->search.'%') - ->orWhere('phone','LIKE', $request->search.'%') - ->orWhere('email','LIKE',$request->search. '%') - ->orWhere('name','LIKE',$request->search. '%') - ->get(); + $users = User::query() + ->where('name_first', 'LIKE',$request->search.'%') + ->orWhere('name_last','LIKE', $request->search.'%') + ->orWhere('phone','LIKE', $request->search.'%') + ->orWhere('email','LIKE',$request->search. '%') + ->orWhere('name','LIKE',$request->search. '%') + ->orWhere('roles','LIKE',$request->search. '%') + ->get(); diff --git a/skolehjem/app/Http/Controllers/WashingReservationController.php b/skolehjem/app/Http/Controllers/WashingReservationController.php index 647253f..1e46d28 100644 --- a/skolehjem/app/Http/Controllers/WashingReservationController.php +++ b/skolehjem/app/Http/Controllers/WashingReservationController.php @@ -11,6 +11,7 @@ use Illuminate\Http\Request; use Illuminate\Http\Response; use App\WashingReservation; +use Illuminate\Support\Facades\DB; use Illuminate\View\View; class WashingReservationController extends Controller @@ -175,5 +176,66 @@ class WashingReservationController extends Controller return Response($output); } } + + + + + function search(Request $request){ + if($request->ajax()){ + $output = "