From 9a5be4e280647b75995aef70ab9005e16c2e1eb3 Mon Sep 17 00:00:00 2001
From: victor <vict3459@edu.sde.dk>
Date: Tue, 28 Jul 2020 09:23:28 +0200
Subject: [PATCH] Name fix for contact
---
skolehjem/app/Http/Controllers/ContactController.php | 8 ++++----
skolehjem/resources/views/admin/contacts/index.blade.php | 1 -
skolehjem/resources/views/admin/events/index.blade.php | 1 -
skolehjem/resources/views/admin/layout/base.blade.php | 1 +
skolehjem/resources/views/admin/roles/index.blade.php | 1 -
skolehjem/resources/views/admin/users/index.blade.php | 1 -
6 files changed, 5 insertions(+), 8 deletions(-)
diff --git a/skolehjem/app/Http/Controllers/ContactController.php b/skolehjem/app/Http/Controllers/ContactController.php
index 443cd99..c581e55 100644
--- a/skolehjem/app/Http/Controllers/ContactController.php
+++ b/skolehjem/app/Http/Controllers/ContactController.php
@@ -146,16 +146,16 @@ class ContactController 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 = DB::table('contacts')->where('name_first', 'LIKE',$request->search.'%')
- ->orWhere('name_last','LIKE', $request->search.'%')
+ $users = DB::table('contacts')->where('contactname', 'LIKE',$request->search.'%')
+ ->orWhere('title','LIKE', $request->search.'%')
->orWhere('phone','LIKE', $request->search.'%')
->orWhere('email','LIKE',$request->search. '%')->get();
if(count($users) !== 0){
foreach ($users as $key => $user){
$output.='<tr>'.
- '<td>' . $user->name_first . '</td>'.
- '<td>' . $user->name_last . '</td>'.
+ '<td>' . $user->contactname . '</td>'.
+ '<td>' . $user->title . '</td>'.
'<td>' . $user->email . '</td>'.
'<td>' . $user->phone .'</td>'.
'<td><a href="'. route("contacts.edit", [ "contact" => $user->id ]) . '"><img class="w-100" src="'. asset('/images/icons/pencil-dark.svg') . '" alt="Update"></a></td>'.
diff --git a/skolehjem/resources/views/admin/contacts/index.blade.php b/skolehjem/resources/views/admin/contacts/index.blade.php
index 71335dd..3622a1b 100644
--- a/skolehjem/resources/views/admin/contacts/index.blade.php
+++ b/skolehjem/resources/views/admin/contacts/index.blade.php
@@ -10,7 +10,6 @@
@endsection
@section("content")
- <script src="http://code.jquery.com/jquery-3.2.1.min.js" integrity="sha256-hwg4gsxgFZhOsEEamdOYGBf13FyQuiTwlAQgxVSNgt4=" crossorigin="anonymous"></script>
<div class="row align-items-center">
<a class="btn btn-inline btn-sde-blue mb-0" href="{{ route('contacts.create') }}"><img src="{{ asset('/images/icons/plus.svg') }}" alt="Create">Opret Kontakt</a>
diff --git a/skolehjem/resources/views/admin/events/index.blade.php b/skolehjem/resources/views/admin/events/index.blade.php
index 2ed1629..22b9f4a 100644
--- a/skolehjem/resources/views/admin/events/index.blade.php
+++ b/skolehjem/resources/views/admin/events/index.blade.php
@@ -10,7 +10,6 @@
@endsection
@section("content")
- <script src="http://code.jquery.com/jquery-3.2.1.min.js" integrity="sha256-hwg4gsxgFZhOsEEamdOYGBf13FyQuiTwlAQgxVSNgt4=" crossorigin="anonymous"></script>
<div class="row align-items-center">
<a class="btn btn-inline btn-sde-blue mb-0" href="{{ route('events.create') }}"><img src="{{ asset('/images/icons/plus.svg') }}" alt="Create">Opret Event</a>
diff --git a/skolehjem/resources/views/admin/layout/base.blade.php b/skolehjem/resources/views/admin/layout/base.blade.php
index 36e1a71..9ba4838 100644
--- a/skolehjem/resources/views/admin/layout/base.blade.php
+++ b/skolehjem/resources/views/admin/layout/base.blade.php
@@ -5,6 +5,7 @@
<meta name="viewport" content="width=device-width, initial-scale=1">
<link rel="stylesheet" href="https://cdnjs.cloudflare.com/ajax/libs/font-awesome/4.7.0/css/font-awesome.min.css">
<link type="text/css" rel="stylesheet" href="{{ mix("/css/admin.css") }}">
+ <script src="http://code.jquery.com/jquery-3.2.1.min.js" integrity="sha256-hwg4gsxgFZhOsEEamdOYGBf13FyQuiTwlAQgxVSNgt4=" crossorigin="anonymous"></script>
</head>
<body>
@yield("header")
diff --git a/skolehjem/resources/views/admin/roles/index.blade.php b/skolehjem/resources/views/admin/roles/index.blade.php
index 554eb3b..a032d77 100644
--- a/skolehjem/resources/views/admin/roles/index.blade.php
+++ b/skolehjem/resources/views/admin/roles/index.blade.php
@@ -10,7 +10,6 @@
@endsection
@section("content")
- <script src="http://code.jquery.com/jquery-3.2.1.min.js" integrity="sha256-hwg4gsxgFZhOsEEamdOYGBf13FyQuiTwlAQgxVSNgt4=" crossorigin="anonymous"></script>
<div class="row align-items-center">
<a class="btn btn-inline btn-sde-blue mb-0" href="{{ route('roles.create') }}"><img src="{{ asset('/images/icons/plus.svg') }}" alt="Create">Opret Rolle</a>
diff --git a/skolehjem/resources/views/admin/users/index.blade.php b/skolehjem/resources/views/admin/users/index.blade.php
index 42045a6..f790b1c 100644
--- a/skolehjem/resources/views/admin/users/index.blade.php
+++ b/skolehjem/resources/views/admin/users/index.blade.php
@@ -10,7 +10,6 @@
@endsection
@section("content")
- <script src="http://code.jquery.com/jquery-3.2.1.min.js" integrity="sha256-hwg4gsxgFZhOsEEamdOYGBf13FyQuiTwlAQgxVSNgt4=" crossorigin="anonymous"></script>
<div class="row align-items-center">