From 40fb01c28d6c89f4bdaaaee7cda2dd89af6dab49 Mon Sep 17 00:00:00 2001 From: Guillaume Pellerin Date: Thu, 10 Dec 2015 01:50:00 +0100 Subject: [PATCH] add quiz class view --- teleforma/urls.py | 3 +-- teleforma/views/pro.py | 19 +++++++++++++++++++ 2 files changed, 20 insertions(+), 2 deletions(-) diff --git a/teleforma/urls.py b/teleforma/urls.py index 611dbd08..324832b2 100644 --- a/teleforma/urls.py +++ b/teleforma/urls.py @@ -42,7 +42,6 @@ from telemeta.views import * import forms_builder.forms.urls from jsonrpc import jsonrpc_site from longerusername.forms import AuthenticationForm -from quiz.views import * htdocs_forma = os.path.dirname(__file__) + '/static/teleforma/' user_export = UsersXLSExport() @@ -104,7 +103,7 @@ urlpatterns = patterns('', # Evaluations url(r'^forms/', include('forms_builder.forms.urls')), url(r'^desk/seminars/(?P.*)/form/$', evaluation_form_detail, name="teleforma-seminar-form"), - url(r'^desk/seminars/(?P.*)/quiz/(?P[\w-]+)/$', QuizTake.as_view(), name="teleforma-quiz"), + url(r'^desk/seminars/(?P.*)/quiz/(?P[\w-]+)/$', QuizQuestionView.as_view(), name="teleforma-quiz"), # Testimonial url(r'^desk/seminars/(?P.*)/testimonial/$', TestimonialView.as_view(), diff --git a/teleforma/views/pro.py b/teleforma/views/pro.py index 17098a15..f230ff96 100644 --- a/teleforma/views/pro.py +++ b/teleforma/views/pro.py @@ -59,6 +59,8 @@ from forms_builder.forms.forms import FormForForm from forms_builder.forms.models import Form from forms_builder.forms.signals import form_invalid, form_valid +from quiz.views import QuizTake + REVISION_DATE_FILTER = datetime.datetime(2014,7,21) @@ -767,3 +769,20 @@ class TestimonialPaybackView(TestimonialView): @method_decorator(login_required) def dispatch(self, *args, **kwargs): return super(TestimonialPaybackView, self).dispatch(*args, **kwargs) + + +class QuizQuestionView(SeminarAccessMixin, SeminarRevisionMixin, QuizTake): + + template_name='quiz/question.html' + + def get_user(self): + user_id = self.request.user.id + return User.objects.get(id=user_id) + + def get_context_data(self, **kwargs): + context = super(QuizQuestionView, self).get_context_data(**kwargs) + user = self.get_user() + seminar = Seminar.objects.get(pk=self.kwargs['pk']) + context['seminar'] = seminar + context['seminar_progress'] = seminar_progress(user, seminar) + return context -- 2.39.5