From 0d4d5e085d34e6c73d6b67d9d986e833718023e5 Mon Sep 17 00:00:00 2001 From: Tom Walker Date: Wed, 11 Jun 2014 16:49:12 +0100 Subject: [PATCH] starting to update the views + making some simple templates to display them --- quiz/views.py | 25 +++++++++++-------------- templates/quiz/quiz_index.html | 12 ++++++------ 2 files changed, 17 insertions(+), 20 deletions(-) diff --git a/quiz/views.py b/quiz/views.py index 8002fb6..f61c19d 100644 --- a/quiz/views.py +++ b/quiz/views.py @@ -9,10 +9,9 @@ from django.shortcuts import render_to_response from django.template import RequestContext from django.shortcuts import render, get_object_or_404 - -from quiz.models import Quiz, Category, Progress, Sitting -from multichoice.models import Question, Answer - +from quiz.models import Quiz, Category, Progress, Sitting, Question +from multichoice.models import MCQuestion, Answer +from true_false.models import TF_Question """ @@ -41,23 +40,21 @@ To do: """ def index(request): - return render(request, 'quiz_index.html', { - 'categories': Category.objects.all(), - }) + all_quizzes = Quiz.objects.all() + return render(request, 'quiz_index.html', + {'quiz_list': all_quizzes,}) def list_categories(request): - return render(request, 'quiz_index.html', { - 'categories': Category.objects.all(), - }) + return render(request, 'quiz_index.html', + {'categories': Category.objects.all(),}) def view_category(request, slug): category = get_object_or_404(Category, category = slug.replace(' ', '-').lower()) quizzes = Quiz.objects.filter(category=category) - return render(request, 'view_quiz_category.html', { - 'category': category, - 'quizzes': quizzes - }) + return render(request, 'view_quiz_category.html', + {'category': category, + 'quizzes': quizzes,}) def quiz_take(request, quiz_name): """ diff --git a/templates/quiz/quiz_index.html b/templates/quiz/quiz_index.html index 0a802d0..a5466ea 100644 --- a/templates/quiz/quiz_index.html +++ b/templates/quiz/quiz_index.html @@ -1,16 +1,16 @@ {% extends 'base.html' %} -{% block title %}All Quiz{% endblock %} +{% block title %}All Quizzes{% endblock %} {% block content %} -

Categories

- {% if categories %} +

Quiz list

+ {% if quiz_list %} {% else %} -

There are no categories.

+

There are no available quizzes.

{% endif %} {% endblock %} -- 2.39.5