ramon
/
vbv
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Add `AssignmentCompletionAuditLog`

This commit is contained in:
Daniel Egger 2023-04-24 16:57:03 +02:00
parent 4c26f4f72d
commit 19a7738457
6 changed files with 122 additions and 99 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
server/vbv_lernwelt/assignment/admin.py
View File

@ -6,14 +6,15 @@ from vbv_lernwelt.core.admin_utils import PrettyJSONWidget
@admin.register(AssignmentCompletion)
class CourseSessionAdmin(admin.ModelAdmin):
class AssignmentCompletionAdmin(admin.ModelAdmin):
formfield_overrides = {
JSONField: {"widget": PrettyJSONWidget(attrs={"rows": 16, "cols": 80})},
}
date_hierarchy = "created_at"
list_display = [
"id",
"completion_status",
"assignment",
"user",
"assignment_user",
"course_session",
]

76
server/vbv_lernwelt/assignment/migrations/0002_assignment_completion.py
View File

@ -1,76 +0,0 @@
# Generated by Django 3.2.13 on 2023-04-14 11:33
import django.db.models.deletion
from django.conf import settings
from django.db import migrations, models
class Migration(migrations.Migration):
dependencies = [
migrations.swappable_dependency(settings.AUTH_USER_MODEL),
("course", "0004_coursesession_assignment_details_list"),
("assignment", "0001_initial"),
]
operations = [
migrations.CreateModel(
name="AssignmentCompletion",
fields=[
(
"id",
models.BigAutoField(
auto_created=True,
primary_key=True,
serialize=False,
verbose_name="ID",
),
),
("created_at", models.DateTimeField(auto_now_add=True)),
("updated_at", models.DateTimeField(auto_now=True)),
(
"completion_status",
models.CharField(
choices=[
(1, "in_progress"),
(2, "submitted"),
(3, "grading_in_progress"),
(4, "graded"),
],
default="in_progress",
max_length=255,
),
),
("completion_data", models.JSONField(default=dict)),
("additional_json_data", models.JSONField(default=dict)),
(
"assignment",
models.ForeignKey(
on_delete=django.db.models.deletion.CASCADE,
to="assignment.assignment",
),
),
(
"course_session",
models.ForeignKey(
on_delete=django.db.models.deletion.CASCADE,
to="course.coursesession",
),
),
(
"user",
models.ForeignKey(
on_delete=django.db.models.deletion.CASCADE,
to=settings.AUTH_USER_MODEL,
),
),
],
),
migrations.AddConstraint(
model_name="assignmentcompletion",
constraint=models.UniqueConstraint(
fields=("user", "assignment", "course_session"),
name="assignment_completion_unique_user_assignment_course_session",
),
),
]

55
server/vbv_lernwelt/assignment/migrations/0002_auto_20230424_1654.py Normal file
View File

@ -0,0 +1,55 @@
# Generated by Django 3.2.13 on 2023-04-24 14:54
from django.conf import settings
from django.db import migrations, models
import django.db.models.deletion
class Migration(migrations.Migration):
dependencies = [
('course', '0004_coursesession_assignment_details_list'),
migrations.swappable_dependency(settings.AUTH_USER_MODEL),
('assignment', '0001_initial'),
]
operations = [
migrations.CreateModel(
name='AssignmentCompletionAuditLog',
fields=[
('id', models.BigAutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')),
('created_at', models.DateTimeField(auto_now_add=True)),
('completion_status', models.CharField(choices=[(1, 'in_progress'), (2, 'submitted'), (3, 'grading_in_progress'), (4, 'graded')], default='in_progress', max_length=255)),
('completion_data', models.JSONField(default=dict)),
('additional_json_data', models.JSONField(default=dict)),
('assignment_user_email', models.CharField(max_length=255)),
('assignment_slug', models.CharField(max_length=255)),
('graded_expert_email', models.CharField(blank=True, default='', max_length=255)),
('assignment', models.ForeignKey(null=True, on_delete=django.db.models.deletion.SET_NULL, related_name='+', to='assignment.assignment')),
('assignment_user', models.ForeignKey(null=True, on_delete=django.db.models.deletion.SET_NULL, related_name='+', to=settings.AUTH_USER_MODEL)),
('course_session', models.ForeignKey(null=True, on_delete=django.db.models.deletion.SET_NULL, related_name='+', to='course.coursesession')),
('graded_expert', models.ForeignKey(blank=True, null=True, on_delete=django.db.models.deletion.SET_NULL, related_name='+', to=settings.AUTH_USER_MODEL)),
],
),
migrations.CreateModel(
name='AssignmentCompletion',
fields=[
('id', models.BigAutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')),
('created_at', models.DateTimeField(auto_now_add=True)),
('updated_at', models.DateTimeField(auto_now=True)),
('submitted_at', models.DateTimeField(blank=True, null=True)),
('graded_at', models.DateTimeField(blank=True, null=True)),
('completion_status', models.CharField(choices=[(1, 'in_progress'), (2, 'submitted'), (3, 'grading_in_progress'), (4, 'graded')], default='in_progress', max_length=255)),
('completion_data', models.JSONField(default=dict)),
('additional_json_data', models.JSONField(default=dict)),
('assignment', models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, to='assignment.assignment')),
('assignment_user', models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, to=settings.AUTH_USER_MODEL)),
('course_session', models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, to='course.coursesession')),
('graded_expert', models.ForeignKey(blank=True, null=True, on_delete=django.db.models.deletion.CASCADE, related_name='+', to=settings.AUTH_USER_MODEL)),
],
),
migrations.AddConstraint(
model_name='assignmentcompletion',
constraint=models.UniqueConstraint(fields=('assignment_user', 'assignment', 'course_session'), name='assignment_completion_unique_user_assignment_course_session'),
),
]

49
server/vbv_lernwelt/assignment/models.py
View File

@ -183,7 +183,17 @@ class AssignmentCompletion(models.Model):
created_at = models.DateTimeField(auto_now_add=True)
updated_at = models.DateTimeField(auto_now=True)
user = models.ForeignKey(User, on_delete=models.CASCADE)
submitted_at = models.DateTimeField(null=True, blank=True)
graded_at = models.DateTimeField(null=True, blank=True)
graded_expert = models.ForeignKey(
User,
on_delete=models.CASCADE,
null=True,
blank=True,
related_name="+",
)
assignment_user = models.ForeignKey(User, on_delete=models.CASCADE)
assignment = models.ForeignKey(Assignment, on_delete=models.CASCADE)
course_session = models.ForeignKey("course.CourseSession", on_delete=models.CASCADE)
@ -194,13 +204,46 @@ class AssignmentCompletion(models.Model):
)
completion_data = models.JSONField(default=dict)
additional_json_data = models.JSONField(default=dict)
class Meta:
constraints = [
UniqueConstraint(
fields=["user", "assignment", "course_session"],
fields=["assignment_user", "assignment", "course_session"],
name="assignment_completion_unique_user_assignment_course_session",
)
]
class AssignmentCompletionAuditLog(models.Model):
"""
This model is used to store the "submitted" and "graded" data separately
"""
created_at = models.DateTimeField(auto_now_add=True)
graded_expert = models.ForeignKey(
User, on_delete=models.SET_NULL, null=True, blank=True, related_name="+"
)
assignment_user = models.ForeignKey(
User, on_delete=models.SET_NULL, null=True, related_name="+"
)
assignment = models.ForeignKey(
Assignment, on_delete=models.SET_NULL, null=True, related_name="+"
)
course_session = models.ForeignKey(
"course.CourseSession", on_delete=models.SET_NULL, null=True, related_name="+"
)
completion_status = models.CharField(
max_length=255,
choices=[(acs.value, acs.name) for acs in AssignmentCompletionStatus],
default="in_progress",
)
completion_data = models.JSONField(default=dict)
additional_json_data = models.JSONField(default=dict)
assignment_user_email = models.CharField(max_length=255)
assignment_slug = models.CharField(max_length=255)
graded_expert_email = models.CharField(max_length=255, blank=True, default="")

4
server/vbv_lernwelt/assignment/services.py
View File

@ -11,7 +11,7 @@ from vbv_lernwelt.course.models import CourseSession
def update_assignment_completion(
user: User,
assignment_user: User,
assignment: Assignment,
course_session: CourseSession,
completion_data=None,
@ -41,7 +41,7 @@ def update_assignment_completion(
completion_data = {}
ac, created = AssignmentCompletion.objects.get_or_create(
user_id=user.id,
assignment_user_id=assignment_user.id,
assignment_id=assignment.id,
course_session_id=course_session.id,
)

32
server/vbv_lernwelt/assignment/tests/test_services.py
View File

@ -37,7 +37,7 @@ class UpdateAssignmentCompletionTestCase(TestCase):
)
update_assignment_completion(
user=self.user,
assignment_user=self.user,
assignment=self.assignment,
course_session=self.course_session,
completion_data={
@ -49,7 +49,7 @@ class UpdateAssignmentCompletionTestCase(TestCase):
)
ac = AssignmentCompletion.objects.get(
user=self.user,
assignment_user=self.user,
assignment=self.assignment,
course_session=self.course_session,
)
@ -71,7 +71,7 @@ class UpdateAssignmentCompletionTestCase(TestCase):
user_text_input1 = subtasks[1]
ac = AssignmentCompletion.objects.create(
user=self.user,
assignment_user=self.user,
assignment=self.assignment,
course_session=self.course_session,
completion_data={
@ -85,7 +85,7 @@ class UpdateAssignmentCompletionTestCase(TestCase):
)
update_assignment_completion(
user=self.user,
assignment_user=self.user,
assignment=self.assignment,
course_session=self.course_session,
completion_data={
@ -96,7 +96,7 @@ class UpdateAssignmentCompletionTestCase(TestCase):
)
ac = AssignmentCompletion.objects.get(
user=self.user,
assignment_user=self.user,
assignment=self.assignment,
course_session=self.course_session,
)
@ -109,7 +109,7 @@ class UpdateAssignmentCompletionTestCase(TestCase):
random_uuid = "7b60903b-d2a5-4798-b6cd-5b51e63e98ab"
update_assignment_completion(
user=self.user,
assignment_user=self.user,
assignment=self.assignment,
course_session=self.course_session,
completion_data={
@ -120,7 +120,7 @@ class UpdateAssignmentCompletionTestCase(TestCase):
)
ac = AssignmentCompletion.objects.get(
user=self.user,
assignment_user=self.user,
assignment=self.assignment,
course_session=self.course_session,
)
@ -134,7 +134,7 @@ class UpdateAssignmentCompletionTestCase(TestCase):
user_text_input1 = subtasks[1]
ac = AssignmentCompletion.objects.create(
user=self.user,
assignment_user=self.user,
assignment=self.assignment,
course_session=self.course_session,
completion_data={
@ -148,14 +148,14 @@ class UpdateAssignmentCompletionTestCase(TestCase):
)
update_assignment_completion(
user=self.user,
assignment_user=self.user,
assignment=self.assignment,
course_session=self.course_session,
completion_status="submitted",
)
ac = AssignmentCompletion.objects.get(
user=self.user,
assignment_user=self.user,
assignment=self.assignment,
course_session=self.course_session,
)
@ -175,7 +175,7 @@ class UpdateAssignmentCompletionTestCase(TestCase):
)
ac = AssignmentCompletion.objects.create(
user=self.user,
assignment_user=self.user,
assignment=self.assignment,
course_session=self.course_session,
completion_data={
@ -186,7 +186,7 @@ class UpdateAssignmentCompletionTestCase(TestCase):
)
update_assignment_completion(
user=self.user,
assignment_user=self.user,
assignment=self.assignment,
course_session=self.course_session,
completion_status="submitted",
@ -194,7 +194,7 @@ class UpdateAssignmentCompletionTestCase(TestCase):
)
ac = AssignmentCompletion.objects.get(
user=self.user,
assignment_user=self.user,
assignment=self.assignment,
course_session=self.course_session,
)
@ -223,7 +223,7 @@ class UpdateAssignmentCompletionTestCase(TestCase):
)
ac = AssignmentCompletion.objects.create(
user=self.user,
assignment_user=self.user,
assignment=self.assignment,
course_session=self.course_session,
completion_data={
@ -234,7 +234,7 @@ class UpdateAssignmentCompletionTestCase(TestCase):
)
update_assignment_completion(
user=self.user,
assignment_user=self.user,
assignment=self.assignment,
course_session=self.course_session,
completion_data={
@ -246,7 +246,7 @@ class UpdateAssignmentCompletionTestCase(TestCase):
)
ac = AssignmentCompletion.objects.get(
user=self.user,
assignment_user=self.user,
assignment=self.assignment,
course_session=self.course_session,
)