This commit is contained in:
Tobias Haegele 2018-06-09 06:32:07 +02:00
parent 70df3fbea7
commit be5fa242c6
4 changed files with 118 additions and 105 deletions

View File

@ -142,7 +142,7 @@ def create_num_equipment():
def create_access_point(): def create_access_point():
for i in range(1, 25): for i in range(1, 25):
access_point, _ = AccessPoint.objects.get_or_create(mac_address=''.join( access_point, _ = AccessPoint.objects.get_or_create(mac_address=''.join(
random.choices(['0', '1', '2', '3', '4', '5', '6', '7', '8', '9', 'A', 'B', 'C', 'D', 'E', 'F'], k=12)), ) random.choices(['0', '1', '2', '3', '4', '5', '6', '7', '8', '9', 'A', 'B', 'C', 'D', 'E', 'F'], k=12)))
for i in range(1, random.randint(1, 4)): for i in range(1, random.randint(1, 4)):
access_point.rooms.add(random.choice(Room.objects.all())) access_point.rooms.add(random.choice(Room.objects.all()))
access_point.save() access_point.save()

View File

@ -14,18 +14,23 @@ def search(request):
def booking(request): def booking(request):
room_id = request.POST["room"] room_id = request.POST["room"]
room = Room.objects.get(id=room_id) room = Room.objects.get(id=room_id)
logger.info(room_id)
logger.info(room)
startdate = datetime.date.today() startdate = datetime.date.today()
weekday = startdate.weekday() weekday = startdate.weekday()
logger.info(weekday)
enddate = startdate + datetime.timedelta(7) enddate = startdate + datetime.timedelta(7)
multd = [[]] multd = []
bookings = Booking.objects.filter(room_id=room.id, start_date__gte=startdate, end_date__lte=enddate) bookings = Booking.objects.filter(room_id=room.id, start_date__gte=startdate, end_date__lte=enddate)
logger.info(bookings)
for booking in bookings: for booking in bookings:
logger.info(booking)
sdate = booking.start_date sdate = booking.start_date
logger.info(sdate)
edate = booking.end_date edate = booking.end_date
logger.info(edate)
stime = booking.start_time.hour stime = booking.start_time.hour
logger.info(stime)
etime = booking.end_time.hour+1 etime = booking.end_time.hour+1
logger.info(etime)
if edate != sdate: if edate != sdate:
break break
else: else:
@ -46,7 +51,9 @@ def booking(request):
timediff = etime - stime timediff = etime - stime
if timediff > 1: if timediff > 1:
while timediff > 1: while timediff > 1:
multd.append([day, stime + timediff]) multd.append(day+(stime+timediff-1).__str__()+"-"+(stime + timediff).__str__())
timediff = timediff-1
logger.info(multd)
return render(request, 'booking.jinja', {"title": "rooF(i)S is love rooF(i)S is live!!", "multd":multd}) return render(request, 'booking.jinja', {"title": "rooF(i)S is love rooF(i)S is live!!", "multd":multd})

View File

@ -8,4 +8,7 @@
} }
td{ td{
background-color: lawngreen; background-color: lawngreen;
}
.booked{
background-color: red;
} }

View File

@ -1,9 +1,12 @@
{% extends 'base.jinja' %} {% extends 'base.jinja' %}
{% block content %} {% block content %}
{% for day in multd%} {% for day in multd%}
$("#"+day[0] + day[1]-1 + "-" + day[1]).css("background-color", "red"); <script>
var el = document.getElementById("{{day}}");
el.classList.add("booked");
</script>
{% endfor %} {% endfor %}
<table class="table table-hover table-light"> <table class="table table-light">
<thead> <thead>
<tr> <tr>
<th scope="col">Time</th> <th scope="col">Time</th>
@ -19,143 +22,143 @@
<tbody> <tbody>
<tr> <tr>
<th scope="row">6:00 - 7:00</th> <th scope="row">6:00 - 7:00</th>
<td id="Monday6-7"></td> <td id="Monday6-7" class=""></td>
<td id="Tuesday6-7"></td> <td id="Tuesday6-7" class=""></td>
<td id="Wednesday6-7"></td> <td id="Wednesday6-7" class=""></td>
<td id="Thursday6-7"></td> <td id="Thursday6-7" class=""></td>
<td id="Friday6-7"></td> <td id="Friday6-7" class=""></td>
<td id="Saturday6-7"></td> <td id="Saturday6-7" class=""></td>
<td id="Sunday6-7"></td> <td id="Sunday6-7" class=""></td>
</tr> </tr>
<tr> <tr>
<th scope="row">7:00 - 8:00</th> <th scope="row">7:00 - 8:00</th>
<td id="Monday7-8"></td> <td id="Monday7-8" class=""></td>
<td id="Tuesday7-8"></td> <td id="Tuesday7-8" class=""></td>
<td id="Wednesday7-8"></td> <td id="Wednesday7-8" class=""></td>
<td id="Thursday7-8"></td> <td id="Thursday7-8" class=""></td>
<td id="Friday7-8"></td> <td id="Friday7-8" class=""></td>
<td id="Saturday7-8"></td> <td id="Saturday7-8" class=""></td>
<td id="Sunday7-8"></td> <td id="Sunday7-8" class=""></td>
</tr> </tr>
<tr> <tr>
<th scope="row">8:00 - 9:00</th> <th scope="row">8:00 - 9:00</th>
<td id="Monday8-9"></td> <td id="Monday8-9" class=""></td>
<td id="Tuesday8-9"></td> <td id="Tuesday8-9" class=""></td>
<td id="Wednesday8-9"></td> <td id="Wednesday8-9" class=""></td>
<td id="Thursday8-9"></td> <td id="Thursday8-9" class=""></td>
<td id="Friday8-9"></td> <td id="Friday8-9" class=""></td>
<td id="Saturday8-9"></td> <td id="Saturday8-9" class=""></td>
<td id="Sunday8-9"></td> <td id="Sunday8-9" class=""></td>
</tr> </tr>
<tr> <tr>
<th scope="row">9:00 - 10:00</th> <th scope="row">9:00 - 10:00</th>
<td id="Monday9-10"></td> <td id="Monday9-10" class=""></td>
<td id="Tuesday9-10"></td> <td id="Tuesday9-10" class=""></td>
<td id="Wednesday9-10"></td> <td id="Wednesday9-10" class=""></td>
<td id="Thursday9-10"></td> <td id="Thursday9-10" class=""></td>
<td id="Friday9-10"></td> <td id="Friday9-10" class=""></td>
<td id="Saturday9-10"></td> <td id="Saturday9-10" class=""></td>
<td id="Sunday9-10"></td> <td id="Sunday9-10" class=""></td>
</tr> </tr>
<tr> <tr>
<th scope="row">10:00 - 11:00</th> <th scope="row">10:00 - 11:00</th>
<td id="Monday10-11"></td> <td id="Monday10-11" class=""></td>
<td id="Tuesday10-11"></td> <td id="Tuesday10-11" class=""></td>
<td id="Wednesday10-11"></td> <td id="Wednesday10-11" class=""></td>
<td id="Thursday10-11"></td> <td id="Thursday10-11" class=""></td>
<td id="Friday10-11"></td> <td id="Friday10-11" class=""></td>
<td id="Saturday10-11"></td> <td id="Saturday10-11" class=""></td>
<td id="Sunday10-11"></td> <td id="Sunday10-11" class=""></td>
</tr> </tr>
<tr> <tr>
<th scope="row">11:00 - 12:00</th> <th scope="row">11:00 - 12:00</th>
<td id="Monday11-12"></td> <td id="Monday11-12" class=""></td>
<td id="Tuesday11-12"></td> <td id="Tuesday11-12" class=""></td>
<td id="Wednesday11-12"></td> <td id="Wednesday11-12" class=""></td>
<td id="Thursday11-12"></td> <td id="Thursday11-12" class=""></td>
<td id="Friday11-12"></td> <td id="Friday11-12" class=""></td>
<td id="Saturday11-12"></td> <td id="Saturday11-12" class=""></td>
<td id="Sunday11-12"></td> <td id="Sunday11-12" class=""></td>
</tr> </tr>
<tr> <tr>
<th scope="row">12:00 - 13:00</th> <th scope="row">12:00 - 13:00</th>
<td id="Monday12-13"></td> <td id="Monday12-13" class=""></td>
<td id="Tuesday12-13"></td> <td id="Tuesday12-13" class=""></td>
<td id="Wednesday12-13"></td> <td id="Wednesday12-13" class=""></td>
<td id="Thursday12-13"></td> <td id="Thursday12-13" class=""></td>
<td id="Friday12-13"></td> <td id="Friday12-13" class=""></td>
<td id="Saturday12-13"></td> <td id="Saturday12-13" class=""></td>
<td id="Sunday12-13"></td> <td id="Sunday12-13" class=""></td>
</tr> </tr>
<tr> <tr>
<th scope="row">13:00 - 14:00</th> <th scope="row">13:00 - 14:00</th>
<td id="Monday13-14"></td> <td id="Monday13-14" class=""></td>
<td id="Tuesday13-14"></td> <td id="Tuesday13-14" class=""></td>
<td id="Wednesday13-14"></td> <td id="Wednesday13-14" class=""></td>
<td id="Thursday13-14"></td> <td id="Thursday13-14" class=""></td>
<td id="Friday13-14"></td> <td id="Friday13-14" class=""></td>
<td id="Saturday13-14"></td> <td id="Saturday13-14" class=""></td>
<td id="Sunday13-14"></td> <td id="Sunday13-14" class=""></td>
</tr> </tr>
<tr> <tr>
<th scope="row">14:00 - 15:00</th> <th scope="row">14:00 - 15:00</th>
<td id="Monday14-15"></td> <td id="Monday14-15" class=""></td>
<td id="Tuesday14-15"></td> <td id="Tuesday14-15" class=""></td>
<td id="Wednesday14-15"></td> <td id="Wednesday14-15" class=""></td>
<td id="Thursday14-15"></td> <td id="Thursday14-15" class=""></td>
<td id="Friday14-15"></td> <td id="Friday14-15" class=""></td>
<td id="Saturday14-15"></td> <td id="Saturday14-15" class=""></td>
<td id="Sunday14-15"></td> <td id="Sunday14-15" class=""></td>
</tr> </tr>
<tr> <tr>
<th scope="row">15:00 - 16:00</th> <th scope="row">15:00 - 16:00</th>
<td id="Monday15-16"></td> <td id="Monday15-16" class=""></td>
<td id="Tuesday15-16"></td> <td id="Tuesday15-16" class=""></td>
<td id="Wednesday15-16"></td> <td id="Wednesday15-16" class=""></td>
<td id="Thursday15-16"></td> <td id="Thursday15-16" class=""></td>
<td id="Friday15-16"></td> <td id="Friday15-16" class=""></td>
<td id="Saturday15-16"></td> <td id="Saturday15-16" class=""></td>
<td id="Sunday15-16"></td> <td id="Sunday15-16" class=""></td>
</tr> </tr>
<tr> <tr>
<th scope="row">16:00 - 17:00</th> <th scope="row">16:00 - 17:00</th>
<td id="Monday16-17"></td> <td id="Monday16-17" class=""></td>
<td id="Tuesday16-17"></td> <td id="Tuesday16-17" class=""></td>
<td id="Wednesday16-17"></td> <td id="Wednesday16-17" class=""></td>
<td id="Thursday16-17"></td> <td id="Thursday16-17" class=""></td>
<td id="Friday16-17"></td> <td id="Friday16-17" class=""></td>
<td id="Saturday16-17"></td> <td id="Saturday16-17" class=""></td>
<td id="Sunday16-17"></td> <td id="Sunday16-17" class=""></td>
</tr> </tr>
<tr> <tr>
<th scope="row">17:00 - 18:00</th> <th scope="row">17:00 - 18:00</th>
<td id="Monday17-18"></td> <td id="Monday17-18" class=""></td>
<td id="Tuesday17-18"></td> <td id="Tuesday17-18" class=""></td>
<td id="Wednesday17-18"></td> <td id="Wednesday17-18" class=""></td>
<td id="Thursday17-18"></td> <td id="Thursday17-18" class=""></td>
<td id="Friday17-18"></td> <td id="Friday17-18" class=""></td>
<td id="Saturday17-18"></td> <td id="Saturday17-18" class=""></td>
<td id="Sunday17-18"></td> <td id="Sunday17-18" class=""></td>
</tr> </tr>
<tr> <tr>
<th scope="row">18:00 - 19:00</th> <th scope="row">18:00 - 19:00</th>
<td id="Monday18-19"></td> <td id="Monday18-19" class=""></td>
<td id="Tuesday18-19"></td> <td id="Tuesday18-19" class=""></td>
<td id="Wednesday18-19"></td> <td id="Wednesday18-19" class=""></td>
<td id="Thursday18-19"></td> <td id="Thursday18-19" class=""></td>
<td id="Friday18-19"></td> <td id="Friday18-19" class=""></td>
<td id="Saturday18-19"></td> <td id="Saturday18-19" class=""></td>
<td id="Sunday18-19"></td> <td id="Sunday18-19" class=""></td>
</tr> </tr>
<tr> <tr>
<th scope="row">19:00 - 20:00</th> <th scope="row">19:00 - 20:00</th>
<td id="Monday19-20"></td> <td id="Monday19-20" class=""></td>
<td id="Tuesday19-20"></td> <td id="Tuesday19-20" class=""></td>
<td id="Wednesday19-20"></td> <td id="Wednesday19-20" class=""></td>
<td id="Thursday19-20"></td> <td id="Thursday19-20" class=""></td>
<td id="Friday19-20"></td> <td id="Friday19-20" class=""></td>
<td id="Saturday19-20"></td> <td id="Saturday19-20" class=""></td>
<td id="Sunday19-20"></td> <td id="Sunday19-20" class=""></td>
</tr> </tr>
</tbody> </tbody>
</table> </table>