diff --git a/server/config/urls.py b/server/config/urls.py index bf7bf863..1ab6159f 100644 --- a/server/config/urls.py +++ b/server/config/urls.py @@ -20,8 +20,8 @@ from vbv_lernwelt.core.views import ( vue_logout, ) from vbv_lernwelt.course.views import ( - mark_course_completion, course_page_api_view, + mark_course_completion, request_course_completion, ) from wagtail import urls as wagtail_urls diff --git a/server/vbv_lernwelt/competence/serializers.py b/server/vbv_lernwelt/competence/serializers.py index a50eb387..8fb287bd 100644 --- a/server/vbv_lernwelt/competence/serializers.py +++ b/server/vbv_lernwelt/competence/serializers.py @@ -1,10 +1,8 @@ from rest_framework import serializers from vbv_lernwelt.competence.models import PerformanceCriteria -from vbv_lernwelt.course.serializers import ( - CourseCategorySerializer, -) from vbv_lernwelt.course.serializer_helpers import get_course_serializer_class +from vbv_lernwelt.course.serializers import CourseCategorySerializer class PerformanceCriteriaSerializer( diff --git a/server/vbv_lernwelt/course/migrations/0002_auto_20221014_0933.py b/server/vbv_lernwelt/course/migrations/0002_auto_20221014_0933.py index 0bdb9a5f..ebddd71c 100644 --- a/server/vbv_lernwelt/course/migrations/0002_auto_20221014_0933.py +++ b/server/vbv_lernwelt/course/migrations/0002_auto_20221014_0933.py @@ -1,43 +1,79 @@ # Generated by Django 3.2.13 on 2022-10-14 07:33 +import django.db.models.deletion from django.conf import settings from django.db import migrations, models -import django.db.models.deletion class Migration(migrations.Migration): dependencies = [ migrations.swappable_dependency(settings.AUTH_USER_MODEL), - ('course', '0001_initial'), + ("course", "0001_initial"), ] operations = [ migrations.CreateModel( - name='CourseSession', + name="CourseSession", 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)), - ('title', models.TextField()), - ('start_date', models.DateField(blank=True, null=True)), - ('end_date', models.DateField(blank=True, null=True)), - ('additional_json_data', models.JSONField(default=dict)), - ('course', models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, to='course.course')), + ( + "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)), + ("title", models.TextField()), + ("start_date", models.DateField(blank=True, null=True)), + ("end_date", models.DateField(blank=True, null=True)), + ("additional_json_data", models.JSONField(default=dict)), + ( + "course", + models.ForeignKey( + on_delete=django.db.models.deletion.CASCADE, to="course.course" + ), + ), ], ), migrations.CreateModel( - name='CourseSessionUser', + name="CourseSessionUser", 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)), - ('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)), + ( + "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)), + ( + "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='coursesessionuser', - constraint=models.UniqueConstraint(fields=('course_session', 'user'), name='course_session_user_unique_course_session_user'), + model_name="coursesessionuser", + constraint=models.UniqueConstraint( + fields=("course_session", "user"), + name="course_session_user_unique_course_session_user", + ), ), ] diff --git a/server/vbv_lernwelt/course/models.py b/server/vbv_lernwelt/course/models.py index daffc51e..fa4f55fd 100644 --- a/server/vbv_lernwelt/course/models.py +++ b/server/vbv_lernwelt/course/models.py @@ -59,8 +59,7 @@ class CourseBasePage(Page): course_parent_page = self.get_course_parent() if course_parent_page: - from vbv_lernwelt.learnpath.models import LearningPath - from vbv_lernwelt.learnpath.models import Circle + from vbv_lernwelt.learnpath.models import Circle, LearningPath circles = ( course_parent_page.get_children() diff --git a/server/vbv_lernwelt/course/serializer_helpers.py b/server/vbv_lernwelt/course/serializer_helpers.py index 6ba4c494..a188f7f3 100644 --- a/server/vbv_lernwelt/course/serializer_helpers.py +++ b/server/vbv_lernwelt/course/serializer_helpers.py @@ -1,7 +1,9 @@ from rest_framework.fields import SerializerMethodField -from vbv_lernwelt.core.serializer_helpers import ItWagtailBaseSerializer, \ - get_it_serializer_class +from vbv_lernwelt.core.serializer_helpers import ( + get_it_serializer_class, + ItWagtailBaseSerializer, +) class CourseBaseSerializer(ItWagtailBaseSerializer): diff --git a/server/vbv_lernwelt/course/serializers.py b/server/vbv_lernwelt/course/serializers.py index 869b04c0..49bf8b6d 100644 --- a/server/vbv_lernwelt/course/serializers.py +++ b/server/vbv_lernwelt/course/serializers.py @@ -1,10 +1,6 @@ from rest_framework import serializers -from vbv_lernwelt.course.models import ( - Course, - CourseCategory, - CourseCompletion, -) +from vbv_lernwelt.course.models import Course, CourseCategory, CourseCompletion class CourseSerializer(serializers.ModelSerializer): diff --git a/server/vbv_lernwelt/learnpath/models.py b/server/vbv_lernwelt/learnpath/models.py index 876be769..8a57f875 100644 --- a/server/vbv_lernwelt/learnpath/models.py +++ b/server/vbv_lernwelt/learnpath/models.py @@ -8,7 +8,7 @@ from wagtail.images.blocks import ImageChooserBlock from wagtail.models import Page from vbv_lernwelt.core.model_utils import find_available_slug -from vbv_lernwelt.course.models import CoursePage, CourseBasePage +from vbv_lernwelt.course.models import CourseBasePage, CoursePage from vbv_lernwelt.learnpath.models_learning_unit_content import ( AssignmentBlock, BookBlock,