From 84cd760b0feb5d90e42b0fa7d1b83b653b745b35 Mon Sep 17 00:00:00 2001 From: Neerholt Date: Mon, 3 Aug 2020 10:08:03 +0200 Subject: [PATCH 1/3] Made ris ros filter --- .../Http/Controllers/FeedbackController.php | 32 +++++++++++++++++ .../views/admin/feedbacks/index.blade.php | 36 +++++++++++++++++++ skolehjem/routes/web.php | 1 + 3 files changed, 69 insertions(+) diff --git a/skolehjem/app/Http/Controllers/FeedbackController.php b/skolehjem/app/Http/Controllers/FeedbackController.php index 18c274b..0c84a6a 100644 --- a/skolehjem/app/Http/Controllers/FeedbackController.php +++ b/skolehjem/app/Http/Controllers/FeedbackController.php @@ -5,6 +5,7 @@ namespace App\Http\Controllers; use App\Feedbacks; use Illuminate\Http\Request; use Illuminate\Http\Response; +use Illuminate\Support\Facades\DB; class FeedbackController extends Controller @@ -125,4 +126,35 @@ class FeedbackController extends Controller return Response::detect("feedbacks.destroy"); } + + + + public function search(Request $request){ + if($request->ajax()){ + $output = "". + "Feedback Besked". + "Ris el. Ros". + ""; + + //$value = Feedbacks::query('feedbacks')->select('suggestion_form ')->dump(); + //$value = DB::table('feedbacks')->select('suggestion_form ')->dump(); + if($request->option === "Ris" || $request->option === "Ros") + $feedbacks = Feedbacks::query()->where('suggestion_form', '=', $request->option) + ->get(); + else + $feedbacks = Feedbacks::all(); + + if(count($feedbacks) !== 0){ + foreach ($feedbacks as $key => $feedback){ + $output.=''. + '' . $feedback->message . ''. + '' . $feedback->suggestion_form . ''. + ''; + } + } + return Response($output); + } + } + + } diff --git a/skolehjem/resources/views/admin/feedbacks/index.blade.php b/skolehjem/resources/views/admin/feedbacks/index.blade.php index 3961ebb..3ec8442 100644 --- a/skolehjem/resources/views/admin/feedbacks/index.blade.php +++ b/skolehjem/resources/views/admin/feedbacks/index.blade.php @@ -9,7 +9,20 @@ Vis Feedback / @endsection + @section("content") + + +
+ + +
+ + @@ -24,4 +37,27 @@
Feedback Besked
{{ $feedback->links() }} + + + + + + + @endsection diff --git a/skolehjem/routes/web.php b/skolehjem/routes/web.php index 74380a5..3745858 100644 --- a/skolehjem/routes/web.php +++ b/skolehjem/routes/web.php @@ -38,6 +38,7 @@ Route::get("/rolesapi", "RolesController@search")->name("roles.search"); Route::get("/userapi", "UserController@search")->name("users.search"); Route::get("/vaskeapi", "WashingReservationController@search")->name("washing-reservations.search"); Route::get("/washing-reservationsapi", "WashingReservationController@api")->name("washing-reservations.api"); +Route::get("/risrosapi", "FeedbackController@search")->name("feedbacks.search"); From b4263d889127cfca8d947b4be59b9efbfcbf96db Mon Sep 17 00:00:00 2001 From: Anders Date: Mon, 3 Aug 2020 10:36:57 +0200 Subject: [PATCH 2/3] Fixed - Password & Confirm Password in create user now need to be the same. Added new "see password" function on all password sites. Fixed bugs --- .../app/Http/Controllers/UserController.php | 36 +++++-------------- .../views/admin/users/create.blade.php | 30 ++++++++++++++-- .../views/admin/users/edit.blade.php | 29 ++++++--------- .../views/app/users/editpass.blade.php | 4 +-- .../resources/views/app/users/login.blade.php | 22 +++++++++++- 5 files changed, 69 insertions(+), 52 deletions(-) diff --git a/skolehjem/app/Http/Controllers/UserController.php b/skolehjem/app/Http/Controllers/UserController.php index 7dd52d5..33ebb3f 100644 --- a/skolehjem/app/Http/Controllers/UserController.php +++ b/skolehjem/app/Http/Controllers/UserController.php @@ -71,15 +71,19 @@ class UserController extends Controller "phone" => "required|unique:users", ]); - $rolez = $request->input("roles", [ "User" ]); + if ($request->password != $request->password2) { + return redirect()->route('users.create')->with('error#notsamepass', '

Der stod ikke det samme i `Password` & `Confirm Password`!

'); + } + + $roles = $request->input("roles", [ "User" ]); $user = new User($data); - $user->assignRole($rolez); + $user->assignRole($roles); $user->save(); - return Response::detect("users.store"); + return redirect()->route('users.index'); } /** @@ -123,7 +127,6 @@ class UserController extends Controller */ public function update(Request $request, $id) { - return redirect()->route("users.account"); $user = User::find($id); if($id === Auth::id() || auth()->user()->hasPermissionTo("user.edit")) { @@ -134,7 +137,7 @@ class UserController extends Controller /** @var User $user */ $user->update($data); } else // Else go back with an error message - return redirect()->route("users.edit", ['user' => $id])->with('error#passnotsame', '

Der stod ikke det samme i `Password` & `Confirm Password`!

'); + return redirect()->route("users.edit", ['user' => $id])->with('error#notsamepass', '

Der stod ikke det samme i `Password` & `Confirm Password`!

'); } else { // If you haven't touched the password, then update everything else but password $data = $request->only(['name_first', 'name_last', 'email', 'phone', 'roles']); @@ -148,27 +151,6 @@ class UserController extends Controller foreach ($request->roles as $role) { $user->assignRole($role); } - } else { // Else if you're not on the admin site (user site) - if ($request->input('password') != null) { // If you're editing the password - $data = $request->only(['name_first', 'name_last', 'email', 'phone', 'password']); - if ($request->input('password') != $request->input('confirmpassword')) { // If new password and new password confirm is not the same, go back with fail message. - return redirect()->route("users.accounteditpass")->with('error#notsamepass', '

Der stod ikke det samme i `Nyt Password` & `Bekræft Nyt Password`!

'); - } elseif (!Hash::check($request->input('oldpassword'), $user->password)) { // If the written current password and current password in DB is not the same, go back with fail message. - return redirect()->route("users.accounteditpass")->with('error#oldpass', '

Det indtastede password i `Nuværende Password` er ikke dit nuværende password!

'); - } else { // If new password and current password is the same AND current written and current DB password is the same. Then update and logout. - /** @var User $user */ - $user->update($data); - Auth::logout(); - - return redirect()->route("users.login")->with('success#passwordchange', '

Dit password er hermed ændret!

'); - } - } else { // Else if you're not editing the password but anything else (Email, Phone Number). Then update user. - $data = $request->only(['email', 'phone']); - $user->update($data); - - return redirect()->route("users.account")->with('success#credentialschanged', '

Dine oplysninger er hermed ændret!

'); - } - } } $users = User::query()->paginate(20); @@ -274,7 +256,7 @@ class UserController extends Controller if ($request->input('password') != null) { // If you're editing the password $data = $request->only(['name_first', 'name_last', 'email', 'phone', 'password']); if ($request->input('password') != $request->input('confirmpassword')) { // If new password and new password confirm is not the same, go back with fail message. - return redirect()->route("users.accounteditpass")->with('error#notsamepass', '

Der stod ikke det samme i `Nyt Password` & `Bekræft Nyt Password`!

'); + return redirect()->route("users.accounteditpass")->with('error#notsamepass', '

Der stod ikke det samme i `Nyt Password` & `Confirm Password`!

'); } elseif (!Hash::check($request->input('oldpassword'), $user->password)) { // If the written current password and current password in DB is not the same, go back with fail message. return redirect()->route("users.accounteditpass")->with('error#oldpass', '

Det indtastede password i `Nuværende Password` er ikke dit nuværende password!

'); } else { // If new password and current password is the same AND current written and current DB password is the same. Then update and logout. diff --git a/skolehjem/resources/views/admin/users/create.blade.php b/skolehjem/resources/views/admin/users/create.blade.php index 0216fe0..e329ea1 100644 --- a/skolehjem/resources/views/admin/users/create.blade.php +++ b/skolehjem/resources/views/admin/users/create.blade.php @@ -11,6 +11,7 @@ @section("content")

Opret Bruger:

+ {!! session()->get('error#notsamepass') !!}
@csrf @@ -20,9 +21,15 @@ - - - +
+ + +
+ +
+ + +
@@ -36,3 +43,20 @@
@endsection + +@section("scripts") + +@endsection diff --git a/skolehjem/resources/views/admin/users/edit.blade.php b/skolehjem/resources/views/admin/users/edit.blade.php index b3feb3a..4559136 100644 --- a/skolehjem/resources/views/admin/users/edit.blade.php +++ b/skolehjem/resources/views/admin/users/edit.blade.php @@ -11,8 +11,8 @@ @section("content")

Rediger Bruger:

- {!! session()->get('error#passnotsame') !!} -
$user]) }}" style="display: inline-table;"> + {!! session()->get('error#notsamepass') !!} + $user]) }}"> @csrf @method("put") @@ -22,11 +22,15 @@ - - +
+ + +
- - +
+ + +
@@ -54,19 +58,6 @@
- @endsection @section("scripts") diff --git a/skolehjem/resources/views/app/users/editpass.blade.php b/skolehjem/resources/views/app/users/editpass.blade.php index bb0f78a..9497b5d 100644 --- a/skolehjem/resources/views/app/users/editpass.blade.php +++ b/skolehjem/resources/views/app/users/editpass.blade.php @@ -7,7 +7,7 @@ @section("content")

Konto

-
Auth::user()]) }}" style="display: inline-table;"> + Auth::user()]) }}"> @csrf @method("put") Nuværende Password: @@ -20,7 +20,7 @@ - Bekræft Nyt Password: + Confirm Password:
diff --git a/skolehjem/resources/views/app/users/login.blade.php b/skolehjem/resources/views/app/users/login.blade.php index e13dc07..8fddb85 100644 --- a/skolehjem/resources/views/app/users/login.blade.php +++ b/skolehjem/resources/views/app/users/login.blade.php @@ -12,7 +12,10 @@ @csrf - +
+ + +
@endsection + +@section("scripts") + +@endsection From 90b58a8586fd4aa4b02e637f6594f98d006ab12e Mon Sep 17 00:00:00 2001 From: Anders Date: Mon, 3 Aug 2020 10:46:48 +0200 Subject: [PATCH 3/3] Fixed - Redirect in Event controler Fixed - orderBy function when searching, in Event & Feedback --- skolehjem/app/Http/Controllers/EventController.php | 4 ++-- skolehjem/app/Http/Controllers/FeedbackController.php | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/skolehjem/app/Http/Controllers/EventController.php b/skolehjem/app/Http/Controllers/EventController.php index 199fa94..43af78c 100644 --- a/skolehjem/app/Http/Controllers/EventController.php +++ b/skolehjem/app/Http/Controllers/EventController.php @@ -72,7 +72,7 @@ class EventController extends Controller return Response::detect("events.store"); }else{ $event = Event::query()->paginate($request->input("limit", 20)); - return Response::detect("events.index", ['events' => $event]); + return redirect()->route("events.index", ['events' => $event]); } } @@ -175,7 +175,7 @@ class EventController extends Controller "\"Update\"". "\"Delete\"". ""; - $events = DB::table('events')->where('name', 'LIKE',$request->search.'%') + $events = DB::table('events')->orderBY('date' , 'asc')->where('name', 'LIKE',$request->search.'%') ->orWhere('date','LIKE', $request->search.'%') ->get();//Job is here dude :9 diff --git a/skolehjem/app/Http/Controllers/FeedbackController.php b/skolehjem/app/Http/Controllers/FeedbackController.php index 821ce83..5d39190 100644 --- a/skolehjem/app/Http/Controllers/FeedbackController.php +++ b/skolehjem/app/Http/Controllers/FeedbackController.php @@ -139,7 +139,7 @@ class FeedbackController extends Controller //$value = Feedbacks::query('feedbacks')->select('suggestion_form ')->dump(); //$value = DB::table('feedbacks')->select('suggestion_form ')->dump(); if($request->option === "Ris" || $request->option === "Ros") - $feedbacks = Feedbacks::query()->where('suggestion_form', '=', $request->option) + $feedbacks = Feedbacks::query()->orderBy('created_at', 'desc')->where('suggestion_form', '=', $request->option) ->get(); else $feedbacks = Feedbacks::all();