From d0c8adf7f484f40384b50e9c12c86307a06bc2f3 Mon Sep 17 00:00:00 2001 From: Anders Date: Wed, 29 Jul 2020 15:28:21 +0200 Subject: [PATCH 1/3] Added store, update, edit to UserEventController.php --- .../app/Http/Controllers/UserEventController.php | 13 +++++++++++++ 1 file changed, 13 insertions(+) diff --git a/skolehjem/app/Http/Controllers/UserEventController.php b/skolehjem/app/Http/Controllers/UserEventController.php index 55715fb..bdbb171 100644 --- a/skolehjem/app/Http/Controllers/UserEventController.php +++ b/skolehjem/app/Http/Controllers/UserEventController.php @@ -20,9 +20,14 @@ class UserEventController extends Controller return Response::detect("events.yourevents", [ "userevents" => $userevents ]); } + public function store() { + + } + /** * Update the specified resource in storage. * + * @param UserEvent $eventid * @param \Illuminate\Http\Request $request * @return \Illuminate\Contracts\Foundation\Application|\Illuminate\Contracts\View\Factory|\Illuminate\View\View */ @@ -72,4 +77,12 @@ class UserEventController extends Controller public function show() { } + + public function edit() { + + } + + public function update() { + + } } From 0ab41524c646140001dea2e0833b55efdcc09d97 Mon Sep 17 00:00:00 2001 From: Anders Date: Thu, 30 Jul 2020 08:42:01 +0200 Subject: [PATCH 2/3] Added an account page for admin site --- .../views/admin/layout/header.blade.php | 2 +- .../views/admin/users/account.blade.php | 40 +++++++++++++++++++ 2 files changed, 41 insertions(+), 1 deletion(-) create mode 100644 skolehjem/resources/views/admin/users/account.blade.php diff --git a/skolehjem/resources/views/admin/layout/header.blade.php b/skolehjem/resources/views/admin/layout/header.blade.php index 432a487..dcc6af3 100644 --- a/skolehjem/resources/views/admin/layout/header.blade.php +++ b/skolehjem/resources/views/admin/layout/header.blade.php @@ -3,7 +3,7 @@ Syddansk Erhvervsskole @auth - Bruger: {{ ucfirst(Auth::user()->name_first) }} {{ ucfirst(Auth::user()->name_last) }} + Bruger: {{ ucfirst(Auth::user()->name_first) }} {{ ucfirst(Auth::user()->name_last) }} Log ud @else Log ind diff --git a/skolehjem/resources/views/admin/users/account.blade.php b/skolehjem/resources/views/admin/users/account.blade.php new file mode 100644 index 0000000..72bbb6b --- /dev/null +++ b/skolehjem/resources/views/admin/users/account.blade.php @@ -0,0 +1,40 @@ +@extends("admin.layout.base") +@extends("admin.layout.header") + +@section("title") + Account +@endsection + +@section("path") + Profil Oplysninger / +@endsection + +@section("content") + + + + + + + + + + + + + + + + + +
FornavnEfternavnEmailTlf nrRolle(r)Update
{{ Auth::user()->name_first }}{{ Auth::user()->name_last }}{{ Auth::user()->email }}{{ Auth::user()->phone }} + + @for($i = 0; $i < count(Auth::user()->roles); $i++) + @if(count(Auth::user()->roles)-1 != $i) + {{Auth::user()->roles[$i]->name}}, + @else + {{Auth::user()->roles[$i]->name}} + @endif + @endfor + Auth::user()->id ]) }}">Update
+@endsection From 62d73d08940a1debfcae89ddf61280956ccea8bf Mon Sep 17 00:00:00 2001 From: Neerholt Date: Thu, 30 Jul 2020 09:17:27 +0200 Subject: [PATCH 3/3] Vaskemaskine search er kogt --- .../app/Http/Controllers/WashingReservationController.php | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/skolehjem/app/Http/Controllers/WashingReservationController.php b/skolehjem/app/Http/Controllers/WashingReservationController.php index 1e46d28..e61ce37 100644 --- a/skolehjem/app/Http/Controllers/WashingReservationController.php +++ b/skolehjem/app/Http/Controllers/WashingReservationController.php @@ -179,7 +179,6 @@ class WashingReservationController extends Controller - function search(Request $request){ if($request->ajax()){ $output = "". @@ -192,6 +191,12 @@ class WashingReservationController extends Controller //Kan ikke søge på vaskemaskine da det er en foreign key + //Kan ikke søge på bruger + //Man kan søge på tidspunkt! + + + + //filter search if($request->isCheck === "vaskemaskine") @@ -237,5 +242,6 @@ class WashingReservationController extends Controller + }