Skip to content

Commit 5601fbe

Browse files
add passage
1 parent e839aeb commit 5601fbe

File tree

6 files changed

+24
-4
lines changed

6 files changed

+24
-4
lines changed

classroom/filters/exercise.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@ def qs(self):
2020
if user.is_teacher():
2121
qs = parent.filter(creator=user)
2222
else:
23-
qs = parent.filter(classrooms__in=user.classrooms_studying.all()) # TODO: test
23+
qs = parent.filter(classrooms__in=user.classrooms_studying.all())
2424
qs = qs.select_related('creator')
2525

2626
return qs

classroom/filters/question.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@ def qs(self):
1818
if user.is_teacher():
1919
qs = parent.filter(exercise__creator=user)
2020
else:
21-
qs = parent.filter(exercise__classrooms__in=user.classrooms_studying.all()) # TODO: test
21+
qs = parent.filter(exercise__classrooms__in=user.classrooms_studying.all())
2222
qs = qs.select_related('exercise__creator')
2323

2424
return qs
Lines changed: 18 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,18 @@
1+
# Generated by Django 3.2.7 on 2021-10-05 14:28
2+
3+
from django.db import migrations, models
4+
5+
6+
class Migration(migrations.Migration):
7+
8+
dependencies = [
9+
('classroom', '0005_auto_20211004_2304'),
10+
]
11+
12+
operations = [
13+
migrations.AddField(
14+
model_name='readingquestion',
15+
name='passage',
16+
field=models.PositiveSmallIntegerField(default=1),
17+
),
18+
]

classroom/models/reading_question.py

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -6,6 +6,7 @@
66

77
class ReadingQuestion(Question):
88
exercise = models.ForeignKey(ReadingExercise, on_delete=models.CASCADE, related_name='questions')
9+
passage = models.PositiveSmallIntegerField(default=1)
910

1011
class Meta:
1112
ordering = ['exercise', 'from_number']

classroom/serializers/question.py

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,12 +8,13 @@ class ReadingQuestionSerializer(serializers.HyperlinkedModelSerializer):
88
class Meta:
99
model = ReadingQuestion
1010
fields = [
11-
'pk', 'url', 'exercise',
11+
'pk', 'url', 'exercise', 'passage',
1212
'from_number', 'to_number', 'question_type', 'correct_answer',
1313
]
1414
extra_kwargs = {
1515
'url': {'view_name': 'reading-question-detail'},
1616
'exercise': {'view_name': 'reading-exercise-detail'},
17+
'passage': {'min_value': 1},
1718
'from_number': {'min_value': 1},
1819
'to_number': {'min_value': 1},
1920
}

keep_learning/views.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@ def get(self, request):
1212
data = {
1313
'account': request.build_absolute_uri('/account/'),
1414
'teacher': {
15-
'class': request.build_absolute_uri('/classroom/'),
15+
'classroom': request.build_absolute_uri('/classroom/'),
1616
}
1717
}
1818
else:

0 commit comments

Comments
 (0)