From 154b123bec5716f079a0b4204c4b1ee991263285 Mon Sep 17 00:00:00 2001 From: Christian Cueni Date: Mon, 6 Mar 2023 11:18:46 +0100 Subject: [PATCH] =?UTF-8?q?Update=20FR=20=C3=BCk?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- client/src/components/MainNavigationBar.vue | 2 +- client/src/locales/de.json | 1 + client/src/locales/fr.json | 11 +- .../vbv_lernwelt/core/create_default_users.py | 18 ++- .../commands/create_default_courses.py | 125 ++++++++++-------- .../management/commands/create_uk_course.py | 6 +- 6 files changed, 99 insertions(+), 64 deletions(-) diff --git a/client/src/components/MainNavigationBar.vue b/client/src/components/MainNavigationBar.vue index 9f553174..ffcadc03 100644 --- a/client/src/components/MainNavigationBar.vue +++ b/client/src/components/MainNavigationBar.vue @@ -135,7 +135,7 @@ const profileDropdownData: DropdownListItem[] = [
- myVBV + {{ $t("general.title") }}
diff --git a/client/src/locales/de.json b/client/src/locales/de.json index d826026b..3d46bd8b 100644 --- a/client/src/locales/de.json +++ b/client/src/locales/de.json @@ -115,6 +115,7 @@ "show": "Anschauen", "showAll": "Alle anschauen", "start": "Los geht's", + "title": "myVBV", "transferTask": "Transferauftrag | Transferaufträge", "yes": "Ja" }, diff --git a/client/src/locales/fr.json b/client/src/locales/fr.json index bac20b85..557916d3 100644 --- a/client/src/locales/fr.json +++ b/client/src/locales/fr.json @@ -115,6 +115,7 @@ "show": "Montrer", "showAll": "Montrer tous", "start": "On y va", + "title": "myAFA", "transferTask": "Ordre de transfert | Ordres de transfert", "yes": "Our" }, @@ -126,9 +127,13 @@ "completeAndContinue": "Marquer comme fait" }, "learningPathPage": { - "nextStep": "Prochaine étape", - "showListView": "Voir la liste", - "welcomeBack": "Bienvenue, {name}" + "currentCircle": "Cercle actuel", + "listView": "Vue: liste", + "nextStep": "Étape suivante", + "pathView": "Vue: parcours", + "progressText": "Tu as travaillé dans { inProgressCount } des { allCount } Cercles", + "topics": "Thèmes:", + "welcomeBack": "Salut { name }! Bienvenue dans ton cours:" }, "mainNavigation": { "logout": "Fermer la session", diff --git a/server/vbv_lernwelt/core/create_default_users.py b/server/vbv_lernwelt/core/create_default_users.py index e1b00c2b..f9504707 100644 --- a/server/vbv_lernwelt/core/create_default_users.py +++ b/server/vbv_lernwelt/core/create_default_users.py @@ -64,12 +64,18 @@ def create_default_users(user_model=User, group_model=Group, default_password=No student_group, created = group_model.objects.get_or_create(name="student_group") def _create_student_user( - email, first_name, last_name, avatar_url="", password=default_password + email, + first_name, + last_name, + avatar_url="", + password=default_password, + language="de", ): student_user, created = _get_or_create_user( user_model=user_model, username=email, password=password, + language=language, ) student_user.first_name = first_name student_user.last_name = last_name @@ -198,11 +204,20 @@ def create_default_users(user_model=User, group_model=Group, default_password=No first_name="Student", last_name="UK1-Zürich", ) + _create_student_user( + email="luca.dupont@assurance.ch", + first_name="Luca", + last_name="Dupont", + avatar_url="/static/avatars/uk1.michael.meier.jpg", + password="myafa1234", + language="fr", + ) def _get_or_create_user(user_model, *args, **kwargs): username = kwargs.get("username", None) password = kwargs.get("password", None) + language = kwargs.get("language", "de") created = False user = user_model.objects.filter(username=username).first() @@ -212,6 +227,7 @@ def _get_or_create_user(user_model, *args, **kwargs): username=username, password=make_password(password), email=username, + language=language, ) created = True return user, created 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 7e717c9e..fca9263a 100644 --- a/server/vbv_lernwelt/course/management/commands/create_default_courses.py +++ b/server/vbv_lernwelt/course/management/commands/create_default_courses.py @@ -199,65 +199,78 @@ def command(): user=User.objects.get(username="patrizia.huggel@eiger-versicherungen.ch"), role=CourseSessionUser.Role.EXPERT, ) - csu.expert.add( - Circle.objects.get(slug="überbetriebliche-kurse-lp-circle-kickoff") - ) - csu.expert.add( - Circle.objects.get(slug="überbetriebliche-kurse-lp-circle-haushalt-teil-1") - ) - csu.expert.add( - Circle.objects.get(slug="überbetriebliche-kurse-lp-circle-fahrzeug") - ) - csu = CourseSessionUser.objects.create( - course_session=cs, - user=User.objects.get(username="andreas.feuz@eiger-versicherungen.ch"), - role=CourseSessionUser.Role.EXPERT, - ) - csu.expert.add( - Circle.objects.get(slug="überbetriebliche-kurse-lp-circle-haushalt-teil-2") - ) - csu.expert.add( - Circle.objects.get(slug="überbetriebliche-kurse-lp-circle-basis") - ) - _csu = CourseSessionUser.objects.create( - course_session=cs, - user=User.objects.get(username="michael.meier@example.com"), - ) - _csu = CourseSessionUser.objects.create( - course_session=cs, - user=User.objects.get(username="lina.egger@example.com"), - ) - _csu = CourseSessionUser.objects.create( - course_session=cs, - user=User.objects.get(username="evelyn.schmid@example.com"), - ) + if course["course_id"] == COURSE_UK: + csu.expert.add( + Circle.objects.get(slug="überbetriebliche-kurse-lp-circle-kickoff") + ) + csu.expert.add( + Circle.objects.get( + slug="überbetriebliche-kurse-lp-circle-haushalt-teil-1" + ) + ) + csu.expert.add( + Circle.objects.get(slug="überbetriebliche-kurse-lp-circle-fahrzeug") + ) + csu = CourseSessionUser.objects.create( + course_session=cs, + user=User.objects.get(username="andreas.feuz@eiger-versicherungen.ch"), + role=CourseSessionUser.Role.EXPERT, + ) + csu.expert.add( + Circle.objects.get( + slug="überbetriebliche-kurse-lp-circle-haushalt-teil-2" + ) + ) + csu.expert.add( + Circle.objects.get(slug="überbetriebliche-kurse-lp-circle-basis") + ) + _csu = CourseSessionUser.objects.create( + course_session=cs, + user=User.objects.get(username="michael.meier@example.com"), + ) + _csu = CourseSessionUser.objects.create( + course_session=cs, + user=User.objects.get(username="lina.egger@example.com"), + ) + _csu = CourseSessionUser.objects.create( + course_session=cs, + user=User.objects.get(username="evelyn.schmid@example.com"), + ) - _csu = CourseSessionUser.objects.create( - course_session=cs, - user=User.objects.get(username="christoph.bosshard@vbv-afa.ch"), - ) + _csu = CourseSessionUser.objects.create( + course_session=cs, + user=User.objects.get(username="christoph.bosshard@vbv-afa.ch"), + ) - _csu = CourseSessionUser.objects.create( - course_session=cs, - user=User.objects.get(username="bianca.muster@eiger-versicherungen.ch"), - ) + _csu = CourseSessionUser.objects.create( + course_session=cs, + user=User.objects.get(username="axel.manderbach@lernetz.ch"), + ) - _csu = CourseSessionUser.objects.create( - course_session=cs, - user=User.objects.get(username="axel.manderbach@lernetz.ch"), - ) - - create_feedback( - Circle.objects.get(slug="überbetriebliche-kurse-lp-circle-kickoff"), cs, 3 - ) - create_feedback( - Circle.objects.get(slug="überbetriebliche-kurse-lp-circle-haushalt-teil-2"), - cs, - 14, - ) - create_feedback( - Circle.objects.get(slug="überbetriebliche-kurse-lp-circle-basis"), cs, 4 - ) + create_feedback( + Circle.objects.get(slug="überbetriebliche-kurse-lp-circle-kickoff"), + cs, + 3, + ) + create_feedback( + Circle.objects.get( + slug="überbetriebliche-kurse-lp-circle-haushalt-teil-2" + ), + cs, + 14, + ) + create_feedback( + Circle.objects.get(slug="überbetriebliche-kurse-lp-circle-basis"), cs, 4 + ) + elif course["course_id"] == COURSE_UK_FR: + _csu = CourseSessionUser.objects.create( + course_session=cs, + user=User.objects.get(username="luca.dupont@assurance.ch"), + ) + for fr_circle in Circle.objects.filter( + slug__startswith="course-hors-établissement-lp" + ): + csu.expert.add(fr_circle) # course session Überbetriebliche Kurse Lehrjahr 1 - Region Zürich cs = CourseSession.objects.create( diff --git a/server/vbv_lernwelt/course/management/commands/create_uk_course.py b/server/vbv_lernwelt/course/management/commands/create_uk_course.py index 89f039da..1900ca52 100644 --- a/server/vbv_lernwelt/course/management/commands/create_uk_course.py +++ b/server/vbv_lernwelt/course/management/commands/create_uk_course.py @@ -39,14 +39,14 @@ def create_uk_learning_path(course_id=COURSE_UK, user=None, skip_locales=True): parent=course_page, ) - TopicFactory(title="üK1", is_visible=True, parent=lp) + TopicFactory(title="1. Lehrjahr", is_visible=True, parent=lp) create_uk_circle(lp, title="Kickoff") create_uk_circle(lp, title="Basis") create_uk_circle(lp, title="Fahrzeug") create_uk_circle(lp, title="Haushalt Teil 1") create_uk_circle(lp, title="Haushalt Teil 2") - TopicFactory(title="üK2", is_visible=True, parent=lp) + TopicFactory(title="2. Lehrjahr", is_visible=True, parent=lp) create_uk_circle(lp, title="Reisen & Rechtsstreitigkeiten") create_uk_circle(lp, title="Wohneigentum") create_uk_circle(lp, title="KMU Teil 1") @@ -55,7 +55,7 @@ def create_uk_learning_path(course_id=COURSE_UK, user=None, skip_locales=True): create_uk_circle(lp, title="Einkommenssicherung (Invalidität)") create_uk_circle(lp, title="Einkommenssicherung (Todesfall)") create_uk_circle(lp, title="Pensionierung (Todesfall)") - TopicFactory(title="üK3", is_visible=True, parent=lp) + TopicFactory(title="3. Lehrjahr", is_visible=True, parent=lp) create_uk_circle(lp, title="Gesundheit") create_uk_circle(lp, title="Prüfungsvorbereitung Teil 1") create_uk_circle(lp, title="Prüfungsvorbereitung Teil 2")