From 42d61ecaca97bc1041fa095a4bd4d41be50853de Mon Sep 17 00:00:00 2001 From: MG Date: Sat, 9 Jun 2018 09:38:31 +0200 Subject: [PATCH] Fixed search --- roofis2/roomservice/views.py | 40 +++++++++++- roofis2/templates/search.jinja | 114 +++++++++++++++++++-------------- 2 files changed, 104 insertions(+), 50 deletions(-) diff --git a/roofis2/roomservice/views.py b/roofis2/roomservice/views.py index 5a15859..64a7553 100644 --- a/roofis2/roomservice/views.py +++ b/roofis2/roomservice/views.py @@ -9,8 +9,44 @@ logger = logging.getLogger(__name__) # Create your views here. def search(request): - rooms = Room.objects.all() - return render(request, 'search.jinja', {"title": "rooF(i)S is love rooF(i)S is live!!", "rooms": rooms}) + if request.method == 'POST': + logger.info(request.POST) + search_token = request.POST['search'] + rooms = Room.objects.all() + # barrierfree = request.POST.get('barrierfree', 'off') + # logger.info(barrierfree) + if search_token: + rooms = rooms.filter(room_number__contains=search_token) + # else: + # # barrierfree = request.POST['barrierfree'] + # + # if barrierfree: + # # barrierfree = request.POST['barrierfree'] + # if barrierfree == 'on': + # rooms = rooms.filter(barrierfree=True) + # + # if 'seating' in request.POST: + # seating = request.POST['seating'] + # if seating == 'on': + # rooms = rooms.filter(seating=True) + # + # if 'cooling' in request.POST: + # cooling = request.POST['cooling'] + # if cooling == 'on': + # rooms = rooms.filter(cooling=True) + # + # if 'capatacity' in request.POST: + # capatacity = request.POST['capatacity'] + # if not capatacity == '-1': + # rooms = rooms.filter(capacity__gte=capatacity) + + # logger.info(search_token, barrierfree, seating, cooling, capatacity) + + return render(request, 'search.jinja', + {"title": "rooF(i)S is love rooF(i)S is live!!", "rooms": rooms, "result_count": rooms.count()}) + else: + rooms = {} + return render(request, 'search.jinja', {"title": "rooF(i)S is love rooF(i)S is live!!", "rooms": rooms}) def booking(request): diff --git a/roofis2/templates/search.jinja b/roofis2/templates/search.jinja index 1344a6d..a9be85c 100644 --- a/roofis2/templates/search.jinja +++ b/roofis2/templates/search.jinja @@ -7,70 +7,88 @@

-

+ - + +

-
-
- -
-
- - -
-
- - -
-
- - -
+
+ + +
+
+ + +
+
+ + +
+
+ + +
-
- -
- no selection - 20 - 30 - 60 +
+ + +
+ +
-
- - +
- -
-
-
- -
- - -
- -
+ {#
#} + {# #} + {#
#} + {# + {#
#} + {# #} + {#
#}
-
+
+
+
+

Results

+
+
+
+ {% for room in rooms %} +
+
+
+
Room:{{ room.room_number }}
+
Building Name: {{ room.building.name }}
+
+

Capacity: {{ room.capacity }} Persons

+

Room type: {{ room.room_type.type }}

+ Detail + Another link +
+
+


+
+ {% endfor %} +

Results: {{ result_count }}

{% endblock %}