Merge remote-tracking branch 'origin/master'

skolehjem/app/Http/Controllers/ContactController.php

@@ -168,6 +168,15 @@ class ContactController extends Controller
                         '</td>'.
                         '</tr>';
                 }
+            }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);
         }

skolehjem/app/Http/Controllers/EventController.php

@@ -194,6 +194,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);
         }

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);
         }

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);
         }

skolehjem/app/Http/Controllers/UserController.php

@@ -290,10 +290,13 @@ class UserController extends Controller
             $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. '%')
+                ->orWhere('name','LIKE',$request->search. '%')
+                ->get();
 
             if(count($users) !== 0){
                 foreach ($users as $key => $user){
+
                     $roles = null;
                     $rolesString = null;
 
@@ -315,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().
@@ -326,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);
         }

skolehjem/resources/views/admin/contacts/index.blade.php

@@ -18,6 +18,7 @@
             <input type="text" class="form-controller" id="search" name="search" placeholder="Søg på Navn, Email, Telefon"></input>
         </form>
 
+        <p></p>
 
     </div>
     <table class="tbl mt-2">

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>
@@ -60,7 +60,6 @@
     </table>
     {{ $users->links() }}
 
-
         <script>
             $('#search').on('keyup', function () {
                 $value = $(this).val();