diff --git a/skolehjem/app/Http/Controllers/WashingReservationController.php b/skolehjem/app/Http/Controllers/WashingReservationController.php index 38d1d56..5e1ba8a 100644 --- a/skolehjem/app/Http/Controllers/WashingReservationController.php +++ b/skolehjem/app/Http/Controllers/WashingReservationController.php @@ -161,13 +161,14 @@ class WashingReservationController extends Controller public function api(Request $request){ if($request->ajax()){ $date = $request->date; + $datetext = $request->datetext; $machines = WashingMachine::all(); if($request->machine_id == 0) $request->machine_id = WashingMachine::all()->first()->id; - $reservations = WashingReservation::query()->where("machine_id", "=", $request->machine_id)->where("time", "LIKE", substr($date, 1, strpos($date, "T"))."%")->get(); + $reservations = WashingReservation::query()->where("machine_id", "=", $request->machine_id)->where("time", "LIKE", $datetext."%")->get(); $times = []; @@ -175,7 +176,7 @@ class WashingReservationController extends Controller array_push($times, $reservation->time); } //2020-07-28% - $output = json_encode(['date' => $date, 'washingmachines' => $machines, 'unavailable_times' => $times]); + $output = json_encode(['date' => $date, 'washingmachines' => $machines, 'unavailable_times' => $times ]); return Response($output); } } diff --git a/skolehjem/resources/views/admin/washing-reservations/index.blade.php b/skolehjem/resources/views/admin/washing-reservations/index.blade.php index b44879d..e0ae2a5 100644 --- a/skolehjem/resources/views/admin/washing-reservations/index.blade.php +++ b/skolehjem/resources/views/admin/washing-reservations/index.blade.php @@ -38,7 +38,7 @@ @foreach($reservations as $reservation)