Skip to content

Commit 7af186a

Browse files
submission model
1 parent 6a6d56d commit 7af186a

File tree

4 files changed

+74
-0
lines changed

4 files changed

+74
-0
lines changed
Lines changed: 41 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,41 @@
1+
# Generated by Django 3.2.7 on 2021-10-06 14:14
2+
3+
from django.conf import settings
4+
from django.db import migrations, models
5+
import django.db.models.deletion
6+
import django.utils.timezone
7+
8+
9+
class Migration(migrations.Migration):
10+
11+
dependencies = [
12+
migrations.swappable_dependency(settings.AUTH_USER_MODEL),
13+
('classroom', '0010_remove_readingquestion_correct_answer'),
14+
]
15+
16+
operations = [
17+
migrations.CreateModel(
18+
name='ReadingSubmission',
19+
fields=[
20+
('id', models.BigAutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')),
21+
('submit_datetime', models.DateTimeField(default=django.utils.timezone.now)),
22+
('exercise', models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, related_name='submissions', to='classroom.readingexercise')),
23+
('submitter', models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, related_name='reading_submissions', to=settings.AUTH_USER_MODEL)),
24+
],
25+
options={
26+
'ordering': ['exercise', 'submitter'],
27+
},
28+
),
29+
migrations.CreateModel(
30+
name='ReadingSubmissionAnswer',
31+
fields=[
32+
('id', models.BigAutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')),
33+
('question_number', models.PositiveSmallIntegerField()),
34+
('content', models.CharField(max_length=255)),
35+
('submission', models.ForeignKey(null=True, on_delete=django.db.models.deletion.SET_NULL, related_name='answers', to='classroom.readingsubmission')),
36+
],
37+
options={
38+
'ordering': ['submission', 'question_number'],
39+
},
40+
),
41+
]

classroom/models/__init__.py

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2,3 +2,5 @@
22
from .reading_answer import ReadingAnswer
33
from .reading_exercise import ReadingExercise
44
from .reading_question import ReadingQuestion
5+
from .reading_submission import ReadingSubmission
6+
from .reading_submission_answer import ReadingSubmissionAnswer
Lines changed: 16 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,16 @@
1+
from django.contrib.auth import get_user_model
2+
from django.db import models
3+
from django.utils import timezone
4+
5+
from .reading_exercise import ReadingExercise
6+
7+
User = get_user_model()
8+
9+
10+
class ReadingSubmission(models.Model):
11+
exercise = models.ForeignKey(ReadingExercise, on_delete=models.CASCADE, related_name='submissions')
12+
submitter = models.ForeignKey(User, on_delete=models.CASCADE, related_name='reading_submissions')
13+
submit_datetime = models.DateTimeField(default=timezone.now)
14+
15+
class Meta:
16+
ordering = ['exercise', 'submitter']
Lines changed: 15 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,15 @@
1+
from django.db import models
2+
from django.contrib.auth import get_user_model
3+
4+
from .reading_submission import ReadingSubmission
5+
6+
User = get_user_model()
7+
8+
9+
class ReadingSubmissionAnswer(models.Model):
10+
submission = models.ForeignKey(ReadingSubmission, on_delete=models.SET_NULL, null=True, related_name='answers')
11+
question_number = models.PositiveSmallIntegerField()
12+
content = models.CharField(max_length=255)
13+
14+
class Meta:
15+
ordering = ['submission', 'question_number']

0 commit comments

Comments
 (0)