diff --git a/server/vbv_lernwelt/assignment/creators/create_assignments.py b/server/vbv_lernwelt/assignment/creators/create_assignments.py index a8ce50a7..8c74555d 100644 --- a/server/vbv_lernwelt/assignment/creators/create_assignments.py +++ b/server/vbv_lernwelt/assignment/creators/create_assignments.py @@ -1,7 +1,3 @@ -from wagtail.blocks import StreamValue -from wagtail.blocks.list_block import ListBlock, ListValue -from wagtail.rich_text import RichText - from vbv_lernwelt.assignment.models import ( AssignmentListPage, AssignmentType, @@ -24,6 +20,9 @@ from vbv_lernwelt.course.consts import ( COURSE_VERSICHERUNGSVERMITTLERIN_ID, ) from vbv_lernwelt.course.models import CoursePage +from wagtail.blocks import StreamValue +from wagtail.blocks.list_block import ListBlock, ListValue +from wagtail.rich_text import RichText def create_uk_fahrzeug_casework(course_id=COURSE_UK): diff --git a/server/vbv_lernwelt/course/creators/test_course.py b/server/vbv_lernwelt/course/creators/test_course.py index 0131722c..703a8ab9 100644 --- a/server/vbv_lernwelt/course/creators/test_course.py +++ b/server/vbv_lernwelt/course/creators/test_course.py @@ -180,8 +180,12 @@ def create_course_session_attendance_course(course_session, course): ) random_week = random.randint(1, 26) - casc.due_date.start = timezone.make_aware(datetime(2023, 6, 14, 8, 30) + timedelta(weeks=random_week)) - casc.due_date.end = timezone.make_aware(datetime(2023, 6, 14, 17, 0) + timedelta(weeks=random_week)) + casc.due_date.start = timezone.make_aware( + datetime(2023, 6, 14, 8, 30) + timedelta(weeks=random_week) + ) + casc.due_date.end = timezone.make_aware( + datetime(2023, 6, 14, 17, 0) + timedelta(weeks=random_week) + ) casc.due_date.save() return casc diff --git a/server/vbv_lernwelt/course/management/commands/create_default_courses.py b/server/vbv_lernwelt/course/management/commands/create_default_courses.py index f289367a..ec204b8d 100644 --- a/server/vbv_lernwelt/course/management/commands/create_default_courses.py +++ b/server/vbv_lernwelt/course/management/commands/create_default_courses.py @@ -263,8 +263,12 @@ def create_course_uk_de(): # TODO: create dates schlauer random_week = random.randint(1, 26) - csac.due_date.start = timezone.make_aware(datetime(2023, 6, 14, 8, 30) + timedelta(weeks=random_week)) - csac.due_date.end = timezone.make_aware(datetime(2023, 6, 14, 17, 0) + timedelta(weeks=random_week)) + csac.due_date.start = timezone.make_aware( + datetime(2023, 6, 14, 8, 30) + timedelta(weeks=random_week) + ) + csac.due_date.end = timezone.make_aware( + datetime(2023, 6, 14, 17, 0) + timedelta(weeks=random_week) + ) csac.due_date.save() # figma demo users and data diff --git a/server/vbv_lernwelt/duedate/factories.py b/server/vbv_lernwelt/duedate/factories.py index f83c4c98..724f9fc8 100644 --- a/server/vbv_lernwelt/duedate/factories.py +++ b/server/vbv_lernwelt/duedate/factories.py @@ -5,9 +5,10 @@ from django.utils import timezone from factory import SubFactory from factory.django import DjangoModelFactory -from .models import DueDate from ..course_session.factories import CourseSessionFactory +from .models import DueDate + logger = structlog.get_logger(__name__) diff --git a/server/vbv_lernwelt/duedate/migrations/0007_auto_20230703_1741.py b/server/vbv_lernwelt/duedate/migrations/0007_auto_20230703_1741.py index c9f5963d..05c6dace 100644 --- a/server/vbv_lernwelt/duedate/migrations/0007_auto_20230703_1741.py +++ b/server/vbv_lernwelt/duedate/migrations/0007_auto_20230703_1741.py @@ -1,36 +1,42 @@ # Generated by Django 3.2.13 on 2023-07-03 15:41 -from django.db import migrations, models import django.db.models.deletion +from django.db import migrations, models class Migration(migrations.Migration): dependencies = [ - ('course', '0006_remove_coursesession_assignment_details_list'), - ('duedate', '0006_auto_20230627_1553'), + ("course", "0006_remove_coursesession_assignment_details_list"), + ("duedate", "0006_auto_20230627_1553"), ] operations = [ migrations.AlterField( - model_name='duedate', - name='course_session', - field=models.ForeignKey(blank=True, default=1, on_delete=django.db.models.deletion.CASCADE, related_name='duedates', to='course.coursesession'), + model_name="duedate", + name="course_session", + field=models.ForeignKey( + blank=True, + default=1, + on_delete=django.db.models.deletion.CASCADE, + related_name="duedates", + to="course.coursesession", + ), preserve_default=False, ), migrations.AlterField( - model_name='duedate', - name='description', - field=models.CharField(default='', max_length=1024), + model_name="duedate", + name="description", + field=models.CharField(default="", max_length=1024), ), migrations.AlterField( - model_name='duedate', - name='learning_content_description', - field=models.CharField(default='', max_length=1024), + model_name="duedate", + name="learning_content_description", + field=models.CharField(default="", max_length=1024), ), migrations.AlterField( - model_name='duedate', - name='url', - field=models.URLField(blank=True, default='', max_length=1024), + model_name="duedate", + name="url", + field=models.URLField(blank=True, default="", max_length=1024), ), ] diff --git a/server/vbv_lernwelt/duedate/models.py b/server/vbv_lernwelt/duedate/models.py index 9db1981b..153402d0 100644 --- a/server/vbv_lernwelt/duedate/models.py +++ b/server/vbv_lernwelt/duedate/models.py @@ -14,9 +14,7 @@ class DueDate(models.Model): end = models.DateTimeField(db_index=True, null=True) # TODO: Welcher Default Wert ist hier sinnvoll? title = models.CharField(default=_("Termin"), max_length=1024) - learning_content_description = models.CharField( - default="", max_length=1024 - ) + learning_content_description = models.CharField(default="", max_length=1024) description = models.CharField(default="", max_length=1024) url = models.URLField(default="", blank=True, max_length=1024) course_session = models.ForeignKey( @@ -31,7 +29,9 @@ class DueDate(models.Model): def Meta(self): ordering = ["start", "end"] verbose_name = _("Termin") - help = "Set only the end date if you want to create a deadline without a duration." + help = ( + "Set only the end date if you want to create a deadline without a duration." + ) def __str__(self): start_str = self.start.strftime("%Y-%m-%d %H:%M") if self.start else ""