diff --git a/skolehjem/app/Http/Controllers/EventController.php b/skolehjem/app/Http/Controllers/EventController.php index 73902b3..ac02075 100644 --- a/skolehjem/app/Http/Controllers/EventController.php +++ b/skolehjem/app/Http/Controllers/EventController.php @@ -311,10 +311,10 @@ class EventController extends Controller } public function nameCheck(Request $request){ - $events = DB::table('events')->where('name', '=',$request->nameCheck)->get(); - if(count($events) > 0){ - return "Det er allerede en event med det navn"; - } + $event = Event::query()->where('name', 'LIKE',$request->nameCheck)->get(); + if(count($event) > 0 && $request->nameCheck !== NULL){ + return 1; + } } } diff --git a/skolehjem/app/Http/Controllers/RolesController.php b/skolehjem/app/Http/Controllers/RolesController.php index 8997ffd..5b958a9 100644 --- a/skolehjem/app/Http/Controllers/RolesController.php +++ b/skolehjem/app/Http/Controllers/RolesController.php @@ -173,5 +173,12 @@ 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){ + return 1; + } + } + } diff --git a/skolehjem/app/Http/Controllers/WashingMachineController.php b/skolehjem/app/Http/Controllers/WashingMachineController.php index d4e30f3..6ef14cf 100644 --- a/skolehjem/app/Http/Controllers/WashingMachineController.php +++ b/skolehjem/app/Http/Controllers/WashingMachineController.php @@ -153,4 +153,14 @@ 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/resources/views/admin/events/create.blade.php b/skolehjem/resources/views/admin/events/create.blade.php index fcb8e7f..d8fc347 100644 --- a/skolehjem/resources/views/admin/events/create.blade.php +++ b/skolehjem/resources/views/admin/events/create.blade.php @@ -94,7 +94,8 @@ url: '{{route('events.nameCheck')}}', data: {'nameCheck':$value}, success:function (data) { - if(data){ + console.log(data); + if(data === false){ $("#error").show(100); $("#error").css('color', 'red'); $("#disable").prop('disabled', true); diff --git a/skolehjem/resources/views/admin/roles/create.blade.php b/skolehjem/resources/views/admin/roles/create.blade.php index c7b8416..d35a559 100644 --- a/skolehjem/resources/views/admin/roles/create.blade.php +++ b/skolehjem/resources/views/admin/roles/create.blade.php @@ -10,14 +10,15 @@ @endsection @section("content") -