From 7da57d5e18e3d8d43a8f5af1d62dd7bcb1a7304b Mon Sep 17 00:00:00 2001 From: victor Date: Wed, 29 Jul 2020 13:33:11 +0200 Subject: [PATCH 1/2] Search --- .../app/Http/Controllers/UserController.php | 27 ++++++++++++++----- 1 file changed, 21 insertions(+), 6 deletions(-) diff --git a/skolehjem/app/Http/Controllers/UserController.php b/skolehjem/app/Http/Controllers/UserController.php index 026d188..0bb9d00 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; @@ -289,6 +290,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(); @@ -298,13 +307,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(); From 4826725e0761ddf0ff5a0dc4ef2dfa8ba7ef7ae2 Mon Sep 17 00:00:00 2001 From: victor Date: Wed, 29 Jul 2020 15:27:07 +0200 Subject: [PATCH 2/2] Made washing-reservations search --- .../WashingReservationController.php | 62 +++++++++++++++++++ .../washing-reservations/index.blade.php | 52 +++++++++++++++- skolehjem/routes/web.php | 1 + 3 files changed, 114 insertions(+), 1 deletion(-) diff --git a/skolehjem/app/Http/Controllers/WashingReservationController.php b/skolehjem/app/Http/Controllers/WashingReservationController.php index d363c54..49db808 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 = "". + "Vaskemaskine". + "Tidspunkt". + "Bruger". + "\"Update\"". + "\"Delete\"". + ""; + + + //Kan ikke søge på vaskemaskine da det er en foreign key + + //filter search + if($request->isCheck === "vaskemaskine") + $users = WashingReservation::query()->where('machine_id', 'LIKE',$request->search.'%')->get(); + elseif ($request->isCheck === "tidspunkt") + $users = WashingReservation::query()->where('time', 'LIKE',$request->search.'%')->get(); + else + $users = WashingReservation::query()->where('time', 'LIKE',$request->search.'%') + ->orWhere('machine','LIKE', $request->search.'%') + ->get(); + + + + if(count($users) !== 0){ + foreach ($users as $key => $user){ + $output.=''. + '' . WashingMachine::query()->find($user->machine_id)->name . ''. + '' . $user->time . ''. + '' . ucfirst(User::query()->find($user->user_id)->name_first) . ' ' . ucfirst(User::query()->find($user->user_id)->name_last) . ''. + ' $user->id ]) . '">Update'. + '
$user->id ]). '" class="w-100 nostyle">'. + csrf_field(). + method_field("delete"). + + ''. + '
'. + ''. + ''; + } + }else{ + $output.=''. + 'Intet match'. + ''. + ''. + ''. + ''. + ''; + } + return Response($output); + } + } + + + + } diff --git a/skolehjem/resources/views/admin/washing-reservations/index.blade.php b/skolehjem/resources/views/admin/washing-reservations/index.blade.php index 133524d..587abea 100644 --- a/skolehjem/resources/views/admin/washing-reservations/index.blade.php +++ b/skolehjem/resources/views/admin/washing-reservations/index.blade.php @@ -13,11 +13,20 @@
CreateOpret Reservation -
+ @csrf
+ + + + + + + + +
@@ -45,4 +54,45 @@
{{ $reservations->links() }} + + + + + + + + + + + @endsection diff --git a/skolehjem/routes/web.php b/skolehjem/routes/web.php index 2f66d27..74380a5 100644 --- a/skolehjem/routes/web.php +++ b/skolehjem/routes/web.php @@ -36,6 +36,7 @@ Route::get("/eventsapi", "EventController@search")->name("events.search"); Route::get("/menuplansapi", "MenuPlanController@search")->name("menu-plans.search"); Route::get("/rolesapi", "RolesController@search")->name("roles.search"); Route::get("/userapi", "UserController@search")->name("users.search"); +Route::get("/vaskeapi", "WashingReservationController@search")->name("washing-reservations.search"); Route::get("/washing-reservationsapi", "WashingReservationController@api")->name("washing-reservations.api");