From 78b0a08bb3df9253fd029564d78d9f678532cb09 Mon Sep 17 00:00:00 2001 From: Lorenz Padberg Date: Thu, 29 Jun 2023 10:53:36 +0200 Subject: [PATCH] Remove attendance_course and assignment_details json fielsd --- .../commands/create_default_courses.py | 99 ++++++------------- 1 file changed, 32 insertions(+), 67 deletions(-) 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 c9fb5ae2..d02eb63b 100644 --- a/server/vbv_lernwelt/course/management/commands/create_default_courses.py +++ b/server/vbv_lernwelt/course/management/commands/create_default_courses.py @@ -241,35 +241,13 @@ def create_course_uk_de(): cs = CourseSession.objects.create( course_id=COURSE_UK, title="Bern 2023 a", - # attendance_courses=[ - # { - # "learningContentId": LearningContentAttendanceCourse.objects.get( - # slug="überbetriebliche-kurse-lp-circle-fahrzeug-lc-präsenzkurs-fahrzeug" - # ).id, - # "start": "2023-05-23T08:30:00+0200", - # "end": "2023-05-23T17:00:00+0200", - # "location": "Handelsschule KV Bern, Zimmer 123, Eigerstrasse 16, 3012 Bern", - # "trainer": "Roland Grossenbacher, roland.grossenbacher@helvetia.ch", - # } - # ], - # assignment_details_list=[ - # { - # "learningContentId": LearningContentAssignment.objects.get( - # slug="überbetriebliche-kurse-lp-circle-fahrzeug-lc-überprüfen-einer-motorfahrzeug-versicherungspolice" - # ).id, - # "submissionDeadlineDateTimeUtc": "2023-06-13T19:00:00Z", - # "evaluationDeadlineDateTimeUtc": "2023-06-27T19:00:00Z", - # }, - # { - # "learningContentId": LearningContentAssignment.objects.get( - # slug="überbetriebliche-kurse-lp-circle-fahrzeug-lc-fahrzeug-mein-erstes-auto" - # ).id, - # "submissionDeadlineDateTimeUtc": "2023-06-13T19:00:00Z", - # "evaluationDeadlineDateTimeUtc": "2023-06-27T19:00:00Z", - # }, - # ], ) + for i, cs in enumerate(CourseSession.objects.filter(course_id=COURSE_UK_TRAINING)): + create_course_session_assignments(cs, + f"{course.slug}-lp-circle-fahrzeug-lc-überprüfen-einer-motorfahrzeug-versicherungspolice", + i=i) + csac = CourseSessionAttendanceCourse.objects.create( course_session=cs, learning_content=LearningContentAttendanceCourse.objects.get( @@ -277,15 +255,13 @@ def create_course_uk_de(): ), due_date=DueDate.objects.create( course_session=cs, - start=timezone.make_aware(datetime(2023, 6, 14, 8, 30)), - end=timezone.make_aware(datetime(2023, 6, 14, 17, 0)), - page=LearningContentAttendanceCourse.objects.get( - slug="überbetriebliche-kurse-lp-circle-fahrzeug-lc-präsenzkurs-fahrzeug" - ), ), location="Handelsschule KV Bern, Zimmer 123, Eigerstrasse 16, 3012 Bern", trainer="Roland Grossenbacher, roland.grossenbacher@helvetia.ch", ) + csac.due_date.start = timezone.make_aware(datetime(2023, 6, 14, 8, 30)) + csac.due_date.end = timezone.make_aware(datetime(2023, 6, 14, 17, 0)) + csac.due_date.save() # figma demo users and data csu = CourseSessionUser.objects.create( @@ -558,41 +534,10 @@ def create_course_training_de(): f"{current_dir}/../../../importer/tests/Schulungen_Teilnehmende.xlsx", ) - for cs in CourseSession.objects.filter(course_id=COURSE_UK_TRAINING): - csa = CourseSessionAssignment.objects.create( - course_session=cs, - learning_content=LearningContentAssignment.objects.get( - slug=f"{course.slug}-lp-circle-fahrzeug-lc-überprüfen-einer-motorfahrzeug-versicherungspolice" - ), - ) - print(csa) - - submission_deadline = csa.submission_deadline - submission_deadline.end = cs.start_date + timedelta(days=14) - submission_deadline.save() - - evaluation_deadline = csa.evaluation_deadline - evaluation_deadline.end = cs.start_date + timedelta(days=28) - evaluation_deadline.save() - - cs.assignment_details_list = [ - { - - "learningContentId": LearningContentAssignment.objects.get( - slug=f"{course.slug}-lp-circle-fahrzeug-lc-überprüfen-einer-motorfahrzeug-versicherungspolice" - ).id, - "submissionDeadlineDateTimeUtc": "2023-06-13T19:00:00Z", - "evaluationDeadlineDateTimeUtc": "2023-06-27T19:00:00Z", - }, - { - "learningContentId": LearningContentAssignment.objects.get( - slug=f"{course.slug}-lp-circle-fahrzeug-lc-fahrzeug-mein-erstes-auto" - ).id, - "submissionDeadlineDateTimeUtc": "2023-06-13T19:00:00Z", - "evaluationDeadlineDateTimeUtc": "2023-06-27T19:00:00Z", - }, - ] - cs.save() + for i, cs in enumerate(CourseSession.objects.filter(course_id=COURSE_UK_TRAINING)): + create_course_session_assignments(cs, + f"{course.slug}-lp-circle-fahrzeug-lc-überprüfen-einer-motorfahrzeug-versicherungspolice", + i=i) # attach users as trainers to ÜK course course_uk = Course.objects.filter(id=COURSE_UK).first() @@ -624,6 +569,26 @@ def create_course_training_de(): csu.save() +def create_course_session_assignments(course_session, assignment_slug, i=1): + csa = CourseSessionAssignment.objects.create( + course_session=course_session, + learning_content=LearningContentAssignment.objects.get( + slug=assignment_slug + ), + ) + if course_session.start_date is None: + course_session.start_date = datetime.now() + timedelta(days=i * 12) + course_session.save() + submission_deadline = csa.submission_deadline + if submission_deadline: + submission_deadline.end = course_session.start_date + timedelta(days=14) + submission_deadline.save() + evaluation_deadline = csa.evaluation_deadline + if evaluation_deadline: + evaluation_deadline.end = course_session.start_date + timedelta(days=28) + evaluation_deadline.save() + + def create_course_training_fr(): # Test Lehrgang für üK Trainer FR course = create_versicherungsvermittlerin_with_categories(