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

Format code

This commit is contained in:
Daniel Egger 2023-04-25 13:19:44 +02:00
parent baf5801b6a
commit 8ffea5bc1b
3 changed files with 142 additions and 36 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
server/config/urls.py
View File

@ -8,15 +8,12 @@ from django.urls import include, path, re_path
from django.views import defaults as default_views from django.views import defaults as default_views
from grapple import urls as grapple_urls from grapple import urls as grapple_urls
from ratelimit.exceptions import Ratelimited from ratelimit.exceptions import Ratelimited
from wagtail import urls as wagtail_urls
from wagtail.admin import urls as wagtailadmin_urls
from wagtail.documents import urls as wagtaildocs_urls
from vbv_lernwelt.assignment.views import ( from vbv_lernwelt.assignment.views import (
grade_assignment_completion,
request_assignment_completion, request_assignment_completion,
request_assignment_completion_for_user, request_assignment_completion_for_user,
upsert_user_assignment_completion, upsert_user_assignment_completion,
grade_assignment_completion,
) )
from vbv_lernwelt.core.middleware.auth import django_view_authentication_exempt from vbv_lernwelt.core.middleware.auth import django_view_authentication_exempt
from vbv_lernwelt.core.views import ( from vbv_lernwelt.core.views import (
@ -47,6 +44,9 @@ from vbv_lernwelt.feedback.views import (
get_feedback_for_circle, get_feedback_for_circle,
) )
from vbv_lernwelt.notify.views import email_notification_settings from vbv_lernwelt.notify.views import email_notification_settings
from wagtail import urls as wagtail_urls
from wagtail.admin import urls as wagtailadmin_urls
from wagtail.documents import urls as wagtaildocs_urls
def raise_example_error(request): def raise_example_error(request):

168
server/vbv_lernwelt/assignment/migrations/0002_auto_20230425_0849.py
View File

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

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

@ -7,8 +7,8 @@ from rest_framework import serializers
from vbv_lernwelt.assignment.models import ( from vbv_lernwelt.assignment.models import (
Assignment, Assignment,
AssignmentCompletion, AssignmentCompletion,
AssignmentCompletionStatus,
AssignmentCompletionAuditLog, AssignmentCompletionAuditLog,
AssignmentCompletionStatus,
) )
from vbv_lernwelt.core.models import User from vbv_lernwelt.core.models import User
from vbv_lernwelt.core.utils import find_first from vbv_lernwelt.core.utils import find_first