Format code
This commit is contained in:
parent
d8577c70d5
commit
c61ea10c7d
|
|
@ -20,8 +20,8 @@ from vbv_lernwelt.core.views import (
|
||||||
vue_logout,
|
vue_logout,
|
||||||
)
|
)
|
||||||
from vbv_lernwelt.course.views import (
|
from vbv_lernwelt.course.views import (
|
||||||
mark_course_completion,
|
|
||||||
course_page_api_view,
|
course_page_api_view,
|
||||||
|
mark_course_completion,
|
||||||
request_course_completion,
|
request_course_completion,
|
||||||
)
|
)
|
||||||
from wagtail import urls as wagtail_urls
|
from wagtail import urls as wagtail_urls
|
||||||
|
|
|
||||||
|
|
@ -1,10 +1,8 @@
|
||||||
from rest_framework import serializers
|
from rest_framework import serializers
|
||||||
|
|
||||||
from vbv_lernwelt.competence.models import PerformanceCriteria
|
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.serializer_helpers import get_course_serializer_class
|
||||||
|
from vbv_lernwelt.course.serializers import CourseCategorySerializer
|
||||||
|
|
||||||
|
|
||||||
class PerformanceCriteriaSerializer(
|
class PerformanceCriteriaSerializer(
|
||||||
|
|
|
||||||
|
|
@ -1,43 +1,79 @@
|
||||||
# Generated by Django 3.2.13 on 2022-10-14 07:33
|
# Generated by Django 3.2.13 on 2022-10-14 07:33
|
||||||
|
|
||||||
|
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 = [
|
||||||
migrations.swappable_dependency(settings.AUTH_USER_MODEL),
|
migrations.swappable_dependency(settings.AUTH_USER_MODEL),
|
||||||
('course', '0001_initial'),
|
("course", "0001_initial"),
|
||||||
]
|
]
|
||||||
|
|
||||||
operations = [
|
operations = [
|
||||||
migrations.CreateModel(
|
migrations.CreateModel(
|
||||||
name='CourseSession',
|
name="CourseSession",
|
||||||
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(
|
||||||
('title', models.TextField()),
|
auto_created=True,
|
||||||
('start_date', models.DateField(blank=True, null=True)),
|
primary_key=True,
|
||||||
('end_date', models.DateField(blank=True, null=True)),
|
serialize=False,
|
||||||
('additional_json_data', models.JSONField(default=dict)),
|
verbose_name="ID",
|
||||||
('course', models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, to='course.course')),
|
),
|
||||||
|
),
|
||||||
|
("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(
|
migrations.CreateModel(
|
||||||
name='CourseSessionUser',
|
name="CourseSessionUser",
|
||||||
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(
|
||||||
('course_session', models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, to='course.coursesession')),
|
auto_created=True,
|
||||||
('user', models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, to=settings.AUTH_USER_MODEL)),
|
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(
|
migrations.AddConstraint(
|
||||||
model_name='coursesessionuser',
|
model_name="coursesessionuser",
|
||||||
constraint=models.UniqueConstraint(fields=('course_session', 'user'), name='course_session_user_unique_course_session_user'),
|
constraint=models.UniqueConstraint(
|
||||||
|
fields=("course_session", "user"),
|
||||||
|
name="course_session_user_unique_course_session_user",
|
||||||
|
),
|
||||||
),
|
),
|
||||||
]
|
]
|
||||||
|
|
|
||||||
|
|
@ -59,8 +59,7 @@ class CourseBasePage(Page):
|
||||||
course_parent_page = self.get_course_parent()
|
course_parent_page = self.get_course_parent()
|
||||||
|
|
||||||
if course_parent_page:
|
if course_parent_page:
|
||||||
from vbv_lernwelt.learnpath.models import LearningPath
|
from vbv_lernwelt.learnpath.models import Circle, LearningPath
|
||||||
from vbv_lernwelt.learnpath.models import Circle
|
|
||||||
|
|
||||||
circles = (
|
circles = (
|
||||||
course_parent_page.get_children()
|
course_parent_page.get_children()
|
||||||
|
|
|
||||||
|
|
@ -1,7 +1,9 @@
|
||||||
from rest_framework.fields import SerializerMethodField
|
from rest_framework.fields import SerializerMethodField
|
||||||
|
|
||||||
from vbv_lernwelt.core.serializer_helpers import ItWagtailBaseSerializer, \
|
from vbv_lernwelt.core.serializer_helpers import (
|
||||||
get_it_serializer_class
|
get_it_serializer_class,
|
||||||
|
ItWagtailBaseSerializer,
|
||||||
|
)
|
||||||
|
|
||||||
|
|
||||||
class CourseBaseSerializer(ItWagtailBaseSerializer):
|
class CourseBaseSerializer(ItWagtailBaseSerializer):
|
||||||
|
|
|
||||||
|
|
@ -1,10 +1,6 @@
|
||||||
from rest_framework import serializers
|
from rest_framework import serializers
|
||||||
|
|
||||||
from vbv_lernwelt.course.models import (
|
from vbv_lernwelt.course.models import Course, CourseCategory, CourseCompletion
|
||||||
Course,
|
|
||||||
CourseCategory,
|
|
||||||
CourseCompletion,
|
|
||||||
)
|
|
||||||
|
|
||||||
|
|
||||||
class CourseSerializer(serializers.ModelSerializer):
|
class CourseSerializer(serializers.ModelSerializer):
|
||||||
|
|
|
||||||
|
|
@ -8,7 +8,7 @@ from wagtail.images.blocks import ImageChooserBlock
|
||||||
from wagtail.models import Page
|
from wagtail.models import Page
|
||||||
|
|
||||||
from vbv_lernwelt.core.model_utils import find_available_slug
|
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 (
|
from vbv_lernwelt.learnpath.models_learning_unit_content import (
|
||||||
AssignmentBlock,
|
AssignmentBlock,
|
||||||
BookBlock,
|
BookBlock,
|
||||||
|
|
|
||||||
Loading…
Reference in New Issue