diff --git a/client/src/pages/DashboardPage.vue b/client/src/pages/DashboardPage.vue index bd246037..b6187e97 100644 --- a/client/src/pages/DashboardPage.vue +++ b/client/src/pages/DashboardPage.vue @@ -69,7 +69,7 @@ const getNextStepLink = (courseSession: CourseSession) => { diff --git a/server/vbv_lernwelt/importer/services.py b/server/vbv_lernwelt/importer/services.py index a4ff3fab..3e9802c1 100644 --- a/server/vbv_lernwelt/importer/services.py +++ b/server/vbv_lernwelt/importer/services.py @@ -262,8 +262,14 @@ def create_or_update_user( def import_course_sessions_from_excel( - filename: str, course: Course = None, restrict_language=None + filename: str, course: Course = None, restrict_language=None, circle_keys=None ): + if circle_keys is None: + circle_keys = [ + "Kickoff", + "Basis", + "Fahrzeug", + ] workbook = load_workbook(filename=filename) sheet = workbook["Schulungen Durchführung"] no_course = course is None @@ -286,13 +292,7 @@ def import_course_sessions_from_excel( course, data, language, - circle_keys=[ - "Kickoff", - "Basis", - "Fahrzeug", - "Haushalt Teil 1", - "Haushalt Teil 2", - ], + circle_keys=circle_keys, ) diff --git a/server/vbv_lernwelt/importer/views.py b/server/vbv_lernwelt/importer/views.py index c814fdab..01f505c8 100644 --- a/server/vbv_lernwelt/importer/views.py +++ b/server/vbv_lernwelt/importer/views.py @@ -25,6 +25,13 @@ def coursesessions_trainers_import(request): def import_training_and_trainer(excel_file: str): import_course_sessions_from_excel( excel_file, + circle_keys=[ + "Kickoff", + "Basis", + "Fahrzeug", + "Haushalt Teil 1", + "Haushalt Teil 2", + ], ) import_trainers_from_excel_for_training(excel_file)