diff --git a/skolehjem/app/Http/Controllers/ContactController.php b/skolehjem/app/Http/Controllers/ContactController.php index 727203b..345c17c 100644 --- a/skolehjem/app/Http/Controllers/ContactController.php +++ b/skolehjem/app/Http/Controllers/ContactController.php @@ -171,6 +171,11 @@ class ContactController extends Controller }else{ $output.=''. 'Din søgning matchede ikke nogen personer'. + ''. + ''. + ''. + ''. + ''. ''; } return Response($output); diff --git a/skolehjem/app/Http/Controllers/EventController.php b/skolehjem/app/Http/Controllers/EventController.php index f487688..e90b742 100644 --- a/skolehjem/app/Http/Controllers/EventController.php +++ b/skolehjem/app/Http/Controllers/EventController.php @@ -167,6 +167,14 @@ class EventController extends Controller ''. ''; } + }else{ + $output.=''. + 'Intet match'. + ''. + ''. + ''. + ''. + ''; } return Response($output); } diff --git a/skolehjem/app/Http/Controllers/MenuPlanController.php b/skolehjem/app/Http/Controllers/MenuPlanController.php index 279bf1c..5a371cc 100644 --- a/skolehjem/app/Http/Controllers/MenuPlanController.php +++ b/skolehjem/app/Http/Controllers/MenuPlanController.php @@ -164,6 +164,16 @@ class MenuPlanController extends Controller ''. ''; } + }else{ + $output.=''. + 'Intet match'. + ''. + ''. + ''. + ''. + ''. + ''. + ''; } return Response($output); } diff --git a/skolehjem/app/Http/Controllers/RolesController.php b/skolehjem/app/Http/Controllers/RolesController.php index 801a275..4b09588 100644 --- a/skolehjem/app/Http/Controllers/RolesController.php +++ b/skolehjem/app/Http/Controllers/RolesController.php @@ -143,6 +143,13 @@ class rolesController extends Controller ''. ''; } + }else{ + $output.=''. + 'Intet match'. + ''. + ''. + ''. + ''; } return Response($output); } diff --git a/skolehjem/app/Http/Controllers/UserController.php b/skolehjem/app/Http/Controllers/UserController.php index 8578c94..53bbd96 100644 --- a/skolehjem/app/Http/Controllers/UserController.php +++ b/skolehjem/app/Http/Controllers/UserController.php @@ -287,16 +287,16 @@ class UserController extends Controller "\"Update\"". "\"Delete\"". ""; - $users = User::query()-> - where('name_first', 'LIKE',$request->search.'%') + $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(); if(count($users) !== 0){ foreach ($users as $key => $user){ + $roles = null; $rolesString = null; @@ -318,7 +318,7 @@ class UserController extends Controller '' . $user->name_last . ''. '' . $user->email . ''. '' . $user->phone .''. - '' . $rolesString .''. + '' . $user->name .''. ' $user->id ]) . '">Update'. '
$user->id ]). '" class="w-100 nostyle">'. csrf_field(). @@ -329,6 +329,16 @@ class UserController extends Controller ''. ''; } + }else{ + $output.=''. + 'Intet match'. + ''. + ''. + ''. + ''. + ''. + ''. + ''; } return Response($output); } diff --git a/skolehjem/resources/views/admin/contacts/index.blade.php b/skolehjem/resources/views/admin/contacts/index.blade.php index 03328db..04442cd 100644 --- a/skolehjem/resources/views/admin/contacts/index.blade.php +++ b/skolehjem/resources/views/admin/contacts/index.blade.php @@ -56,14 +56,7 @@ url: '{{route('contacts.search')}}', data: {'search':$value}, success:function (data) { - if(data == $value){ - $('tbody').html(data); - $("p").hide(); - }else{ - $("p").show(); - $("p").html("Det er ingen data der matcher din søgning."); - } - + $('tbody').html(data); }, error:function (data) { console.log(data); diff --git a/skolehjem/resources/views/admin/users/index.blade.php b/skolehjem/resources/views/admin/users/index.blade.php index 5c761c2..4ab71ef 100644 --- a/skolehjem/resources/views/admin/users/index.blade.php +++ b/skolehjem/resources/views/admin/users/index.blade.php @@ -17,7 +17,7 @@ @csrf - +