vict3459/Ekapp
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

fixes

Browse Source
This commit is contained in:
frederikpyt
2020-08-04 15:29:21 +02:00
parent 2a3a728fa3
commit 50d8079da2
3 changed files with 15 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files
skolehjem/app/Http/Controllers/WashingReservationController.php
+3 -2
View File
@@ -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);
}
}