s434782/Hotel
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

fix

Browse Source
This commit is contained in:
Łukasz Jędyk 2019-01-23 12:22:27 +01:00
parent 646e675910
commit ffd81453b7
7 changed files with 3 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

0
hotel/manage.py Executable file → Normal file
View File

BIN
hotel/rooms/__pycache__/admin.cpython-36.pyc
View File

Binary file not shown.

BIN
hotel/rooms/__pycache__/models.cpython-36.pyc
View File

Binary file not shown.

BIN
hotel/rooms/__pycache__/urls.cpython-36.pyc
View File

Binary file not shown.

BIN
hotel/rooms/__pycache__/views.cpython-36.pyc
View File

Binary file not shown.

BIN
hotel/rooms/migrations/__pycache__/0006_remove_room_reserved.cpython-36.pyc Normal file
View File

Binary file not shown.

5
hotel/rooms/views.py
View File

@ -3,6 +3,7 @@ from django.template import loader
from django.shortcuts import get_object_or_404, render from django.shortcuts import get_object_or_404, render
from .models import * from .models import *
from .forms import * from .forms import *
from django.db.models import Q
import re import re
import datetime import datetime
@ -29,8 +30,8 @@ def reservation(request):
template = loader.get_template('reservation.html') template = loader.get_template('reservation.html')
error = "" error = ""
reservation = Reservation.objects.filter(room_number=room_number).filter(begin_date__gte=begin_date).filter(end_date__lte=end_date) reservation = Reservation.objects.filter(room_number=room_number).filter(Q(begin_date__range=(begin_datetime, end_datetime)) | Q(end_date__range=(begin_datetime, end_datetime))).first()
if reservation: if not reservation is None:
status = "Pokój " + str(room_number) + " jest już zarezerwowany" status = "Pokój " + str(room_number) + " jest już zarezerwowany"
return HttpResponse(template.render({'status': status}, request)) return HttpResponse(template.render({'status': status}, request))