Skip to content

Commit ea7d6e9

Browse files
committed
Merge branch 'mathjax'
2 parents c926f08 + 8a76ff8 commit ea7d6e9

File tree

7 files changed

+55
-1
lines changed

7 files changed

+55
-1
lines changed

django_school/classroom/templates/classroom/students/quiz_result.html

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -31,4 +31,9 @@ <h5 class="card-title">{{forloop.counter}}. {{question.text}}</h5>
3131
</div>
3232
<br>
3333
{% endfor %}
34+
{% endblock %}
35+
36+
{% block js %}
37+
<script src="https://polyfill.io/v3/polyfill.min.js?features=es6"></script>
38+
<script id="MathJax-script" async src="https://cdn.jsdelivr.net/npm/mathjax@3/es5/tex-mml-chtml.js"></script>
3439
{% endblock %}

django_school/classroom/templates/classroom/students/take_quiz_form.html

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -45,3 +45,8 @@ <h2 class="mb-3">{{ quiz.name }}</h2>
4545
<button type="submit" class="btn btn-primary">Next →</button>
4646
</form>
4747
{% endblock %}
48+
49+
{% block js %}
50+
<script src="https://polyfill.io/v3/polyfill.min.js?features=es6"></script>
51+
<script id="MathJax-script" async src="https://cdn.jsdelivr.net/npm/mathjax@3/es5/tex-mml-chtml.js"></script>
52+
{% endblock %}

django_school/classroom/templates/classroom/teachers/question_change_form.html

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@
77
<ol class="breadcrumb">
88
<li class="breadcrumb-item"><a href="{% url 'teachers:quiz_change_list' %}">My Quizzes</a></li>
99
<li class="breadcrumb-item"><a href="{% url 'teachers:quiz_change' quiz.pk %}">{{ quiz.name }}</a></li>
10-
<li class="breadcrumb-item active" aria-current="page">{{ question.text }}</li>
10+
<!-- <li class="breadcrumb-item active" aria-current="page">{{ question.text }}</li> -->
1111
</ol>
1212
</nav>
1313
<h2 class="mb-3">{{ question.txt }}</h2>
Lines changed: 28 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,28 @@
1+
{% extends 'base.html' %}
2+
3+
{% block content %}
4+
<nav aria-label="breadcrumb">
5+
<ol class="breadcrumb">
6+
<li class="breadcrumb-item"><a href="{% url 'teachers:quiz_change_list' %}">My Quizzes</a></li>
7+
<li class="breadcrumb-item"><a href="{% url 'teachers:quiz_change' quiz.pk %}">{{ quiz.name }}</a></li>
8+
</ol>
9+
</nav>
10+
<h2 class="mb-3">Question Preview</h2>
11+
12+
<div class="card">
13+
<div class="card-header">
14+
{{question.text}}
15+
</div>
16+
<ul class="list-group list-group-flush">
17+
{% for answer in question.answers.all %}
18+
19+
<li class="list-group-item">{{answer.text}}</li>
20+
{% endfor %}
21+
</ul>
22+
</div>
23+
{% endblock %}
24+
25+
{% block js %}
26+
<!-- <script src="https://polyfill.io/v3/polyfill.min.js?features=es6"></script> -->
27+
<script id="MathJax-script" async src="https://cdn.jsdelivr.net/npm/mathjax@3/es5/tex-mml-chtml.js"></script>
28+
{% endblock %}

django_school/classroom/templates/classroom/teachers/quiz_change_form.html

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -41,6 +41,7 @@ <h2 class="mb-3">
4141
<div class="row">
4242
<div class="col-10">
4343
<a href="{% url 'teachers:question_change' quiz.pk question.pk %}">{{ question.text }}</a>
44+
<a class="btn btn-sm btn-secondary" href="{% url 'teachers:question_preview' quiz.pk question.pk %}">preview</a>
4445
</div>
4546
<div class="col-2">
4647
{{ question.answers_count }}

django_school/classroom/urls.py

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -23,6 +23,7 @@
2323
path('quiz/<int:pk>/results/', teachers.QuizResultsView.as_view(), name='quiz_results'),
2424
path('quiz/<int:pk>/question/add/', teachers.question_add, name='question_add'),
2525
path('quiz/<int:quiz_pk>/question/<int:question_pk>/', teachers.question_change, name='question_change'),
26+
path('quiz/<int:quiz_pk>/question/<int:question_pk>/preview/', teachers.QuestionPreviewView.as_view(), name='question_preview'),
2627
path('quiz/<int:quiz_pk>/question/<int:question_pk>/delete/', teachers.QuestionDeleteView.as_view(), name='question_delete'),
2728
], 'classroom'), namespace='teachers')),
2829
]

django_school/classroom/views/teachers.py

Lines changed: 14 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -215,3 +215,17 @@ def get_queryset(self):
215215
def get_success_url(self):
216216
question = self.get_object()
217217
return reverse('teachers:quiz_change', kwargs={'pk': question.quiz_id})
218+
219+
@method_decorator([login_required, teacher_required], name='dispatch')
220+
class QuestionPreviewView(DetailView):
221+
model = Question
222+
template_name = 'classroom/teachers/question_preview.html'
223+
pk_url_kwarg = 'question_pk'
224+
225+
def get_context_data(self, **kwargs):
226+
question = self.get_object()
227+
kwargs['quiz'] = question.quiz
228+
return super().get_context_data(**kwargs)
229+
230+
def get_queryset(self):
231+
return Question.objects.filter(quiz__owner=self.request.user)

0 commit comments

Comments
 (0)