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

fixes

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
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
skolehjem/app/Http/Controllers/WashingReservationController.php
View File

@ -161,13 +161,14 @@ class WashingReservationController extends Controller
public function api(Request $request){ public function api(Request $request){
if($request->ajax()){ if($request->ajax()){
$date = $request->date; $date = $request->date;
$datetext = $request->datetext;
$machines = WashingMachine::all(); $machines = WashingMachine::all();
if($request->machine_id == 0) if($request->machine_id == 0)
$request->machine_id = WashingMachine::all()->first()->id; $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 = []; $times = [];

2
skolehjem/resources/views/admin/washing-reservations/index.blade.php
View File

@ -38,7 +38,7 @@
@foreach($reservations as $reservation) @foreach($reservations as $reservation)
<tr> <tr>
<td>{{ \App\WashingMachine::query()->find($reservation->machine_id)->name }}</td> <td>{{ \App\WashingMachine::query()->find($reservation->machine_id)->name }}</td>
<td>{{ \Illuminate\Support\Facades\Date::createFromTimeStamp(strtotime($reservation->time))->format('d/m/Y \k\l\. H:i') }}</td> <td>{{ \Illuminate\Support\Facades\Date::createFromTimeStamp(strtotime($reservation->time))->format('d/m/Y \k\l\. H:i') }} {{ $reservation->time }}</td>
<td>{{ ucfirst(\App\User::query()->find($reservation->user_id)->name_first) }} {{ ucfirst(\App\User::query()->find($reservation->user_id)->name_last) }}</td> <td>{{ ucfirst(\App\User::query()->find($reservation->user_id)->name_first) }} {{ ucfirst(\App\User::query()->find($reservation->user_id)->name_last) }}</td>
<td><form method="post" action="{{ route('washing-reservations.destroy', ['washing_reservation' => $reservation]) }}" class="w-100 nostyle"> <td><form method="post" action="{{ route('washing-reservations.destroy', ['washing_reservation' => $reservation]) }}" class="w-100 nostyle">
@csrf @csrf

19
skolehjem/resources/views/app/washing-reservations/create.blade.php
View File

@ -66,6 +66,7 @@
header.appendChild(headerDay); header.appendChild(headerDay);
let date = moment().locale("da").day(weekDay).week(week); 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"); let dayHolder = document.createElement("div");
dayHolder.classList.add("calendar-table__col"); dayHolder.classList.add("calendar-table__col");
@ -77,7 +78,7 @@
dayHolder.appendChild(day); dayHolder.appendChild(day);
dayHolder.onclick = function() { dayHolder.onclick = function() {
onDateSelect(date, dayHolder); onDateSelect(date, dayHolder, datetext);
} }
calendarRow.appendChild(dayHolder); calendarRow.appendChild(dayHolder);
@ -91,8 +92,8 @@
calendar.appendChild(calendarBody); calendar.appendChild(calendarBody);
} }
function onDateSelect(date, dayHolder) { function onDateSelect(date, dayHolder, datetext) {
console.log("Opdaterer selects"); //console.log("Opdaterer selects");
let events; let events;
let machinez; let machinez;
let buttonz; let buttonz;
@ -118,9 +119,9 @@
axios({ axios({
method: 'get', method: 'get',
url: '{{ route("washing-reservations.api") }}', url: '{{ route("washing-reservations.api") }}',
params: { 'date': date, 'machine_id': machine_id } params: { 'date': date, 'machine_id': machine_id, 'datetext': datetext }
}).then(function (response) { }).then(function (response) {
console.log(response.data["unavailable_times"]); //console.log(response.data["unavailable_times"]);
var data = response.data; var data = response.data;
if(document.getElementById("washing-machines") != undefined) if(document.getElementById("washing-machines") != undefined)
@ -136,7 +137,7 @@
select.name = "machine_id"; select.name = "machine_id";
select.onchange = function() { select.onchange = function() {
onDateSelect(date, dayHolder); onDateSelect(date, dayHolder, datetext);
} }
container.appendChild(span); container.appendChild(span);
@ -179,7 +180,7 @@
machinez.innerHTML = ""; machinez.innerHTML = "";
machinez.onchange = function () { machinez.onchange = function () {
onDateSelect(date, dayHolder); onDateSelect(date, dayHolder, datetext);
} }
for (let i = 0; i < machines.length; i++) { for (let i = 0; i < machines.length; i++) {
@ -195,7 +196,8 @@
events.innerHTML = ""; events.innerHTML = "";
for (let hour = 8; hour <= 20; hour++) { 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"); let option = document.createElement("option");
option.text = prependZero(hour) + ":00"; option.text = prependZero(hour) + ":00";
@ -207,6 +209,7 @@
let unavailable_times = data["unavailable_times"]; let unavailable_times = data["unavailable_times"];
unavailable_times.forEach(function (item, index) { unavailable_times.forEach(function (item, index) {
//console.log(item);
document.getElementById(item).remove(); document.getElementById(item).remove();
}); });