From 63f2cc31d99d861e59b42859e96c160dcc1ee601 Mon Sep 17 00:00:00 2001
From: victor <vict3459@edu.sde.dk>
Date: Tue, 28 Jul 2020 14:23:54 +0200
Subject: [PATCH] Fix live search again
---
.../app/Http/Controllers/ContactController.php | 5 +++++
.../app/Http/Controllers/EventController.php | 8 ++++++++
.../Http/Controllers/MenuPlanController.php | 10 ++++++++++
.../app/Http/Controllers/RolesController.php | 7 +++++++
.../app/Http/Controllers/UserController.php | 18 ++++++++++++++----
.../views/admin/contacts/index.blade.php | 9 +--------
.../views/admin/users/index.blade.php | 2 +-
7 files changed, 46 insertions(+), 13 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.='<tr>'.
'<td>Din søgning matchede ikke nogen personer</td>'.
+ '<td></td>'.
+ '<td></td>'.
+ '<td></td>'.
+ '<td></td>'.
+ '<td></td>'.
'</tr>';
}
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
'</td>'.
'</tr>';
}
+ }else{
+ $output.='<tr>'.
+ '<td>Intet match</td>'.
+ '<td></td>'.
+ '<td></td>'.
+ '<td></td>'.
+ '<td></td>'.
+ '</tr>';
}
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
'</td>'.
'</tr>';
}
+ }else{
+ $output.='<tr>'.
+ '<td>Intet match</td>'.
+ '<td></td>'.
+ '<td></td>'.
+ '<td></td>'.
+ '<td></td>'.
+ '<td></td>'.
+ '<td></td>'.
+ '</tr>';
}
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
'</td>'.
'</tr>';
}
+ }else{
+ $output.='<tr>'.
+ '<td>Intet match</td>'.
+ '<td></td>'.
+ '<td></td>'.
+ '<td></td>'.
+ '</tr>';
}
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
"<th style=\"width: 1em;\"><img class=\"w-100\" src=\"http://127.0.0.1:8000/images/icons/pencil.svg\" alt=\"Update\"></th>".
"<th style=\"width: 1em;\"><img class=\"w-100\" src=\"http://127.0.0.1:8000/images/icons/trashcan.svg\" alt=\"Delete\"></th>".
"</tr>";
- $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
'<td>' . $user->name_last . '</td>'.
'<td>' . $user->email . '</td>'.
'<td>' . $user->phone .'</td>'.
- '<td>' . $rolesString .'</td>'.
+ '<td>' . $user->name .'</td>'.
'<td><a href="'. route("users.edit", [ "user" => $user->id ]) . '"><img class="w-100" src="'. asset('/images/icons/pencil-dark.svg') . '" alt="Update"></a></td>'.
'<td><form method="post" action="' .route("users.destroy", [ "user" => $user->id ]). '" class="w-100 nostyle">'.
csrf_field().
@@ -329,6 +329,16 @@ class UserController extends Controller
'</td>'.
'</tr>';
}
+ }else{
+ $output.='<tr>'.
+ '<td>Intet match</td>'.
+ '<td></td>'.
+ '<td></td>'.
+ '<td></td>'.
+ '<td></td>'.
+ '<td></td>'.
+ '<td></td>'.
+ '</tr>';
}
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 @@
<form method="post" action="{{ route("users.store") }}">
@csrf
- <input type="text" class="form-controller" id="search" name="search" placeholder="Søg efter navn"></input>
+ <input type="text" class="form-controller" id="search" name="search" placeholder="Søg efter navn,email,tf"></input>
</form>
</div>