From 16b38b0d24677e6f45760cd697e9da1cc5ebd1df Mon Sep 17 00:00:00 2001
From: Anish Lakhwara <anish@lakhwara.com>
Date: Tue, 7 Jul 2020 22:14:26 +1000
Subject: [PATCH] finished tut4, onto tut 5

---
 .../__pycache__/__init__.cpython-37.pyc       | Bin 144 -> 148 bytes
 .../__pycache__/settings.cpython-37.pyc       | Bin 2278 -> 2282 bytes
 mysite/mysite/__pycache__/urls.cpython-37.pyc | Bin 986 -> 990 bytes
 mysite/mysite/__pycache__/wsgi.cpython-37.pyc | Bin 546 -> 550 bytes
 .../polls/__pycache__/__init__.cpython-37.pyc | Bin 143 -> 147 bytes
 mysite/polls/__pycache__/admin.cpython-37.pyc | Bin 258 -> 262 bytes
 mysite/polls/__pycache__/apps.cpython-37.pyc  | Bin 357 -> 361 bytes
 .../polls/__pycache__/models.cpython-37.pyc   | Bin 1229 -> 1233 bytes
 mysite/polls/__pycache__/urls.cpython-37.pyc  | Bin 453 -> 481 bytes
 mysite/polls/__pycache__/views.cpython-37.pyc | Bin 1504 -> 2335 bytes
 .../__pycache__/0001_initial.cpython-37.pyc   | Bin 993 -> 997 bytes
 .../__pycache__/__init__.cpython-37.pyc       | Bin 154 -> 158 bytes
 mysite/polls/templates/polls/index.html       |   2 +-
 mysite/polls/urls.py                          |   6 +++---
 mysite/polls/views.py                         |  19 +++++++++++++++++-
 15 files changed, 22 insertions(+), 5 deletions(-)

diff --git a/mysite/mysite/__pycache__/__init__.cpython-37.pyc b/mysite/mysite/__pycache__/__init__.cpython-37.pyc
index caa798b6093d64281bb2f0773497dc54cadf9d3b..ecc92973aeef01a2fccf8f0b1a530a928fe2f436 100644
GIT binary patch
delta 60
zcmbQhIE9hNiI<m)0SH8+SmG!0n5)?8XXNLm>L=!97H8;}78mKKq?YNYWF_XM=j)b~
OmgE;@Cgw~`)&&5@{1O!a

delta 56
zcmbQjIDwJJiI<m)0SNN8e~6pNW3FJSpOK%Ns-KvbS)8F?T3n=`l3J#pl9ia3p0Asd
Knwvi{T^9hteG%gT

diff --git a/mysite/mysite/__pycache__/settings.cpython-37.pyc b/mysite/mysite/__pycache__/settings.cpython-37.pyc
index fe3c765b9081203cea7f08326c657ff20ab1657b..6bba6b8227a927ab244f2a7b8a70ed11d6dd41fd 100644
GIT binary patch
delta 62
zcmaDR_)3t+iI<m)0SH8+SmHPGSaPV?>SyHVrs^l=Wfo`XmlhZ4r=*tYr(`AOrRVFG
Ql$PWdWhUlKPUUC>02F2uYXATM

delta 58
zcmaDQ_)L(;iI<m)0SJuue2Ck~W67alsh^Rbo2s9fmsy;lUs_zGpORXppOTfBm!7Yi
MlA4=8Ig_Ii00a9I0{{R3

diff --git a/mysite/mysite/__pycache__/urls.cpython-37.pyc b/mysite/mysite/__pycache__/urls.cpython-37.pyc
index e10d51868f8f6c609d9a76d98d5262fa820b764b..748b7be86dc939665f507c14392bac070612c4e9 100644
GIT binary patch
delta 40
ucmcb`evh5UiI<m)0SH8+SmHPG)G{+#PVQos<|rvG$uG)G%$dBB*$@D~YznCW

delta 36
qcmcb|ev6&QiI<m)0SLbA_z<^|r<R$~baEH7G)qcqZvN!8%!UBOS_=LE

diff --git a/mysite/mysite/__pycache__/wsgi.cpython-37.pyc b/mysite/mysite/__pycache__/wsgi.cpython-37.pyc
index 9840dbab529ada3f4b4d148b4fbd1a3feca8d461..19857ca6a04d7297187573579ad2b7fad1071882 100644
GIT binary patch
delta 62
zcmZ3)vW$htiI<m)0SH8+SmHPG9A#9o)X&JzP1R4#%Ph{&FD)+8Pf0D)PsvKmOV8IW
QDJ{t_%1q3e{E^WR00in2e*gdg

delta 58
zcmZ3+vWSJpiI<m)0SNN8e~8=2bCglRR6ip>H&s6|FS9s9zqGhWKP9zHKP4+MFFjv3
MB{esH@>fPf0RDFqO#lD@

diff --git a/mysite/polls/__pycache__/__init__.cpython-37.pyc b/mysite/polls/__pycache__/__init__.cpython-37.pyc
index 7e11076196a921d9b27715da36503caba73a1a90..c86605f89bf00285ecf724768427680d46387370 100644
GIT binary patch
delta 60
zcmeBYoXp7M#LLUY00g2@Eb$Y0%vEgkGxBp&^%L_li!<~~i;MJAQp@yHvJ&&s^L0x~
OOY(~{6LTge>i_`8UJ?-i

delta 56
zcmbQt*w4u0#LLUY00ft|e~6pNW3FJKpOK%Ns-KvbS)8F?T3n=`l3J#pl9ia3p0Asd
Knwvi{T?YWtw-Q4D

diff --git a/mysite/polls/__pycache__/admin.cpython-37.pyc b/mysite/polls/__pycache__/admin.cpython-37.pyc
index c7dbf5fc4861ace87313e3796a068911a1a4f0a0..d1a487a154f5fb1a52c2b7ef9cfe7c3d3f3feb72 100644
GIT binary patch
delta 60
zcmZo-YGdMY;^pOH00Pk{miUQ0D^)D@GxBp&^%L_li!<~~i;MJAQp@yHvJ&&s^L0x~
OOY(~{6LThB)dc|4h7#KV

delta 56
zcmZo;YGUGX;^pOH0D`@ZU*ab6tW+@7&&bbB)lbaJEY8p`EiTeeNiEY)$x6&i&(}>!
K&CQ>9Qx^cz#1h5;

diff --git a/mysite/polls/__pycache__/apps.cpython-37.pyc b/mysite/polls/__pycache__/apps.cpython-37.pyc
index 429cbd05f276d88fb2f570788f4535898bd98181..575eb8619183e3c05125b5822daaad4d13083a19 100644
GIT binary patch
delta 37
rcmaFL^pc6kiI<m)0SH8+SmG!0oME(>cvG6Aq_iZzC^Io<;*VSav~3Hp

delta 33
ocmaFK^puImiI<m)0SGQ_{}4Bk=M1CC#GBGADXF>n6aVA_0I&NC;s5{u

diff --git a/mysite/polls/__pycache__/models.cpython-37.pyc b/mysite/polls/__pycache__/models.cpython-37.pyc
index c00f228a8f7f0bb62eb09d29301e043f23554d3f..a16d86e77dd5bc51b979692c808c3a410ad3eac4 100644
GIT binary patch
delta 41
vcmX@hd6ARHiI<m)0SH8+SmHPGI5RR@O%7m`<|rvG$uG)G%-NjJ7{?3%y`u^+

delta 37
rcmcb}d6tvMiI<m)0SJ!m{}8v4$C;7QY;pjjG)qcqZvN(C#yDmG!D|X$

diff --git a/mysite/polls/__pycache__/urls.cpython-37.pyc b/mysite/polls/__pycache__/urls.cpython-37.pyc
index 10b912cdb5d9f978d480a02d3a3fea044b3b9edc..f003bd34d1017d62c52f9bd7a742c821c5460d80 100644
GIT binary patch
delta 270
zcmX@g{E(T~iI<m)0SI=-vBW1$<dtO1n5eGquz+nLLke38doOb;V+uzqa~3;TgcB;l
z1r*@`i*Q3lcz`0DDZC(FI!hGS#3n0gPMgfU603r2JN;X1DXArinK@O0P@#!0jTyNo
z%QC9fM{#=QrKDDbWu}(jVoxlNF9R{ST)@gff>GQ-sl}x^CB-045jW7Gx427-atabl
zN>YpRidQle2?E8y#4ii|jQreG{lvV?;tc)L;v)T&)H3~)ti-(ZeBF}LlKi5~#2o$H
a%HqtDRQ-bdoSb6)(#Z=L<=KQ7K@b2c98%5z

delta 205
zcmaFJe3Y5jiI<m)0SH8%e~t5;$ScVhGf`dLB!w-7y_Y$aF@+<QIg2fY6UyTP^4L?j
zp*$WSk0XT_#7k$1;+)uLr7L8UnO9;}SejZ~l9`_upP6E(e~T?8wIne!r%DQ4ZsKEO
zMy|=?jB5Ht>_8V3ae@etV~V(e#4Ya9qMU-nl9JS-yyBG%Mf@NM5b?`oau=gCOG;{P
O{^YfcdTe}*AP4{&fHtuJ

diff --git a/mysite/polls/__pycache__/views.cpython-37.pyc b/mysite/polls/__pycache__/views.cpython-37.pyc
index ff3ed69585775e9faed50da63339d1f9237184b1..bc8f37fc9ce1d0f5d2b4557bd754424976b2ac1e 100644
GIT binary patch
literal 2335
zcmbtVOOG2x5bo|7+hcpY>wRRi;icsrAF>815&|I<kwk!q7Dy0}IWThEo!xO}Jf^$7
zWLM59;h2BGAvtp8$8hKi2Tu75ocOB8-Zcq(K-lWXR9AO@RrOW%$DK}#;rGW6VfuTW
zu|Mf!@e47zf@Xe0Cz<3qD|o^SkqA!TA`gl%35!}%E9yzz%YwX7L`mf5VcslSNz2b`
zdAo>{81uSp<eg$ASt(YNRn9(PGLp@QOg2?K>OKgPHAq^r4M`i4bx77BiDd_p&Rnt~
zSLEtLmTbzdT*G)yuFDOKTXIvL!+2h9-D17-Pl22DgsW>cmP)&|ePz?~_DBse==AbC
zmwSPWKecvpQ<+IQHp(^V3kz;@S$tE;Ok-D%yLw&@a293_tqzqoil+N&taLVf%Bu^b
zucpe_tQ@=g)q^q{sv#j+`~)Uf(9BEd6ic{diI6-Aq)0*;$PgCPWDOS7UGp;_zxPe1
zemd?>$~-syj0C#}w#Z%Q$N4pBo*6r&%jrjBfOZwlY@)Ml#2@2^C%8$9pTz}+vxB|k
z=B3H>b}9!}J*`2l7w9$y*Qi`%TvTe9n%+KwiJ?*XonM*WfW}|%_YcZK^#|k39Q3C~
z_oX`Q%h6!GUtY3PTk33(_lqNwS=FylAHo8&J2`SO#Q?bVkx{mT!wk8DiQ}ykOLv!5
z_TYplO~->mrKxMBX;I2)PV+d$IfHz@(y^+T<S@mnx{YBuw(8zVxJgT&!$sbJrH=fg
z2}cvnAO%>&Lmmn*`$yQwtyf5iwk*P?0)&hsT!LKcTGx~vWVw&mT4lNP5+5+wqPMVF
zpQmn{I`8lrY*M+tKmzjbQs?2l2-zB%p^PMWnk4@jTpKK(=GH8;NqZ5o=?rk1NP0H3
zm$6E2J%vV+6Dkr73ACr;MNFQj;(acI8PE8AVS^cy;Y>UT;LF-FJ@qQK>J@a)XF)IY
zPSjmeAunkn6k>t=^!efUxyGCj&-m8Wd_IxueefCI<Pq09_#S#<VnRkxet09u9hO->
z<B~rT04)Gozyy(T4?NsMwus5y<LBe=qD8_Y)#%g;d4*TM0)cBUG}27!*GT1*5X1#n
zulPjD-sg<RT)%;@{{dIOiv0_`6(c-fJ%F>I>esR9-yv2<5c*SyZ!SY5N>ILekIpbz
z_UO^}OpL?`WEh1KwF-Xb_k(ZQ_+rRx&DKYaJK}Cj-{2^8oY@HehxcVDYrlBve8*-%
z$VN?Be~$^4HfO=())Uff+gLVmcIOV4(IfGI-@+>fsx=WY?*dmJ`f9y!#Zu}XzwmuI
z-I19bzioF=3h@~140bB@p73sP9i=s%l|mUa*jJh!*5lY0fe$K=P#GQQebZYxjlOGD
zhomTnE<ojT;g?_B`r1XGtE205o_-7GxcFMB%wB1)-$SMM40pA|(kg?(Jis$Vg-b`I
zDKd$aAby-iC|Ru_E16ceJ<F<)&Z3J9r4eyT@NJ~RrdXkLco(w0-geThYW%J_D776<
zt?@{_F|IvdJHP{~DZrX?#shP!^R-2d)(tG3?3n7@c<f0$*YmH1CWg4WuZ^b4l$a#Z
z4Y+`6m@m=36ly9uK52a_Xd;^jy=14)BcDRiht(VM5mj_UWw;AdWB>04>(P3+9!9k&
HjKaSGz@-o?

delta 671
zcmZuv&2G~`5cW3y*~WHam!xfuNJW(o#6qICQdOKdArJ>p1cb;tG={ae>~7MQOE0`Y
zwGYq}2adds4+x11eE@{SiP@x3R56z4Z)fJ4{p|C#ui^InIBq*A$@d>Gf4YwI%?5vD
z1)Y6-6+heFzvD5VhgCF+h{FO#KRBb9t+F=S4hva?w##DHL7TAd6DLc~zPwH^2=-^B
zp^s;vbSY}{)P2;u@G#rN?=Ev=UMg)qyM59&>B{=4w7^-b2_!5^WMs>OLev_L^(RNB
z82{SIr=o&<QkQC)&y>s=%yaf;QXh!h3@VXVC#uwt9}3P@J}==&4G&KmudEpyQ=FiD
zR1WD8O5_dn3JZ&3w!G&LEGw6L$S(R#_;=fq$-X_cTP)R@E$|uWNy%gM6*7sFBO*7<
zz}o}a!|;8&+(d$!aXp;siZAA5E!o0jc^y%%+w6almLn|w71E}8>z|XJ34?om+tkD$
zrI6zal$soXTs1F(n@I3!aElDg$KdXcz19`TsH=cOp@EHysVED$em{3EH1th}4uUQ0
ze3+$XNMAi`{7Nw3YPrAVQEphZX_YPfXU>AL1zB_#yJj5r?Ej$>R0)2F$UZIVQJ1>E
E0fZHlMgRZ+

diff --git a/mysite/polls/migrations/__pycache__/0001_initial.cpython-37.pyc b/mysite/polls/migrations/__pycache__/0001_initial.cpython-37.pyc
index d37e6f677a61461384f2dc8974a0e93bf74e8acf..50052e2dc5dc82867fdc76364d8a67bbca851815 100644
GIT binary patch
delta 62
zcmaFJ{*;}^iI<m)0SH8+SmHPG{A5z`*3Zb#P1R4#%Ph{&FD)+8Pf0D)PsvKmOV8IW
QDJ{t_%1q3etjfFx04_Nc3jhEB

delta 58
zcmaFL{*ax=iI<m)0SFBCe2Ck~^OH%zT|Xl~H&s6|FS9s9zqGhWKP9zHKP4+MFFjv3
MB{esHvL^E$02-eYpa1{>

diff --git a/mysite/polls/migrations/__pycache__/__init__.cpython-37.pyc b/mysite/polls/migrations/__pycache__/__init__.cpython-37.pyc
index 8005e44c77e81fdc09ea10b80b321b4772ead9d4..f7ec59ef2c8ec0a055a28d3d0b32ce24119b1bc5 100644
GIT binary patch
delta 60
zcmbQmIFFIXiI<m)0SH8+SmG!0n5($!XXNLm>L=!97H8;}78mKKq?YNYWF_XM=j)b~
OmgE;@Cgw~`HU|LBC=xvY

delta 56
zcmbQoIE#_TiI<m)0SGQ_{}4Bk$6Uc#KO;XkRX;H=vp7S)w75t=CACaHB`Yy6JzqB^
KH8+1^x;X&Y{St2g

diff --git a/mysite/polls/templates/polls/index.html b/mysite/polls/templates/polls/index.html
index de92577..a5a7c18 100644
--- a/mysite/polls/templates/polls/index.html
+++ b/mysite/polls/templates/polls/index.html
@@ -1,7 +1,7 @@
 {% if question_list %}
 	<ul>
 	{% for question in question_list %}
-	<li><a href="{% url 'detail' question.id %}">{{ question.question_text }}</a></li>
+	<li><a href="{% url 'polls:detail' question.id %}">{{ question.question_text }}</a></li>
 	{% endfor %}
 	</ul>
 {% else %}
diff --git a/mysite/polls/urls.py b/mysite/polls/urls.py
index 06524e9..1aec99b 100644
--- a/mysite/polls/urls.py
+++ b/mysite/polls/urls.py
@@ -4,8 +4,8 @@ from . import views
 
 app_name = 'polls'
 urlpatterns = [
-	path('', views.index, name='index'),
-        path('<int:question_id>/', views.detail, name='detail'),
-        path('<int:question_id>/results/', views.result, name='result'),
+	path('', views.IndexView.as_view(), name='index'),
+        path('<int:pk>/', views.DetailView.as_view(), name='detail'),
+        path('<int:pk>/results/', views.ResultsView.as_view(), name='result'),
         path('<int:question_id>/vote/', views.vote, name='vote')
 ]
diff --git a/mysite/polls/views.py b/mysite/polls/views.py
index 9905f27..2d0fd3d 100644
--- a/mysite/polls/views.py
+++ b/mysite/polls/views.py
@@ -2,9 +2,26 @@ from django.shortcuts import render, get_object_or_404
 from django.http import HttpResponse, Http404, HttpResponseRedirect
 from django.template import loader
 from django.urls import reverse
-from .models import Question
+from django.views import generic
+from .models import Question, Choice
 
 # Create your views here.
+class IndexView(generic.ListView):
+    template_name = 'polls/index.html'
+    context_object_name = 'question_list'
+
+    def get_queryset(self):
+        # Return last 5 questions
+        return Question.objects.order_by('-pub_date')[:5]
+
+class DetailView(generic.DetailView):
+    model = Question
+    template_name = 'polls/detail.html'
+
+class ResultsView(generic.DetailView):
+    model = Question
+    template_name = 'polls/resulthtml'
+
 def index(request):
     question_list = Question.objects.order_by('-pub_date')[:5]
     context = { 'question_list': question_list }