Skip to content

Commit 96f9e3e

Browse files
committed
show all quizzess.
1 parent 3fb6a67 commit 96f9e3e

File tree

2 files changed

+9
-5
lines changed

2 files changed

+9
-5
lines changed

django_school/classroom/templates/classroom/students/quiz_list.html

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@
88
{% block content %}
99
{% include 'classroom/students/_header.html' with active='new' %}
1010

11-
<table class="table table-striped table-bordered mb-0" id="tb_quizlist" >
11+
<table class="table table-bordered mb-0" id="tb_quizlist" >
1212
<thead>
1313
<tr>
1414
<th>Quiz</th>
@@ -19,7 +19,7 @@
1919
</thead>
2020
<tbody>
2121
{% for quiz in quizzes %}
22-
<tr>
22+
<tr{% if quiz.subject.id in student_subjects %} style="background: #fdf7e3"{%endif%}>
2323
<td class="align-middle">{{ quiz.name }}</td>
2424
<td class="align-middle d-none d-sm-table-cell">{{ quiz.subject.get_html_badge }}</td>
2525
<td class="align-middle d-none d-sm-table-cell">{{ quiz.questions_count }} questions</td>

django_school/classroom/views/students.py

Lines changed: 7 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -57,14 +57,18 @@ class QuizListView(ListView):
5757

5858
def get_queryset(self):
5959
student = self.request.user.student
60-
student_interests = student.interests.values_list('pk', flat=True)
60+
# student_interests = student.interests.values_list('pk', flat=True)
6161
taken_quizzes = student.quizzes.values_list('pk', flat=True)
62-
queryset = Quiz.objects.filter(subject__in=student_interests) \
63-
.exclude(pk__in=taken_quizzes) \
62+
queryset = Quiz.objects.exclude(pk__in=taken_quizzes) \
6463
.annotate(questions_count=Count('questions')) \
6564
.filter(questions_count__gt=0)
6665
return queryset
6766

67+
def get_context_data(self, **kwargs):
68+
context = super().get_context_data(**kwargs)
69+
context['student_subjects'] = self.request.user.student.interests.values_list('pk', flat=True)
70+
return context
71+
6872

6973
@method_decorator([login_required, student_required], name='dispatch')
7074
class QuizResultsView(View):

0 commit comments

Comments
 (0)