From bed9dcce6172409353514ae24be665be5cb55e88 Mon Sep 17 00:00:00 2001 From: Christian Cueni Date: Wed, 29 May 2024 16:59:09 +0200 Subject: [PATCH 1/2] wip: Add circles to importer [skip ci] --- server/vbv_lernwelt/importer/services.py | 64 ++++++++++++++++++++++++ 1 file changed, 64 insertions(+) diff --git a/server/vbv_lernwelt/importer/services.py b/server/vbv_lernwelt/importer/services.py index 38062629..6452da19 100644 --- a/server/vbv_lernwelt/importer/services.py +++ b/server/vbv_lernwelt/importer/services.py @@ -187,6 +187,70 @@ LP_DATA = { "edoniq_tests": [], }, }, + "Reisen & Rechtsstreitigkeiten": { + "de": { + "title": "Reisen & Rechtsstreitigkeiten", + "slug": "reisen-rechtsstreitigkeiten", + "presence_course": "", + "assignments": [ + "", + "", + ], + "edoniq_tests": [], + }, + "fr": { + "title": "Voyages / Litiges juridiques", + "slug": "voyages-litiges-juridiques", + "presence_course": "", + "assignments": [ + "", + "", + ], + "edoniq_tests": [], + }, + "it": { + "title": "Viaggi e controversie giuridiche", + "slug": "viaggi-e-controversie-giuridiche", + "presence_course": "", + "assignments": [ + "", + "", + ], + "edoniq_tests": [], + }, + }, + "Wohneigentum": { + "de": { + "title": "Wohneigentum", + "slug": "wohneigentum", + "presence_course": "", + "assignments": [ + "", + "", + ], + "edoniq_tests": [], + }, + "fr": { + "title": "Propriété du logement", + "slug": "propriété-du-logement", + "presence_course": "", + "assignments": [ + "", + "", + ], + "edoniq_tests": [], + }, + "it": { + "title": "Casa di proprietà", + "slug": "casa-di-proprietà", + "presence_course": "", + "assignments": [ + "", + "", + ], + "edoniq_tests": [], + }, + }, } # the request is always, so we cannot rely on the language in the request From 71e43de52067a43287b7bde883ce2057fe169508 Mon Sep 17 00:00:00 2001 From: Christian Cueni Date: Sat, 8 Jun 2024 10:04:41 +0200 Subject: [PATCH 2/2] Add circles to import --- server/vbv_lernwelt/importer/services.py | 236 +++++++++++++++++++++-- server/vbv_lernwelt/importer/views.py | 8 + 2 files changed, 226 insertions(+), 18 deletions(-) diff --git a/server/vbv_lernwelt/importer/services.py b/server/vbv_lernwelt/importer/services.py index 6452da19..1db6fea8 100644 --- a/server/vbv_lernwelt/importer/services.py +++ b/server/vbv_lernwelt/importer/services.py @@ -191,55 +191,223 @@ LP_DATA = { "de": { "title": "Reisen & Rechtsstreitigkeiten", "slug": "reisen-rechtsstreitigkeiten", - "presence_course": "", + "presence_course": "reisen-rechtsstreitigkeiten-lc-präsenzkurs-reisen-rechtsstreiti", "assignments": [ - "", - "", + "reisen-rechtsstreitigkeiten-lc-vorbereitungsauftrag", + ], + "edoniq_tests": [ + "reisen-rechtsstreitigkeiten-lc-wissens-und-verständnisfragen" ], - "edoniq_tests": [], }, "fr": { "title": "Voyages / Litiges juridiques", "slug": "voyages-litiges-juridiques", - "presence_course": "", + "presence_course": "voyages--litiges-juridiques-lc-cours-de-présence", "assignments": [ - "", - "", + "voyages-litiges-juridiques-lc-mandat-de-préparation", + ], + "edoniq_tests": [ + "voyages-litiges-juridiques-lc-questions-de-connaissances-et-de-compréhension" ], - "edoniq_tests": [], }, "it": { "title": "Viaggi e controversie giuridiche", "slug": "viaggi-e-controversie-giuridiche", - "presence_course": "", + "presence_course": "viaggi-e-controversie-giuridiche-lc-corso-di-presenza", "assignments": [ - "", - "", + "viaggi-e-controversie-giuridiche-lc-incarico-di-preparazione", + ], + "edoniq_tests": [ + "viaggi-e-controversie-giuridiche-lc-domande-di-conoscenza-e-di-comprensione" ], - "edoniq_tests": [], }, }, "Wohneigentum": { "de": { "title": "Wohneigentum", "slug": "wohneigentum", - "presence_course": "", + "presence_course": "wohneigentum-lc-präsenzkurs-wohneigentum", "assignments": [ - "", - "", + "wohneigentum-lc-vorbereitungsauftrag", + "wohneigentum-lc-geleitete-fallarbeit-von-der-baustelle-zum-eigenheim", ], "edoniq_tests": [], }, "fr": { "title": "Propriété du logement", "slug": "propriété-du-logement", - "presence_course": "", + "presence_course": "propriété-du-logement-lc-cours-de-présence", "assignments": [ - "", - "", + "propriété-du-logement-lc-mandat-de-préparation", + "propriété-du-logement-lc-etude-de-cas-dirigée", ], "edoniq_tests": [], }, + "it": { + "title": "Casa di proprietà", + "slug": "casa-di-proprietà", + "presence_course": "casa-di-proprietà-lc-corso-di-presenza", + "assignments": [ + "casa-di-proprietà-lc-incarico-di-preparazione", + "casa-di-proprietà-lc-caso-di-studio-guidato-dal-cantiere-alla-propria-casa", + ], + "edoniq_tests": [], + }, + }, + "KMU Teil 1": { + "de": { + "title": "KMU Teil 1", + "slug": "kmu-teil-1", + "presence_course": "kmu-teil-1-lc-präsenzkurs-kmu-teil-1", + "assignments": [ + "kmu-teil-1-lc-vorbereitungsauftrag", + ], + "edoniq_tests": ["kmu-teil-1-lc-wissens-und-verständnisfragen"], + }, + "fr": { + "title": "PME, Partie 1", + "slug": "pme-partie-1", + "presence_course": "pme-partie-1-lc-cours-de-présence", + "assignments": [ + "pme-partie-1-lc-mandat-de-préparation", + ], + "edoniq_tests": [ + "pme-partie-1-lc-questions-de-connaissances-et-de-compréhension-placeholder" + ], + }, + "it": { + "title": "PMI parte 1", + "slug": "PMI parte 1", + "presence_course": "pmi-parte-1-lc-corso-di-presenza", + "assignments": [ + "pmi-parte-1-lc-incarico-di-preparazione", + ], + "edoniq_tests": ["pmi-parte-1-lc-domande-di-conoscenza-e-di-comprensione"], + }, + }, + "KMU Teil 2": { + "de": { + "title": "KMU Teil 2", + "slug": "kmu-teil-2", + "presence_course": "kmu-teil-2-lc-präsenzkurs-kmu-teil-2", + "assignments": [ + "kmu-teil-2-lc-vorbereitungsauftrag", + "kmu-teil-2-lc-geleitete-fallarbeit-kmu-betrieb-besuchen", + ], + "edoniq_tests": [], + }, + "fr": { + "title": "PME, Partie 2", + "slug": "pme-partie-2", + "presence_course": "pme-partie-2-lc-cours-de-présence", + "assignments": [ + "pme-partie-2-lc-mandat-de-préparation", + "pme-partie-2-lc-etude-de-cas-dirigée", + ], + "edoniq_tests": [], + }, + "it": { + "title": "PMI parte 2", + "slug": "PMI parte 2", + "presence_course": "pmi-parte-2-lc-corso-di-presenza", + "assignments": [ + "pmi-parte-2-lc-incarico-di-preparazione", + "pmi-parte-2-lc-caso-di-studio-guidato", + ], + "edoniq_tests": [], + }, + }, + "3-Säulenkonzept": { + "de": { + "title": "3-säulenkonzept", + "slug": "3-säulenkonzept", + "presence_course": "3-säulenkonzept-lc-präsenzkurs-3-säulenkonzept", + "assignments": [ + "3-säulenkonzept-lc-vorbereitungsauftrag", + ], + "edoniq_tests": ["3-säulenkonzept-lc-wissens-und-verständnisfragen"], + }, + "fr": { + "title": "Concept des 3 piliers", + "slug": "concept-des-3-piliers", + "presence_course": "", + "assignments": [ + "concept-des-3-piliers-lc-mandat-de-préparation", + ], + "edoniq_tests": [ + "concept-des-3-piliers-lc-questions-de-connaissances-et-de-compréhension" + ], + }, + "it": { + "title": "Concetto dei 3 pilastri", + "slug": "concetto-dei-3-pilastri", + "presence_course": "concetto-dei-3-pilastri-lc-corso-di-presenza", + "assignments": [ + "concetto-dei-3-pilastri-lc-incarico-di-preparazione", + ], + "edoniq_tests": [ + "concetto-dei-3-pilastri-lc-domande-di-conoscenza-e-di-comprensione" + ], + }, + }, + "Einkommenssicherung (Invalidität)": { + "de": { + "title": "Einkommenssicherung (Invalidität)", + "slug": "einkommenssicherung-invalidität", + "presence_course": "einkommenssicherung-invalidität-lc-präsenzkurs-einkommenssicherung-invalidität", + "assignments": [ + "einkommenssicherung-invalidität-lc-vorbereitungsauftrag", + ], + "edoniq_tests": [ + "einkommenssicherung-invalidität-lc-wissens-und-verständnisfragen" + ], + }, + "fr": { + "title": "Garantie des revenus, Partie 1", + "slug": "garantie-des-revenus-partie-1", + "presence_course": "garantie-des-revenus-partie-1-lc-cours-de-présence", + "assignments": [ + "garantie-des-revenus-partie-1-lc-mandat-de-préparation", + ], + "edoniq_tests": [ + "garantie-des-revenus-partie-1-lc-questions-de-connaissances-et-de-compréhension" + ], + }, + "it": { + "title": "Protezione del reddito parte 1", + "slug": "protezione-del-reddito-parte-1", + "presence_course": "protezione-del-reddito-parte-1-lc-corso-di-presenza", + "assignments": [ + "protezione-del-reddito-parte-1-lc-incarico-di-preparazione", + ], + "edoniq_tests": [ + "protezione-del-reddito-parte-1-lc-domande-di-conoscenza-e-di-comprensione" + ], + }, + }, + "Einkommenssicherung (Todesfall)": { + "de": { + "title": "Einkommenssicherung (Todesfall)", + "slug": "einkommenssicherung-todesfall", + "presence_course": "einkommenssicherung-invalidität-lc-präsenzkurs-einkommenssicherung-invalidität", + "assignments": [ + "einkommenssicherung-todesfall-lc-vorbereitungsauftrag", + ], + "edoniq_tests": [ + "einkommenssicherung-todesfall-lc-wissens-und-verständnisfragen" + ], + }, + "fr": { + "title": "Garantie des revenus, Partie 2", + "slug": "garantie-des-revenus-partie-2", + "presence_course": "garantie-des-revenus-partie-2-lc-cours-de-présence", + "assignments": [ + "garantie-des-revenus-partie-2-lc-mandat-de-préparation", + ], + "edoniq_tests": [ + "garantie-des-revenus-partie-2-lc-questions-de-connaissances-et-de-compréhension" + ], + }, "it": { "title": "Casa di proprietà", "slug": "casa-di-proprietà", @@ -251,6 +419,38 @@ LP_DATA = { "edoniq_tests": [], }, }, + "Pensionierung": { + "de": { + "title": "Penionierung", + "slug": "pensionierung", + "presence_course": "pensionierung-lc-präsenzkurs-pensionierung", + "assignments": [ + "pensionierung-lc-vorbereitungsauftrag", + "pensionierung-lc-geleitete-fallarbeit-geleitete-fallarbeit", + ], + "edoniq_tests": [], + }, + "fr": { + "title": "Retraite", + "slug": "retraite", + "presence_course": "retraite-lc-cours-de-présence", + "assignments": [ + "retraite-lc-mandat-de-préparation", + "retraite-lc-etude-de-cas-dirigée", + ], + "edoniq_tests": [], + }, + "it": { + "title": "Pensionamento", + "slug": "pensionamento", + "presence_course": "pensionamento-lc-corso-di-presenza", + "assignments": [ + "pensionamento-lc-incarico-di-preparazione", + "pensionamento-lc-caso-di-studio-guidato", + ], + "edoniq_tests": [], + }, + }, } # the request is always, so we cannot rely on the language in the request diff --git a/server/vbv_lernwelt/importer/views.py b/server/vbv_lernwelt/importer/views.py index 01f505c8..0aca7c52 100644 --- a/server/vbv_lernwelt/importer/views.py +++ b/server/vbv_lernwelt/importer/views.py @@ -31,6 +31,14 @@ def import_training_and_trainer(excel_file: str): "Fahrzeug", "Haushalt Teil 1", "Haushalt Teil 2", + "Reisen & Rechtsstreitigkeiten", + "Wohneigentum", + "KMU Teil 1", + "KMU Teil 2", + "3-Säulenkonzept", + "Einkommenssicherung (Invalidität)", + "Einkommenssicherung (Todesfall)", + "Pensionierung", ], ) import_trainers_from_excel_for_training(excel_file)