From 842933f4dfb15890bd99f23b4057e52891cb9051 Mon Sep 17 00:00:00 2001
From: Anders <anders164a@gmail.com>
Date: Wed, 2 Sep 2020 13:31:56 +0200
Subject: [PATCH] v0.11.1e - Fixed roles.create/edit - Added comment to
 users.create (To add a pattern later)

---
 .../resources/views/admin/roles/create.blade.php     | 12 ++++++------
 skolehjem/resources/views/admin/roles/edit.blade.php | 10 +++++-----
 .../resources/views/admin/users/create.blade.php     |  2 +-
 3 files changed, 12 insertions(+), 12 deletions(-)

diff --git a/skolehjem/resources/views/admin/roles/create.blade.php b/skolehjem/resources/views/admin/roles/create.blade.php
index 77c9803..6f9824e 100644
--- a/skolehjem/resources/views/admin/roles/create.blade.php
+++ b/skolehjem/resources/views/admin/roles/create.blade.php
@@ -32,7 +32,7 @@
         @csrf
         <label for="name">Navn:</label>
         <label hidden id="error" for="errormesseages">Rolle navnet findes allerede</label>
-            <input type="text" name="name" id="name" placeholder="Admin" required>
+            <input type="text" name="name" id="name" pattern="[A-Za-z]+" title="Der må ikke være tal i rollenavnet" placeholder="Admin" required>
         <label for="name">Beskrivelse:</label>
             <input type="text" name="description" id="description" placeholder="Admin rollen bruges til administratorene" required>
 
@@ -70,14 +70,14 @@
                 <tr>
                     <td>Aktiviteter</td>
                     <td><p>Empty</p></td>
-                    <td>//TEST<input id="EventCAccount" type="checkbox" name="value[]" value="userevent.create"></td>
+                    <td><input id="EventCAccount" type="checkbox" name="value[]" value="userevent.create"></td>
                     <td><input id="EventRAccount" onclick="if ($('#EventR').prop('checked') == false) $('#EventR').prop('checked', true); else $('#EventR').prop('checked', false);" type="checkbox" name="value[]" value="event.show"></td>
-                    <td>//TEST<input id="EventDAccount" type="checkbox" name="value[]" value="userevent.delete"></td>
+                    <td><input id="EventDAccount" type="checkbox" name="value[]" value="userevent.delete"></td>
                 </tr>
                 <tr>
                     <td>Reservationer</td>
                     <td>Empty</td>
-                    <td><input id="ReservationCAccount" onclick="if ($('#ReservationC').prop('checked') == false) $('#ReservationC').prop('checked', true); else $('#ReservationC').prop('checked', false);" type="checkbox" name="value[]" value="washing.machine.reservation.create"></td>
+                    <td><input id="ReservationCAccount" type="checkbox" name="value[]" value="washing.machine.reservation.create"></td>
                     <td><input id="ReservationRAccount" onclick="if ($('#ReservationR').prop('checked') == false) $('#ReservationR').prop('checked', true); else $('#ReservationR').prop('checked', false);" type="checkbox" name="value[]" value="washing.machine.reservation.show"></td>
                     <td><input id="ReservationDAccount" onclick="if ($('#ReservationD').prop('checked') == false) $('#ReservationD').prop('checked', true); else $('#ReservationD').prop('checked', false);" type="checkbox" name="value[]" value="washing.machine.reservation.delete"></td>
                 </tr>
@@ -98,7 +98,7 @@
                 <tr>
                     <td>Feedback</td>
                     <td>Empty</td>
-                    <td><input id="FeedbackCAccount" onclick="if ($('#FeedbackC').prop('checked') == false) $('#FeedbackC').prop('checked', true); else $('#FeedbackC').prop('checked', false);" type="checkbox" name="value[]" value="feedback.create"></td>
+                    <td><input id="FeedbackCAccount" type="checkbox" name="value[]" value="feedback.create"></td>
                     <td></td>
                     <td></td>
                 </tr>
@@ -219,7 +219,7 @@
                     <td>Feedback</td>
                     <td><p>Empty</p></td>
                     <td></td>
-                    <td><input id="FeedbackR" onclick="if ($('#FeedbackRAccount').prop('checked') == false) $('#FeedbackRAccount').prop('checked', true); else $('#FeedbackRAccount').prop('checked', false);" type="checkbox" name="value[]" value="feedback.show"></td>
+                    <td><input id="FeedbackR" type="checkbox" name="value[]" value="feedback.show"></td>
                     <td></td>
                     <td><input id="FeedbackD" type="checkbox" name="value[]" value="feedback.delete"></td>
                     <td><input id="Feedback" type="checkbox" onclick="FullControl(this)"></td>
diff --git a/skolehjem/resources/views/admin/roles/edit.blade.php b/skolehjem/resources/views/admin/roles/edit.blade.php
index 54c0bb3..9c0bf35 100644
--- a/skolehjem/resources/views/admin/roles/edit.blade.php
+++ b/skolehjem/resources/views/admin/roles/edit.blade.php
@@ -33,7 +33,7 @@
         @method("put")
         <label for="name">Navn:</label>
         <label hidden id="error" for="errormesseages">Rolle navnet findes allerede</label>
-            <input type="text" name="name" id="name" placeholder="Admin" value="{{ $role->name }}" required>
+            <input type="text" name="name" id="name" pattern="[A-Za-z]+" title="Der må ikke være tal i rollenavnet" placeholder="Admin" value="{{ $role->name }}" required>
         <label for="name">Beskrivelse:</label>
             <input type="text" name="description" id="description" placeholder="Admin rollen bruges til administratorene" value="{{ $role->description }}" required>
 
@@ -70,14 +70,14 @@
                 <tr>
                     <td>Aktiviteter</td>
                     <td><p>Empty</p></td>
-                    <td>//TEST<input id="EventRAccount" type="checkbox" name="value[]" value="userevent.create" @if ($role->hasPermissionTo("userevent.create")) checked @endif></td>
+                    <td><input id="EventRAccount" type="checkbox" name="value[]" value="userevent.create" @if ($role->hasPermissionTo("userevent.create")) checked @endif></td>
                     <td><input id="EventRAccount" onclick="if ($('#EventR').prop('checked') == false) $('#EventR').prop('checked', true); else $('#EventR').prop('checked', false);" type="checkbox" name="value[]" value="event.show" @if ($role->hasPermissionTo("event.show")) checked @endif></td>
-                    <td>//TEST<input id="EventRAccount" type="checkbox" name="value[]" value="userevent.delete" @if ($role->hasPermissionTo("userevent.delete")) checked @endif></td>
+                    <td><input id="EventRAccount" type="checkbox" name="value[]" value="userevent.delete" @if ($role->hasPermissionTo("userevent.delete")) checked @endif></td>
                 </tr>
                 <tr>
                     <td>Reservationer</td>
                     <td>Empty</td>
-                    <td><input id="ReservationCAccount" onclick="if ($('#ReservationC').prop('checked') == false) $('#ReservationC').prop('checked', true); else $('#ReservationC').prop('checked', false);" type="checkbox" name="value[]" value="washing.machine.reservation.create" @if ($role->hasPermissionTo("washing.machine.reservation.create")) checked @endif></td>
+                    <td><input id="ReservationCAccount" type="checkbox" name="value[]" value="washing.machine.reservation.create" @if ($role->hasPermissionTo("washing.machine.reservation.create")) checked @endif></td>
                     <td><input id="ReservationRAccount" onclick="if ($('#ReservationR').prop('checked') == false) $('#ReservationR').prop('checked', true); else $('#ReservationR').prop('checked', false);" type="checkbox" name="value[]" value="washing.machine.reservation.show" @if ($role->hasPermissionTo("washing.machine.reservation.show")) checked @endif></td>
                     <td><input id="ReservationDAccount" onclick="if ($('#ReservationD').prop('checked') == false) $('#ReservationD').prop('checked', true); else $('#ReservationD').prop('checked', false);" type="checkbox" name="value[]" value="washing.machine.reservation.delete" @if ($role->hasPermissionTo("washing.machine.reservation.delete")) checked @endif></td>
                 </tr>
@@ -98,7 +98,7 @@
                 <tr>
                     <td>Feedback</td>
                     <td>Empty</td>
-                    <td><input id="FeedbackCAccount" onclick="if ($('#FeedbackC').prop('checked') == false) $('#FeedbackC').prop('checked', true); else $('#FeedbackC').prop('checked', false);" type="checkbox" name="value[]" value="feedback.create" @if ($role->hasPermissionTo("feedback.create")) checked @endif></td>
+                    <td><input id="FeedbackCAccount" type="checkbox" name="value[]" value="feedback.create" @if ($role->hasPermissionTo("feedback.create")) checked @endif></td>
                     <td></td>
                     <td></td>
                 </tr>
diff --git a/skolehjem/resources/views/admin/users/create.blade.php b/skolehjem/resources/views/admin/users/create.blade.php
index aebea0f..668d55e 100644
--- a/skolehjem/resources/views/admin/users/create.blade.php
+++ b/skolehjem/resources/views/admin/users/create.blade.php
@@ -20,7 +20,7 @@
         <label for="email">Email:</label>
         <label hidden id="erroremail">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>
+        <label for="password1">Adgangskode:</label> <!--Tilføj dette til passwords: pattern="(?=.*\d)(?=.*[a-z])(?=.*[A-Z]).{8,}" title="Must contain at least one number and one uppercase and lowercase letter, and at least 8 or more characters"-->
         <label hidden id="errornotsamepass" for="errormesseages">Der stod ikke det samme i `Adgangskode` & `Bekræft Adgangskode`!</label>
         <div class="input-group text-left">
             <input type="password" class="form-control" name="password" id="password1" placeholder="******" required>