From c44c90065eeb5beecc17935e1c54765ba414175b Mon Sep 17 00:00:00 2001 From: Arjun Date: Mon, 19 Jan 2015 21:26:52 +0530 Subject: [PATCH] v0.2 Vote Answers --- db.sqlite3 | Bin 184320 -> 184320 bytes qa/migrations/0008_answer_votes.py | 20 ++++++++++ qa/migrations/0008_answer_votes.pyc | Bin 0 -> 842 bytes qa/models.py | 1 + qa/models.pyc | Bin 2538 -> 2602 bytes qa/templates/qa/detail.html | 42 +++++++++++++++++--- qa/templates/qa/index.html | 11 +++++- qa/views.py | 59 ++++++++++++++++++++++++++-- qa/views.pyc | Bin 4974 -> 6230 bytes simpleqa/urls.py | 1 + simpleqa/urls.pyc | Bin 925 -> 1031 bytes 11 files changed, 125 insertions(+), 9 deletions(-) create mode 100644 qa/migrations/0008_answer_votes.py create mode 100644 qa/migrations/0008_answer_votes.pyc diff --git a/db.sqlite3 b/db.sqlite3 index ce3d545f5d67306cf40525e44024adf9fc056133..1aff27612050c81b3de652e46bc58918a30497bb 100644 GIT binary patch delta 1077 zcmah|QEL=e6uxJ6wwr8r?%AYjirDOIwi*K2*?VVZcV^cY7c7L5{s5t9C&?t)m~67y zF>xhe455@Fq68iA#Z~$s)!NjRY^CB;Xx?h9AU+gn`_ev?)CWQEMQ0~VY7p^Z&J1(T z_kHJ_``v|V+d{SN{N4`86GD>B2fX*e3w^2p`5(Xh7WYM@d4lVB35PL-g#JR$(jzo3 z{VlCX^R;;N3rSZaLDHVemn_DZdCV%7=j@qdvr~>;RvAwx8Bg-8%(a}#a-1n#&1N%N zZRO){+9?KNP_mj3y4;@{fW-2})Hp}o@070omDhF&3Ntf{jdHMV89Jkp@+hN z)PWbtZ*YLz3m#sMM;F|CRoD}b{0r-yy}htB>At8!9Qxe}}!g55IVT`mJ}%g`#7R+B5FwKfrDG{&yhPFJA*E{DE|rh+}4b*Y|J-S~qwM z&JY5c`|uX535Bf7u0dgS1%6dzQ!Q0yCrg!#GdO&*=*&%Mv-WIh&MMj`#tOrwk^1IS z5P|+brNK>o^$++NKYbrm@DAw{^`tg5t_>OH_{bpB)Z?Sp&@{8g%Bo!)u`?5=R-eHm z?AxZ-GDgPi3gltyRMaF>Wxk!&8{+j>uOJu=2e3kL4XaqG)2MJ9h5ZS4AtrP-TGet~ zQw*Ik)u>lv!tkM8Ex1AOB|gVZ{0INS-|;bS)Y_+i!meNdAVC|kTk>PXk8OSo*Egqx zJ@UKY)98MEMdFFLCBJd$VUZ_}=g!rZ@w+1qmtjk2n` zRx^0pdm%>~-cNf*Hk6E^bJa|TJq-6`yc^;ailcJTo|DVYiIH;oEh#;xnTp1Are#tg zZ;XTo3-Yof=lyFIj|beF4}`tDlPz8{)<{lPnr+8LKZQN5p4{%HT=Qqj^H0dDKOluj dOJgWVOr?)(E`={1O49OeK3 delta 707 zcmah{O-vI(7@cprrG>itEsdbTNOz4$NTBR4blYt_NR)(wC*y^SxYAPEN=ucY4MIqpgH{LNK)>CpQL^#q>>M`u_(g&*@h--&9f|NlxFPfkGXI5NEX&d~UtTWYD7a?P}f3Xy?puEwNI1=na6@= zL3qvkX^?z}BV@&Wq9lt&wqikjQ@k&1n#zD4k2}8ogV|(%yyf_*?yl3_(w=YdU|&lM zOd9N+1v0D5!+utGAHt=gmt#j4pqGiWkfKSQu?0xl_h#WjP1Q2t_`#69_aQuiYOflA zD_50H4_lvy)or=Gxd3ZHDVqq5o4Qg6rBk_Kb10=mB8gmfphGbV+HiJk(5}1(4un5H z3hR1g=_5SF?*BcdPP2zIx;~aL&c*U6WgupzVnex1x)4!DBk4pTm+Tl@`T=jTb=O`s zoXQ$qU7#sys7=wFBdNPnZ7bZ~+yu8+L(w9*iWXk71(Bw)SvMl8+EmAp16}#}Xg--q z?0Becsv)ULw9|-c;h<()0UA3dy0Aj<7yiTwe#OuDpjQ%gp gR+wD9&E9SH@J?|qoFKT4bI#T5#GOYru|_9<144Ak;{X5v diff --git a/qa/migrations/0008_answer_votes.py b/qa/migrations/0008_answer_votes.py new file mode 100644 index 0000000..c81cda9 --- /dev/null +++ b/qa/migrations/0008_answer_votes.py @@ -0,0 +1,20 @@ +# -*- coding: utf-8 -*- +from __future__ import unicode_literals + +from django.db import models, migrations + + +class Migration(migrations.Migration): + + dependencies = [ + ('qa', '0007_answer_pub_date'), + ] + + operations = [ + migrations.AddField( + model_name='answer', + name='votes', + field=models.IntegerField(default=0), + preserve_default=True, + ), + ] diff --git a/qa/migrations/0008_answer_votes.pyc b/qa/migrations/0008_answer_votes.pyc new file mode 100644 index 0000000000000000000000000000000000000000..bcef7637ba366e3c294095755c44fa7df27aa00c GIT binary patch literal 842 zcmb`F&2H2%5XZ-fll=gs3L%~$r)F<(K!}eDsRuZu<-lGncRjmG($-fQuW({d zVe7-1WqX)(Xb0!Ril!eQrhiE}`i@C2NFXqvS;K)yGr$}=$*jaiNCaX^zyi7w%mU1k z2!&YzE=WlJWC_hx^@ui#%yO&aGkR?{n-@wu{}m@S#v5gHz?qFPmD4>&rk+!RB$;9b ziMt`753KerS`!we4DNNbp(QyRF;3`lxY}SJhF$E@1z(#^yTefXwjV9t>YAQYBWp7B<%6Ngp!4y*;SFS(nr-#m^|S1G{s-QV!~OsO literal 0 HcmV?d00001 diff --git a/qa/models.py b/qa/models.py index d86598b..5357c3a 100644 --- a/qa/models.py +++ b/qa/models.py @@ -34,6 +34,7 @@ def __unicode__(self): class Answer(models.Model): question = models.ForeignKey(Question) answer_text = models.CharField(max_length=200) + votes = models.IntegerField(default=0) pub_date = models.DateTimeField('date published') user_data = models.ForeignKey(UserProfile) def __str__(self): diff --git a/qa/models.pyc b/qa/models.pyc index 633b2fcf5322a02e405fee2e01c95d0e93e1b0f6..d9a3368d77aa5da6912d861717879c3ec57fd308 100644 GIT binary patch delta 178 zcmaDQyh?U|E-yn0D?vJUB delta 103 zcmZ1_@=BPU`7 + + +

Simple QA Open Questions

-

Q: {{ question.question_text }}

+

{{ question.pub_date }}

+

Q: {{ question.question_text }}

Answer this Question!

-{% if question.answer_set.count %} +{% if answers %}
-

There are {{ question.answer_set.count }} Answers

+

There are {{ answers.count }} Answers

- {% for answer in question.answer_set.all %} - + {% for answer in answers %} +
+ {% if user.is_authenticated %} +

{{ answer.votes }}

+ {% endif %} +
+

- {{ answer.user_data.user.username }} ({{ answer.pub_date }})

+
{% endfor %}
+ + + {% else %}

This question is still open, Write answer!

{% endif %} diff --git a/qa/templates/qa/index.html b/qa/templates/qa/index.html index f4b651b..895c086 100644 --- a/qa/templates/qa/index.html +++ b/qa/templates/qa/index.html @@ -3,6 +3,15 @@ {% bootstrap_css %} {% bootstrap_javascript %} + + + +
Ask Question

Simple QA Open Questions

@@ -11,7 +20,7 @@ {% if questions %} diff --git a/qa/views.py b/qa/views.py index b1c6eb0..15ce088 100644 --- a/qa/views.py +++ b/qa/views.py @@ -47,9 +47,22 @@ def add(request): def detail(request, question_id): try: question = Question.objects.get(pk=question_id) + answer_list = question.answer_set.order_by('-votes') + + paginator = Paginator(answer_list, 10) + page = request.GET.get('page') + try: + answers = paginator.page(page) + except PageNotAnInteger: + # If page is not an integer, deliver first page. + answers = paginator.page(1) + except EmptyPage: + # If page is out of range (e.g. 9999), deliver last page of results. + answers = paginator.page(paginator.num_pages) + except Question.DoesNotExist: raise Http404("Question does not exist") - return render(request, 'qa/detail.html', {'question': question}) + return render(request, 'qa/detail.html', {'answers': answers, 'question': question}, ) def answer(request, question_id): try: @@ -72,13 +85,53 @@ def add_answer(request): return render(request, 'qa/answer.html', {'question': question, 'message': 'Empty'}) a = Answer() + pub_date = datetime.datetime.now() a.answer_text = answer_text a.question = question a.user_data = user + a.pub_date = pub_date a.save() - return render(request, 'qa/detail.html', {'question': question}) - return render(request, 'qa/answer.html', {'question': question}) + answer_list = question.answer_set.order_by('-votes') + + paginator = Paginator(answer_list, 10) + page = request.GET.get('page') + try: + answers = paginator.page(page) + except PageNotAnInteger: + # If page is not an integer, deliver first page. + answers = paginator.page(1) + except EmptyPage: + # If page is out of range (e.g. 9999), deliver last page of results. + answers = paginator.page(paginator.num_pages) + + return render(request, 'qa/detail.html', {'question': question, 'answers': answers}) + + return render(request, 'qa/detail.html', {'question': question}) + +def vote(request, answer_id, question_id, op_code): + answer = Answer.objects.get(pk=answer_id) + if op_code == '0': + answer.votes += 1 + if op_code == '1': + answer.votes -= 1 + answer.save() + question = Question.objects.get(pk=question_id) + + answer_list = question.answer_set.order_by('-votes') + + paginator = Paginator(answer_list, 10) + page = request.GET.get('page') + try: + answers = paginator.page(page) + except PageNotAnInteger: + # If page is not an integer, deliver first page. + answers = paginator.page(1) + except EmptyPage: + # If page is out of range (e.g. 9999), deliver last page of results. + answers = paginator.page(paginator.num_pages) + + return render(request, 'qa/detail.html', {'question': question, 'answers': answers}) from qa.forms import UserForm, UserProfileForm diff --git a/qa/views.pyc b/qa/views.pyc index 9d7367026674f09a0cb8394ac9535fa0b2327b62..c6b3a2f05427dff1b2cc24306d8fc776fedccd36 100644 GIT binary patch delta 1959 zcma)6OKcle6uoc8_ISpBJ8|=G3ME(~Nz)_>Eg)32BvLL%4AY2(>XPCZi%kh|;YBwIfuws2!D_7+r6kr$`W| zO^0^gBc)U~BzXIT=HrOl691gz{qe}+^iwnyy>`7h2^!{02=gv8gCuz|=De?nIYEk7 zl>xWKZmZ@QP#jgf#4xg^gkZ0f=Zh}El4(NBSsb@HoTLc6gdFy7?4{EJu zrRGUq>Fj6Rs`-IC#B@nCt@o^JV`KOxWvW4yH!>=ZRzanVJf0ClkH^0npXC9k7$Sg@ z$t|AFodf7Q)@3V9e?h-!ADiUN2gUyq`{f$q&=hSNwDXD5x9!imfy0N7qwW!P;w*@^ zMU^C%mK!+cm^9MVMif06#(I|dQokJ4^W!F+?% zmLc6vvM-yW6nhP|R&618X&I6vQOz+4-#iR6X=tCpioo*Z>aZf9V-t#iXtJRq4x`v$ z7!{!;xvZ-$pS-)Ed(OGy(PGhiPSJ9wK`RaG2hJtOJ;_6!0O%8mljoo0uM)!y!+(ec zl#Af1HcxZxc@J5@P<6{vk2k%_zJ7cZ`2a zr)W$V8!Q*r>46-EG071|fTH8h8zPVeKBx#>0Y~|?Q8B3r1>q|q(U<=g?Vi~W<0iu% zpbWUjp~=8fU^4I%bizX{Ixqw-3vMrNHcSRi0)g6MGL}>}E^>j~prp9;*nPEx*6^K} zh}C5RRvAiA!ElnW8-5%$_^5(*|4ckoiDfXui?X7BN-btZtGun1 zi&vJ{+>3f9J)OP6Bvz(-nPE}a(r>5_cfU^OmAb0G&)iSE%KcZv;GP9Fr`27Z$u(42 zcXAt<-w^S6iDWotX;S~1`{vnsX3MUg=hh1V2nPncKKo{Cr{TM@v=xrM!tgpnnc;^1 kIe(*sv!Sdisxdr3!%<1Y&f`B|TlSPaR5a}8>{8bJ3x)zXnE(I) delta 684 zcmZ9Jzi-n}5XbM?X<|EZ>^j6v^P`jsRUS%`N+?TODHJsoQ9;BhOC*{`bwN#&mc*%8 zB9`(GR3{-e*3M)kBLiZh66%P=%1~9}AK=dEgir6|@4Gv{_w{>M#p~sa{8!hCH0*a?s3ChZPhS zz*C^%B*ta&VFqhzCo<&a-yGp}q+q)_(oUG*8Vr+>z`n99Wc;Y)@TXG8Q_aAtI!Ui^ z@c|=5aAa0CBac~aN0hLy%`GaF;PoEU@Pz;v0d&ZkfFlV8e*iDEPkSQ)qX@J#7=;26 zg;6*VF=j`HGXODE_**XuhtwScPlnQ&42|2g@?YAC(T305EYU4uJyyZbh9x<1{2Hra zO240UsN%4@spk@_JigQKX{#iMs%ls{(Yt%ROu#VrYhi0(!3?-{iwl^DY1>=bolaI!I#Mof0VlDAfycl03 zEFre=%bly}Q_gQqiSWOK-M}FKle^7$&Zsk7f&)mqVJ\d+)/(?P\d+)/(?P\d+)/$', views.vote, name='vote'), url(r'^register/$', views.register, name='register'), url(r'^login/$', views.user_login, name='login'), diff --git a/simpleqa/urls.pyc b/simpleqa/urls.pyc index b7f3b0407f9be2727ed8288918f05019207dc8e0..a78749673ada3c54bc93cd3d65a938de27e73eab 100644 GIT binary patch delta 183 zcmbQs-p(P-{F#?4NMLVBG6NI{0BHvxE>_$q&B~~l%FK`=&XCH^kR`;B!p4vy!O+aa z*v!okCCrc_$q=j|HCc!8zYIu2Tv>ies=kJOfK6gvad~P{d}fMWOp3PVwzDfxTP!CAUWGyCtMv=)?Ow~+5ypumM^~*^CWn>rym;{*Em_!*tPy$Sf Gf_VVI1tl#2 delta 96 zcmZqYn9DBB{F#@_^ZuTYWCkeU2ht8eT+Fjknw62KnTsJxh#^IsAy`9VvLoaF$$d6krlyVq+3z1VIT931$NTtaK2d