From ffd81453b76d576f8030cbab71bcbc509957df3d Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C5=81ukasz=20J=C4=99dyk?=
 <s434708@pc16e.labs.wmi.amu.edu.pl>
Date: Wed, 23 Jan 2019 12:22:27 +0100
Subject: [PATCH] fix

---
 hotel/manage.py                               |   0
 hotel/rooms/__pycache__/admin.cpython-36.pyc  | Bin 286 -> 335 bytes
 hotel/rooms/__pycache__/models.cpython-36.pyc | Bin 1705 -> 1671 bytes
 hotel/rooms/__pycache__/urls.cpython-36.pyc   | Bin 364 -> 320 bytes
 hotel/rooms/__pycache__/views.cpython-36.pyc  | Bin 1604 -> 2151 bytes
 .../0006_remove_room_reserved.cpython-36.pyc  | Bin 0 -> 537 bytes
 hotel/rooms/views.py                          |   5 +++--
 7 files changed, 3 insertions(+), 2 deletions(-)
 mode change 100755 => 100644 hotel/manage.py
 create mode 100644 hotel/rooms/migrations/__pycache__/0006_remove_room_reserved.cpython-36.pyc

diff --git a/hotel/manage.py b/hotel/manage.py
old mode 100755
new mode 100644
diff --git a/hotel/rooms/__pycache__/admin.cpython-36.pyc b/hotel/rooms/__pycache__/admin.cpython-36.pyc
index e1f84ff1fc9e3552f18f6e107e2a8b29460b59ff..0eb562ec7c7fc00f9973479ea2b1cccf060c33ca 100644
GIT binary patch
delta 121
zcmbQobe>7sn3tDpWsQ5xItB)Y$3P4ROhA?c5Epw)RMr<sWz1sEVo7ChW@Kc5vN<OD
zsW5U*EVh-q#T}GdoLW?tSdy8acZ<zACo?s#WF<op4^Vp%&%~Y4d|W^l4<iQ?4<iTy
E01Lhu+W-In

delta 75
zcmX@lG>=Kyn3tEUNX9y*kb!~WF%ZK66OiQq#Ki^^mGviPDKN56?6&1x$xy@v6fEMJ
R_$-=>4ankQ<Y3}q1OVrT3|RmG

diff --git a/hotel/rooms/__pycache__/models.cpython-36.pyc b/hotel/rooms/__pycache__/models.cpython-36.pyc
index 815db6a858a7a6886da2b10c86f77e3aaff6bfda..fdca877de1f419b5743617592abb8df4a455448b 100644
GIT binary patch
delta 210
zcmZ3<+s?~r%*)HQvc^5ee<P<M6QkE;YbHmI6t)!h7KSLE$vsTdWn>r_7>b#I1OsCg
zPf&h-u3mh6aY<2pyq_lTWP9eI$zK?yqy&J{JRpU9K!Ssjg^`JgkA($@1t#BTUcw~K
zFu9e*kWqE=b`~c#kby<AlRq-bic0~R3P4=U0VFsW`51W^d6<f%CMz;YPWEAKVw9SE
mp4CNM4k)RKP$j@9z{tT^BsW=$&6N#g0+3nCX2>ie#0dajASHqT

delta 227
zcmZqYUCGO7%*)GF80HdFyphw8i7{xhHIt)2DsvW3GeZ<_3R?<$3qus&<QAssjIxtu
zn57u`Cz~?|N!;Rb%FoY9P0Vx4OwCD&;wVZjPAw`+O_}_FMM_?Pfq{Vsh>JlC4n`J6
zCMG@>79bX2<X|cin5@VoIr%1Y2U8l;<YX2@MzzUPS)ABpfohB7CVym<6_*Aw6+!wr
z!20<Zc^G+^iliqCvd(6dp1hXTMO+>zp@mQ(zz8&%u}FS02b(J!NH>rf%x1_eD#Qr@
D4o@ox

diff --git a/hotel/rooms/__pycache__/urls.cpython-36.pyc b/hotel/rooms/__pycache__/urls.cpython-36.pyc
index 62808f28a30ac48a745292d0cafe6430bb242d4b..903b1471c95eb0e5827ab59f160e35b87975965c 100644
GIT binary patch
delta 102
zcmaFEbbv|On3tDpWsQ5x8U_Z2$3P4RY(SO+5Et7_R5s^IXNqD=;Rt5X<eXS!$?T`e
rKJloU*e&kTqMU-nl9JS-yyBG%MchE;Mck9w7^ApAx_Ov*nE4n1OT-lM

delta 145
zcmX@W^oB{<n3tEUFw7<9IRgX3V<3hDb|A|Eh>N`@Dw|8BGNy2(GH0=+aHg>JGN&^~
zv8QkaGiY*8OtF-T;!4iROwB7v%P-2k#hI9r0^#~;a!g#HCSAk{G~^a{X;Dr=Vo6DA
eQC{&%h9VxISP{>}J5f9wKo$=Z4>KPlA0q%^>LP9c

diff --git a/hotel/rooms/__pycache__/views.cpython-36.pyc b/hotel/rooms/__pycache__/views.cpython-36.pyc
index 95ed9b72802d54a3b9aceb4fdd97520e87bc4d01..37dd7705a40217336807c2d2f68a7e5ed2762363 100644
GIT binary patch
literal 2151
zcmZ`4O^@3|bjIItoNRWx?RHzJqDn<drERKqB{(1iEh^=bmbOx<DMa4PY!k<h!+6{!
zk#lL_ScxMN9Jq3YD>u6T0nL?D{{ko88z<crQf<wf_ujm(dGqGY%|^q&*}MDnn>r!?
zkW-%l_{T8vDF8+oO-M>ZN)a~_BQ--)<7Q%|c4((g=m2doJ8>UXvj;O_PEt$#(ATnV
zQV;9EbCVzpn8#}0ld!>jR)@LC0@i?egSih$r}-MZk`7hDT`8vzcs|W0IS1NFvWRif
zG1TTWF8kR*%m*-u{{HoS<p@53#n-gbrB^|Le$g8sjh_j_f^i#0egl9cF^!ESS<sTk
zCZkKbpwfzMW&mbLr!-=hnI#?3k}QD-ky$-e7g?6}Cq;U|#oQl(%kQoYWtu1(7xIp$
ztOtN7w~8)TW|Sn#%LK&MKbQ#&Lj@SV<mohtBo~-%VFT!x$`$<Eg6C5BDCezZej{QF
z82^6O9cC%-=CWXXBJ*y(e{=u+>mPJK<@s1<)9&ZJd+qxoi}_f#Z*=cwk|&^nP)FB&
zKH^9DwdqXRI`RhC%sl{v`uH1S8}K(NYXX4`oiY!?EJ+N-uv^W>YBqNvw+5tfVJys9
zTT)DGX)tSPEUXn}YRZ00CT&Xam!?j&y`-_j9Oj-RxwM!!Hu9fJdp(!dm;hbba+gF?
zwzjM(@%!7YX)iT6P=|R7S9)<R_DjnAmo)Zey|haE&|vkK^bH=oq_+q}6+mHlrN_v)
z_9GRSSVJ~SD3Kk)nmc4slV<5a<Qrw}ROBRXvewuD`M+ns>RfH^l7%lfN`Fa#`%1R7
zf1hoEfA9d-J>bW36Qv=_dRdRRmY5$8{0H)k+}6<=WzathRI5Z?q|TKHcS;lB`7)@q
zPDOd<ZBerAg$w5pROj%7OpGsy+yrk8ovX8$t7>;;qjXCOeoS`m7khmP7=eqh(^D2!
zR9HLU&!Ci`j6)ahA0l(_%9Fh->E0DK_qh<6Slthe7g)x(j$gd`fwiY%K5K(UG#Dx}
zZwa1r@jQ~FY@#(fRMbGYL&Ht&q>sk?eGyHbK{E(9z};z9;ezn}Z2Z?Bal1GVcsquB
z)Q*eeKil(2@HrPp*-<o^DJPeaEOKStzxVKws*Tv{I)lRtpjTW*<#`5D$1mE`ES(+y
zoJ>YsTS1#bn<*}WSg%OAXtV4nV?`TerXo5TvEvun(QIBj%tTu4#8ws(;vA^xO)39m
zOUhgCq_Zn_K|*=BQ#nex^1#~^v8qX6^AH;duw5uyW-OYiI<&}j=0t!C&fzG5#v<@)
zEBkOHa;Z!(rJR(@VaAj_81lhbIk%G$^pVi7<~tChvhwIT7uYEUJPWIEYXdFVA2IO`
zGT#NzX^Pfb;Dj4CPj-fZhrxPxdK;UlfoXt7dMau>FVR7^Q+ZNU2u!eUdlfi?<W&G?
zVdQrJ5PF#!v`M$9Lod*Mdcp9iMXy6AYtd~pfHfaD=YjSN2jrR{=Kv0?hNp1{*0jwx
zJrA2P4&C#x`QbBBJr3|p7;p>lAuxLLi(h@R7k+&Lp0bl48o433atB#D9VJ}ZX(R{3
zjuG1MaB!jAX(Zu%CjZ~vd*JUDj2zPsJ=qY*>9kax#ZdMcRFj<QQcxQ!&iaMW4@=lu
zar0p&<e-pwb&$GRoHS!R$)O(Lm~*ujWe3-)1zjy-4;+e12ypW{H#&$@q2d)5cpA$4
b5LAnVe}s>0jtT({Ao(8r0YcmJyuJSbD77Hp

delta 960
zcmZ9L&2G~`5XX1dYkT8-Gz}l6NT5JlK_mnRjucd=RBojrJyl4-WVUM3IIhM{t45A;
zFjo#$E=ceKJ-~$%7cRg<;A;=O2D1)|0=9N`_V1nX_&4j{)gPsmhvl;O?e+6lpKQi1
z*xV(^-=Gn}*~-(qdj)Voy=8kI6u_go2t_E-T!J!GXfA`(WQ~Qh_giNdUuy*l%v7v{
zqn;n@bB2qP&%8M<ntX~3<DR(%ULwEEjY60FJ2q*K_Q}L7<_YTx;L8leJ2B$1)s<kS
zd?XUywWDVs6W+4PcT&a~*s+`NlrJ%Gme|PZSLYOW2}p`nBDw`oiPfRhsYp4MUD(bf
zhGEd)XsR1lQAZk&{kRkM?;pfLZ+GC5z7rmP|I)1wmdURVebhsZC*g_TKdm2y!RgNr
zy?#eee#y0Q!$b2i=#k0f&Wq+QT4r4_Yc<WTA(N4RtTQW$5e;sn9<YYQ1>;{frfSR;
zV-{zoMqXB&tI#lv%udE@MAhNWm@8frRe{$@oZ&Uu&6wc@J~DU-?V-SpDe4@p=vpZw
zMG`9;tYwyRTqi$=9J?uNGLX~^p5{b}r%iE^;LEO;SjlY;&POrB>uzTZuhN^dLI+y?
zLGVW7<gtBkEHb$tVvyMyF~mkOa{?V7gs|sr_By&BZ_&ePpz1`eW53sd%x)j(_F-0P
z_q5;F&;md9@fszcBAj8K!nCI_Z<?1o?K~;oFq;jpNB>hT_yE&Qb$T3`k{OrzSyjA3
zP#rFXLu*`}D0g`0-=^R#+Wx=<n%>h97rD}?OwQfrOI#x@Kks>0aMdhL#9R@1zP!I`
bJqTgY(@)I55gDn(OT0=Y&}}QF%4*>cTc^eW

diff --git a/hotel/rooms/migrations/__pycache__/0006_remove_room_reserved.cpython-36.pyc b/hotel/rooms/migrations/__pycache__/0006_remove_room_reserved.cpython-36.pyc
new file mode 100644
index 0000000000000000000000000000000000000000..1ae7e9f0f0f4a1aac1ac056fd533e2ad3dd08dac
GIT binary patch
literal 537
zcmY*VJx{|h5Vhl^qy+>UYsHp@M6`Si2r(cE0|mhrAz7t&l$0bcc3KIE4OV_g|B_cG
z{sI%{6a-lE)A{b+yL;}euD0gSy_*xx*gN}ke2S0gnoR;=z;jmclylZ&;DLB$Adru}
z7m<44U$ZFqpgtCH+bXh=9#oks&CsQO&Obq9DF;T>r4dgB`r`lu_z=8#^lm_d1Vh_A
z|537mR;n;|BT14SIm|OGE2+_-p4F4A@9Jr|NFhWXt)T#OSq=)czQcaxX}5z82%;q$
z%DO0}ZAnSZ(;O*Yk@9gm$Q{AG04G=imctB<_K0Ygudq-vJjpNz+foz!_Bv;J&8a*1
zyo>Kufw8Hk#H~zhx}EM`vL7F#d8pJRKI>n!FSQ!uL)G4nPgR9EF&x%D<KHig$?+~(
zbu*<ae%nUanmlPi!y0r=NDzvK?{kmW*?uH!6UKvbq_*I;UcJu$F1d)-iD<)vh5tjR
JXPnIy@dY%&j?e%A

literal 0
HcmV?d00001

diff --git a/hotel/rooms/views.py b/hotel/rooms/views.py
index 336e2bf..fe439ae 100644
--- a/hotel/rooms/views.py
+++ b/hotel/rooms/views.py
@@ -3,6 +3,7 @@ from django.template import loader
 from django.shortcuts import get_object_or_404, render
 from .models import *
 from .forms import *
+from django.db.models import Q
 import re
 import datetime
 
@@ -29,8 +30,8 @@ def reservation(request):
 
     template = loader.get_template('reservation.html')
     error = ""
-    reservation = Reservation.objects.filter(room_number=room_number).filter(begin_date__gte=begin_date).filter(end_date__lte=end_date)
-    if reservation:
+    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 not reservation is None:
         status = "Pokój " + str(room_number) + " jest już zarezerwowany"
         return HttpResponse(template.render({'status': status}, request))