diff --git a/db.sqlite3 b/db.sqlite3 index ce3d545..1aff276 100644 Binary files a/db.sqlite3 and b/db.sqlite3 differ 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 0000000..bcef763 Binary files /dev/null and b/qa/migrations/0008_answer_votes.pyc differ 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 633b2fc..d9a3368 100644 Binary files a/qa/models.pyc and b/qa/models.pyc differ diff --git a/qa/templates/qa/detail.html b/qa/templates/qa/detail.html index d1e3457..1c5c647 100644 --- a/qa/templates/qa/detail.html +++ b/qa/templates/qa/detail.html @@ -3,27 +3,59 @@ {% bootstrap_css %} {% bootstrap_javascript %} + + + +

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 9d73670..c6b3a2f 100644 Binary files a/qa/views.pyc and b/qa/views.pyc differ diff --git a/simpleqa/urls.py b/simpleqa/urls.py index 07e27d9..2507194 100644 --- a/simpleqa/urls.py +++ b/simpleqa/urls.py @@ -11,6 +11,7 @@ url(r'^admin/', include(admin.site.urls)), url(r'^add/$', views.add, name='add'), url(r'^answer/$', views.add_answer, name='add_answer'), + url(r'^vote/(?P\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 b7f3b04..a787496 100644 Binary files a/simpleqa/urls.pyc and b/simpleqa/urls.pyc differ