From bc2db30129d46493edb1c77794d339a3a165321d Mon Sep 17 00:00:00 2001 From: Hokan Date: Wed, 30 Jan 2019 23:41:40 +0100 Subject: [PATCH] fix formularza klienta --- hotel/db.sqlite3 | Bin 59392 -> 59392 bytes hotel/rooms/__pycache__/models.cpython-35.pyc | Bin 1803 -> 1803 bytes hotel/rooms/__pycache__/views.cpython-35.pyc | Bin 2714 -> 2860 bytes hotel/rooms/models.py | 3 -- hotel/rooms/views.py | 50 ++++++++++-------- 5 files changed, 28 insertions(+), 25 deletions(-) diff --git a/hotel/db.sqlite3 b/hotel/db.sqlite3 index b228c2ce4367e3ae4aaa5db11cdfbaf4af881f11..2a6da49bf6a649cf819958963ca4ca36724bbf25 100644 GIT binary patch delta 384 zcmY+9F-XHu5Qg*KpALP=qc{Xhl?EY;n-~Z}ry?%xAWou_g%SsG62YldJBZMNA%fuI z>R^!&$fARagD$mLX+;GE(Luz)4k|d9Cm84rKldN^{l}G?C^xY=Kx)q5IH`Ga8w%n6 ztCBiSGUyWCaf1`=V;gHU@}o&)r2Ox86mm(7``X<1gWuvD}QMccJ58zEQ{;1{m2 zhaHp<;1N}v`9t?MSi~^5+FD6-s!6yDR~#&00y_PsEn27Rv_Lad^PDcB26qqIDK!FR zLlpxz(}^Q)C{fQ1_TQ6)UvE#x(j0jST|A?M3*@nj3Jy^ZZ!KdUGoCYyF%F$X(OkIM z?9|9#sXb2Vam=ketcLl4gdcq318;Z<-wbezBV6MY4V?RZ@)nXY5F&G-aaAZ+geI8Z Icp8;|0nJBh%K!iX delta 186 zcmWm6A&bIb0LJm{{c9K|i{WnIcQEV=h}mehidam>>59UFFAIXjYH(ppES3|lT$!Sx zqQQehgB%78Dj0mN&yW9O&#-5-KlP?GvwAZqwi3D#o)RBlDFaL6%!UaAIy9(|#|os0 zXH6r;?wjw->C diff --git a/hotel/rooms/__pycache__/models.cpython-35.pyc b/hotel/rooms/__pycache__/models.cpython-35.pyc index cea04ab295253f87513a8f3e682f5cf798829cef..21d392645a7689a581e772e0a36dcd110bcc8cfc 100644 GIT binary patch delta 85 zcmeC?>*nJWrT*}tZ&Me6;DI&=Q05d8P3jhEB delta 85 zcmeC?>*nJWX#`2W zfMB-9#jPyl*G(*=>mWi))~HCRu~k04`Y zMbJdD4($>vvMN#=GY68AXh09?2DFD+8L|mog-oD}kRG&v+=R9uThKP91zw95rK-bQ zx&_wCBBV{E$@8nil@L0@@n+7}^92Jc%t`7-igeqCF6T~%@oH%4BlTIEWD?mnXHM_v z|IaUh!$HTqcE2PC>%#cWWc+sR%t!AgYj5#Ev14|r7pH4>ei9D90bfo%Bx%;Qn$vibdvDdv%gc=YGYARvhXSig|)8ZqsW6p~G#P7`hBR LBwfGshhq2-16h)e delta 683 zcmYLH%Wl&^6g@LeY-bwVc?X9eluA${c0}z07A%TbAlOiz6;kD9A`z1YG%-j>HeKWc z5X=VnhE|9lfDZtPE%G<8WDj>73cB*S=f2LJv3=C}&=wuf6F~5bZ}23*s<33pe55|&8kT_i$PBNq1_I;$ z$C8Ft#Q>qKodh+6Qwy1mq=7U5DXMGSG&YSQOUlM&H6$%0ZAb?akiLVs3fV?Vm+c^R&B;hr(sm9>t1V2+<}EF`nc9)S&M?&9?e~6Onnwqd z+*v$VMD$l@LmxV~_^_vcIngD1dp4cSlU=d$*Pp6`+?_7=UPQC0%&X(sB$`j;o{W+x zFOMHj#!vKXchKLUucs~$3>&IzxG=EF>Tm9doqtH825F>YVB9{e#nn zZ4sFK;*P#sIeXb+9v|?4Rhd^Ai)kyD)XT2ds%KUrkih;fXvzf|2#Z|WX2kKaaivR!s diff --git a/hotel/rooms/models.py b/hotel/rooms/models.py index ce7564e..f7299cf 100644 --- a/hotel/rooms/models.py +++ b/hotel/rooms/models.py @@ -2,7 +2,6 @@ from django.db import models from django.core.validators import MinValueValidator, RegexValidator - class RoomType(models.Model): room_type = models.CharField(max_length=40) @@ -33,7 +32,6 @@ class Room(models.Model): class Client(models.Model): id_number = models.CharField(max_length=9, primary_key=True) - name = models.CharField(max_length=40) surname = models.CharField(max_length=40) @@ -41,7 +39,6 @@ class Client(models.Model): return self.name + self.surname - class Reservation(models.Model): room_number = models.ForeignKey(Room, on_delete=models.CASCADE) client_id = models.ForeignKey(Client, on_delete=models.CASCADE) diff --git a/hotel/rooms/views.py b/hotel/rooms/views.py index 383ba36..a0dd2ca 100644 --- a/hotel/rooms/views.py +++ b/hotel/rooms/views.py @@ -26,7 +26,6 @@ def index(request, page=1): rooms = rooms[10*(page-1):10*page] template = loader.get_template('index.html') - print (first_page,last_page) return HttpResponse(template.render({'rooms': rooms, 'firstpage': first_page, 'lastpage': last_page, @@ -50,33 +49,40 @@ def reservation(request): if request.method == "POST": begin = datetime.datetime.strptime(begin_date, "%d-%m-%Y") end = datetime.datetime.strptime(end_date, "%d-%m-%Y") - try: - client_id = request.POST['id_number'] + client_id = request.POST.get('id_number', False) + if client_id: - if Client.objects.filter(id_number=client_id).first() is None: - - client = ClientForm(request.POST) - if client.is_valid(): - id_number = client.cleaned_data['id_number'] - clientform = {'id_number': client.cleaned_data['id_number'], + client = ClientForm(request.POST) + if client.is_valid(): + id_number = client.cleaned_data['id_number'] + clientform = {'id_number': client.cleaned_data['id_number'], 'name': client.cleaned_data['name'], 'surname': client.cleaned_data['surname']} if check(id_number): - client.save() - - r = Reservation() - r.room_number = get_object_or_404(Room, room_number=room_number) - r.client_id = get_object_or_404(Client, id_number=client_id) - r.begin_date = begin - r.end_date = end - r.save() - - status = "Pokój " + str(room_number) + " został pomyślnie zarezerwowany" - - return HttpResponse(template.render({'status': status}, request)) + if Client.objects.filter(id_number=client_id).first() is None: + client.save() else: error = "Zły numer dowodu" - except: + form = ClientForm(initial=clientform) + template = loader.get_template('form.html') + return HttpResponse(template.render({'form': form, + 'error': error, + 'room_number': room_number, + 'begin_date': begin_date, + 'end_date': end_date}, request)) + + r = Reservation() + r.room_number = get_object_or_404(Room, room_number=room_number) + r.client_id = get_object_or_404(Client, id_number=client_id) + r.begin_date = begin + r.end_date = end + r.save() + + status = "Pokój " + str(room_number) + " został pomyślnie zarezerwowany" + + return HttpResponse(template.render({'status': status}, request)) + + else: pass form = ClientForm(initial=clientform)