diff --git a/skolehjem/app/Http/Controllers/EventController.php b/skolehjem/app/Http/Controllers/EventController.php index 92a6ca9..656c4cb 100644 --- a/skolehjem/app/Http/Controllers/EventController.php +++ b/skolehjem/app/Http/Controllers/EventController.php @@ -171,12 +171,13 @@ class EventController extends Controller "Event Navn". "Event Beskrivelse". "Event Dato". + "\"Update\"". "\"Update\"". "\"Delete\"". ""; $events = DB::table('events')->where('name', 'LIKE',$request->search.'%') ->orWhere('date','LIKE', $request->search.'%') - ->get(); + ->get();//Job is here dude :9 if(count($events) !== 0){ foreach ($events as $key => $event){ @@ -184,6 +185,7 @@ class EventController extends Controller '' . $event->name . ''. '' . $event->description .''. '' . $event->date .''. + ' $event->id ]).'">Update'. ' $event->id ]) . '">Update'. '
$event->id ]). '" class="w-100 nostyle">'. csrf_field(). @@ -201,6 +203,7 @@ class EventController extends Controller ''. ''. ''. + ''. ''; } return Response($output); diff --git a/skolehjem/app/Http/Controllers/UserController.php b/skolehjem/app/Http/Controllers/UserController.php index 225fd19..9bd7924 100644 --- a/skolehjem/app/Http/Controllers/UserController.php +++ b/skolehjem/app/Http/Controllers/UserController.php @@ -288,13 +288,35 @@ class UserController extends Controller "\"Update\"". "\"Delete\"". ""; - $users = User::query()->where('name_first', 'LIKE',$request->search.'%') + + + //filter search + if($request->isCheck === "navn") + $users = User::query()->where('name_first', 'LIKE',$request->search.'%')->get(); + elseif ($request->isCheck === "efternavn") + $users = User::query()->where('name_last', 'LIKE',$request->search.'%')->get(); + elseif ($request->isCheck === "email") + $users = User::query()->where('email', 'LIKE',$request->search.'%')->get(); + elseif ($request->isCheck === "telefon") + $users = User::query()->where('phone', 'LIKE',$request->search.'%')->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(); + + + + //Dont delete + /*elseif ($request->isCheck === "rolle") + $users = User::query()->where('rolle', 'LIKE',$request->search.'%');*/ + + + + if(count($users) !== 0){ foreach ($users as $key => $user){ diff --git a/skolehjem/resources/views/admin/users/index.blade.php b/skolehjem/resources/views/admin/users/index.blade.php index 4ab71ef..9223bda 100644 --- a/skolehjem/resources/views/admin/users/index.blade.php +++ b/skolehjem/resources/views/admin/users/index.blade.php @@ -20,7 +20,24 @@
+ + +
+
+ + + + + + + + + + +
+
+ @@ -63,13 +80,14 @@ + + + @endsection
Fornavn