From 072c5c65ab29a907fa6715bdcef75ca8d74ebf15 Mon Sep 17 00:00:00 2001 From: frederikpyt Date: Wed, 5 Aug 2020 08:10:38 +0200 Subject: [PATCH 1/4] Fixes and todo's --- skolehjem/app/Http/Controllers/UserController.php | 1 - skolehjem/resources/views/admin/events/index.blade.php | 1 - skolehjem/resources/views/admin/events/signups.blade.php | 3 +-- skolehjem/resources/views/admin/roles/index.blade.php | 1 - skolehjem/resources/views/admin/users/index.blade.php | 1 - .../resources/views/admin/washing-reservations/index.blade.php | 2 +- 6 files changed, 2 insertions(+), 7 deletions(-) diff --git a/skolehjem/app/Http/Controllers/UserController.php b/skolehjem/app/Http/Controllers/UserController.php index 1151bed..46991b4 100644 --- a/skolehjem/app/Http/Controllers/UserController.php +++ b/skolehjem/app/Http/Controllers/UserController.php @@ -369,7 +369,6 @@ class UserController extends Controller ->orWhere('name_last', 'LIKE', $request->search . '%') ->orWhere('phone', 'LIKE', $request->search . '%') ->orWhere('email', 'LIKE', $request->search . '%') - ->orWhere('name', 'LIKE', $request->search . '%') ->get(); $roles = Role::query()->where('name', 'LIKE', $request->search . '%')->get(); diff --git a/skolehjem/resources/views/admin/events/index.blade.php b/skolehjem/resources/views/admin/events/index.blade.php index 61d63e9..536ef83 100644 --- a/skolehjem/resources/views/admin/events/index.blade.php +++ b/skolehjem/resources/views/admin/events/index.blade.php @@ -60,7 +60,6 @@ data: {'search':$value}, success:function (data) { $('tbody').html(data); - console.log(data); }, error:function (data) { console.log(data); diff --git a/skolehjem/resources/views/admin/events/signups.blade.php b/skolehjem/resources/views/admin/events/signups.blade.php index 85d9f3a..3bf7443 100644 --- a/skolehjem/resources/views/admin/events/signups.blade.php +++ b/skolehjem/resources/views/admin/events/signups.blade.php @@ -14,7 +14,7 @@
@csrf - +
@@ -53,7 +53,6 @@ data: {'search':$value}, success:function (data) { $('tbody').html(data); - console.log(data); }, error:function (data) { console.log(data); diff --git a/skolehjem/resources/views/admin/roles/index.blade.php b/skolehjem/resources/views/admin/roles/index.blade.php index 361bfe9..33255fa 100644 --- a/skolehjem/resources/views/admin/roles/index.blade.php +++ b/skolehjem/resources/views/admin/roles/index.blade.php @@ -53,7 +53,6 @@ data: {'search':$value}, success:function (data) { $('tbody').html(data); - console.log(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 76f7a53..86ef422 100644 --- a/skolehjem/resources/views/admin/users/index.blade.php +++ b/skolehjem/resources/views/admin/users/index.blade.php @@ -81,7 +81,6 @@ url: '{{route('users.search')}}', data: {'search':$value, 'isCheck': $checkboxValue, 'page': page }, success:function (data) { - console.log($checkboxValue); $('tbody').html(data); }, error:function (data) { diff --git a/skolehjem/resources/views/admin/washing-reservations/index.blade.php b/skolehjem/resources/views/admin/washing-reservations/index.blade.php index acc4864..8af142e 100644 --- a/skolehjem/resources/views/admin/washing-reservations/index.blade.php +++ b/skolehjem/resources/views/admin/washing-reservations/index.blade.php @@ -15,7 +15,7 @@
@csrf - +
From 182b33fbaf799cfcf82d5a362cc55323d6ba60e8 Mon Sep 17 00:00:00 2001 From: frederikpyt Date: Wed, 5 Aug 2020 08:14:03 +0200 Subject: [PATCH 2/4] Added href --- skolehjem/resources/views/app/layout/base.blade.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/skolehjem/resources/views/app/layout/base.blade.php b/skolehjem/resources/views/app/layout/base.blade.php index af2b83d..506a6cf 100644 --- a/skolehjem/resources/views/app/layout/base.blade.php +++ b/skolehjem/resources/views/app/layout/base.blade.php @@ -7,7 +7,7 @@
- + From 4ed1d183929dec9c54451e60f185728467d338f2 Mon Sep 17 00:00:00 2001 From: frederikpyt Date: Wed, 5 Aug 2020 08:27:33 +0200 Subject: [PATCH 3/4] Fixed month --- .../resources/views/app/washing-reservations/create.blade.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/skolehjem/resources/views/app/washing-reservations/create.blade.php b/skolehjem/resources/views/app/washing-reservations/create.blade.php index 54ab577..25455f0 100644 --- a/skolehjem/resources/views/app/washing-reservations/create.blade.php +++ b/skolehjem/resources/views/app/washing-reservations/create.blade.php @@ -67,7 +67,7 @@ header.appendChild(headerDay); let date = moment().locale("da").day(weekDay).week(week); - var datetext = moment().locale("da").day(weekDay).week(week).year() + "-" + prependZero(moment().locale("da").day(weekDay).week(week).month()) + "-" + prependZero(moment().locale("da").day(weekDay).week(week).date()); + var datetext = moment().locale("da").day(weekDay).week(week).year() + "-" + prependZero((moment().locale("da").day(weekDay).week(week).month() + 1)) + "-" + prependZero(moment().locale("da").day(weekDay).week(week).date()); let dayHolder = document.createElement("div"); dayHolder.classList.add("calendar-table__col"); From 5120adebc07b938e16a9694f2057b57a4b592996 Mon Sep 17 00:00:00 2001 From: Anders Date: Wed, 5 Aug 2020 08:32:27 +0200 Subject: [PATCH 4/4] Fixed links CSS --- .../resources/views/app/layout/base.blade.php | 10 +++++----- .../resources/views/app/users/index.blade.php | 17 ++++++++++++++--- 2 files changed, 19 insertions(+), 8 deletions(-) diff --git a/skolehjem/resources/views/app/layout/base.blade.php b/skolehjem/resources/views/app/layout/base.blade.php index af2b83d..7ecf239 100644 --- a/skolehjem/resources/views/app/layout/base.blade.php +++ b/skolehjem/resources/views/app/layout/base.blade.php @@ -6,7 +6,7 @@ -
+