From 6d1c1a2052420a4cb4506ab9b09ccdaf65d3a27f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Cl=C3=A9o=20Baras?= Date: Wed, 31 Mar 2021 09:38:56 +0200 Subject: [PATCH] =?UTF-8?q?ajoute=20les=20noms=20de=20comp=C3=A9tences=20a?= =?UTF-8?q?ssoci=C3=A9s=20aux=20acs=20dans=20le=20yaml=20pour=20une=20meil?= =?UTF-8?q?leure=20lisibilit=C3=A9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- latex/ressources/R108.tex | 6 +++--- python/export/R101.yml | 9 ++++++--- python/export/R102.yml | 7 ++++--- python/export/R103.yml | 9 ++++++--- python/export/R104.yml | 8 +++++--- python/export/R105.yml | 7 ++++--- python/export/R106.yml | 8 +++++--- python/export/R107.yml | 7 ++++--- python/export/R108.yml | 8 +++++--- python/export/R109.yml | 7 ++++--- python/export/R110.yml | 8 +++++--- python/export/R111.yml | 8 +++++--- python/export/R113.yml | 8 +++++--- python/export/R114.yml | 8 +++++--- python/export/R115.yml | 8 +++++--- python/export/R201.yml | 9 ++++++--- python/export/R202.yml | 8 +++++--- python/export/R203.yml | 7 ++++--- python/export/R205.yml | 8 +++++--- python/export/R206.yml | 8 +++++--- python/export/R207.yml | 8 +++++--- python/export/R208.yml | 7 ++++--- python/export/R209.yml | 8 +++++--- python/export/R210.yml | 8 +++++--- python/export/R211.yml | 8 +++++--- python/export/R212.yml | 6 +++--- python/export/R213.yml | 9 ++++++--- python/export/R214.yml | 8 +++++--- python/officiel.py | 2 +- python/ressource.py | 10 ++++++---- 30 files changed, 141 insertions(+), 89 deletions(-) diff --git a/latex/ressources/R108.tex b/latex/ressources/R108.tex index 59f5d36..8c79d47 100644 --- a/latex/ressources/R108.tex +++ b/latex/ressources/R108.tex @@ -9,9 +9,9 @@ %% Les compétences et les ACs \ajoutcompetence{RT1-Administrer}{\niveauA} -\ajoutac{AC0111}{Maîtriser les lois fondamentales de l'électricité afin d'intervenir sur des équipements de réseaux et télécommunications} -\ajoutac{AC0114}{Maîtriser les rôles et les principes fondamentaux des systèmes d'exploitation afin d'interagir avec ceux-ci pour la configuration et administration des réseaux et services fournis} -\ajoutac{AC0116}{Installer un poste client} +\ajoutac{RT1}{Maîtriser les lois fondamentales de l'électricité afin d'intervenir sur des équipements de réseaux et télécommunications} +\ajoutac{RT1}{Maîtriser les rôles et les principes fondamentaux des systèmes d'exploitation afin d'interagir avec ceux-ci pour la configuration et administration des réseaux et services fournis} +\ajoutac{RT1}{Installer un poste client} \ajoutcompetence{RT2-Connecter}{\niveauA} diff --git a/python/export/R101.yml b/python/export/R101.yml index 7b93941..9c9c2ec 100644 --- a/python/export/R101.yml +++ b/python/export/R101.yml @@ -4,11 +4,14 @@ semestre: 1 heures_formation: 46 heures_tp: 24 acs: -- - AC0113 + RT1: + - AC0113 - AC0115 - AC0116 -- - AC0213 -- - AC0311 + RT2: + - AC0213 + RT3: + - AC0311 sae: - SAÉ11 - SAÉ12 diff --git a/python/export/R102.yml b/python/export/R102.yml index b7ec657..447c9ed 100644 --- a/python/export/R102.yml +++ b/python/export/R102.yml @@ -4,10 +4,11 @@ semestre: 1 heures_formation: 30 heures_tp: 15 acs: -- - AC0114 + RT1: + - AC0114 - AC0115 -- [] -- [] + RT2: [] + RT3: [] sae: - SAÉ11 - SAÉ12 diff --git a/python/export/R103.yml b/python/export/R103.yml index a5ff418..97e4fff 100644 --- a/python/export/R103.yml +++ b/python/export/R103.yml @@ -4,11 +4,14 @@ semestre: 1 heures_formation: 30 heures_tp: 16 acs: -- - AC0113 + RT1: + - AC0113 - AC0115 - AC0116 -- - AC0213 -- - AC0311 + RT2: + - AC0213 + RT3: + - AC0311 sae: - SAÉ11 - SAÉ12 diff --git a/python/export/R104.yml b/python/export/R104.yml index 69ab2c5..5cc4d0f 100644 --- a/python/export/R104.yml +++ b/python/export/R104.yml @@ -4,9 +4,11 @@ semestre: 1 heures_formation: 33 heures_tp: 18 acs: -- - AC0111 -- - AC0211 -- [] + RT1: + - AC0111 + RT2: + - AC0211 + RT3: [] sae: [] prerequis: Aucun contexte: >- diff --git a/python/export/R105.yml b/python/export/R105.yml index 934d596..6bdc591 100644 --- a/python/export/R105.yml +++ b/python/export/R105.yml @@ -4,10 +4,11 @@ semestre: 1 heures_formation: 12 heures_tp: 6 acs: -- [] -- - AC0211 + RT1: [] + RT2: + - AC0211 - AC0213 -- [] + RT3: [] sae: - SAÉ13 prerequis: Aucun diff --git a/python/export/R106.yml b/python/export/R106.yml index 7296ed5..b837ac8 100644 --- a/python/export/R106.yml +++ b/python/export/R106.yml @@ -4,9 +4,11 @@ semestre: 1 heures_formation: 24 heures_tp: 12 acs: -- - AC0112 -- [] -- - AC0311 + RT1: + - AC0112 + RT2: [] + RT3: + - AC0311 sae: - SAÉ24 prerequis: Aucun diff --git a/python/export/R107.yml b/python/export/R107.yml index 0f7c4a7..689ea4c 100644 --- a/python/export/R107.yml +++ b/python/export/R107.yml @@ -4,9 +4,10 @@ semestre: 1 heures_formation: 41 heures_tp: 30 acs: -- [] -- [] -- - AC0311 + RT1: [] + RT2: [] + RT3: + - AC0311 - AC0312 - AC0313 - AC0316 diff --git a/python/export/R108.yml b/python/export/R108.yml index 2b41f56..f0c0fd7 100644 --- a/python/export/R108.yml +++ b/python/export/R108.yml @@ -4,11 +4,13 @@ semestre: 1 heures_formation: 27 heures_tp: 21 acs: -- - AC0111 + RT1: + - AC0111 - AC0114 - AC0116 -- [] -- - AC0311 + RT2: [] + RT3: + - AC0311 - AC0312 sae: - SAÉ15 diff --git a/python/export/R109.yml b/python/export/R109.yml index 6989462..b72a2db 100644 --- a/python/export/R109.yml +++ b/python/export/R109.yml @@ -4,9 +4,10 @@ semestre: 1 heures_formation: 9 heures_tp: 5 acs: -- [] -- [] -- - AC0314 + RT1: [] + RT2: [] + RT3: + - AC0314 sae: - SAÉ14 prerequis: Aucun diff --git a/python/export/R110.yml b/python/export/R110.yml index 2431b83..1bed727 100644 --- a/python/export/R110.yml +++ b/python/export/R110.yml @@ -4,9 +4,11 @@ semestre: 1 heures_formation: 30 heures_tp: 20 acs: -- - AC0115 -- [] -- - AC0316 + RT1: + - AC0115 + RT2: [] + RT3: + - AC0316 sae: - SAÉ11 - SAÉ12 diff --git a/python/export/R111.yml b/python/export/R111.yml index d2538b6..2464c8a 100644 --- a/python/export/R111.yml +++ b/python/export/R111.yml @@ -4,9 +4,11 @@ semestre: 1 heures_formation: 30 heures_tp: 21 acs: -- [] -- - AC0215 -- - AC0316 + RT1: [] + RT2: + - AC0215 + RT3: + - AC0316 sae: - SAÉ11 - SAÉ12 diff --git a/python/export/R113.yml b/python/export/R113.yml index c75e094..deed158 100644 --- a/python/export/R113.yml +++ b/python/export/R113.yml @@ -4,10 +4,12 @@ semestre: 1 heures_formation: 30 heures_tp: 6 acs: -- - AC0111 -- - AC0211 + RT1: + - AC0111 + RT2: + - AC0211 - AC0212 -- [] + RT3: [] sae: - SAÉ13 - SAÉ22 diff --git a/python/export/R114.yml b/python/export/R114.yml index 0484aed..173a023 100644 --- a/python/export/R114.yml +++ b/python/export/R114.yml @@ -4,10 +4,12 @@ semestre: 1 heures_formation: 30 heures_tp: 6 acs: -- - AC0111 -- - AC0211 + RT1: + - AC0111 + RT2: + - AC0211 - AC0212 -- [] + RT3: [] sae: - SAÉ13 - SAÉ22 diff --git a/python/export/R115.yml b/python/export/R115.yml index 43b8b7c..ae41f5d 100644 --- a/python/export/R115.yml +++ b/python/export/R115.yml @@ -4,9 +4,11 @@ semestre: 1 heures_formation: 8 heures_tp: 4 acs: -- [] -- - AC0215 -- - AC0316 + RT1: [] + RT2: + - AC0215 + RT3: + - AC0316 sae: - SAÉ11 - SAÉ12 diff --git a/python/export/R201.yml b/python/export/R201.yml index 589673e..48a6eba 100644 --- a/python/export/R201.yml +++ b/python/export/R201.yml @@ -4,11 +4,14 @@ semestre: 2 heures_formation: ??? heures_tp: 30 acs: -- - AC0113 + RT1: + - AC0113 - AC0115 - AC0116 -- - AC0213 -- - AC0311 + RT2: + - AC0213 + RT3: + - AC0311 sae: - SAÉ21 - SAÉ24 diff --git a/python/export/R202.yml b/python/export/R202.yml index 467193d..a9c01bd 100644 --- a/python/export/R202.yml +++ b/python/export/R202.yml @@ -4,12 +4,14 @@ semestre: 2 heures_formation: ??? heures_tp: 20 acs: -- - AC0113 + RT1: + - AC0113 - AC0114 - AC0115 - AC0116 -- [] -- - AC0311 + RT2: [] + RT3: + - AC0311 sae: - SAÉ21 - SAÉ24 diff --git a/python/export/R203.yml b/python/export/R203.yml index b4a3b1e..2ce4ba9 100644 --- a/python/export/R203.yml +++ b/python/export/R203.yml @@ -4,11 +4,12 @@ semestre: 2 heures_formation: ??? heures_tp: 18 acs: -- - AC0113 + RT1: + - AC0113 - AC0114 - AC0115 -- [] -- [] + RT2: [] + RT3: [] sae: - SAÉ21 prerequis: diff --git a/python/export/R205.yml b/python/export/R205.yml index 03a2378..996f029 100644 --- a/python/export/R205.yml +++ b/python/export/R205.yml @@ -4,10 +4,12 @@ semestre: 2 heures_formation: ??? heures_tp: 15 acs: -- - AC0111 -- - AC0211 + RT1: + - AC0111 + RT2: + - AC0211 - AC0212 -- [] + RT3: [] sae: - SAÉ22 prerequis: diff --git a/python/export/R206.yml b/python/export/R206.yml index f21b6d0..e9e5400 100644 --- a/python/export/R206.yml +++ b/python/export/R206.yml @@ -4,10 +4,12 @@ semestre: 2 heures_formation: ??? heures_tp: 12 acs: -- - AC0112 -- - AC0211 + RT1: + - AC0112 + RT2: + - AC0211 - AC0212 -- [] + RT3: [] sae: - SAÉ22 prerequis: diff --git a/python/export/R207.yml b/python/export/R207.yml index c314f60..e2c1161 100644 --- a/python/export/R207.yml +++ b/python/export/R207.yml @@ -4,9 +4,11 @@ semestre: 2 heures_formation: 20 heures_tp: 12 acs: -- - AC0112 -- [] -- - AC0311 + RT1: + - AC0112 + RT2: [] + RT3: + - AC0311 - AC0312 - AC0313 - AC0314 diff --git a/python/export/R208.yml b/python/export/R208.yml index ddf3700..7f5976d 100644 --- a/python/export/R208.yml +++ b/python/export/R208.yml @@ -4,9 +4,10 @@ semestre: 2 heures_formation: 16 heures_tp: 10 acs: -- [] -- [] -- - AC0311 + RT1: [] + RT2: [] + RT3: + - AC0311 - AC0312 - AC0313 - AC0315 diff --git a/python/export/R209.yml b/python/export/R209.yml index 676d998..3bf6394 100644 --- a/python/export/R209.yml +++ b/python/export/R209.yml @@ -4,10 +4,12 @@ semestre: 2 heures_formation: 24 heures_tp: 15 acs: -- - AC0112 + RT1: + - AC0112 - AC0114 -- [] -- - AC0311 + RT2: [] + RT3: + - AC0311 - AC0312 - AC0313 - AC0314 diff --git a/python/export/R210.yml b/python/export/R210.yml index 5d91b35..f4d0064 100644 --- a/python/export/R210.yml +++ b/python/export/R210.yml @@ -4,9 +4,11 @@ semestre: 2 heures_formation: ??? heures_tp: 30 acs: -- - AC0112 -- [] -- - AC0316 + RT1: + - AC0112 + RT2: [] + RT3: + - AC0316 sae: - SAÉ21 - SAÉ22 diff --git a/python/export/R211.yml b/python/export/R211.yml index 456179a..085ef15 100644 --- a/python/export/R211.yml +++ b/python/export/R211.yml @@ -4,9 +4,11 @@ semestre: 2 heures_formation: 30 heures_tp: 21 acs: -- [] -- - AC0215 -- - AC0316 + RT1: [] + RT2: + - AC0215 + RT3: + - AC0316 sae: - SAÉ21 - SAÉ22 diff --git a/python/export/R212.yml b/python/export/R212.yml index b754f05..5b1445d 100644 --- a/python/export/R212.yml +++ b/python/export/R212.yml @@ -4,9 +4,9 @@ semestre: 2 heures_formation: ??? heures_tp: 12 acs: -- [] -- [] -- [] + RT1: [] + RT2: [] + RT3: [] sae: [] prerequis: Aucun contexte: >- diff --git a/python/export/R213.yml b/python/export/R213.yml index 2c3b765..dd4a1ce 100644 --- a/python/export/R213.yml +++ b/python/export/R213.yml @@ -4,9 +4,12 @@ semestre: 2 heures_formation: ??? heures_tp: 6 acs: -- - AC0112 -- - AC0212 -- - AC0311 + RT1: + - AC0112 + RT2: + - AC0212 + RT3: + - AC0311 - AC0313 sae: - SAÉ22 diff --git a/python/export/R214.yml b/python/export/R214.yml index a09e06d..4510f6c 100644 --- a/python/export/R214.yml +++ b/python/export/R214.yml @@ -4,10 +4,12 @@ semestre: 2 heures_formation: ??? heures_tp: 6 acs: -- - AC0111 -- - AC0211 + RT1: + - AC0111 + RT2: + - AC0211 - AC0212 -- [] + RT3: [] sae: - SAÉ22 prerequis: diff --git a/python/officiel.py b/python/officiel.py index 11b6bdc..83d4698 100644 --- a/python/officiel.py +++ b/python/officiel.py @@ -49,7 +49,7 @@ def get_matrices_ac_ressource(ressources, sem): matrice = [[False] * nbre_ressources_semestre for i in range(nbre_acs)] for (i, r) in enumerate(ressem): # pour chaque ressource - for comp in range(len(r.apprentissages)): # pour chaque comp + for comp in r.apprentissages: # pour chaque comp for (j, ac) in enumerate(les_codes_acs): # pour chaque ac if ac in r.apprentissages[comp]: # si l'ac est prévue dans la ressource matrice[j][i] = True diff --git a/python/ressource.py b/python/ressource.py index 49b7922..b169efb 100644 --- a/python/ressource.py +++ b/python/ressource.py @@ -151,6 +151,7 @@ def nettoie_acs(r): """Nettoie les acs d'une ressource en les remplaçant par leur code pour les 3 compétences""" if len(r.apprentissages) != 3: __LOGGER.warning(f"nettoie_acs : Problème dans le nombre de compétences de {r.nom}") + dico = {} for comp in range(3): donnees = r.apprentissages[comp] # chaine de caractères listant les ACS # donnees = donnees.replace("\t", "").replace("-", "") # supprime les tabulations @@ -159,7 +160,8 @@ def nettoie_acs(r): acs_finaux = acs_avec_code + acs_avec_nom acs_finaux = [ac.replace(" ", "") for ac in acs_finaux] acs_finaux = sorted(list(set(acs_finaux))) - r.apprentissages[comp] = acs_finaux + dico["RT" + str(comp+1)] = acs_finaux + r.apprentissages = dico # [comp] = acs_finaux def nettoie_sae(r): """Nettoie les sae en détectant les codes""" @@ -342,10 +344,10 @@ def convert_ressource_yml_to_latex(fichieryaml, fichierlatex, modele): # Préparation des ac ajoutac = "\\ajoutac{%s}{%s}" compRT = [] - for (i, accomp) in enumerate(ressource["acs"]): + for accomp in ressource["acs"]: comps = [] - for no_ac in range(len(accomp)): # les ac de la comp - comps.append( ajoutac % (accomp[no_ac], DATA_ACS["RT"+str(i+1)][accomp[no_ac]]) ) + for no_ac in range(len(ressource["acs"][accomp])): # les ac de la comp + comps.append( ajoutac % (accomp, DATA_ACS[accomp][ressource["acs"][accomp][no_ac]]) ) compRT.append("\n".join(comps)) # Préparation des sae