From d7247c3fb95ac797575a459af593f2d4ae64542f Mon Sep 17 00:00:00 2001 From: Fabian Lamprecht Date: Sat, 9 Jun 2018 07:00:48 +0200 Subject: [PATCH 1/2] js ... --- roofis2/roomservice/views.py | 8 ++++---- roofis2/static/js/script.js | 23 +++++++++++++++++++++++ 2 files changed, 27 insertions(+), 4 deletions(-) create mode 100644 roofis2/static/js/script.js diff --git a/roofis2/roomservice/views.py b/roofis2/roomservice/views.py index 1eaa631..97edd29 100644 --- a/roofis2/roomservice/views.py +++ b/roofis2/roomservice/views.py @@ -1,5 +1,7 @@ from django.shortcuts import render from roomservice.models import Room +from django.utils import simplejson + import logging logger = logging.getLogger(__name__) @@ -12,10 +14,8 @@ def search(request): def booking(request): room_id = request.POST["room"] - room = Room.objects.get(id=room_id) - logger.info(room_id) - logger.info(room) - return render(request, 'booking.jinja', {"title": "rooF(i)S is love rooF(i)S is live!!","room":room}) + dataFromAPI = + return render(request, 'booking.jinja', {"title": "rooF(i)S is love rooF(i)S is live!!","data":dataFromAPI}) def admin(request): diff --git a/roofis2/static/js/script.js b/roofis2/static/js/script.js new file mode 100644 index 0000000..de4c3e4 --- /dev/null +++ b/roofis2/static/js/script.js @@ -0,0 +1,23 @@ +$.document.ready(function () { + updateColors(); +}); + +function updateColors(listOfBookings) { + let list = []; + + listOfBookings.forEach(booking =>{ + list.add(getDayOfWeek(booking.startDate)+) + + }); + + + list.forEach(id => { + $("#"+id).addClass("booked"); + }); +} + +// Accepts a Date object or date string that is recognized by the Date.parse() method +function getDayOfWeek(date) { + var dayOfWeek = new Date(date).getDay(); + return isNaN(dayOfWeek) ? null : ['Sunday', 'Monday', 'Tuesday', 'Wednesday', 'Thursday', 'Friday', 'Saturday'][dayOfWeek]; +} \ No newline at end of file From 630571bb568e56f098a19e7a174d5efaed03aaad Mon Sep 17 00:00:00 2001 From: Lara Aubele Date: Sat, 9 Jun 2018 07:48:09 +0200 Subject: [PATCH 2/2] added filters --- roofis2/roomservice/urls.py | 3 +- roofis2/roomservice/views.py | 9 +++++ roofis2/templates/search.jinja | 66 ++++++++++++++++++++++++++++------ 3 files changed, 66 insertions(+), 12 deletions(-) diff --git a/roofis2/roomservice/urls.py b/roofis2/roomservice/urls.py index 4623121..ff68b43 100644 --- a/roofis2/roomservice/urls.py +++ b/roofis2/roomservice/urls.py @@ -7,5 +7,6 @@ urlpatterns = [ path('adminpage', views.admin, name='admin'), path('booking', views.booking, name='booking'), path('search', views.search, name='search'), - path('search', views.location_based_search, name='location-based-search'), + path('location_search', views.location_based_search, name='location-based-search'), + path('filter_search', views.filter_search, name='filter-search'), ] diff --git a/roofis2/roomservice/views.py b/roofis2/roomservice/views.py index 5ccdc8b..415c16e 100644 --- a/roofis2/roomservice/views.py +++ b/roofis2/roomservice/views.py @@ -34,3 +34,12 @@ def favorites(request): def location_based_search(request): return render(request, 'favorites.jinja', {"title": "rooF(i)S is love rooF(i)S is live!!"}) + + +def filter_search(request): + if request.method=="POST": + logger.info(request.POST) + + + return render(request, 'search.jinja',{"title": "rooF(i)S is love rooF(i)S is live!!"}) + diff --git a/roofis2/templates/search.jinja b/roofis2/templates/search.jinja index 0fcf368..1344a6d 100644 --- a/roofis2/templates/search.jinja +++ b/roofis2/templates/search.jinja @@ -4,28 +4,72 @@
+

+ +

+
+

+ +
+
+ +
+
+ + +
+
+ + +
+
+ + +
+ +
+ +
+ no selection + 20 + 30 + 60 +
+
+ + +
+
+
- -
- - -
- -
+ +
+ + +
+ +