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

Add prepwork IT/FR, add link to allowed features

This commit is contained in:
Christian Cueni 2023-08-02 15:03:43 +02:00
parent a7dde5e58c
commit 28b2265465
7 changed files with 991 additions and 215 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
client/src/pages/DashboardPage.vue
View File

@ -90,6 +90,8 @@ const getNextStepLink = (courseSession: CourseSession) => {
{{ $t("uk.contact.team") }}
<br />
{{ $t("uk.contact.address") }}
<br />
<a href="mailto:uek-support@vbv-afa.ch">uk.contact.email</a>
</p>
</address>
</div>

2
client/src/pages/LoginPage.vue
View File

@ -102,6 +102,8 @@ const userStore = useUserStore();
{{ $t("uk.contact.team") }}
<br />
{{ $t("uk.contact.address") }}
<br />
<a href="mailto:uek-support@vbv-afa.ch">uek-support@vbv-afa.ch</a>
</p>
</address>
</div>

1081
server/vbv_lernwelt/assignment/creators/create_assignments.py
View File

File diff suppressed because it is too large Load Diff

2
server/vbv_lernwelt/core/constants.py
View File

@ -2,12 +2,14 @@ DEFAULT_RICH_TEXT_FEATURES = [
"ul",
"bold",
"italic",
"link",
]
DEFAULT_RICH_TEXT_FEATURES_WITH_HEADER = [
"ul",
"bold",
"italic",
"h3",
"link",
]
# ids for cypress test data

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

@ -4,6 +4,7 @@ from datetime import datetime, timedelta
import djclick as click
from dateutil.relativedelta import MO, relativedelta, TH, TU
from django.conf import settings
from django.utils import timezone
from vbv_lernwelt.assignment.creators.create_assignments import (
@ -11,11 +12,15 @@ from vbv_lernwelt.assignment.creators.create_assignments import (
create_uk_condition_acceptance,
create_uk_fahrzeug_casework,
create_uk_fahrzeug_prep_assignment,
create_uk_fr_basis_prep_assignment,
create_uk_fr_fahrzeug_casework,
create_uk_fr_fahrzeug_prep_assignment,
create_uk_fr_kickoff_prep_assignment,
create_uk_fr_reflection,
create_uk_it_basis_prep_assignment,
create_uk_it_fahrzeug_casework,
create_uk_it_fahrzeug_prep_assignment,
create_uk_it_kickoff_prep_assignment,
create_uk_it_reflection,
create_uk_kickoff_prep_assignment,
create_uk_reflection,
@ -131,17 +136,18 @@ def command(course):
if COURSE_UK in course:
create_course_uk_de()
create_course_uk_de_course_sessions()
create_course_uk_de_completion_data(
CourseSession.objects.get(title="Bern 2023 a")
)
create_course_uk_de_assignment_completion_data(
assignment=Assignment.objects.get(
slug="überbetriebliche-kurse-assignment-überprüfen-einer-motorfahrzeugs-versicherungspolice"
),
course_session=CourseSession.objects.get(title="Bern 2023 a"),
user=User.objects.get(email="lina.egger@example.com"),
)
if settings.APP_ENVIRONMENT != "production":
create_course_uk_de_course_sessions()
create_course_uk_de_completion_data(
CourseSession.objects.get(title="Bern 2023 a")
)
create_course_uk_de_assignment_completion_data(
assignment=Assignment.objects.get(
slug="überbetriebliche-kurse-assignment-überprüfen-einer-motorfahrzeugs-versicherungspolice"
),
course_session=CourseSession.objects.get(title="Bern 2023 a"),
user=User.objects.get(email="lina.egger@example.com"),
)
if COURSE_UK_FR in course:
create_course_uk_fr()
@ -431,6 +437,9 @@ def create_course_uk_fr():
_assignment_list_page = AssignmentListPageFactory(
parent=course.coursepage,
)
create_uk_fr_kickoff_prep_assignment(course_id=COURSE_UK_FR)
create_uk_fr_basis_prep_assignment(course_id=COURSE_UK_FR)
create_uk_fr_fahrzeug_casework(course_id=COURSE_UK_FR)
create_uk_fr_fahrzeug_prep_assignment(course_id=COURSE_UK_FR)
create_uk_fr_reflection(course_id=COURSE_UK_FR)
@ -438,33 +447,34 @@ def create_course_uk_fr():
create_uk_fr_competence_profile(course_id=COURSE_UK_FR)
create_default_media_library(course_id=COURSE_UK_FR)
cs = CourseSession.objects.create(
course_id=COURSE_UK_FR,
title="Cours interentreprises année 1 - Région Fribourg",
)
if settings.APP_ENVIRONMENT != "production":
cs = CourseSession.objects.create(
course_id=COURSE_UK_FR,
title="Cours interentreprises année 1 - Région Fribourg",
)
csu = CourseSessionUser.objects.create(
course_session=cs,
user=User.objects.get(username="geraldine.kolly@assurance.ch"),
role=CourseSessionUser.Role.EXPERT,
)
csu.expert.add(
Circle.objects.get(slug="cours-interentreprises-lp-circle-lancement")
)
_csu = CourseSessionUser.objects.create(
course_session=cs,
user=User.objects.get(username="luca.dupont@assurance.ch"),
)
csu = CourseSessionUser.objects.create(
course_session=cs,
user=User.objects.get(username="andreas.feuz@eiger-versicherungen.ch"),
role=CourseSessionUser.Role.EXPERT,
)
csu = CourseSessionUser.objects.create(
course_session=cs,
user=User.objects.get(username="geraldine.kolly@assurance.ch"),
role=CourseSessionUser.Role.EXPERT,
)
csu.expert.add(
Circle.objects.get(slug="cours-interentreprises-lp-circle-lancement")
)
_csu = CourseSessionUser.objects.create(
course_session=cs,
user=User.objects.get(username="luca.dupont@assurance.ch"),
)
csu = CourseSessionUser.objects.create(
course_session=cs,
user=User.objects.get(username="andreas.feuz@eiger-versicherungen.ch"),
role=CourseSessionUser.Role.EXPERT,
)
for fr_circle in Circle.objects.filter(
slug__startswith="cours-interentreprises-lp"
):
csu.expert.add(fr_circle)
for fr_circle in Circle.objects.filter(
slug__startswith="cours-interentreprises-lp"
):
csu.expert.add(fr_circle)
def create_course_uk_it():
@ -477,6 +487,8 @@ def create_course_uk_it():
_assignment_list_page = AssignmentListPageFactory(
parent=course.coursepage,
)
create_uk_it_kickoff_prep_assignment(course_id=COURSE_UK_IT)
create_uk_it_basis_prep_assignment(course_id=COURSE_UK_IT)
create_uk_it_fahrzeug_casework(course_id=COURSE_UK_IT)
create_uk_it_fahrzeug_prep_assignment(course_id=COURSE_UK_IT)
create_uk_it_reflection(course_id=COURSE_UK_IT)
@ -484,10 +496,11 @@ def create_course_uk_it():
create_uk_it_competence_profile(course_id=COURSE_UK_IT)
create_default_media_library(course_id=COURSE_UK_IT)
_cs = CourseSession.objects.create(
course_id=COURSE_UK_IT,
title="Corso interaziendale Ticino",
)
if settings.APP_ENVIRONMENT != "production":
_cs = CourseSession.objects.create(
course_id=COURSE_UK_IT,
title="Corso interaziendale Ticino",
)
def create_course_uk_de_assignment_completion_data(assignment, course_session, user):

14
server/vbv_lernwelt/edoniq_test/tests/test_edoniq_export.py
View File

@ -61,18 +61,18 @@ class EdoniqUserExportTestCase(TestCase):
expected_response_data = [
[
"login",
"firstName",
"lastName",
"firstname",
"lastname",
"gender",
"preferredLanguage",
"emailBusiness",
"preferred_language",
"email",
"birthday",
"group",
"region",
"division",
"organisationUnit",
"superiorLogin",
],
"oe",
"superior_login",
]
] + user_data
# Perform assertions on the response

12
server/vbv_lernwelt/edoniq_test/views.py
View File

@ -35,17 +35,17 @@ def generate_export_response(cs_users: List[CourseSessionUser]) -> HttpResponse:
writer.writerow(
[
"login",
"firstName",
"lastName",
"firstname",
"lastname",
"gender",
"preferredLanguage",
"emailBusiness",
"preferred_language",
"email",
"birthday",
"group",
"region",
"division",
"organisationUnit",
"superiorLogin",
"oe",
"superior_login",
]
)