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/FeedbackController.php b/skolehjem/app/Http/Controllers/FeedbackController.php index 83c6157..6fbedac 100644 --- a/skolehjem/app/Http/Controllers/FeedbackController.php +++ b/skolehjem/app/Http/Controllers/FeedbackController.php @@ -135,7 +135,8 @@ class FeedbackController extends Controller $output = "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 = ''. ' @@ -206,4 +204,19 @@ class MenuPlanController extends Controller return $pdf->stream("menuplan_uge_".$menuPlan->week.".pdf"); } + + public function nameCheck(Request $request){ + $menuplan = MenuPlan::query()->where('week', 'LIKE',$request->nameCheck)->get(); + if(count($menuplan) > 0 && $request->nameCheck !== NULL){ + return 1; + } + } + + 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 c619922..1bbfc07 100644 --- a/skolehjem/app/Http/Controllers/NewsController.php +++ b/skolehjem/app/Http/Controllers/NewsController.php @@ -153,4 +153,18 @@ class NewsController extends Controller $news->delete(); 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){ + return 1; + } + } + + 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/app/Http/Controllers/UserController.php b/skolehjem/app/Http/Controllers/UserController.php index 81f6dcf..83c1c55 100644 --- a/skolehjem/app/Http/Controllers/UserController.php +++ b/skolehjem/app/Http/Controllers/UserController.php @@ -576,4 +576,14 @@ class UserController extends Controller } } + /* + public function nameCheck(Request $request){ + $users = User::query()->where('mail', 'LIKE',$request->mailCheck) + ->get(); + if(count($users) > 0 && $request->mailCheck !== NULL){ + return 1; + } + } + */ + } diff --git a/skolehjem/app/Http/Controllers/WashingMachineController.php b/skolehjem/app/Http/Controllers/WashingMachineController.php index 6ef14cf..d4e30f3 100644 --- a/skolehjem/app/Http/Controllers/WashingMachineController.php +++ b/skolehjem/app/Http/Controllers/WashingMachineController.php @@ -153,14 +153,4 @@ class WashingMachineController extends Controller return redirect()->route("washing-machines.index"); } - - - - public function nameCheck(Request $request){ - $washing = Role::query()->where('name', 'LIKE',$request->nameCheck)->get(); - if(count($washing) > 0 && $request->nameCheck !== NULL){ - return 1; - } - } - } diff --git a/skolehjem/database/migrations/2020_08_04_062259_create_guides_table.php b/skolehjem/database/migrations/2020_08_04_062259_create_guides_table.php index d18ba53..4473fd8 100644 --- a/skolehjem/database/migrations/2020_08_04_062259_create_guides_table.php +++ b/skolehjem/database/migrations/2020_08_04_062259_create_guides_table.php @@ -16,7 +16,7 @@ class CreateGuidesTable extends Migration Schema::create('guides', function (Blueprint $table) { $table->id(); $table->timestamps(); - $table->string('name'); + $table->string('name')->unique(); $table->longText('guide_articles'); $table->foreignId('resource_id')->nullable()->constrained('resources', 'id'); }); diff --git a/skolehjem/resources/lang/dk/msg.php b/skolehjem/resources/lang/dk/msg.php index 964b59c..8400730 100644 --- a/skolehjem/resources/lang/dk/msg.php +++ b/skolehjem/resources/lang/dk/msg.php @@ -39,6 +39,8 @@ return[ "bookingliste" => "Booking Liste", "ugestor" => "Uge", "maskiner" => "Vaskemaskiner", + "fjern" => "Fjern", + "tid" => "Tid", "tilgængeligetider" => "Tilgængelige tider", "reserver" => "Reserver", "rediger" => "Rediger", diff --git a/skolehjem/resources/views/admin/events/create.blade.php b/skolehjem/resources/views/admin/events/create.blade.php index d8fc347..fcb8e7f 100644 --- a/skolehjem/resources/views/admin/events/create.blade.php +++ b/skolehjem/resources/views/admin/events/create.blade.php @@ -94,8 +94,7 @@ url: '{{route('events.nameCheck')}}', data: {'nameCheck':$value}, success:function (data) { - console.log(data); - if(data === false){ + if(data){ $("#error").show(100); $("#error").css('color', 'red'); $("#disable").prop('disabled', true); 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 @@ @@ -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') !!}