v0.12.0 - Fixed pagination

Fixed RolesController.php - Changes "User" to "Bruger"
Added æøåÆØÅ to roles pattern
Fixed bugs/mistakes

skolehjem/app/Http/Controllers/ContactController.php

@@ -29,7 +29,7 @@ class ContactController extends Controller
     public function index(Request $request)
     {
 
-        $contact = Contact::query()->paginate($request->input("limit", 20));
+        $contact = Contact::query()->paginate(20);
 
         return Response::detect("contacts.index", [ "contacts" => $contact]);
     }
@@ -67,7 +67,7 @@ class ContactController extends Controller
         if(!$saved){
             return redirect()->route("contacts.store");
         }else{
-            $contact = Contact::query()->paginate($request->input("limit", 20));
+            $contact = Contact::query()->paginate(20);
             return redirect()->route("contacts.index", ['contacts' => $contact]);
         }
 
@@ -115,7 +115,7 @@ class ContactController extends Controller
         if(!$saved){
             return redirect()->route("contacts.update", [ "contacts" => $contact ]);
         }else{
-            $contact = Contact::query()->paginate($request->input("limit", 20));
+            $contact = Contact::query()->paginate(20);
             return redirect()->route("contacts.index", ['contacts' => $contact]);
         }
 

skolehjem/app/Http/Controllers/EventController.php

@@ -43,7 +43,7 @@ class EventController extends Controller
             }
         }
 
-        $events = Event::query()->orderBY('date' , 'asc')->paginate($request->input("limit", 20));
+        $events = Event::query()->orderBY('date' , 'asc')->paginate(20);
 
         //returns the function with events index page and a parameter of events.
         //also Response::detect checks screen size to determine if user is on a computer or mobile.
@@ -89,7 +89,7 @@ class EventController extends Controller
             }
 
             $event->save();
-            $events = Event::query()->paginate($request->input("limit", 20));
+            $events = Event::query()->paginate(20);
 
             if($request->newsoption == true){
                 $news = new News();
@@ -184,7 +184,7 @@ class EventController extends Controller
             $event->update($data);
             $event->save();
 
-            $events = Event::query()->paginate($request->input("limit", 20));
+            $events = Event::query()->paginate(20);
 
             if($request->newsoption == true){
                 $news = new News();

skolehjem/app/Http/Controllers/FeedbackController.php

@@ -29,7 +29,7 @@ class FeedbackController extends Controller
      */
     public function index(Request $request)
     {
-        $feedback = Feedbacks::query()->orderBy('created_at', 'desc')->paginate($request->input("limit", 20));
+        $feedback = Feedbacks::query()->orderBy('created_at', 'desc')->paginate(20);
 
         return Response::detect("feedbacks.index", [ "feedback" => $feedback ]);
     }

skolehjem/app/Http/Controllers/GuideController.php

@@ -30,7 +30,7 @@ class GuideController extends Controller
      */
     public function index(Request $request)
     {
-        $guides = Guide::query()->orderBy("created_at", "desc")->paginate($request->input("limit", 20));
+        $guides = Guide::query()->orderBy("created_at", "desc")->paginate(20);
 
         return Response::detect("guides.index", [ "guides" => $guides]);
     }
@@ -71,7 +71,7 @@ class GuideController extends Controller
         if(!$saved) {
             return redirect()->route("guides.store");
         } else {
-            $guides = Guide::query()->paginate($request->input("limit", 20));
+            $guides = Guide::query()->paginate(20);
 
             if($request->newsoption == true){
                 $news = new News();
@@ -137,7 +137,7 @@ class GuideController extends Controller
         if(!$saved){
             return redirect()->route("guides.update", [ "guide" => $guide ]);
         }else{
-            $guides = Guide::query()->paginate($request->input("limit", 20));
+            $guides = Guide::query()->paginate(20);
 
             if($request->newsoption == true){
                 $news = new News();

skolehjem/app/Http/Controllers/LocationController.php

@@ -31,7 +31,7 @@ class LocationController extends Controller
      */
     public function index(Request $request)
     {
-        $locations = Location::query()->paginate($request->input("limit", 20));
+        $locations = Location::query()->paginate(20);
 
         return Response::detect("locations.index", [ "locations" => $locations ]);
     }
@@ -67,7 +67,7 @@ class LocationController extends Controller
             return redirect()->route("locations.index");
         else { // Else - Add it
             $location->save();
-            $locations = Location::query()->paginate($request->input("limit", 20));
+            $locations = Location::query()->paginate(20);
             return redirect()->route("locations.index", ['locations' => $locations]);
         }
     }
@@ -119,7 +119,7 @@ class LocationController extends Controller
             $location->update($data);
             $location->save();
 
-            $locations = Location::query()->paginate($request->input("limit", 20));
+            $locations = Location::query()->paginate(20);
             return redirect()->route("locations.index", ["locations" => $locations]);
         }
     }

skolehjem/app/Http/Controllers/MenuPlanController.php

@@ -35,7 +35,7 @@ class MenuPlanController extends Controller
      */
     public function index(Request $request)
     {
-        $menuPlans = MenuPlan::query()->paginate($request->input("limit", 20));
+        $menuPlans = MenuPlan::query()->paginate(20);
 
         return Response::detect("menuplans.index", [ "menuPlans" => $menuPlans]);
     }
@@ -74,7 +74,7 @@ class MenuPlanController extends Controller
             return redirect()->route("menu-plans.index");
         else {
             $menuPlan->save();
-            $menuPlans = MenuPlan::query()->paginate($request->input("limit", 20));
+            $menuPlans = MenuPlan::query()->paginate(20);
 
             $menuArray = [];
 
@@ -154,7 +154,7 @@ class MenuPlanController extends Controller
             $menuplan->update($data);
             $menuplan->save();
 
-            $menuPlans = MenuPlan::query()->paginate($request->input("limit", 20));
+            $menuPlans = MenuPlan::query()->paginate(20);
 
             if($request->newsoption == true){
                 $news = new News();

skolehjem/app/Http/Controllers/PermissionController.php

@@ -22,7 +22,7 @@ class PermissionController extends Controller
      */
     public function index(Request $request)
     {
-        $permission = Permission::query()->paginate($request->input("limit", 20));
+        $permission = Permission::query()->paginate(20);
 
         return Response::detect("permission.index", [ "permission" => $permission ]);
     }

skolehjem/app/Http/Controllers/RolesController.php

@@ -29,7 +29,7 @@ class RolesController extends Controller
      */
     public function index(Request $request)
     {
-        $roles = Role::query()->where("id", "!=", 1)->paginate($request->input("limit", 20));
+        $roles = Role::query()->where("id", "!=", 1)->paginate(20);
 
         return Response::detect("roles.index", [ "roles" => $roles]);
     }
@@ -80,7 +80,7 @@ class RolesController extends Controller
                 }
             }
 
-            $roles = Role::query()->paginate($request->input("limit", 20));
+            $roles = Role::query()->paginate(20);
             return redirect()->route("roles.index", ['roles' => $roles]);
         }
     }
@@ -156,7 +156,7 @@ class RolesController extends Controller
             $role->update($data);
             $role->save();
 
-            $roles = Role::query()->paginate($request->input("limit", 20));
+            $roles = Role::query()->paginate(20);
             return redirect()->route("roles.index", ['roles' => $roles]);
         }
 

skolehjem/app/Http/Controllers/UserController.php

@@ -41,7 +41,6 @@ class UserController extends Controller
      */
     public function index(Request $request)
     {
-        //$users = User::query()->paginate($request->query("page", 20));
         $users = User::query()->where("id", "!=", 1)->orderBy('id', 'asc')->paginate(20);
 
         return Response::detect("users.index", [ "users" => $users ]);
@@ -87,7 +86,7 @@ class UserController extends Controller
         elseif (count($allUsersPhone) > 0)
             return redirect()->route('users.create')->with('PhoneExists', '<p><b>Der findes allerede en bruger med det Telefon Nr.!</b></p>');
 
-        $roles = $request->input("roles", [ "User" ]);
+        $roles = $request->input("roles", [ "Bruger" ]);
 
         $user = new User($data);
 

skolehjem/app/Http/Controllers/WashingMachineController.php

@@ -34,7 +34,7 @@ class WashingMachineController extends Controller
      */
     public function index(Request $request)
     {
-        $machines = WashingMachine::query()->paginate($request->query("limit", 20));
+        $machines = WashingMachine::query()->paginate(20);
 
         return Response::detect("washing-machines.index", [ "machines" => $machines ]);
     }
@@ -73,7 +73,7 @@ class WashingMachineController extends Controller
             return redirect()->route("washing-machines.store");
         else { // Else - Add it
             $machine->save();
-            $machines = WashingMachine::query()->paginate($request->input("limit", 20));
+            $machines = WashingMachine::query()->paginate(20);
             return redirect()->route("washing-machines.index", ['machines' => $machines]);
         }
     }
@@ -131,7 +131,7 @@ class WashingMachineController extends Controller
         else { // Else - Change the name
             $machine->update($data);
             $machine->save();
-            $machines = WashingMachine::query()->paginate($request->input("limit", 20));
+            $machines = WashingMachine::query()->paginate(20);
             return redirect()->route("washing-machines.index", ["machines" => $machines]);
         }
     }

skolehjem/app/Http/Controllers/WashingReservationController.php

@@ -133,7 +133,6 @@ class WashingReservationController extends Controller
     public function destroy($id)
     {
         $machineReservation = WashingReservation::find($id);
-        dd($id);
         $machineReservation->delete();
 
         $reservations = WashingReservation::query()->paginate( 20);
@@ -267,7 +266,7 @@ class WashingReservationController extends Controller
     {
         WashingReservation::query()->where('time', '<', date('Y-m-d H:i:s', strtotime('-1 hour')))->delete();
 
-        $reservations = WashingReservation::query()->where("user_id", "=", auth()->user()->id)->orderBY('time' , 'asc')->paginate($request->query("limit", 20));
+        $reservations = WashingReservation::query()->where("user_id", "=", auth()->user()->id)->orderBY('time' , 'asc')->paginate(10);
 
         return Response::detect("washing-reservations.index", [ "reservations" => $reservations]);
     }

skolehjem/database/migrations/2020_06_29_065007_create_contact.php

@@ -22,7 +22,7 @@ class CreateContact extends Migration
             $table->string('title', 255);
             $table->string('email', 255);
             $table->integer('phone')->nullable(true);
-            $table->string('phonetimes');
+            $table->string('phonetimes')->nullable(true);
         });
     }
 

skolehjem/resources/views/admin/contacts/index.blade.php

@@ -69,6 +69,8 @@
         @endforeach
     </table>
 
+    {{ $contacts->links() }}
+
     <script>
         $('#search').on('keyup', function () {
             $value = $(this).val();

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" pattern="[A-Za-z]+" title="Der må ikke være tal i rollenavnet" placeholder="Admin" required>
+            <input type="text" name="name" id="name" pattern="[A-Za-z-æøåÆØÅ]+" title="Der må ikke være tal eller specialtegn i rollenavnet" placeholder="Admin" required>
         <label for="name">Beskrivelse:</label>
             <input type="text" name="description" id="description" placeholder="Admin rollen bruges til administratorene" required>
 

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" pattern="[A-Za-z]+" title="Der må ikke være tal i rollenavnet" placeholder="Admin" value="{{ $role->name }}" required>
+            <input type="text" name="name" id="name" pattern="[A-Za-z-æøåÆØÅ]+" title="Der må ikke være tal eller specialtegn 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>
 

skolehjem/resources/views/admin/roles/index.blade.php

@@ -52,6 +52,7 @@
         @endforeach
     </table>
 
+    {{ $roles->links() }}
 
     <script>
         $('#search').on('keyup', function () {

skolehjem/resources/views/admin/washing-machines/edit.blade.php

@@ -15,7 +15,8 @@
         @method("put")
         <label for="name_first">Vaskemaskine Navn:</label>
         <label hidden id="error" for="errormesseages">Vaskemaskinen med den lokation findes allerede</label>
-        <input type="text" name="name" id="name" max="60" value="{{$machine->name}}" required>
+        <input type="text" name="name" id="name" max="60" placeholder="Vaskemaskine nr. 1" value="{{$machine->name}}" required>
+        <label for="location_id">Lokation:</label>
         <select class="w-100" name="location_id" id="location_id" class="mb-2" required>
             <option disabled> -- Vælg Lokation -- </option>
             @foreach($locations as $location)

skolehjem/resources/views/admin/washing-machines/index.blade.php

@@ -53,6 +53,9 @@
         </tr>
         @endforeach
     </table>
+
+    {{ $machines->links() }}
+
     <script>
         $('#locationID').change(function () {
             $value = $('#locationID').find(":selected").val();

skolehjem/resources/views/app/contacts/index.blade.php

@@ -20,6 +20,7 @@
                     <a class="btn text-center btn-sde-blue mt-1" href="tel:+45{{ $contact->phone }}">{{__('msg.ring')}}</a>
                 @endif
             @endforeach
+            {{ $contacts->links() }}
         @else
             <p class="text-center">{{__('msg.dereringenkontakter')}}!</p>
         @endif