Compare commits
No commits in common. "devel" and "master" have entirely different histories.
2
.gitignore
vendored
2
.gitignore
vendored
@ -1,5 +1,3 @@
|
|||||||
env/
|
env/
|
||||||
.vscode
|
.vscode
|
||||||
__pycache__
|
__pycache__
|
||||||
db.sqlite3
|
|
||||||
.env
|
|
@ -32,7 +32,6 @@ ALLOWED_HOSTS = []
|
|||||||
|
|
||||||
INSTALLED_APPS = [
|
INSTALLED_APPS = [
|
||||||
"scheduler.apps.SchedulerConfig",
|
"scheduler.apps.SchedulerConfig",
|
||||||
"polls.apps.PollsConfig",
|
|
||||||
"django.contrib.admin",
|
"django.contrib.admin",
|
||||||
"django.contrib.auth",
|
"django.contrib.auth",
|
||||||
"django.contrib.contenttypes",
|
"django.contrib.contenttypes",
|
||||||
|
@ -18,6 +18,5 @@ from django.urls import include, path
|
|||||||
|
|
||||||
urlpatterns = [
|
urlpatterns = [
|
||||||
path('scheduler/', include('scheduler.urls')),
|
path('scheduler/', include('scheduler.urls')),
|
||||||
path('polls/', include("polls.urls")),
|
|
||||||
path('admin/', admin.site.urls),
|
path('admin/', admin.site.urls),
|
||||||
]
|
]
|
||||||
|
Binary file not shown.
@ -1,5 +0,0 @@
|
|||||||
from django.contrib import admin
|
|
||||||
|
|
||||||
from .models import Question
|
|
||||||
|
|
||||||
admin.site.register(Question)
|
|
@ -1,6 +0,0 @@
|
|||||||
from django.apps import AppConfig
|
|
||||||
|
|
||||||
|
|
||||||
class PollsConfig(AppConfig):
|
|
||||||
default_auto_field = "django.db.models.BigAutoField"
|
|
||||||
name = "polls"
|
|
@ -1,52 +0,0 @@
|
|||||||
# Generated by Django 4.1 on 2022-09-09 02:24
|
|
||||||
|
|
||||||
from django.db import migrations, models
|
|
||||||
import django.db.models.deletion
|
|
||||||
|
|
||||||
|
|
||||||
class Migration(migrations.Migration):
|
|
||||||
|
|
||||||
initial = True
|
|
||||||
|
|
||||||
dependencies = []
|
|
||||||
|
|
||||||
operations = [
|
|
||||||
migrations.CreateModel(
|
|
||||||
name="Question",
|
|
||||||
fields=[
|
|
||||||
(
|
|
||||||
"id",
|
|
||||||
models.BigAutoField(
|
|
||||||
auto_created=True,
|
|
||||||
primary_key=True,
|
|
||||||
serialize=False,
|
|
||||||
verbose_name="ID",
|
|
||||||
),
|
|
||||||
),
|
|
||||||
("question_text", models.CharField(max_length=200)),
|
|
||||||
("pub_date", models.DateTimeField(verbose_name="date published")),
|
|
||||||
],
|
|
||||||
),
|
|
||||||
migrations.CreateModel(
|
|
||||||
name="Choice",
|
|
||||||
fields=[
|
|
||||||
(
|
|
||||||
"id",
|
|
||||||
models.BigAutoField(
|
|
||||||
auto_created=True,
|
|
||||||
primary_key=True,
|
|
||||||
serialize=False,
|
|
||||||
verbose_name="ID",
|
|
||||||
),
|
|
||||||
),
|
|
||||||
("choice_text", models.CharField(max_length=200)),
|
|
||||||
("votes", models.IntegerField(default=0)),
|
|
||||||
(
|
|
||||||
"question",
|
|
||||||
models.ForeignKey(
|
|
||||||
on_delete=django.db.models.deletion.CASCADE, to="polls.question"
|
|
||||||
),
|
|
||||||
),
|
|
||||||
],
|
|
||||||
),
|
|
||||||
]
|
|
@ -1,22 +0,0 @@
|
|||||||
import datetime
|
|
||||||
from django.db import models
|
|
||||||
from django.utils import timezone
|
|
||||||
|
|
||||||
class Question(models.Model):
|
|
||||||
question_text = models.CharField(max_length=200)
|
|
||||||
pub_date = models.DateTimeField('date published')
|
|
||||||
|
|
||||||
def __str__(self):
|
|
||||||
return self.question_text
|
|
||||||
|
|
||||||
def was_published_recently(self):
|
|
||||||
now = timezone.now()
|
|
||||||
return now - datetime.timedelta(days=1) <= self.pub_date <= now
|
|
||||||
|
|
||||||
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
|
|
@ -1,12 +0,0 @@
|
|||||||
<form action="{% url 'polls:vote' question.id %}" method="post">
|
|
||||||
{% csrf_token %}
|
|
||||||
<fieldset>
|
|
||||||
<legend><h1>{{ question.question_text }}</h1></legend>
|
|
||||||
{% if error_message %}<p><strong>{{ error_message }}</strong></p>{% endif %}
|
|
||||||
{% for choice in question.choice_set.all %}
|
|
||||||
<input type="radio" name="choice" id="choice{{ forloop.counter }}" value="{{ choice.id }}">
|
|
||||||
<label for="choice{{ forloop.counter }}">{{ choice.choice_text }}</label><br>
|
|
||||||
{% endfor %}
|
|
||||||
</fieldset>
|
|
||||||
<input type="submit" value="Vote">
|
|
||||||
</form>
|
|
@ -1,9 +0,0 @@
|
|||||||
{% if latest_question_list %}
|
|
||||||
<ul>
|
|
||||||
{% for question in latest_question_list %}
|
|
||||||
<li><a href="{% url 'polls:detail' question.id %}">{{ question.question_text }}</a></li>
|
|
||||||
{% endfor %}
|
|
||||||
</ul>
|
|
||||||
{% else %}
|
|
||||||
<p>No polls are available.</p>
|
|
||||||
{% endif %}
|
|
@ -1,9 +0,0 @@
|
|||||||
<h1>{{ question.question_text }}</h1>
|
|
||||||
|
|
||||||
<ul>
|
|
||||||
{% for choice in question.choice_set.all %}
|
|
||||||
<li>{{ choice.choice_text }} -- {{ choice.votes }} vote{{ choice.votes|pluralize }}</li>
|
|
||||||
{% endfor %}
|
|
||||||
</ul>
|
|
||||||
|
|
||||||
<a href="{% url 'polls:detail' question.id %}">Vote again?</a>
|
|
@ -1,36 +0,0 @@
|
|||||||
import datetime
|
|
||||||
|
|
||||||
from django.test import TestCase
|
|
||||||
from django.utils import timezone
|
|
||||||
|
|
||||||
from .models import Question
|
|
||||||
|
|
||||||
|
|
||||||
class QuestionModelTests(TestCase):
|
|
||||||
|
|
||||||
def test_was_published_recently_with_future_question(self):
|
|
||||||
"""
|
|
||||||
was_published_recently() returns False for questions whose pub_date
|
|
||||||
is in the future.
|
|
||||||
"""
|
|
||||||
time = timezone.now() + datetime.timedelta(days=30)
|
|
||||||
future_question = Question(pub_date=time)
|
|
||||||
self.assertIs(future_question.was_published_recently(), False)
|
|
||||||
|
|
||||||
def test_was_published_recently_with_old_question(self):
|
|
||||||
"""
|
|
||||||
was_published_recently() returns False for questions whose pub_date
|
|
||||||
is older than 1 day.
|
|
||||||
"""
|
|
||||||
time = timezone.now() - datetime.timedelta(days=1, seconds=1)
|
|
||||||
old_question = Question(pub_date=time)
|
|
||||||
self.assertIs(old_question.was_published_recently(), False)
|
|
||||||
|
|
||||||
def test_was_published_recently_with_recent_question(self):
|
|
||||||
"""
|
|
||||||
was_published_recently() returns True for questions whose pub_date
|
|
||||||
is within the last day.
|
|
||||||
"""
|
|
||||||
time = timezone.now() - datetime.timedelta(hours=23, minutes=59, seconds=59)
|
|
||||||
recent_question = Question(pub_date=time)
|
|
||||||
self.assertIs(recent_question.was_published_recently(), True)
|
|
@ -1,11 +0,0 @@
|
|||||||
from django.urls import path
|
|
||||||
|
|
||||||
from . import views
|
|
||||||
|
|
||||||
app_name = 'polls'
|
|
||||||
urlpatterns = [
|
|
||||||
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='results'),
|
|
||||||
path('<int:question_id>/vote/', views.vote, name='vote'),
|
|
||||||
]
|
|
@ -1,47 +0,0 @@
|
|||||||
from django.http import HttpResponseRedirect
|
|
||||||
from django.shortcuts import get_object_or_404, render
|
|
||||||
from django.urls import reverse
|
|
||||||
from django.views import generic
|
|
||||||
|
|
||||||
from .models import Choice, Question
|
|
||||||
|
|
||||||
|
|
||||||
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:
|
|
||||||
## added type ignore to get rid of choice _set error
|
|
||||||
selected_choice = question.choice_set.get(pk=request.POST['choice']) # type: ignore
|
|
||||||
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.
|
|
||||||
## type ignore bs
|
|
||||||
return HttpResponseRedirect(reverse('polls:results', args=(question.id,))) # type: ignore # type: ignore)
|
|
@ -5,4 +5,4 @@ from django.http import HttpResponse
|
|||||||
|
|
||||||
|
|
||||||
def index(request):
|
def index(request):
|
||||||
return HttpResponse("Hello, world. You're at the Scheduler index.")
|
return HttpResponse("Hello, world. You're at the polls index.")
|
Loading…
x
Reference in New Issue
Block a user