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

Merge branch 'develop'

This commit is contained in:
Christian Cueni 2023-03-06 12:28:38 +01:00
parent b5c9fe289c ef6774f260
commit 89d7cc48dc
6 changed files with 99 additions and 64 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
client/src/components/MainNavigationBar.vue
View File

@ -135,7 +135,7 @@ const profileDropdownData: DropdownListItem[] = [
</router-link> </router-link>
<router-link to="/" class="flex"> <router-link to="/" class="flex">
<div class="ml-1 border-l border-white pr-10 pl-3 text-2xl text-white"> <div class="ml-1 border-l border-white pr-10 pl-3 text-2xl text-white">
myVBV {{ $t("general.title") }}
</div> </div>
</router-link> </router-link>
</div> </div>

1
client/src/locales/de.json
View File

@ -115,6 +115,7 @@
"show": "Anschauen", "show": "Anschauen",
"showAll": "Alle anschauen", "showAll": "Alle anschauen",
"start": "Los geht's", "start": "Los geht's",
"title": "myVBV",
"transferTask": "Transferauftrag | Transferaufträge", "transferTask": "Transferauftrag | Transferaufträge",
"yes": "Ja" "yes": "Ja"
}, },

11
client/src/locales/fr.json
View File

@ -115,6 +115,7 @@
"show": "Montrer", "show": "Montrer",
"showAll": "Montrer tous", "showAll": "Montrer tous",
"start": "On y va", "start": "On y va",
"title": "myAFA",
"transferTask": "Ordre de transfert | Ordres de transfert", "transferTask": "Ordre de transfert | Ordres de transfert",
"yes": "Our" "yes": "Our"
}, },
@ -126,9 +127,13 @@
"completeAndContinue": "Marquer comme fait" "completeAndContinue": "Marquer comme fait"
}, },
"learningPathPage": { "learningPathPage": {
"nextStep": "Prochaine étape", "currentCircle": "Cercle actuel",
"showListView": "Voir la liste", "listView": "Vue: liste",
"welcomeBack": "Bienvenue, {name}" "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": { "mainNavigation": {
"logout": "Fermer la session", "logout": "Fermer la session",

18
server/vbv_lernwelt/core/create_default_users.py
View File

@ -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") student_group, created = group_model.objects.get_or_create(name="student_group")
def _create_student_user( 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( student_user, created = _get_or_create_user(
user_model=user_model, user_model=user_model,
username=email, username=email,
password=password, password=password,
language=language,
) )
student_user.first_name = first_name student_user.first_name = first_name
student_user.last_name = last_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", first_name="Student",
last_name="UK1-Zürich", 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): def _get_or_create_user(user_model, *args, **kwargs):
username = kwargs.get("username", None) username = kwargs.get("username", None)
password = kwargs.get("password", None) password = kwargs.get("password", None)
language = kwargs.get("language", "de")
created = False created = False
user = user_model.objects.filter(username=username).first() user = user_model.objects.filter(username=username).first()
@ -212,6 +227,7 @@ def _get_or_create_user(user_model, *args, **kwargs):
username=username, username=username,
password=make_password(password), password=make_password(password),
email=username, email=username,
language=language,
) )
created = True created = True
return user, created return user, created

125
server/vbv_lernwelt/course/management/commands/create_default_courses.py
View File

@ -199,65 +199,78 @@ def command():
user=User.objects.get(username="patrizia.huggel@eiger-versicherungen.ch"), user=User.objects.get(username="patrizia.huggel@eiger-versicherungen.ch"),
role=CourseSessionUser.Role.EXPERT, role=CourseSessionUser.Role.EXPERT,
) )
csu.expert.add( if course["course_id"] == COURSE_UK:
Circle.objects.get(slug="überbetriebliche-kurse-lp-circle-kickoff") 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(
csu.expert.add( slug="überbetriebliche-kurse-lp-circle-haushalt-teil-1"
Circle.objects.get(slug="überbetriebliche-kurse-lp-circle-fahrzeug") )
) )
csu = CourseSessionUser.objects.create( csu.expert.add(
course_session=cs, Circle.objects.get(slug="überbetriebliche-kurse-lp-circle-fahrzeug")
user=User.objects.get(username="andreas.feuz@eiger-versicherungen.ch"), )
role=CourseSessionUser.Role.EXPERT, csu = CourseSessionUser.objects.create(
) course_session=cs,
csu.expert.add( user=User.objects.get(username="andreas.feuz@eiger-versicherungen.ch"),
Circle.objects.get(slug="überbetriebliche-kurse-lp-circle-haushalt-teil-2") role=CourseSessionUser.Role.EXPERT,
) )
csu.expert.add( csu.expert.add(
Circle.objects.get(slug="überbetriebliche-kurse-lp-circle-basis") Circle.objects.get(
) slug="überbetriebliche-kurse-lp-circle-haushalt-teil-2"
_csu = CourseSessionUser.objects.create( )
course_session=cs, )
user=User.objects.get(username="michael.meier@example.com"), csu.expert.add(
) Circle.objects.get(slug="überbetriebliche-kurse-lp-circle-basis")
_csu = CourseSessionUser.objects.create( )
course_session=cs, _csu = CourseSessionUser.objects.create(
user=User.objects.get(username="lina.egger@example.com"), course_session=cs,
) user=User.objects.get(username="michael.meier@example.com"),
_csu = CourseSessionUser.objects.create( )
course_session=cs, _csu = CourseSessionUser.objects.create(
user=User.objects.get(username="evelyn.schmid@example.com"), 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( _csu = CourseSessionUser.objects.create(
course_session=cs, course_session=cs,
user=User.objects.get(username="christoph.bosshard@vbv-afa.ch"), user=User.objects.get(username="christoph.bosshard@vbv-afa.ch"),
) )
_csu = CourseSessionUser.objects.create( _csu = CourseSessionUser.objects.create(
course_session=cs, course_session=cs,
user=User.objects.get(username="bianca.muster@eiger-versicherungen.ch"), user=User.objects.get(username="axel.manderbach@lernetz.ch"),
) )
_csu = CourseSessionUser.objects.create( create_feedback(
course_session=cs, Circle.objects.get(slug="überbetriebliche-kurse-lp-circle-kickoff"),
user=User.objects.get(username="axel.manderbach@lernetz.ch"), cs,
) 3,
)
create_feedback( create_feedback(
Circle.objects.get(slug="überbetriebliche-kurse-lp-circle-kickoff"), cs, 3 Circle.objects.get(
) slug="überbetriebliche-kurse-lp-circle-haushalt-teil-2"
create_feedback( ),
Circle.objects.get(slug="überbetriebliche-kurse-lp-circle-haushalt-teil-2"), cs,
cs, 14,
14, )
) create_feedback(
create_feedback( Circle.objects.get(slug="überbetriebliche-kurse-lp-circle-basis"), cs, 4
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 # course session Überbetriebliche Kurse Lehrjahr 1 - Region Zürich
cs = CourseSession.objects.create( cs = CourseSession.objects.create(

6
server/vbv_lernwelt/course/management/commands/create_uk_course.py
View File

@ -39,14 +39,14 @@ def create_uk_learning_path(course_id=COURSE_UK, user=None, skip_locales=True):
parent=course_page, 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="Kickoff")
create_uk_circle(lp, title="Basis") create_uk_circle(lp, title="Basis")
create_uk_circle(lp, title="Fahrzeug") create_uk_circle(lp, title="Fahrzeug")
create_uk_circle(lp, title="Haushalt Teil 1") create_uk_circle(lp, title="Haushalt Teil 1")
create_uk_circle(lp, title="Haushalt Teil 2") 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="Reisen & Rechtsstreitigkeiten")
create_uk_circle(lp, title="Wohneigentum") create_uk_circle(lp, title="Wohneigentum")
create_uk_circle(lp, title="KMU Teil 1") 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 (Invalidität)")
create_uk_circle(lp, title="Einkommenssicherung (Todesfall)") create_uk_circle(lp, title="Einkommenssicherung (Todesfall)")
create_uk_circle(lp, title="Pensionierung (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="Gesundheit")
create_uk_circle(lp, title="Prüfungsvorbereitung Teil 1") create_uk_circle(lp, title="Prüfungsvorbereitung Teil 1")
create_uk_circle(lp, title="Prüfungsvorbereitung Teil 2") create_uk_circle(lp, title="Prüfungsvorbereitung Teil 2")