From e6f03ad72b35e561cfbf1bdae0e198e59e6e8f0b Mon Sep 17 00:00:00 2001 From: Anders Date: Mon, 17 Aug 2020 10:21:02 +0200 Subject: [PATCH] v0.9.15h - NameCheck - Fixed Updates --- .../app/Http/Controllers/EventController.php | 11 +++- .../app/Http/Controllers/GuideController.php | 9 ++- .../Http/Controllers/MenuPlanController.php | 15 +++-- .../app/Http/Controllers/NewsController.php | 7 ++- .../app/Http/Controllers/RolesController.php | 12 ++-- .../views/admin/events/edit.blade.php | 59 ++++++++++++++++++- .../views/admin/events/index.blade.php | 1 - .../views/admin/guides/edit.blade.php | 55 ++++++++++++++++- .../views/admin/menuplans/create.blade.php | 5 -- .../views/admin/menuplans/edit.blade.php | 55 ++++++++++++++++- .../views/admin/menuplans/index.blade.php | 1 - .../views/admin/news/create.blade.php | 3 - .../resources/views/admin/news/edit.blade.php | 57 +++++++++++++++++- .../views/admin/roles/create.blade.php | 5 +- .../views/admin/roles/edit.blade.php | 53 ++++++++++++++++- .../views/admin/roles/index.blade.php | 1 - skolehjem/routes/web.php | 9 ++- 17 files changed, 320 insertions(+), 38 deletions(-) diff --git a/skolehjem/app/Http/Controllers/EventController.php b/skolehjem/app/Http/Controllers/EventController.php index e6e069e..b571811 100644 --- a/skolehjem/app/Http/Controllers/EventController.php +++ b/skolehjem/app/Http/Controllers/EventController.php @@ -73,7 +73,7 @@ class EventController extends Controller $allEvents = Event::query()->where('name', '=', $request->name)->get(); if(count($allEvents) > 0) { - return redirect()->route("events.index", ['events' => $event])->with('EventNameExists', '

Der findes allerede et event med det navn!

'); + return redirect()->route("events.index", ['events' => $event]); } else { if($request->file("resource")) { $event->resource_id = ResourceController::store($request)->id; @@ -171,7 +171,7 @@ class EventController extends Controller $allEvents = Event::query()->where('name', '=', $request->name)->where('id', '!=', $id)->get(); if(count($allEvents) > 0){ - return redirect()->route("events.index", ['events' => $event])->with('EventNameExists', '

Der findes allerede et event med det navn!

'); + return redirect()->route("events.index", ['events' => $event]); }else{ $event->update($data); $event->save(); @@ -321,6 +321,13 @@ class EventController extends Controller } } + public function nameCheckUpdate(Request $request){ + $event = Event::query()->where('name', 'LIKE',$request->nameCheck)->where('id', '!=', $request->id)->get(); + if(count($event) > 0 && $request->nameCheck !== NULL){ + return 1; + } + } + } diff --git a/skolehjem/app/Http/Controllers/GuideController.php b/skolehjem/app/Http/Controllers/GuideController.php index 6a71696..739489a 100644 --- a/skolehjem/app/Http/Controllers/GuideController.php +++ b/skolehjem/app/Http/Controllers/GuideController.php @@ -199,12 +199,19 @@ class GuideController extends Controller - public function nameCheck(Request $request){ + public function nameCheck(Request $request) { $guide = Guide::query()->where('name', 'LIKE',$request->nameCheck)->get(); if(count($guide) > 0 && $request->nameCheck !== NULL){ return 1; } } + public function nameCheckUpdate(Request $request) { + $guide = Guide::query()->where('name', 'LIKE',$request->nameCheck)->where('id', '!=', $request->id)->get(); + if(count($guide) > 0 && $request->nameCheck !== NULL){ + return 1; + } + } + } diff --git a/skolehjem/app/Http/Controllers/MenuPlanController.php b/skolehjem/app/Http/Controllers/MenuPlanController.php index 78eb0d2..308c98b 100644 --- a/skolehjem/app/Http/Controllers/MenuPlanController.php +++ b/skolehjem/app/Http/Controllers/MenuPlanController.php @@ -69,7 +69,7 @@ class MenuPlanController extends Controller $allMenuPlans = MenuPlan::query()->where('week', '=', $request->week)->get(); if(count($allMenuPlans) > 0) - return redirect()->route("menu-plans.index")->with('WeekExists', '

Der findes allerede en menuplan for den uge!

'); + return redirect()->route("menu-plans.index"); else { $menuPlan->save(); $menuPlans = MenuPlan::query()->paginate($request->input("limit", 20)); @@ -134,7 +134,7 @@ class MenuPlanController extends Controller $allMenuPlans = MenuPlan::query()->where('week', '=', $request->week)->where('id', '!=', $id)->get(); if(count($allMenuPlans) > 0){ - return redirect()->route("menu-plans.index")->with('WeekExists', '

Der findes allerede en menuplan for den uge!

'); + return redirect()->route("menu-plans.index"); }else{ $menuplan->update($data); $menuplan->save(); @@ -180,8 +180,6 @@ class MenuPlanController extends Controller */ public function genPDF($Id){ $menuPlan = MenuPlan::query()->where("id", "=", $Id)->first(); - //$images = App\Resource::query()->where("id", '=', $menuPlan->resource_id)->first(); - //$imagesSize = getimagesize($images->filename); $pdf = \Illuminate\Support\Facades\App::make('dompdf.wrapper'); $data = ''. ' @@ -207,8 +205,6 @@ class MenuPlanController extends Controller } - - public function nameCheck(Request $request){ $menuplan = MenuPlan::query()->where('week', 'LIKE',$request->nameCheck)->get(); if(count($menuplan) > 0 && $request->nameCheck !== NULL){ @@ -216,4 +212,11 @@ class MenuPlanController extends Controller } } + public function nameCheckUpdate(Request $request){ + $menuplan = MenuPlan::query()->where('week', 'LIKE',$request->nameCheck)->where('id', '!=', $request->id)->get(); + if(count($menuplan) > 0 && $request->nameCheck !== NULL){ + return 1; + } + } + } diff --git a/skolehjem/app/Http/Controllers/NewsController.php b/skolehjem/app/Http/Controllers/NewsController.php index 1c1e162..1bbfc07 100644 --- a/skolehjem/app/Http/Controllers/NewsController.php +++ b/skolehjem/app/Http/Controllers/NewsController.php @@ -154,7 +154,6 @@ class NewsController extends Controller return redirect()->route("news.index"); } - public function nameCheck(Request $request){ $news = News::query()->where('subname', 'LIKE',$request->nameCheck)->get(); if(count($news) > 0 && $request->nameCheck !== NULL){ @@ -162,4 +161,10 @@ class NewsController extends Controller } } + public function nameCheckUpdate(Request $request){ + $news = News::query()->where('subname', 'LIKE',$request->nameCheck)->where('id', '!=', $request->id)->get(); + if(count($news) > 0 && $request->nameCheck !== NULL){ + return 1; + } + } } diff --git a/skolehjem/app/Http/Controllers/RolesController.php b/skolehjem/app/Http/Controllers/RolesController.php index 5b958a9..29216a2 100644 --- a/skolehjem/app/Http/Controllers/RolesController.php +++ b/skolehjem/app/Http/Controllers/RolesController.php @@ -63,7 +63,7 @@ class rolesController extends Controller // If there already is a role with that name, then don't create if(count($allRoles) > 0) - return redirect()->route("roles.store")->with('RoleNameExists', '

Der findes allerede en rolle med det navn!

'); + return redirect()->route("roles.store"); else { // Else - Create it $role->save(); $roles = Role::query()->paginate($request->input("limit", 20)); @@ -111,7 +111,7 @@ class rolesController extends Controller $allRoles = Role::query()->where('name', '=', $request->name)->where('id', '!=', $id)->get(); if(count($allRoles) > 0){ - return redirect()->route("roles.index", [ "role" => $role ])->with('RoleNameExists', '

Der findes allerede en rolle med det navn!

'); + return redirect()->route("roles.index", [ "role" => $role ]); }else{ $role->update($data); $role->save(); @@ -172,7 +172,6 @@ class rolesController extends Controller } } - public function nameCheck(Request $request){ $roles = Role::query()->where('name', 'LIKE',$request->nameCheck)->get(); if(count($roles) > 0 && $request->nameCheck !== NULL){ @@ -180,5 +179,10 @@ class rolesController extends Controller } } - + public function nameCheckUpdate(Request $request){ + $roles = Role::query()->where('name', 'LIKE',$request->nameCheck)->where('id', '!=', $request->id)->get(); + if(count($roles) > 0 && $request->nameCheck !== NULL){ + return 1; + } + } } diff --git a/skolehjem/resources/views/admin/events/edit.blade.php b/skolehjem/resources/views/admin/events/edit.blade.php index 5e0e371..a56ae3b 100644 --- a/skolehjem/resources/views/admin/events/edit.blade.php +++ b/skolehjem/resources/views/admin/events/edit.blade.php @@ -27,8 +27,9 @@
$event])}}"> @csrf @method("PUT") - - + + + @@ -42,7 +43,7 @@ Opret som nyhed - +
@@ -83,5 +84,57 @@ } ); }); + + $(document).ready(function () { + $value = $('#name').val(); + $.ajax({ + type: 'get', + url: '{{route('events.nameCheckUpdate')}}', + data: {'nameCheck':$value, 'id':{{$event->id}}}, + success:function (data) { + console.log(data); + if(data){ + $("#error").show(100); + $("#error").css('color', 'red'); + $("#disable").prop('disabled', true); + $('#disable').css('cursor','not-allowed'); + }else{ + $("#error").hide(); + $("#disable").prop('disabled', false); + $('#disable').css('cursor','pointer'); + } + + }, + error:function (data) { + console.log(data); + } + }); + }); + + $('#name').on('keyup', function () { + $value = $(this).val(); + console.log($value); + $.ajax({ + type: 'get', + url: '{{route('events.nameCheckUpdate')}}', + data: {'nameCheck':$value, 'id':{{$event->id}}}, + success:function (data) { + if(data){ + $("#error").show(100); + $("#error").css('color', 'red'); + $("#disable").prop('disabled', true); + $('#disable').css('cursor','not-allowed'); + }else{ + $("#error").hide(); + $("#disable").prop('disabled', false); + $('#disable').css('cursor','pointer'); + } + + }, + error:function (data) { + console.log(data); + } + }); + }) @endsection diff --git a/skolehjem/resources/views/admin/events/index.blade.php b/skolehjem/resources/views/admin/events/index.blade.php index 6d18017..3f5e8a3 100644 --- a/skolehjem/resources/views/admin/events/index.blade.php +++ b/skolehjem/resources/views/admin/events/index.blade.php @@ -18,7 +18,6 @@ - {!! session()->get('EventNameExists') !!} diff --git a/skolehjem/resources/views/admin/guides/edit.blade.php b/skolehjem/resources/views/admin/guides/edit.blade.php index de2d78e..e389472 100644 --- a/skolehjem/resources/views/admin/guides/edit.blade.php +++ b/skolehjem/resources/views/admin/guides/edit.blade.php @@ -28,6 +28,7 @@ @csrf @method("PUT") +
{!! $guide->guide_articles !!}
@@ -38,7 +39,7 @@ Opret som nyhed - + @@ -79,5 +80,57 @@ } ); }); + + $(document).ready(function () { + $value = $('#title').val(); + console.log($value); + $.ajax({ + type: 'get', + url: '{{route('guides.nameCheckUpdate')}}', + data: {'nameCheck':$value, 'id':{{$guide->id}}}, + success:function (data) { + console.log(data); + if(data){ + $("#error").show(100); + $("#error").css('color', 'red'); + $("#disable").prop('disabled', true); + $('#disable').css('cursor','not-allowed'); + }else{ + $("#error").hide(); + $("#disable").prop('disabled', false); + $('#disable').css('cursor','pointer'); + } + + }, + error:function (data) { + console.log(data); + } + }); + }); + + $('#title').on('keyup', function () { + $value = $(this).val(); + $.ajax({ + type: 'get', + url: '{{route('guides.nameCheckUpdate')}}', + data: {'nameCheck':$value, 'id':{{$guide->id}}}, + success:function (data) { + if(data){ + $("#error").show(100); + $("#error").css('color', 'red'); + $("#disable").prop('disabled', true); + $('#disable').css('cursor','not-allowed'); + }else{ + $("#error").hide(); + $("#disable").prop('disabled', false); + $('#disable').css('cursor','pointer'); + } + + }, + error:function (data) { + console.log(data); + } + }); + }) @endsection diff --git a/skolehjem/resources/views/admin/menuplans/create.blade.php b/skolehjem/resources/views/admin/menuplans/create.blade.php index c9b49b5..3f3d16c 100644 --- a/skolehjem/resources/views/admin/menuplans/create.blade.php +++ b/skolehjem/resources/views/admin/menuplans/create.blade.php @@ -108,9 +108,6 @@ } change(); - - - //Dont delete me, if the user reloads the pages with text in the text-box this code runs. $(document).ready(function () { $value = $('#week').val(); @@ -162,8 +159,6 @@ } }); }) - - @endsection diff --git a/skolehjem/resources/views/admin/menuplans/edit.blade.php b/skolehjem/resources/views/admin/menuplans/edit.blade.php index eae43e5..04dea77 100644 --- a/skolehjem/resources/views/admin/menuplans/edit.blade.php +++ b/skolehjem/resources/views/admin/menuplans/edit.blade.php @@ -28,6 +28,7 @@ @csrf @method("PUT") +
{!! $menuplan->menu !!}
@@ -37,7 +38,7 @@ Opret som nyhed - + @@ -78,5 +79,57 @@ } ); }); + + //Dont delete me, if the user reloads the pages with text in the text-box this code runs. + $(document).ready(function () { + $value = $('#week').val(); + $.ajax({ + type: 'get', + url: '{{route('menuplans.nameCheckUpdate')}}', + data: {'nameCheck':$value, 'id':{{$menuplan->id}}}, + success:function (data) { + console.log(data); + if(data){ + $("#error").show(100); + $("#error").css('color', 'red'); + $("#disable").prop('disabled', true); + $('#disable').css('cursor','not-allowed'); + }else{ + $("#error").hide(); + $("#disable").prop('disabled', false); + $('#disable').css('cursor','pointer'); + } + + }, + error:function (data) { + console.log(data); + } + }); + }); + + $('#week').on('keyup', function () { + $value = $(this).val(); + $.ajax({ + type: 'get', + url: '{{route('menuplans.nameCheckUpdate')}}', + data: {'nameCheck':$value, 'id':{{$menuplan->id}}}, + success:function (data) { + if(data){ + $("#error").show(100); + $("#error").css('color', 'red'); + $("#disable").prop('disabled', true); + $('#disable').css('cursor','not-allowed'); + }else{ + $("#error").hide(); + $("#disable").prop('disabled', false); + $('#disable').css('cursor','pointer'); + } + + }, + error:function (data) { + console.log(data); + } + }); + }) @endsection diff --git a/skolehjem/resources/views/admin/menuplans/index.blade.php b/skolehjem/resources/views/admin/menuplans/index.blade.php index 71b94f2..612a5b3 100644 --- a/skolehjem/resources/views/admin/menuplans/index.blade.php +++ b/skolehjem/resources/views/admin/menuplans/index.blade.php @@ -14,7 +14,6 @@
CreateOpret Menuplan
- {!! session()->get('WeekExists') !!}
diff --git a/skolehjem/resources/views/admin/news/create.blade.php b/skolehjem/resources/views/admin/news/create.blade.php index 2343fb9..eafb8ef 100644 --- a/skolehjem/resources/views/admin/news/create.blade.php +++ b/skolehjem/resources/views/admin/news/create.blade.php @@ -67,7 +67,6 @@ ); }); - //Dont delete me, if the user reloads the pages with text in the text-box this code runs. $(document).ready(function () { $value = $('#title').val(); @@ -119,7 +118,5 @@ } }); }) - - @endsection diff --git a/skolehjem/resources/views/admin/news/edit.blade.php b/skolehjem/resources/views/admin/news/edit.blade.php index 6472ee3..14bee6f 100644 --- a/skolehjem/resources/views/admin/news/edit.blade.php +++ b/skolehjem/resources/views/admin/news/edit.blade.php @@ -21,10 +21,11 @@ @csrf @method("PUT") - + +
{!! $news->content !!}
- + @@ -65,5 +66,57 @@ } ); }); + + //Dont delete me, if the user reloads the pages with text in the text-box this code runs. + $(document).ready(function () { + $value = $('#title').val(); + $.ajax({ + type: 'get', + url: '{{route('news.nameCheckUpdate')}}', + data: {'nameCheck':$value, 'id': {{$news->id}}}, + success:function (data) { + console.log(data); + if(data){ + $("#error").show(100); + $("#error").css('color', 'red'); + $("#disable").prop('disabled', true); + $('#disable').css('cursor','not-allowed'); + }else{ + $("#error").hide(); + $("#disable").prop('disabled', false); + $('#disable').css('cursor','pointer'); + } + + }, + error:function (data) { + console.log(data); + } + }); + }); + + $('#title').on('keyup', function () { + $value = $(this).val(); + $.ajax({ + type: 'get', + url: '{{route('news.nameCheckUpdate')}}', + data: {'nameCheck':$value, 'id': {{$news->id}}}, + success:function (data) { + if(data){ + $("#error").show(100); + $("#error").css('color', 'red'); + $("#disable").prop('disabled', true); + $('#disable').css('cursor','not-allowed'); + }else{ + $("#error").hide(); + $("#disable").prop('disabled', false); + $('#disable').css('cursor','pointer'); + } + + }, + error:function (data) { + console.log(data); + } + }); + }) @endsection diff --git a/skolehjem/resources/views/admin/roles/create.blade.php b/skolehjem/resources/views/admin/roles/create.blade.php index d35a559..6735d0a 100644 --- a/skolehjem/resources/views/admin/roles/create.blade.php +++ b/skolehjem/resources/views/admin/roles/create.blade.php @@ -14,7 +14,7 @@ @csrf - + @@ -32,8 +32,6 @@ ); }); - - $(document).ready(function () { $value = $('#name').val(); $.ajax({ @@ -83,6 +81,5 @@ } }); }) - @endsection diff --git a/skolehjem/resources/views/admin/roles/edit.blade.php b/skolehjem/resources/views/admin/roles/edit.blade.php index 3f1ea28..777f39e 100644 --- a/skolehjem/resources/views/admin/roles/edit.blade.php +++ b/skolehjem/resources/views/admin/roles/edit.blade.php @@ -15,10 +15,11 @@ @csrf @method("put") + - + @endsection @section("scripts") @@ -31,5 +32,55 @@ } ); }); + + $(document).ready(function () { + $value = $('#name').val(); + $.ajax({ + type: 'get', + url: '{{route('roles.nameCheckUpdate')}}', + data: {'nameCheck':$value, 'id': {{$role->id}}}, + success:function (data) { + if(data){ + $("#error").show(100); + $("#error").css('color', 'red'); + $("#disable").prop('disabled', true); + $('#disable').css('cursor','not-allowed'); + }else{ + $("#error").hide(); + $("#disable").prop('disabled', false); + $('#disable').css('cursor','pointer'); + } + + }, + error:function (data) { + console.log(data); + } + }); + }); + + $('#name').on('keyup', function () { + $value = $(this).val(); + $.ajax({ + type: 'get', + url: '{{route('roles.nameCheckUpdate')}}', + data: {'nameCheck':$value, 'id': {{$role->id}}}, + success:function (data) { + if(data){ + $("#error").show(100); + $("#error").css('color', 'red'); + $("#disable").prop('disabled', true); + $('#disable').css('cursor','not-allowed'); + }else{ + $("#error").hide(); + $("#disable").prop('disabled', false); + $('#disable').css('cursor','pointer'); + } + + }, + error:function (data) { + console.log(data); + } + }); + }) @endsection diff --git a/skolehjem/resources/views/admin/roles/index.blade.php b/skolehjem/resources/views/admin/roles/index.blade.php index 33255fa..136ad47 100644 --- a/skolehjem/resources/views/admin/roles/index.blade.php +++ b/skolehjem/resources/views/admin/roles/index.blade.php @@ -18,7 +18,6 @@ - {!! session()->get('RoleNameExists') !!}
diff --git a/skolehjem/routes/web.php b/skolehjem/routes/web.php index ce7055d..b790b85 100644 --- a/skolehjem/routes/web.php +++ b/skolehjem/routes/web.php @@ -55,7 +55,7 @@ Route::get("/darkmode", "UserController@setDarkMode")->name("users.setDarkMode") //Convert to PDF Route::get("/pdf/{menuPlan}", "MenuPlanController@genPDF")->name("pdf.genPDF")->hasParameter("Id"); -//Check name adminpanle +//Check name adminpanel Route::get("/eventCheck", "EventController@nameCheck")->name("events.nameCheck"); Route::get("/roleCheck", "RolesController@nameCheck")->name("roles.nameCheck"); Route::get("/usersCheck", "UserController@nameCheck")->name("users.nameCheck"); @@ -63,6 +63,13 @@ Route::get("/guidesCheck", "GuideController@nameCheck")->name("guides.nameCheck" Route::get("/newsCheck", "NewsController@nameCheck")->name("news.nameCheck"); Route::get("/menuplanCheck", "MenuPlanController@nameCheck")->name("menuplans.nameCheck"); +//Check name update adminpanel +Route::get("/eventCheckUpdate", "EventController@nameCheckUpdate")->name("events.nameCheckUpdate"); +Route::get("/roleCheckUpdate", "RolesController@nameCheckUpdate")->name("roles.nameCheckUpdate"); +Route::get("/guidesCheckUpdate", "GuideController@nameCheckUpdate")->name("guides.nameCheckUpdate"); +Route::get("/newsCheckUpdate", "NewsController@nameCheckUpdate")->name("news.nameCheckUpdate"); +Route::get("/menuplanCheckUpdate", "MenuPlanController@nameCheckUpdate")->name("menuplans.nameCheckUpdate"); + Route::resource("contacts", "ContactController");