From da24ffe8db536f52ac65de8bc9eef2c836164fd9 Mon Sep 17 00:00:00 2001 From: Christian Cueni Date: Thu, 28 Dec 2023 12:05:04 +0100 Subject: [PATCH 1/4] Add new slugs for Haushalt circles --- server/vbv_lernwelt/importer/services.py | 44 ++++++++++++++---------- 1 file changed, 25 insertions(+), 19 deletions(-) diff --git a/server/vbv_lernwelt/importer/services.py b/server/vbv_lernwelt/importer/services.py index e62f1a04..7f513147 100644 --- a/server/vbv_lernwelt/importer/services.py +++ b/server/vbv_lernwelt/importer/services.py @@ -133,22 +133,22 @@ LP_DATA = { "title": "Haushalt Teil 1", "slug": "haushalt-teil-1", "presence_course": "haushalt-teil-1-lc-präsenzkurs-haushalt-1", - "assignments": [], - "edoniq_tests": [], + "assignments": ["haushalt-teil-1-lc-vorbereitungsauftrag"], + "edoniq_tests": ["haushalt-teil-1-lc-wissens-und-verständnisfragen"], }, "fr": { "title": "Ménage partie 1", "slug": "ménage-partie-1", "presence_course": "ménage-partie-1-lc-cours-de-présence-ménage-partie-1", - "assignments": [], - "edoniq_tests": [], + "assignments": ["ménage-partie-1-lc-mandat-de-préparation"], + "edoniq_tests": ["ménage-partie-1-lc-questions-de-connaissances-et-de-compréhension"], }, "it": { "title": "Economica domestica parte 1", "slug": "economica-domestica-parte-1", "presence_course": "economica-domestica-parte-1-lc-corso-di-presenza-economica-domestica-parte-1", - "assignments": [], - "edoniq_tests": [], + "assignments": ["economica-domestica-parte-1-lc-incarico-di-preparazione"], + "edoniq_tests": ["economica-domestica-parte-1-lc-domande-di-conoscenza-e-di-comprensione"], }, }, "Haushalt Teil 2": { @@ -156,21 +156,24 @@ LP_DATA = { "title": "Haushalt Teil 2", "slug": "haushalt-teil-2", "presence_course": "haushalt-teil-2-lc-präsenzkurs-haushalt-2", - "assignments": [], + "assignments": ["haushalt-teil-2-lc-vorbereitungsauftrag", + "haushalt-teil-2-lc-geleitete-fallarbeit-schadenfall-managen"], "edoniq_tests": [], }, "fr": { "title": "Ménage partie 2", "slug": "ménage-partie-2", "presence_course": "ménage-partie-2-lc-cours-de-présence-ménage-partie-2", - "assignments": [], + "assignments": ["ménage-partie-2-lc-mandat-de-préparation", + "ménage-partie-2-lc-étude-de-cas-dirigée-gérer-un-cas-de-sinistre"], "edoniq_tests": [], }, "it": { "title": "Economica domestica parte 2", "slug": "economica-domestica-parte-2", "presence_course": "ménage-partie-2-lc-cours-de-présence-ménage-partie-2", - "assignments": [], + "assignments": ["economica-domestica-parte-2-lc-incarico-di-preparazione", + "economica-domestica-parte-2-lc-caso-di-studio-guidato-gestione-di-un-sinistro"], "edoniq_tests": [], }, }, @@ -354,16 +357,19 @@ def create_or_update_course_session( slug=f"{course.slug}-lp-circle-{circle_data['presence_course']}" ).first() - room = data[f"{circle} {TRANSLATIONS[language]['raum']}"] - place = data[f"{circle} {TRANSLATIONS[language]['standort']}"] - address = data[f"{circle} {TRANSLATIONS[language]['adresse']}"] - location = f"{room}, {place}, {address}" - presence_day_start = try_parse_datetime( - data[f"{circle} {TRANSLATIONS[language]['start']}"] - )[1] - presence_day_end = try_parse_datetime( - data[f"{circle} {TRANSLATIONS[language]['ende']}"] - )[1] + try: + room = data[f"{circle} {TRANSLATIONS[language]['raum']}"] + place = data[f"{circle} {TRANSLATIONS[language]['standort']}"] + address = data[f"{circle} {TRANSLATIONS[language]['adresse']}"] + location = f"{room}, {place}, {address}" + presence_day_start = try_parse_datetime( + data[f"{circle} {TRANSLATIONS[language]['start']}"] + )[1] + presence_day_end = try_parse_datetime( + data[f"{circle} {TRANSLATIONS[language]['ende']}"] + )[1] + except KeyError: + continue if attendance_course_lc: create_or_update_course_session_attendance( From 8c6b01cec29b8e28ee87a07280afb872d80ad400 Mon Sep 17 00:00:00 2001 From: Christian Cueni Date: Thu, 28 Dec 2023 12:30:25 +0100 Subject: [PATCH 2/4] Update email --- client/src/pages/learningMentor/InvitationAcceptPage.vue | 4 +++- client/src/pages/onboarding/uk/SetupComplete.vue | 2 +- client/src/pages/onboarding/vv/CheckoutAddress.vue | 4 +++- 3 files changed, 7 insertions(+), 3 deletions(-) diff --git a/client/src/pages/learningMentor/InvitationAcceptPage.vue b/client/src/pages/learningMentor/InvitationAcceptPage.vue index 6e75e01d..163712ed 100644 --- a/client/src/pages/learningMentor/InvitationAcceptPage.vue +++ b/client/src/pages/learningMentor/InvitationAcceptPage.vue @@ -37,7 +37,9 @@ const { data, error } = useCSRFFetch( ) }}
- help@vbv.ch + + vermittler@vbv-afa.ch +
{{ $t("a.Fehlermeldung") }}: {{ error.message }} diff --git a/client/src/pages/onboarding/uk/SetupComplete.vue b/client/src/pages/onboarding/uk/SetupComplete.vue index 1511dd2d..7f7276c5 100644 --- a/client/src/pages/onboarding/uk/SetupComplete.vue +++ b/client/src/pages/onboarding/uk/SetupComplete.vue @@ -43,7 +43,7 @@ const courseSessionName = ref(""); " >

diff --git a/client/src/pages/onboarding/vv/CheckoutAddress.vue b/client/src/pages/onboarding/vv/CheckoutAddress.vue index 2d7c9271..3fcd46f9 100644 --- a/client/src/pages/onboarding/vv/CheckoutAddress.vue +++ b/client/src/pages/onboarding/vv/CheckoutAddress.vue @@ -236,7 +236,9 @@ const executePayment = () => { {{ $t("a.Fehler bei der Zahlung. Bitte versuche es erneut oder kontaktiere uns") }}: - help@vbv.ch + + vermittler@vbv-afa.ch@vbv.ch +

{{ $t("a.Adresse") }}

From 909803f3c1ad2eb9a12564f8c744be07038055f7 Mon Sep 17 00:00:00 2001 From: Christian Cueni Date: Thu, 28 Dec 2023 17:02:22 +0100 Subject: [PATCH 3/4] Update payment email templates --- server/vbv_lernwelt/notify/email/email_services.py | 4 ++-- server/vbv_lernwelt/shop/views.py | 3 +-- 2 files changed, 3 insertions(+), 4 deletions(-) diff --git a/server/vbv_lernwelt/notify/email/email_services.py b/server/vbv_lernwelt/notify/email/email_services.py index 6281dcf1..45144894 100644 --- a/server/vbv_lernwelt/notify/email/email_services.py +++ b/server/vbv_lernwelt/notify/email/email_services.py @@ -65,8 +65,8 @@ class EmailTemplate(Enum): # Versicherungsvermittler (after buying a course) WELCOME_MAIL_VV = { "de": "d-308a72c779b74c8487cdec03c772ad13", - "fr": "d-1a0958c7798c4dd18f730491e920eab5", - "it": "d-0882ec9c92f64312b9f358481a943c9a", + "fr": "d-77b3c3a0f185408da55ce006226ca3ff", + "it": "d-d27db9fc96f34f55a8cacf7640787c4e", } # VBV - Lernbegleitung Einladung diff --git a/server/vbv_lernwelt/shop/views.py b/server/vbv_lernwelt/shop/views.py index 86752d83..31edf824 100644 --- a/server/vbv_lernwelt/shop/views.py +++ b/server/vbv_lernwelt/shop/views.py @@ -215,8 +215,7 @@ def send_vv_welcome_email(checkout_info: CheckoutInformation): "company_street": f"{checkout_info.company_street} {checkout_info.company_street_number}", "company_city": f"{checkout_info.company_postal_code} {checkout_info.company_city} {checkout_info.company_country}", }, - # template_language=checkout_info.user.language, - template_language="de", + template_language=checkout_info.user.language, fail_silently=True, ) From 6a99e6829f1d401eeee35c578efe679e8df751d0 Mon Sep 17 00:00:00 2001 From: Christian Cueni Date: Thu, 28 Dec 2023 17:09:26 +0100 Subject: [PATCH 4/4] Re-enable VV on start page, format py Code --- client/src/pages/start/GuestStartPage.vue | 5 ++--- server/vbv_lernwelt/importer/services.py | 26 ++++++++++++++++------- 2 files changed, 20 insertions(+), 11 deletions(-) diff --git a/client/src/pages/start/GuestStartPage.vue b/client/src/pages/start/GuestStartPage.vue index 66659662..73b4c874 100644 --- a/client/src/pages/start/GuestStartPage.vue +++ b/client/src/pages/start/GuestStartPage.vue @@ -16,8 +16,7 @@ const { t } = useTranslation();

{{ $t("start.chooseCourse") }}

    - +

  • {{ $t("start.ukTitle") }}

    diff --git a/server/vbv_lernwelt/importer/services.py b/server/vbv_lernwelt/importer/services.py index 7f513147..55d558ba 100644 --- a/server/vbv_lernwelt/importer/services.py +++ b/server/vbv_lernwelt/importer/services.py @@ -141,14 +141,18 @@ LP_DATA = { "slug": "ménage-partie-1", "presence_course": "ménage-partie-1-lc-cours-de-présence-ménage-partie-1", "assignments": ["ménage-partie-1-lc-mandat-de-préparation"], - "edoniq_tests": ["ménage-partie-1-lc-questions-de-connaissances-et-de-compréhension"], + "edoniq_tests": [ + "ménage-partie-1-lc-questions-de-connaissances-et-de-compréhension" + ], }, "it": { "title": "Economica domestica parte 1", "slug": "economica-domestica-parte-1", "presence_course": "economica-domestica-parte-1-lc-corso-di-presenza-economica-domestica-parte-1", "assignments": ["economica-domestica-parte-1-lc-incarico-di-preparazione"], - "edoniq_tests": ["economica-domestica-parte-1-lc-domande-di-conoscenza-e-di-comprensione"], + "edoniq_tests": [ + "economica-domestica-parte-1-lc-domande-di-conoscenza-e-di-comprensione" + ], }, }, "Haushalt Teil 2": { @@ -156,24 +160,30 @@ LP_DATA = { "title": "Haushalt Teil 2", "slug": "haushalt-teil-2", "presence_course": "haushalt-teil-2-lc-präsenzkurs-haushalt-2", - "assignments": ["haushalt-teil-2-lc-vorbereitungsauftrag", - "haushalt-teil-2-lc-geleitete-fallarbeit-schadenfall-managen"], + "assignments": [ + "haushalt-teil-2-lc-vorbereitungsauftrag", + "haushalt-teil-2-lc-geleitete-fallarbeit-schadenfall-managen", + ], "edoniq_tests": [], }, "fr": { "title": "Ménage partie 2", "slug": "ménage-partie-2", "presence_course": "ménage-partie-2-lc-cours-de-présence-ménage-partie-2", - "assignments": ["ménage-partie-2-lc-mandat-de-préparation", - "ménage-partie-2-lc-étude-de-cas-dirigée-gérer-un-cas-de-sinistre"], + "assignments": [ + "ménage-partie-2-lc-mandat-de-préparation", + "ménage-partie-2-lc-étude-de-cas-dirigée-gérer-un-cas-de-sinistre", + ], "edoniq_tests": [], }, "it": { "title": "Economica domestica parte 2", "slug": "economica-domestica-parte-2", "presence_course": "ménage-partie-2-lc-cours-de-présence-ménage-partie-2", - "assignments": ["economica-domestica-parte-2-lc-incarico-di-preparazione", - "economica-domestica-parte-2-lc-caso-di-studio-guidato-gestione-di-un-sinistro"], + "assignments": [ + "economica-domestica-parte-2-lc-incarico-di-preparazione", + "economica-domestica-parte-2-lc-caso-di-studio-guidato-gestione-di-un-sinistro", + ], "edoniq_tests": [], }, },