From 70df3fbea7dc606364c530b304f9e84d963bbe02 Mon Sep 17 00:00:00 2001 From: Tobias Haegele Date: Sat, 9 Jun 2018 05:14:49 +0200 Subject: [PATCH] push --- roofis2/roomservice/views.py | 4 ++-- roofis2/static/css/style.css | 3 +++ roofis2/templates/booking.jinja | 2 +- 3 files changed, 6 insertions(+), 3 deletions(-) diff --git a/roofis2/roomservice/views.py b/roofis2/roomservice/views.py index 041770e..24ce7ba 100644 --- a/roofis2/roomservice/views.py +++ b/roofis2/roomservice/views.py @@ -24,8 +24,8 @@ def booking(request): for booking in bookings: sdate = booking.start_date edate = booking.end_date - stime = booking.start_time.hour() - etime = booking.end_time.hour()+1 + stime = booking.start_time.hour + etime = booking.end_time.hour+1 if edate != sdate: break else: diff --git a/roofis2/static/css/style.css b/roofis2/static/css/style.css index ca41812..f9a528f 100644 --- a/roofis2/static/css/style.css +++ b/roofis2/static/css/style.css @@ -5,4 +5,7 @@ line-height: 3.5em; vertical-align: middle; padding-left: -1em; +} +td{ + background-color: lawngreen; } \ No newline at end of file diff --git a/roofis2/templates/booking.jinja b/roofis2/templates/booking.jinja index cb9da74..01aee26 100644 --- a/roofis2/templates/booking.jinja +++ b/roofis2/templates/booking.jinja @@ -1,7 +1,7 @@ {% extends 'base.jinja' %} {% block content %} {% for day in multd%} - $("#"+day[0]+"-"+day[1]).css("background-color", "red"); + $("#"+day[0] + day[1]-1 + "-" + day[1]).css("background-color", "red"); {% endfor %}