Spaces:

tddschn
/

mq-quiz

Runtime error

Pamela Fox commited on Sep 15, 2022

Commit

1dbd98a

1 Parent(s): 013c0dc

Admin changes

Files changed (7) hide show

quizzes/admin.py CHANGED Viewed

@@ -1,7 +1,15 @@
 from django.contrib import admin
-from .models import Quiz, Question, FreeTextAnswer, MultipleChoiceAnswer
 admin.site.register(Quiz)
-admin.site.register(Question)
-admin.site.register(FreeTextAnswer)
-admin.site.register(MultipleChoiceAnswer)

 from django.contrib import admin
+from .models import Quiz, Question, Answer, FreeTextAnswer, MultipleChoiceAnswer
 admin.site.register(Quiz)
+class FreeTextAnswerInline(admin.StackedInline):
+    model = FreeTextAnswer
+class MultipleChoiceAnswerInline(admin.StackedInline):
+    model = MultipleChoiceAnswer
+class QuestionAdmin(admin.ModelAdmin):
+    inlines = [FreeTextAnswerInline, MultipleChoiceAnswerInline]
+admin.site.register(Question, QuestionAdmin)

quizzes/migrations/0002_remove_question_answer_status_and_more.py ADDED Viewed

+# Generated by Django 4.1.1 on 2022-09-15 00:57
+from django.db import migrations, models
+import django.db.models.deletion
+class Migration(migrations.Migration):
+    dependencies = [
+        ("quizzes", "0001_initial"),
+    ]
+    operations = [
+        migrations.RemoveField(
+            model_name="question",
+            name="answer_status",
+        ),
+        migrations.AlterField(
+            model_name="freetextanswer",
+            name="question",
+            field=models.OneToOneField(
+                on_delete=django.db.models.deletion.CASCADE, to="quizzes.question"
+            ),
+        ),
+        migrations.AlterField(
+            model_name="multiplechoiceanswer",
+            name="question",
+            field=models.OneToOneField(
+                on_delete=django.db.models.deletion.CASCADE, to="quizzes.question"
+            ),
+        ),
+    ]

quizzes/models.py CHANGED Viewed

@@ -28,10 +28,9 @@ class Quiz(models.Model):
 class Question(models.Model):
   quiz = models.ForeignKey(Quiz, on_delete=models.CASCADE)
   prompt = models.CharField(max_length=200)
-  answer_status = models.CharField(default='unanswered', max_length=16)
   def __str__(self):
-    return f"<Question: {self.prompt}>"
   def display(self):
     print(self.prompt)
@@ -44,15 +43,22 @@ class Question(models.Model):
       print(f"Sorry, it was: {self.answer.correct_answer}")
       self.answer_status = 'incorrect'
-# Create your models here.
-class FreeTextAnswer(models.Model):
-  question = models.ForeignKey(Question, on_delete=models.CASCADE)
   correct_answer = models.CharField(max_length=200)
   case_sensitive = models.BooleanField(default=False)
   def __str__(self):
-    return f"<FreeTextAnswer: {self.correct_answer}>"
   def is_correct(self, user_answer):
     if not self.case_sensitive:
@@ -65,13 +71,11 @@ class FreeTextAnswer(models.Model):
     else:
       print("Type your answer in (don't worry about capitalization):")
-class MultipleChoiceAnswer(models.Model):
-  question = models.ForeignKey(Question, on_delete=models.CASCADE)
-  correct_answer = models.CharField(max_length=200)
   choices = fields.ArrayField(models.CharField(max_length=200, blank=True))
   def __str__(self):
-    return f"<MultipleChoiceAnswer: {self.correct_answer} of {self.choices}>"
   def is_correct(self, user_answer):
     """Assumes user answer is number corresponding to answer."""

 class Question(models.Model):
   quiz = models.ForeignKey(Quiz, on_delete=models.CASCADE)
   prompt = models.CharField(max_length=200)
   def __str__(self):
+    return self.prompt
   def display(self):
     print(self.prompt)
       print(f"Sorry, it was: {self.answer.correct_answer}")
       self.answer_status = 'incorrect'
+class Answer(models.Model):
+  question = models.OneToOneField(
+        Question,
+        on_delete=models.CASCADE
+    )
   correct_answer = models.CharField(max_length=200)
+  class Meta:
+    abstract = True
+class FreeTextAnswer(Answer):
   case_sensitive = models.BooleanField(default=False)
   def __str__(self):
+    return self.correct_answer
   def is_correct(self, user_answer):
     if not self.case_sensitive:
     else:
       print("Type your answer in (don't worry about capitalization):")
+class MultipleChoiceAnswer(Answer):
   choices = fields.ArrayField(models.CharField(max_length=200, blank=True))
   def __str__(self):
+    return f"{self.correct_answer} from {self.choices}"
   def is_correct(self, user_answer):
     """Assumes user answer is number corresponding to answer."""

quizzes/templates/quizzes/display.html ADDED Viewed

+<!DOCTYPE HTML>
+<html>
+<head>
+  <meta charset="utf-8">
+  <meta name="viewport" content="width=device-width">
+  <title>Quiz {{ quiz.id }}</title>
+</head>
+<body>
+    <h1>{{ quiz.name }}</h1>
+    <form action="{% url 'quizzes:grade' question.id %}" method="post">
+        {% csrf_token %}
+    {% for question in quiz.question_set.all %}
+    <section>
+        <h3>{{ question.prompt }}</h3>
+        {% if question.freetextanswer %}
+        <input type="text" name="{{ question.pk }}">
+        {% else %}
+        {% for choice in question.multiplechoiceanswer.choices %}
+        <label>
+            <input type="radio" name="{{ question.pk }}" value="{{ choice }}">
+            {{ choice}}
+        </label>
+        {% endfor %}
+        {% endif %}
+    </section>
+    {% endfor %}
+    <button type="submit">Check answers</button>
+</form>
+</body>
+</html>

quizzes/templates/quizzes/index.html ADDED Viewed

+<!DOCTYPE HTML>
+<html>
+<head>
+  <meta charset="utf-8">
+  <meta name="viewport" content="width=device-width">
+  <title>Quizzes</title>
+</head>
+<body>
+{% if quiz_list %}
+    <ul>
+    {% for quiz in quiz_list %}
+        <li><a href="{% url 'quizzes:display' quiz.id %}">{{ quiz.name }}</a></li>
+    {% endfor %}
+    </ul>
+{% else %}
+    <p>No quizzes are available.</p>
+{% endif %}
+</body>
+</html>

quizzes/urls.py CHANGED Viewed

@@ -2,9 +2,11 @@ from django.urls import path
 from . import views
 urlpatterns = [
     path('', views.index, name='index'),
-    # ex: /polls/5/
     path('<int:quiz_id>/', views.display, name='display'),
 ]

 from . import views
+app_name = 'quizzes'
 urlpatterns = [
     path('', views.index, name='index'),
     path('<int:quiz_id>/', views.display, name='display'),
+    path('<int:quiz_id>/grade/', views.grade, name='grade'),
 ]

quizzes/views.py CHANGED Viewed

@@ -1,7 +1,18 @@
-from django.http import HttpResponse
 def index(request):
-    return HttpResponse("Here are all the quizzes")
 def display(request, quiz_id):
-    return HttpResponse("You're looking at quiz %s." % quiz_id)

+from django.shortcuts import get_object_or_404,render
+from .models import Quiz
 def index(request):
+    quiz_list = Quiz.objects.all()
+    context = {'quiz_list': quiz_list}
+    return render(request, 'quizzes/index.html', context)
 def display(request, quiz_id):
+    quiz = get_object_or_404(Quiz, pk=quiz_id)
+    return render(request, 'quizzes/display.html', {'quiz': quiz})
+def grade(request, quiz_id):
+    quiz = get_object_or_404(Quiz, pk=quiz_id)
+    return render(request, 'quizzes/display.html', {'quiz': quiz})