ramon
/
vbv
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merged in feature/vv-release (pull request #258) 

Feature/vv release
This commit is contained in:
Christian Cueni 2023-12-29 09:57:30 +00:00
parent d9982fb030 6a99e6829f
commit 233d052391
7 changed files with 47 additions and 29 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
client/src/pages/learningMentor/InvitationAcceptPage.vue
View File

@ -37,7 +37,9 @@ const { data, error } = useCSRFFetch(
) )
}} }}
<div> <div>
<a class="underline" href="mailto:help@vbv.ch">help@vbv.ch</a> <a class="underline" href="mailto:vermittler@vbv-afa.ch">
vermittler@vbv-afa.ch
</a>
</div> </div>
<div v-if="error.message" class="my-4"> <div v-if="error.message" class="my-4">
{{ $t("a.Fehlermeldung") }}: {{ error.message }} {{ $t("a.Fehlermeldung") }}: {{ error.message }}

2
client/src/pages/onboarding/uk/SetupComplete.vue
View File

@ -43,7 +43,7 @@ const courseSessionName = ref("");
" "
> >
<template #support> <template #support>
<a class="underline" href="mailto:help@vbv.ch">Support</a> <a class="underline" href="mailto:uek-support@vbv-afa.ch">Support</a>
</template> </template>
</i18next> </i18next>
</p> </p>

4
client/src/pages/onboarding/vv/CheckoutAddress.vue
View File

@ -236,7 +236,9 @@ const executePayment = () => {
{{ {{
$t("a.Fehler bei der Zahlung. Bitte versuche es erneut oder kontaktiere uns") $t("a.Fehler bei der Zahlung. Bitte versuche es erneut oder kontaktiere uns")
}}: }}:
<a href="mailto:help@vbv.ch" class="underline">help@vbv.ch</a> <a href="mailto:vermittler@vbv-afa.ch" class="underline">
vermittler@vbv-afa.ch@vbv.ch
</a>
</p> </p>
<h3 class="mb-4 mt-10">{{ $t("a.Adresse") }}</h3> <h3 class="mb-4 mt-10">{{ $t("a.Adresse") }}</h3>

5
client/src/pages/start/GuestStartPage.vue
View File

@ -16,8 +16,7 @@ const { t } = useTranslation();
<h3 class="mb-8 text-blue-900">{{ $t("start.chooseCourse") }}</h3> <h3 class="mb-8 text-blue-900">{{ $t("start.chooseCourse") }}</h3>
<ul> <ul>
<!-- todo: enable when payment is ready <li class="mb-16 flex items-center gap-x-8">
li class="mb-16 flex items-center gap-x-8">
<img <img
class="hidden h-72 md:block" class="hidden h-72 md:block"
src="../../assets/images/mood_vv.jpg" src="../../assets/images/mood_vv.jpg"
@ -34,7 +33,7 @@ const { t } = useTranslation();
{{ $t("a.Mehr erfahren") }} {{ $t("a.Mehr erfahren") }}
</router-link> </router-link>
</div> </div>
</li--> </li>
<li class="flex items-center gap-x-8"> <li class="flex items-center gap-x-8">
<div class="space-y-2"> <div class="space-y-2">
<h4 class="text-lg font-bold">{{ $t("start.ukTitle") }}</h4> <h4 class="text-lg font-bold">{{ $t("start.ukTitle") }}</h4>

54
server/vbv_lernwelt/importer/services.py
View File

@ -133,22 +133,26 @@ LP_DATA = {
"title": "Haushalt Teil 1", "title": "Haushalt Teil 1",
"slug": "haushalt-teil-1", "slug": "haushalt-teil-1",
"presence_course": "haushalt-teil-1-lc-präsenzkurs-haushalt-1", "presence_course": "haushalt-teil-1-lc-präsenzkurs-haushalt-1",
"assignments": [], "assignments": ["haushalt-teil-1-lc-vorbereitungsauftrag"],
"edoniq_tests": [], "edoniq_tests": ["haushalt-teil-1-lc-wissens-und-verständnisfragen"],
}, },
"fr": { "fr": {
"title": "Ménage partie 1", "title": "Ménage partie 1",
"slug": "ménage-partie-1", "slug": "ménage-partie-1",
"presence_course": "ménage-partie-1-lc-cours-de-présence-ménage-partie-1", "presence_course": "ménage-partie-1-lc-cours-de-présence-ménage-partie-1",
"assignments": [], "assignments": ["ménage-partie-1-lc-mandat-de-préparation"],
"edoniq_tests": [], "edoniq_tests": [
"ménage-partie-1-lc-questions-de-connaissances-et-de-compréhension"
],
}, },
"it": { "it": {
"title": "Economica domestica parte 1", "title": "Economica domestica parte 1",
"slug": "economica-domestica-parte-1", "slug": "economica-domestica-parte-1",
"presence_course": "economica-domestica-parte-1-lc-corso-di-presenza-economica-domestica-parte-1", "presence_course": "economica-domestica-parte-1-lc-corso-di-presenza-economica-domestica-parte-1",
"assignments": [], "assignments": ["economica-domestica-parte-1-lc-incarico-di-preparazione"],
"edoniq_tests": [], "edoniq_tests": [
"economica-domestica-parte-1-lc-domande-di-conoscenza-e-di-comprensione"
],
}, },
}, },
"Haushalt Teil 2": { "Haushalt Teil 2": {
@ -156,21 +160,30 @@ LP_DATA = {
"title": "Haushalt Teil 2", "title": "Haushalt Teil 2",
"slug": "haushalt-teil-2", "slug": "haushalt-teil-2",
"presence_course": "haushalt-teil-2-lc-präsenzkurs-haushalt-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": [], "edoniq_tests": [],
}, },
"fr": { "fr": {
"title": "Ménage partie 2", "title": "Ménage partie 2",
"slug": "ménage-partie-2", "slug": "ménage-partie-2",
"presence_course": "ménage-partie-2-lc-cours-de-présence-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": [], "edoniq_tests": [],
}, },
"it": { "it": {
"title": "Economica domestica parte 2", "title": "Economica domestica parte 2",
"slug": "economica-domestica-parte-2", "slug": "economica-domestica-parte-2",
"presence_course": "ménage-partie-2-lc-cours-de-présence-ménage-partie-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": [], "edoniq_tests": [],
}, },
}, },
@ -354,16 +367,19 @@ def create_or_update_course_session(
slug=f"{course.slug}-lp-circle-{circle_data['presence_course']}" slug=f"{course.slug}-lp-circle-{circle_data['presence_course']}"
).first() ).first()
room = data[f"{circle} {TRANSLATIONS[language]['raum']}"] try:
place = data[f"{circle} {TRANSLATIONS[language]['standort']}"] room = data[f"{circle} {TRANSLATIONS[language]['raum']}"]
address = data[f"{circle} {TRANSLATIONS[language]['adresse']}"] place = data[f"{circle} {TRANSLATIONS[language]['standort']}"]
location = f"{room}, {place}, {address}" address = data[f"{circle} {TRANSLATIONS[language]['adresse']}"]
presence_day_start = try_parse_datetime( location = f"{room}, {place}, {address}"
data[f"{circle} {TRANSLATIONS[language]['start']}"] presence_day_start = try_parse_datetime(
)[1] data[f"{circle} {TRANSLATIONS[language]['start']}"]
presence_day_end = try_parse_datetime( )[1]
data[f"{circle} {TRANSLATIONS[language]['ende']}"] presence_day_end = try_parse_datetime(
)[1] data[f"{circle} {TRANSLATIONS[language]['ende']}"]
)[1]
except KeyError:
continue
if attendance_course_lc: if attendance_course_lc:
create_or_update_course_session_attendance( create_or_update_course_session_attendance(

4
server/vbv_lernwelt/notify/email/email_services.py
View File

@ -65,8 +65,8 @@ class EmailTemplate(Enum):
# Versicherungsvermittler (after buying a course) # Versicherungsvermittler (after buying a course)
WELCOME_MAIL_VV = { WELCOME_MAIL_VV = {
"de": "d-308a72c779b74c8487cdec03c772ad13", "de": "d-308a72c779b74c8487cdec03c772ad13",
"fr": "d-1a0958c7798c4dd18f730491e920eab5", "fr": "d-77b3c3a0f185408da55ce006226ca3ff",
"it": "d-0882ec9c92f64312b9f358481a943c9a", "it": "d-d27db9fc96f34f55a8cacf7640787c4e",
} }
# VBV - Lernbegleitung Einladung # VBV - Lernbegleitung Einladung

3
server/vbv_lernwelt/shop/views.py
View File

@ -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_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}", "company_city": f"{checkout_info.company_postal_code} {checkout_info.company_city} {checkout_info.company_country}",
}, },
# template_language=checkout_info.user.language, template_language=checkout_info.user.language,
template_language="de",
fail_silently=True, fail_silently=True,
) )