From c9cb3e99cd79078990bacb9f92ce9e8f5d0b3ede Mon Sep 17 00:00:00 2001 From: victor Date: Tue, 28 Jul 2020 11:07:33 +0200 Subject: [PATCH 1/5] Jeg er ikke sikker --- skolehjem/app/Http/Controllers/ContactController.php | 4 ++++ .../resources/views/admin/contacts/index.blade.php | 10 +++++++++- 2 files changed, 13 insertions(+), 1 deletion(-) diff --git a/skolehjem/app/Http/Controllers/ContactController.php b/skolehjem/app/Http/Controllers/ContactController.php index 0ffc9b6..727203b 100644 --- a/skolehjem/app/Http/Controllers/ContactController.php +++ b/skolehjem/app/Http/Controllers/ContactController.php @@ -168,6 +168,10 @@ class ContactController extends Controller ''. ''; } + }else{ + $output.=''. + 'Din søgning matchede ikke nogen personer'. + ''; } return Response($output); } diff --git a/skolehjem/resources/views/admin/contacts/index.blade.php b/skolehjem/resources/views/admin/contacts/index.blade.php index 3622a1b..03328db 100644 --- a/skolehjem/resources/views/admin/contacts/index.blade.php +++ b/skolehjem/resources/views/admin/contacts/index.blade.php @@ -18,6 +18,7 @@ +

@@ -55,7 +56,14 @@ url: '{{route('contacts.search')}}', data: {'search':$value}, success:function (data) { - $('tbody').html(data); + if(data == $value){ + $('tbody').html(data); + $("p").hide(); + }else{ + $("p").show(); + $("p").html("Det er ingen data der matcher din søgning."); + } + }, error:function (data) { console.log(data); From 47a07c61748cebacc244d2804b0e0df19e4dedf6 Mon Sep 17 00:00:00 2001 From: victor Date: Tue, 28 Jul 2020 11:31:39 +0200 Subject: [PATCH 2/5] Added no match found on live search --- skolehjem/app/Http/Controllers/ContactController.php | 5 +++++ skolehjem/app/Http/Controllers/EventController.php | 8 ++++++++ skolehjem/app/Http/Controllers/MenuPlanController.php | 10 ++++++++++ skolehjem/app/Http/Controllers/RolesController.php | 7 +++++++ skolehjem/app/Http/Controllers/UserController.php | 10 ++++++++++ .../resources/views/admin/contacts/index.blade.php | 9 +-------- skolehjem/resources/views/admin/users/index.blade.php | 3 ++- 7 files changed, 43 insertions(+), 9 deletions(-) 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.=''. ''. + ''. + ''. + ''. + ''. + ''. ''; } return Response($output); diff --git a/skolehjem/app/Http/Controllers/EventController.php b/skolehjem/app/Http/Controllers/EventController.php index f487688..8763e1d 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.=''. + ''. + ''. + ''. + ''. + ''. + ''; } return Response($output); } diff --git a/skolehjem/app/Http/Controllers/MenuPlanController.php b/skolehjem/app/Http/Controllers/MenuPlanController.php index 279bf1c..7ef8090 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.=''. + ''. + ''. + ''. + ''. + ''. + ''. + ''. + ''; } return Response($output); } diff --git a/skolehjem/app/Http/Controllers/RolesController.php b/skolehjem/app/Http/Controllers/RolesController.php index 801a275..777447c 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.=''. + ''. + ''. + ''. + ''. + ''; } return Response($output); } diff --git a/skolehjem/app/Http/Controllers/UserController.php b/skolehjem/app/Http/Controllers/UserController.php index ba8e475..37686ee 100644 --- a/skolehjem/app/Http/Controllers/UserController.php +++ b/skolehjem/app/Http/Controllers/UserController.php @@ -326,6 +326,16 @@ class UserController extends Controller ''. ''; } + }else{ + $output.=''. + ''. + ''. + ''. + ''. + ''. + ''. + ''. + ''; } 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 f790b1c..0a755df 100644 --- a/skolehjem/resources/views/admin/users/index.blade.php +++ b/skolehjem/resources/views/admin/users/index.blade.php @@ -17,7 +17,7 @@ @csrf - + @@ -46,6 +46,7 @@ {{$user->roles[$i]->name}} @endif @endfor + ". "". ""; - $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. '%')->get(); + ->orWhere('email','LIKE',$request->search. '%') + + ->get(); 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 0a755df..901f92d 100644 --- a/skolehjem/resources/views/admin/users/index.blade.php +++ b/skolehjem/resources/views/admin/users/index.blade.php @@ -61,7 +61,6 @@
Din søgning matchede ikke nogen personer
Din søgning matchede ikke nogen personer
Din søgning matchede ikke nogen personer
Din søgning matchede ikke nogen resultater
Din søgning matchede ikke nogen personer
$user->id ]) }}">Update
$user ]) }}" class="w-100 nostyle"> From a90c9aa8cd148468069c4ddbc2619294b444d6e3 Mon Sep 17 00:00:00 2001 From: victor Date: Tue, 28 Jul 2020 13:21:02 +0200 Subject: [PATCH 3/5] big smoke --- skolehjem/app/Http/Controllers/UserController.php | 7 +++++-- skolehjem/resources/views/admin/users/index.blade.php | 1 - 2 files changed, 5 insertions(+), 3 deletions(-) diff --git a/skolehjem/app/Http/Controllers/UserController.php b/skolehjem/app/Http/Controllers/UserController.php index 37686ee..07ae942 100644 --- a/skolehjem/app/Http/Controllers/UserController.php +++ b/skolehjem/app/Http/Controllers/UserController.php @@ -287,10 +287,13 @@ class UserController extends Controller "
\"Update\"\"Delete\"
{{ $users->links() }} -