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) {{ \App\WashingMachine::query()->find($reservation->machine_id)->name }} - {{ \Illuminate\Support\Facades\Date::createFromTimeStamp(strtotime($reservation->time))->format('d/m/Y \k\l\. H:i') }} + {{ \Illuminate\Support\Facades\Date::createFromTimeStamp(strtotime($reservation->time))->format('d/m/Y \k\l\. H:i') }} {{ $reservation->time }} {{ ucfirst(\App\User::query()->find($reservation->user_id)->name_first) }} {{ ucfirst(\App\User::query()->find($reservation->user_id)->name_last) }}
@csrf diff --git a/skolehjem/resources/views/app/washing-reservations/create.blade.php b/skolehjem/resources/views/app/washing-reservations/create.blade.php index 25a48ad..a4f12bc 100644 --- a/skolehjem/resources/views/app/washing-reservations/create.blade.php +++ b/skolehjem/resources/views/app/washing-reservations/create.blade.php @@ -66,6 +66,7 @@ header.appendChild(headerDay); let date = moment().locale("da").day(weekDay).week(week); + var datetext = moment().locale("da").day(weekDay).week(week).year() + "-" + prependZero(moment().locale("da").day(weekDay).week(week).date()) + "-" + prependZero(moment().locale("da").day(weekDay).week(week).month()); let dayHolder = document.createElement("div"); dayHolder.classList.add("calendar-table__col"); @@ -77,7 +78,7 @@ dayHolder.appendChild(day); dayHolder.onclick = function() { - onDateSelect(date, dayHolder); + onDateSelect(date, dayHolder, datetext); } calendarRow.appendChild(dayHolder); @@ -91,8 +92,8 @@ calendar.appendChild(calendarBody); } - function onDateSelect(date, dayHolder) { - console.log("Opdaterer selects"); + function onDateSelect(date, dayHolder, datetext) { + //console.log("Opdaterer selects"); let events; let machinez; let buttonz; @@ -118,9 +119,9 @@ axios({ method: 'get', url: '{{ route("washing-reservations.api") }}', - params: { 'date': date, 'machine_id': machine_id } + params: { 'date': date, 'machine_id': machine_id, 'datetext': datetext } }).then(function (response) { - console.log(response.data["unavailable_times"]); + //console.log(response.data["unavailable_times"]); var data = response.data; if(document.getElementById("washing-machines") != undefined) @@ -136,7 +137,7 @@ select.name = "machine_id"; select.onchange = function() { - onDateSelect(date, dayHolder); + onDateSelect(date, dayHolder, datetext); } container.appendChild(span); @@ -179,7 +180,7 @@ machinez.innerHTML = ""; machinez.onchange = function () { - onDateSelect(date, dayHolder); + onDateSelect(date, dayHolder, datetext); } for (let i = 0; i < machines.length; i++) { @@ -195,7 +196,8 @@ events.innerHTML = ""; for (let hour = 8; hour <= 20; hour++) { - let value = data["date"].split("T")[0].slice(1, data["date"].split("T")[0].length) + "T" + prependZero(hour) + ":00"; + let value = datetext + " " + prependZero(hour) + ":" + "00"; + let option = document.createElement("option"); option.text = prependZero(hour) + ":00"; @@ -207,6 +209,7 @@ let unavailable_times = data["unavailable_times"]; unavailable_times.forEach(function (item, index) { + //console.log(item); document.getElementById(item).remove(); });