v1.3.4 - Small fixes

skolehjem/app/Http/Controllers/WashingMachineController.php

@@ -154,6 +154,76 @@ class WashingMachineController extends Controller
         return redirect()->route("washing-machines.index");
     }
 
+    public function search(Request $request)
+    {
+        if ($request->ajax()) {
+            $output = "<tr>" .
+                "<th>Navn</th>" .
+                "<th>Lokation</th>" .
+                "<th style=\"width: 1em;\"><img class=\"w-100\" src=" . asset('/images/icons/pencil.svg') . " alt=\"Update\"></th>" .
+                "<th style=\"width: 1em;\"><img class=\"w-100\" src=" . asset('/images/icons/trashcan.svg') . " alt=\"Delete\"></th>" .
+                "</tr>";
+
+            if ($request->option !== 'all') {
+                $machines = DB::table('washing_machines')
+                    ->join('locations', 'washing_machines.location_id', '=', 'locations.id')
+                    ->select(DB::raw('washing_machines.name as washing_name, locations.name as location_name, washing_machines.id as id'))
+                    ->where('locations.id', '=', $request->option)
+                    ->get();
+
+                if (count($machines) !== 0) {
+                    foreach ($machines as $machine) {
+                        $output .= '<tr>' .
+                            '<td>' . $machine->washing_name . '</td>' .
+                            '<td>' . $machine->location_name . '</td>' .
+                            '<td><a href="' . route("washing-machines.edit", ["washing_machine" => $machine->id]) . '"><img class="w-100" src="' . asset('/images/icons/pencil-dark.svg') . '" alt="Update"></a></td>' .
+                            '<td><form method="post" action="' . route("washing-machines.destroy", ["washing_machine" => $machine->id]) . '" class="w-100 nostyle">' .
+                            csrf_field() .
+                            method_field("delete") .
+
+                            '<button class="w-100 nostyle" onclick="return confirm(\'Are you sure you want to delete?\');" type="submit"><img class="w-100 cursor-pointer" src="' . asset('/images/icons/trashcan-dark.svg') . '" alt="Delete"></button>' .
+                            '</form>' .
+                            '</td>' .
+                            '</tr>';
+                    }
+                } else {
+                    $output .= '<tr>' .
+                        '<td>Det er ikke blivet oprettet nogen vaskmaskine på denne lokation endnu</td>' .
+                        '<td></td>' .
+                        '<td></td>' .
+                        '<td></td>' .
+                        '</tr>';
+                }
+            } elseif ($request->option === "all") {
+                $machines = WashingMachine::all();
+
+                if (count($machines) !== 0) {
+                    foreach ($machines as $machine) {
+                        $output .= '<tr>' .
+                            '<td>' . $machine->name . '</td>' .
+                            '<td>' . Location::query()->where("id", "=", $machine->location_id)->first()->name . '</td>' .
+                            '<td><a href="' . route("washing-machines.edit", ["washing_machine" => $machine->id]) . '"><img class="w-100" src="' . asset('/images/icons/pencil-dark.svg') . '" alt="Update"></a></td>' .
+                            '<td><form method="post" action="' . route('washing-machines.destroy', ['washing_machine' => $machine->id]) . '" class="w-100 nostyle">' .
+                            csrf_field() .
+                            method_field("delete") .
+                            '<button class="w-100 nostyle" onclick="return confirm(' . "'Are you sure you want to delete?'" . ');" type="submit"><img class="w-100 cursor-pointer" src="' . asset('/images/icons/trashcan-dark.svg') . '" alt="Delete"></button>' .
+                            '</form>' .
+                            '</td>' .
+                            '</tr>';
+                    }
+                } else {
+                    $output .= '<tr>' .
+                        '<td>Det er ikke blivet oprettet nogen vaskmaskine på denne lokation endnu</td>' .
+                        '<td></td>' .
+                        '<td></td>' .
+                        '<td></td>' .
+                        '</tr>';
+                }
+            }
+            return Response($output);
+        }
+    }
+
     //Used for checking if the currently typed washingmachine name is unique. Create version
     public function nameCheck(Request $request){
         $washing = WashingMachine::query()->where('name', 'LIKE',$request->nameCheck)->where('location_id', '=', $request->location)->get();

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

@@ -81,6 +81,4 @@
             @endforeach
         </table>
     </div>
-
-    {{ $guides->links() }}
 @endsection

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

@@ -45,6 +45,4 @@
             </tr>
         @endforeach
     </table>
-
-    {{ $locations->links() }}
 @endsection

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

@@ -20,7 +20,6 @@
                     <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

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

@@ -117,7 +117,6 @@
                     </div>
                 </div>
             @endforeach
-            {{ $events->links() }}
         @else
             <p class="text-center" style="margin-bottom: auto">{{__('msg.dereringenaktiviteter')}}!</p>
         @endif

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

@@ -55,7 +55,6 @@
                     </div>
                 </div>
             @endforeach
-            {{ $guides->links() }}
         @else
             <p style="margin: 0 18px; margin-bottom: auto; text-align: center">{{__('msg.dereringenvejledninger')}}.</p>
         @endif

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

@@ -37,5 +37,4 @@
             <p class="text-center">{{__('msg.dereringenmenuplanerdenneuge')}}!</p>
         @endif
     </main>
-    {{ $menuPlans->links() }}
 @endsection

skolehjem/resources/views/app/washing-reservations/index.blade.php

@@ -33,7 +33,6 @@
         @if(count($reservations) < 1 || $washingreservations == 0)
             <p style="margin: 0 18px;">{{__('msg.duharingenreservationer')}}.</p>
         @else
-            {{ $reservations->links() }}
         @endif
         <a href="{{ route("washing-reservations.create") }}" class="btn btn-sde-blue mt-auto mb-1">{{__('msg.reservervaskemaskine')}}</a>
     </main>

skolehjem/routes/web.php

@@ -44,6 +44,9 @@ Route::post("/feedbacks/store", "FeedbackController@storeajax")->name("feedbacks
 Route::get("/signup", "UserController@signup")->name("users.signup");
 Route::post("/signupStore", "UserController@signupStore")->name("users.signupStore");
 
+//Search
+Route::get("/machineapi", "WashingMachineController@search")->name("washing-machines.search");
+
 //Cookies
 Route::get("/languages", "UserController@setLanguages")->name("users.setLanguages");
 Route::get("/darkmode", "UserController@setDarkMode")->name("users.setDarkMode");