From d19b9c1d1abe93b2e7f5c45bbde2e61134e30d1b Mon Sep 17 00:00:00 2001
From: Anders <anders164a@gmail.com>
Date: Mon, 17 Aug 2020 15:10:44 +0200
Subject: [PATCH] v0.10.1a - Added AJAX check on update WashingMachine Added
 AJAX check on create (missing on update) UserController - Only checks when
 submitting

---
 .../app/Http/Controllers/UserController.php   | 15 ++--
 .../views/admin/users/create.blade.php        | 72 ++++++++-----------
 skolehjem/routes/web.php                      |  2 +-
 3 files changed, 40 insertions(+), 49 deletions(-)

diff --git a/skolehjem/app/Http/Controllers/UserController.php b/skolehjem/app/Http/Controllers/UserController.php
index 35e2c17..eb14e48 100644
--- a/skolehjem/app/Http/Controllers/UserController.php
+++ b/skolehjem/app/Http/Controllers/UserController.php
@@ -576,14 +576,17 @@ 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){
+        $usersemail = User::query()->where('email', 'LIKE', $request->mailCheck)->get();
+        $usersphone = User::query()->where('phone', '=', $request->phoneCheck)->get();
+        if (count($usersemail) > 0 && count($usersphone) > 0) {
             return 1;
         }
+        elseif(count($usersemail) > 0 && $request->mailCheck !== NULL){
+            return 2;
+        }
+        elseif(count($usersphone) > 0 && $request->phoneCheck !== NULL){
+            return 3;
+        }
     }
-    */
-
 }
diff --git a/skolehjem/resources/views/admin/users/create.blade.php b/skolehjem/resources/views/admin/users/create.blade.php
index efaf35f..370aa73 100644
--- a/skolehjem/resources/views/admin/users/create.blade.php
+++ b/skolehjem/resources/views/admin/users/create.blade.php
@@ -14,14 +14,14 @@
     {!! session()->get('error#notsamepass') !!}
     {!! session()->get('EmailExists') !!}
     {!! session()->get('PhoneExists') !!}
-    <form method="post" action="{{ route("users.store") }}">
+    <form method="post" action="{{ route("users.store") }}" onsubmit="return myFunction()">
         @csrf
         <label for="name_first">Fornavn:</label>
-        <label hidden id="error" for="errormesseages">Dette Event navn findes allerede</label>
             <input type="text" name="name_first" id="name_first" placeholder="Fornavn" required>
         <label for="name_last">Efternavn:</label>
             <input type="text" name="name_last" id="name_last" placeholder="Efternavn" required>
         <label for="email">Email:</label>
+        <label hidden id="erroremail" for="errormesseages">Der findes allerede en bruger med denne email!</label>
             <input type="email" name="email" id="email" placeholder="x@y.z" required>
         <label for="password1">Adgangskode:</label>
         <div class="input-group text-left">
@@ -34,6 +34,7 @@
             <span class="fa fa-fw fa-eye field-icon toggle-password" id="fa-confirm" onclick="show('password2', 'fa-confirm')"></span>
         </div>
         <label for="phone">Telefon nr:</label>
+        <label hidden id="errorphone" for="errormesseages">Der findes allerede en bruger med dette telefon nr!</label>
             <input type="tel" name="phone" id="phone" placeholder="12345678" pattern="[0-9]{2}[0-9]{2}[0-9]{2}[0-9]{2}" required>
         <label for="roles">Rolle:</label>
         <select name="roles[]" id="roles" class="mb-2" multiple="multiple" required>
@@ -72,51 +73,34 @@
             );
         });
 
-        $(document).ready(function () {
+        function myFunction() {
+            var save = true;
             $mail = $('#email').val();
-            //$phone = $('#phone').val();
-            $.ajax({
-                type: 'get',
-                url: '{{route('users.nameCheck')}}',
-                data: {'mailChek':$mail},
-                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 () {
-           // $mail = $('#email').val();
             $phone = $('#phone').val();
             $.ajax({
+                'async': false,
                 type: 'get',
                 url: '{{route('users.nameCheck')}}',
-                data: {'mailCheck':$mail},
+                data: {'mailCheck':$mail, 'phoneCheck':$phone},
                 success:function (data) {
-                    console.log($mail);
-                    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');
+                    if (data == 1) {
+                        $("#erroremail").show(100);
+                        $("#erroremail").css('color', 'red');
+                        $("#errorphone").show(100);
+                        $("#errorphone").css('color', 'red');
+                        save = false;
+                    } else if(data == 2){
+                        $("#errorphone").hide();
+                        $("#erroremail").show(100);
+                        $("#erroremail").css('color', 'red');
+                        save = false;
+                    } else if (data == 3) {
+                        $("#erroremail").hide();
+                        $("#errorphone").show(100);
+                        $("#errorphone").css('color', 'red');
+                        save = false;
+                    } else {
+                        $("#erroremail").hide();
                     }
 
                 },
@@ -124,7 +108,11 @@
                     console.log(data);
                 }
             });
-        })
 
+            if (save)
+                return true;
+            else
+                return false;
+        }
     </script>
 @endsection
diff --git a/skolehjem/routes/web.php b/skolehjem/routes/web.php
index 594557d..3ecfd04 100644
--- a/skolehjem/routes/web.php
+++ b/skolehjem/routes/web.php
@@ -56,9 +56,9 @@ Route::get("/darkmode", "UserController@setDarkMode")->name("users.setDarkMode")
 Route::get("/pdf/{menuPlan}", "MenuPlanController@genPDF")->name("pdf.genPDF")->hasParameter("Id");
 
 //Check name adminpanel
+Route::get("/usersCheck", "UserController@nameCheck")->name("users.nameCheck");
 Route::get("/eventCheck", "EventController@nameCheck")->name("events.nameCheck");
 Route::get("/roleCheck", "RolesController@nameCheck")->name("roles.nameCheck");
-Route::get("/usersCheck", "UserController@nameCheck")->name("users.nameCheck");
 Route::get("/guidesCheck", "GuideController@nameCheck")->name("guides.nameCheck");
 Route::get("/newsCheck", "NewsController@nameCheck")->name("news.nameCheck");
 Route::get("/menuplanCheck", "MenuPlanController@nameCheck")->name("menuplans.nameCheck");