Make owner of assignments optional
This commit is contained in:
parent
b0e89c34f7
commit
297896e380
|
|
@ -0,0 +1,20 @@
|
||||||
|
# Generated by Django 2.2.17 on 2021-01-26 13:46
|
||||||
|
|
||||||
|
from django.conf import settings
|
||||||
|
from django.db import migrations, models
|
||||||
|
import django.db.models.deletion
|
||||||
|
|
||||||
|
|
||||||
|
class Migration(migrations.Migration):
|
||||||
|
|
||||||
|
dependencies = [
|
||||||
|
('assignments', '0011_assignment_taskbase_id'),
|
||||||
|
]
|
||||||
|
|
||||||
|
operations = [
|
||||||
|
migrations.AlterField(
|
||||||
|
model_name='assignment',
|
||||||
|
name='owner',
|
||||||
|
field=models.ForeignKey(blank=True, null=True, on_delete=django.db.models.deletion.PROTECT, to=settings.AUTH_USER_MODEL),
|
||||||
|
),
|
||||||
|
]
|
||||||
|
|
@ -13,7 +13,8 @@ class Assignment(TimeStampedModel):
|
||||||
solution = models.TextField(null=True, blank=True)
|
solution = models.TextField(null=True, blank=True)
|
||||||
deleted = models.BooleanField(default=False)
|
deleted = models.BooleanField(default=False)
|
||||||
owner = models.ForeignKey(get_user_model(),
|
owner = models.ForeignKey(get_user_model(),
|
||||||
on_delete=models.PROTECT) # probably don't want to delete all assignments if a user gets deleted
|
on_delete=models.PROTECT, null=True,
|
||||||
|
blank=True) # probably don't want to delete all assignments if a user gets deleted
|
||||||
module = models.ForeignKey('books.Module', related_name='assignments', on_delete=models.CASCADE)
|
module = models.ForeignKey('books.Module', related_name='assignments', on_delete=models.CASCADE)
|
||||||
user_created = models.BooleanField(default=False)
|
user_created = models.BooleanField(default=False)
|
||||||
taskbase_id = models.CharField(max_length=255, null=True, blank=True)
|
taskbase_id = models.CharField(max_length=255, null=True, blank=True)
|
||||||
|
|
@ -44,10 +45,9 @@ class StudentSubmission(TimeStampedModel):
|
||||||
class SubmissionFeedback(TimeStampedModel):
|
class SubmissionFeedback(TimeStampedModel):
|
||||||
text = models.TextField(blank=True)
|
text = models.TextField(blank=True)
|
||||||
teacher = models.ForeignKey(get_user_model(), on_delete=models.CASCADE, related_name='feedbacks')
|
teacher = models.ForeignKey(get_user_model(), on_delete=models.CASCADE, related_name='feedbacks')
|
||||||
student_submission = models.OneToOneField(StudentSubmission, on_delete=models.CASCADE, primary_key=True, related_name='submission_feedback')
|
student_submission = models.OneToOneField(StudentSubmission, on_delete=models.CASCADE, primary_key=True,
|
||||||
|
related_name='submission_feedback')
|
||||||
final = models.BooleanField(default=False)
|
final = models.BooleanField(default=False)
|
||||||
|
|
||||||
def __str__(self):
|
def __str__(self):
|
||||||
return '{} - {}'.format(self.student_submission.student.full_name, self.text)
|
return '{} - {}'.format(self.student_submission.student.full_name, self.text)
|
||||||
|
|
||||||
|
|
||||||
|
|
|
||||||
|
|
@ -0,0 +1,18 @@
|
||||||
|
# Generated by Django 2.2.17 on 2021-01-21 18:57
|
||||||
|
|
||||||
|
from django.db import migrations, models
|
||||||
|
|
||||||
|
|
||||||
|
class Migration(migrations.Migration):
|
||||||
|
|
||||||
|
dependencies = [
|
||||||
|
('objectives', '0010_auto_20200930_1323'),
|
||||||
|
]
|
||||||
|
|
||||||
|
operations = [
|
||||||
|
migrations.AlterField(
|
||||||
|
model_name='objective',
|
||||||
|
name='order',
|
||||||
|
field=models.IntegerField(blank=True, null=True),
|
||||||
|
),
|
||||||
|
]
|
||||||
|
|
@ -0,0 +1,17 @@
|
||||||
|
# Generated by Django 2.2.17 on 2021-01-26 13:43
|
||||||
|
|
||||||
|
from django.db import migrations
|
||||||
|
|
||||||
|
|
||||||
|
class Migration(migrations.Migration):
|
||||||
|
|
||||||
|
dependencies = [
|
||||||
|
('users', '0024_auto_20200928_1547'),
|
||||||
|
]
|
||||||
|
|
||||||
|
operations = [
|
||||||
|
migrations.AlterModelOptions(
|
||||||
|
name='user',
|
||||||
|
options={'ordering': ['pk']},
|
||||||
|
),
|
||||||
|
]
|
||||||
Loading…
Reference in New Issue