From cde599d554453305cac3c9fa4af164aec71c6f6d Mon Sep 17 00:00:00 2001 From: Fabian Lamprecht Date: Fri, 8 Jun 2018 22:37:08 +0200 Subject: [PATCH 1/6] stuff --- roofis2/roomservice/urls.py | 2 +- roofis2/templates/search.jinja | 11 +++++++---- 2 files changed, 8 insertions(+), 5 deletions(-) diff --git a/roofis2/roomservice/urls.py b/roofis2/roomservice/urls.py index e0c9a75..900d78d 100644 --- a/roofis2/roomservice/urls.py +++ b/roofis2/roomservice/urls.py @@ -4,6 +4,6 @@ from . import views app_name = 'roomservice' urlpatterns = [ path('', views.home, name='home'), - path('admin', views.admin, name='admin'), + path('adminpage', views.admin, name='admin'), path('booking', views.booking, name='booking'), ] diff --git a/roofis2/templates/search.jinja b/roofis2/templates/search.jinja index 6ca45ea..2756aa3 100644 --- a/roofis2/templates/search.jinja +++ b/roofis2/templates/search.jinja @@ -1,9 +1,12 @@ {% extends "base.jinja" %} {% block content %} -
- - -
+
+ <\div> +
+ + +
+
{% endblock %} From 73f8b277056b3289a02d1c1de626f19568151fff Mon Sep 17 00:00:00 2001 From: Tobias Haegele Date: Sat, 9 Jun 2018 00:36:40 +0200 Subject: [PATCH 2/6] last one --- roofis2/roomservice/urls.py | 1 + roofis2/roomservice/views.py | 3 +++ roofis2/templates/favorites.jinja | 10 ++++++++++ 3 files changed, 14 insertions(+) create mode 100644 roofis2/templates/favorites.jinja diff --git a/roofis2/roomservice/urls.py b/roofis2/roomservice/urls.py index 900d78d..e60d212 100644 --- a/roofis2/roomservice/urls.py +++ b/roofis2/roomservice/urls.py @@ -6,4 +6,5 @@ urlpatterns = [ path('', views.home, name='home'), path('adminpage', views.admin, name='admin'), path('booking', views.booking, name='booking'), + path('favorites', views.favorites, name='favorites'), ] diff --git a/roofis2/roomservice/views.py b/roofis2/roomservice/views.py index 2b44417..b4088ad 100644 --- a/roofis2/roomservice/views.py +++ b/roofis2/roomservice/views.py @@ -13,3 +13,6 @@ def booking(request): def admin(request): return render(request, 'admin.jinja', {"title": "rooF(i)S is love rooF(i)S is live!!"}) + +def favorites(request): + return render(request, 'favorites.jinja', {"title": "rooF(i)S is love rooF(i)S is live!!"}) \ No newline at end of file diff --git a/roofis2/templates/favorites.jinja b/roofis2/templates/favorites.jinja new file mode 100644 index 0000000..03c1a38 --- /dev/null +++ b/roofis2/templates/favorites.jinja @@ -0,0 +1,10 @@ +{% extends 'base.jinja' %} +{% block content %} +

Ressourcenpool Bamberg

+

Impressum

+

Anbieter:
Max Mustermann
Musterstraße 1
96049 Bamberg

+

Kontakt:
Telefon: 0951/12345678
Telefax: 0951/1234567
E-Mail: mail@mustermann.de
Website: www.mustermann.de

+

 

+

Bei redaktionellen Inhalten:

+

Verantwortlich nach § 55 Abs.2 RStV
Moritz Schreiberling
Musterstraße 2
96049 Bamberg

+{% endblock %} \ No newline at end of file From 5c39f580a5b97c19812ab85fc681d910984eca43 Mon Sep 17 00:00:00 2001 From: Fabian Lamprecht Date: Sat, 9 Jun 2018 00:39:29 +0200 Subject: [PATCH 3/6] search improved --- roofis2/roomservice/views.py | 4 +++- roofis2/templates/search.jinja | 34 +++++++++++++++++++++++++++++----- 2 files changed, 32 insertions(+), 6 deletions(-) diff --git a/roofis2/roomservice/views.py b/roofis2/roomservice/views.py index 2b44417..b2c8da2 100644 --- a/roofis2/roomservice/views.py +++ b/roofis2/roomservice/views.py @@ -1,9 +1,11 @@ from django.shortcuts import render +from roomservice.models import Room # Create your views here. def home(request): - return render(request, 'search.jinja', {"title":"rooF(i)S is love rooF(i)S is live!!"}) + rooms = Room.objects.all() + 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 2756aa3..e79d80e 100644 --- a/roofis2/templates/search.jinja +++ b/roofis2/templates/search.jinja @@ -1,11 +1,35 @@ {% extends "base.jinja" %} {% block content %}
- <\div> -
- - -
+
+
+
+
+ + +
+
+
+
+
+
+
+ + +
+ +
+
+
+
+
+ +
+
{% endblock %} From 8c006cf33f43a08185a2f277a056f075140ddc94 Mon Sep 17 00:00:00 2001 From: Fabian Lamprecht Date: Sat, 9 Jun 2018 01:51:03 +0200 Subject: [PATCH 4/6] more stuff --- roofis2/roomservice/views.py | 4 +++- roofis2/templates/search.jinja | 7 +++++-- 2 files changed, 8 insertions(+), 3 deletions(-) diff --git a/roofis2/roomservice/views.py b/roofis2/roomservice/views.py index 6219d83..380befa 100644 --- a/roofis2/roomservice/views.py +++ b/roofis2/roomservice/views.py @@ -1,6 +1,7 @@ from django.shortcuts import render from roomservice.models import Room - +import logging +logger=logging.getLogger(__name__) # Create your views here. def home(request): @@ -9,6 +10,7 @@ def home(request): def booking(request): + request.POST.get("sel1", "") return render(request, 'booking.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 e79d80e..92ee978 100644 --- a/roofis2/templates/search.jinja +++ b/roofis2/templates/search.jinja @@ -13,6 +13,8 @@
+
+
- -
+ +
+
From 3c6a339f565f0da18205365b19827d92cfa73930 Mon Sep 17 00:00:00 2001 From: Fabian Lamprecht Date: Sat, 9 Jun 2018 02:01:27 +0200 Subject: [PATCH 5/6] suppling selected room --- roofis2/core/settings.py | 2 +- roofis2/roomservice/views.py | 9 ++++++--- roofis2/templates/search.jinja | 6 +++--- 3 files changed, 10 insertions(+), 7 deletions(-) diff --git a/roofis2/core/settings.py b/roofis2/core/settings.py index c3e59da..46b8759 100644 --- a/roofis2/core/settings.py +++ b/roofis2/core/settings.py @@ -177,7 +177,7 @@ LOGGING = { # }, }, 'loggers': { - 'respool': { + 'roomservice': { 'handlers': ['console'], 'level': 'INFO', }, diff --git a/roofis2/roomservice/views.py b/roofis2/roomservice/views.py index 380befa..0a7d683 100644 --- a/roofis2/roomservice/views.py +++ b/roofis2/roomservice/views.py @@ -1,7 +1,7 @@ from django.shortcuts import render from roomservice.models import Room import logging -logger=logging.getLogger(__name__) +logger = logging.getLogger(__name__) # Create your views here. def home(request): @@ -10,8 +10,11 @@ def home(request): def booking(request): - request.POST.get("sel1", "") - return render(request, 'booking.jinja', {"title": "rooF(i)S is love rooF(i)S is live!!"}) + 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}) def admin(request): diff --git a/roofis2/templates/search.jinja b/roofis2/templates/search.jinja index 92ee978..19e8b79 100644 --- a/roofis2/templates/search.jinja +++ b/roofis2/templates/search.jinja @@ -13,13 +13,13 @@
-
+
- {% for room in rooms %} - + {% endfor %}
From 173283f8686c7094d58447f8eb9527114ca6725f Mon Sep 17 00:00:00 2001 From: Tobias Haegele Date: Sat, 9 Jun 2018 02:03:16 +0200 Subject: [PATCH 6/6] foo --- roofis2/roomservice/views.py | 1 + roofis2/templates/booking.jinja | 173 ++++++++++++++++++++++++++++++-- 2 files changed, 167 insertions(+), 7 deletions(-) diff --git a/roofis2/roomservice/views.py b/roofis2/roomservice/views.py index 6219d83..2c03dda 100644 --- a/roofis2/roomservice/views.py +++ b/roofis2/roomservice/views.py @@ -9,6 +9,7 @@ def home(request): def booking(request): + belegung = Room.objects.get() return render(request, 'booking.jinja', {"title": "rooF(i)S is love rooF(i)S is live!!"}) diff --git a/roofis2/templates/booking.jinja b/roofis2/templates/booking.jinja index 03c1a38..f68d9ea 100644 --- a/roofis2/templates/booking.jinja +++ b/roofis2/templates/booking.jinja @@ -1,10 +1,169 @@ {% extends 'base.jinja' %} {% block content %} -

Ressourcenpool Bamberg

-

Impressum

-

Anbieter:
Max Mustermann
Musterstraße 1
96049 Bamberg

-

Kontakt:
Telefon: 0951/12345678
Telefax: 0951/1234567
E-Mail: mail@mustermann.de
Website: www.mustermann.de

-

 

-

Bei redaktionellen Inhalten:

-

Verantwortlich nach § 55 Abs.2 RStV
Moritz Schreiberling
Musterstraße 2
96049 Bamberg

+ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
TimeMondayTuesdayWednesdayThursdayFridaySaturdaySunday
6:00 - 7:00
7:00 - 8:00
8:00 - 9:00
9:00 - 10:00
10:00 - 11:00
11:00 - 12:00
12:00 - 13:00
13:00 - 14:00
14:00 - 15:00
15:00 - 16:00
16:00 - 17:00
17:00 - 18:00
18:00 - 19:00
19:00 - 20:00
20:00 - 6:00
{% endblock %} \ No newline at end of file