From 3c1672b7530eb04ce099661541c5c2099c563f93 Mon Sep 17 00:00:00 2001 From: samuel Date: Mon, 13 Jul 2020 17:12:39 +0200 Subject: [PATCH] step4 --- sami/django/mysite2/db.sqlite3 | Bin 0 -> 143360 bytes sami/django/mysite2/mysite2/settings.py | 7 ++- sami/django/mysite2/mysite2/urls.py | 4 +- sami/django/mysite2/polls/.#models.py | 1 + .../mysite2/polls/migrations/0001_initial.py | 32 +++++++++++ sami/django/mysite2/polls/models.py | 24 ++++++++ .../mysite2/polls/templates/polls/detail.html | 1 + .../mysite2/polls/templates/polls/index.html | 22 ++++++++ .../polls/templates/polls/results.html | 9 +++ sami/django/mysite2/polls/urls.py | 13 +++++ sami/django/mysite2/polls/views.py | 52 +++++++++++++++++- 11 files changed, 160 insertions(+), 5 deletions(-) create mode 120000 sami/django/mysite2/polls/.#models.py create mode 100644 sami/django/mysite2/polls/migrations/0001_initial.py create mode 100644 sami/django/mysite2/polls/templates/polls/detail.html create mode 100644 sami/django/mysite2/polls/templates/polls/index.html create mode 100644 sami/django/mysite2/polls/templates/polls/results.html create mode 100644 sami/django/mysite2/polls/urls.py diff --git a/sami/django/mysite2/db.sqlite3 b/sami/django/mysite2/db.sqlite3 index e69de29bb2d1d6434b8b29ae775ad8c2e48c5391..95016afdcda3372d141ae70285e53f77a5419a45 100644 GIT binary patch literal 143360 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 timezone.now() -datetime.timedelta(days=1) + +class Choice(models.Model): + question = models.ForeignKey(Question, on_delete=models.CASCADE) + choice_text = models.CharField(max_length=200) + votes = models.IntegerField(default=0) + + def __str__(self): + return self.choice_text + + diff --git a/sami/django/mysite2/polls/templates/polls/detail.html b/sami/django/mysite2/polls/templates/polls/detail.html new file mode 100644 index 0000000..6667640 --- /dev/null +++ b/sami/django/mysite2/polls/templates/polls/detail.html @@ -0,0 +1 @@ +{{ question }} diff --git a/sami/django/mysite2/polls/templates/polls/index.html b/sami/django/mysite2/polls/templates/polls/index.html new file mode 100644 index 0000000..71c2249 --- /dev/null +++ b/sami/django/mysite2/polls/templates/polls/index.html @@ -0,0 +1,22 @@ +{% if latest_question_list %} + +{% else %} +

No polls are available.

+{% endif %} + +

{{ question.question_text }}

+ +{% if error_message %}

{{ error_message }}

{% endif %} + +
+{% csrf_token %} +{% for choice in question.choice_set.all %} + +
+{% endfor %} + +
diff --git a/sami/django/mysite2/polls/templates/polls/results.html b/sami/django/mysite2/polls/templates/polls/results.html new file mode 100644 index 0000000..3b2c74f --- /dev/null +++ b/sami/django/mysite2/polls/templates/polls/results.html @@ -0,0 +1,9 @@ +

{{ question.question_text }}

+ +
    +{% for choice in question.choice_set.all %} +
  • {{ choice.choice_text }} -- {{ choice.votes }} vote{{ choice.votes|pluralize }}
    • +{% endfor %} +
+ +Vote again? diff --git a/sami/django/mysite2/polls/urls.py b/sami/django/mysite2/polls/urls.py new file mode 100644 index 0000000..0b66ce8 --- /dev/null +++ b/sami/django/mysite2/polls/urls.py @@ -0,0 +1,13 @@ +from django.urls import path +# Here is importing the views which I modified +from . import views +app_name = 'polls' +urlpatterns = [ + path('', views.index, name='index'), + # ex: /polls/5/ + path('/', views.detail, name='detail'), + # ex: /polls/5/results/ + path('/results/', views.results, name='results'), + # ex: /polls/5/vote/ + path('/vote/', views.vote, name='vote'), +] diff --git a/sami/django/mysite2/polls/views.py b/sami/django/mysite2/polls/views.py index 91ea44a..b018678 100644 --- a/sami/django/mysite2/polls/views.py +++ b/sami/django/mysite2/polls/views.py @@ -1,3 +1,53 @@ +# Here is the fist view add by Sami from Diesbach from django.shortcuts import render +from django.http import HttpResponse +from django.shortcuts import Http404 +from .models import Choice, Question +from django.template import loader +from django.shortcuts import get_object_or_404, render +from django.http import HttpResponse, HttpResponseRedirect +from django.urls import reverse +from django.views import generic + + + +class IndexView(generic.ListView): + template_name = 'polls/index.html' + context_object_name = 'latest_question_list' + + def get_queryset(self): + """Return the last five published 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/results.html' + + + + +def vote(request, question_id): + question = get_object_or_404(Question, pk=question_id) + try: + selected_choice = question.choice_set.get(pk=request.POST['choice']) + except (KeyError, Choice.DoesNotExist): + # Redisplay the question voting form. + return render(request, 'polls/detail.html', { + 'question': question, + 'error_message': "You didn't select a choice.", + }) + else: + selected_choice.votes += 1 + selected_choice.save() + # Always return an HttpResponseRedirect after successfully dealing + # with POST data. This prevents data from being posted twice if a + # user hits the Back button. + return HttpResponseRedirect(reverse('polls:results', args=(question.id,))) + -# Create your views here.