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

Merged in feature/update-importer (pull request #194) 

Feature/update importer

Approved-by: Daniel Egger
This commit is contained in:
Christian Cueni 2023-08-23 13:37:35 +00:00 committed by Daniel Egger
parent a8819296e2 9483c1f6d3
commit e821159864
3 changed files with 36 additions and 24 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -81,7 +81,7 @@ class EdoniqUserExportTestCase(TestCase):
"m", "m",
user.language, user.language,
user.email, user.email,
user.additional_json_data.get("Geburtsdatum", ""), "",
"Lernende", "Lernende",
user.additional_json_data.get("Firmenname", ""), user.additional_json_data.get("Firmenname", ""),
user.additional_json_data.get("Lehrvertragsnummer", ""), user.additional_json_data.get("Lehrvertragsnummer", ""),

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

@ -184,7 +184,7 @@ def generate_export_response(cs_users: List[User]) -> HttpResponse:
"m", "m",
cs_user.language, cs_user.language,
cs_user.email, cs_user.email,
cs_user.additional_json_data.get("Geburtsdatum", ""), "",
cs_user.edoniq_role, cs_user.edoniq_role,
cs_user.additional_json_data.get("Firmenname", ""), cs_user.additional_json_data.get("Firmenname", ""),
cs_user.additional_json_data.get("Lehrvertragsnummer", ""), cs_user.additional_json_data.get("Lehrvertragsnummer", ""),

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

@ -36,7 +36,7 @@ LP_DATA = {
"slug": "kickoff", "slug": "kickoff",
"presence_course": "kickoff-lc-präsenzkurs-kickoff", "presence_course": "kickoff-lc-präsenzkurs-kickoff",
"assignments": [ "assignments": [
"kickoff-lc-vorbereitungsauftrag-circle-kickoff", "kickoff-lc-vorbereitungsauftrag",
"kickoff-lc-redlichkeitserklärung", "kickoff-lc-redlichkeitserklärung",
"kickoff-lc-reflexion", "kickoff-lc-reflexion",
], ],
@ -48,10 +48,12 @@ LP_DATA = {
"presence_course": "lancement-lc-cours-de-présence-lancement", "presence_course": "lancement-lc-cours-de-présence-lancement",
"assignments": [ "assignments": [
"lancement-lc-mission-de-préparation", "lancement-lc-mission-de-préparation",
"lancement-lc-redlichkeitserklärung", "lancement-lc-déclaration-de-probité",
"lancement-lc-réflexion", "lancement-lc-réflexion",
], ],
"edoniq_tests": [], "edoniq_tests": [
"lancement-lc-questions-de-connaissances-et-de-compréhension"
],
}, },
"it": { "it": {
"title": "Introduzione", "title": "Introduzione",
@ -59,10 +61,10 @@ LP_DATA = {
"presence_course": "introduzione-lc-corso-di-presenza-introduzione", "presence_course": "introduzione-lc-corso-di-presenza-introduzione",
"assignments": [ "assignments": [
"introduzione-lc-incarico-di-preparazione", "introduzione-lc-incarico-di-preparazione",
"introduzione-lc-redlichkeitserklärung", "introduzione-lc-dichiarazione-di-onestà",
"introduzione-lc-riflessione", "introduzione-lc-riflessione",
], ],
"edoniq_tests": [], "edoniq_tests": ["introduzione-lc-domande-di-conoscenza-e-di-comprensione"],
}, },
}, },
"Basis": { "Basis": {
@ -73,25 +75,25 @@ LP_DATA = {
"assignments": [ "assignments": [
"basis-lc-vorbereitungsauftrag-circle-basis", "basis-lc-vorbereitungsauftrag-circle-basis",
], ],
"edoniq_tests": [], "edoniq_tests": ["basis-lc-wissens-und-verständnisfragen"],
}, },
"fr": { "fr": {
"title": "Base", "title": "Base",
"slug": "base", "slug": "base",
"presence_course": "base-lc-cours-de-présence-base", "presence_course": "base-lc-cours-de-présence-base",
"assignments": [ "assignments": [
"base-lc-mandats-préparatoires-circle-base", "base-lc-mission-de-préparation",
], ],
"edoniq_tests": [], "edoniq_tests": ["base-lc-questions-de-connaissances-et-de-compréhension"],
}, },
"it": { "it": {
"title": "Base", "title": "Base",
"slug": "base", "slug": "base",
"presence_course": "base-lc-corso-di-presenza-base", "presence_course": "base-lc-corso-di-presenza-base",
"assignments": [ "assignments": [
"base-lc-vorbereitungsauftrag-circle-basis", "base-lc-incarico-di-preparazione",
], ],
"edoniq_tests": [], "edoniq_tests": ["base-lc-domande-di-conoscenza-e-di-comprensione"],
}, },
}, },
"Fahrzeug": { "Fahrzeug": {
@ -108,7 +110,7 @@ LP_DATA = {
"fr": { "fr": {
"title": "Véhicule", "title": "Véhicule",
"slug": "véhicule", "slug": "véhicule",
"presence_course": "véhicule-lc-cours-de-présence-véhicule-à-moteur", "presence_course": "véhicule-lc-cours-de-présence-véhicule",
"assignments": [ "assignments": [
"véhicule-lc-vérification-dune-police-dassurance-de-véhicule-à-moteur", "véhicule-lc-vérification-dune-police-dassurance-de-véhicule-à-moteur",
"véhicule-lc-véhicule-à-moteur-ma-première-voiture", "véhicule-lc-véhicule-à-moteur-ma-première-voiture",
@ -118,7 +120,7 @@ LP_DATA = {
"it": { "it": {
"title": "Veicolo", "title": "Veicolo",
"slug": "veicolo", "slug": "veicolo",
"presence_course": "veicolo-lc-corso-di-presenza-veicolo", "presence_course": "veicolo-lc-corso-di-presenza",
"assignments": [ "assignments": [
"veicolo-lc-verifica-di-una-polizza-di-assicurazione-veicoli-a-motore", "veicolo-lc-verifica-di-una-polizza-di-assicurazione-veicoli-a-motore",
"veicolo-lc-veicolo-la-mia-prima-auto", "veicolo-lc-veicolo-la-mia-prima-auto",
@ -130,35 +132,45 @@ LP_DATA = {
"de": { "de": {
"title": "Haushalt Teil 1", "title": "Haushalt Teil 1",
"slug": "haushalt-teil-1", "slug": "haushalt-teil-1",
"presence_course": "", "presence_course": "haushalt-teil-1-lc-präsenzkurs-haushalt-1",
"assignments": [], "assignments": [],
"edoniq_tests": [], "edoniq_tests": [],
}, },
"fr": { "fr": {
"title": "Habitat partie 1", "title": "Ménage partie 1",
"slug": "habitat-partie-1", "slug": "ménage-partie-1",
"presence_course": "", "presence_course": "ménage-partie-1-lc-cours-de-présence-ménage-partie-1",
"assignments": [],
},
"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": [], "assignments": [],
"edoniq_tests": [], "edoniq_tests": [],
}, },
"it": {},
}, },
"Haushalt Teil 2": { "Haushalt Teil 2": {
"de": { "de": {
"title": "Haushalt Teil 2", "title": "Haushalt Teil 2",
"slug": "haushalt-teil-2", "slug": "haushalt-teil-2",
"presence_course": "", "presence_course": "haushalt-teil-2-lc-präsenzkurs-haushalt-2",
"assignments": [], "assignments": [],
"edoniq_tests": [], "edoniq_tests": [],
}, },
"fr": { "fr": {
"title": "Habitat partie 2", "title": "Ménage partie 2",
"slug": "habitat-partie-2", "slug": "ménage-partie-2",
"presence_course": "", "presence_course": "ménage-partie-2-lc-cours-de-présence-ménage-partie-2",
"assignments": [],
},
"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": [],
"edoniq_tests": [], "edoniq_tests": [],
}, },
"it": {},
}, },
} }