From dce7dc42cbb0ec81f5b78d7de7a5282b334c0b26 Mon Sep 17 00:00:00 2001
From: Emmanuel Viennet <emmanuel.viennet@gmail.com>
Date: Fri, 24 Dec 2021 00:08:25 +0100
Subject: [PATCH 01/10] =?UTF-8?q?Pr=C3=A9pare=20modernisation=20de=20NT?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/but/bulletin_but.py                   | 182 ++----------------
 app/but/bulletin_but_xml_compat.py        |  10 -
 app/comp/res_sem.py                       | 216 ++++++++++++++++++++++
 app/models/formsemestre.py                |   6 +-
 app/pe/pe_tagtable.py                     |  12 +-
 app/scodoc/notes_table.py                 |  61 ++----
 app/scodoc/sco_abs_views.py               |   4 +-
 app/scodoc/sco_apogee_csv.py              |   4 +-
 app/scodoc/sco_bulletins.py               |   6 +-
 app/scodoc/sco_bulletins_json.py          |   4 +-
 app/scodoc/sco_bulletins_xml.py           |   4 +-
 app/scodoc/sco_cache.py                   |  10 +-
 app/scodoc/sco_formsemestre_validation.py |  16 +-
 app/scodoc/sco_moduleimpl_inscriptions.py |   6 +-
 app/scodoc/sco_parcours_dut.py            |  20 +-
 app/scodoc/sco_poursuite_dut.py           |   2 +-
 app/scodoc/sco_preferences.py             |  28 +++
 app/scodoc/sco_prepajury.py               |  12 +-
 app/scodoc/sco_pvjury.py                  |   2 +-
 app/scodoc/sco_recapcomplet.py            |   6 +-
 app/views/absences.py                     |  26 +--
 app/views/notes.py                        |   2 +-
 22 files changed, 346 insertions(+), 293 deletions(-)
 create mode 100644 app/comp/res_sem.py

diff --git a/app/but/bulletin_but.py b/app/but/bulletin_but.py
index 4ff2849f8..65756767f 100644
--- a/app/but/bulletin_but.py
+++ b/app/but/bulletin_but.py
@@ -4,7 +4,6 @@
 # See LICENSE
 ##############################################################################
 
-from collections import defaultdict
 import datetime
 from flask import url_for, g
 import numpy as np
@@ -15,62 +14,24 @@ from app import db
 from app.comp import moy_ue, moy_sem, inscr_mod
 from app.models import ModuleImpl
 from app.scodoc import sco_utils as scu
-from app.scodoc.sco_cache import ResultatsSemestreBUTCache
 from app.scodoc import sco_bulletins_json
 from app.scodoc import sco_preferences
 from app.scodoc.sco_utils import jsnan, fmt_note
+from app.comp.res_sem import ResultatsSemestre, NotesTableCompat
 
 
-class ResultatsSemestreBUT:
-    """Structure légère pour stocker les résultats du semestre et
-    générer les bulletins.
-    __init__ : charge depuis le cache ou calcule
-    """
+class ResultatsSemestreBUT(NotesTableCompat):
+    """Résultats BUT: organisation des calculs"""
 
-    _cached_attrs = (
-        "sem_cube",
-        "modimpl_inscr_df",
-        "modimpl_coefs_df",
-        "etud_moy_ue",
-        "modimpls_evals_poids",
-        "modimpls_evals_notes",
-        "etud_moy_gen",
-        "etud_moy_gen_ranks",
-        "modimpls_evaluations_complete",
-    )
+    _cached_attrs = NotesTableCompat._cached_attrs + ()
 
     def __init__(self, formsemestre):
-        self.formsemestre = formsemestre
-        self.ues = formsemestre.query_ues().all()
-        self.modimpls = formsemestre.modimpls.all()
-        self.etuds = self.formsemestre.get_inscrits(include_dem=False)
-        self.etud_index = {e.id: idx for idx, e in enumerate(self.etuds)}
-        self.saes = [
-            m for m in self.modimpls if m.module.module_type == scu.ModuleType.SAE
-        ]
-        self.ressources = [
-            m for m in self.modimpls if m.module.module_type == scu.ModuleType.RESSOURCE
-        ]
+        super().__init__(formsemestre)
+
         if not self.load_cached():
             self.compute()
             self.store()
 
-    def load_cached(self) -> bool:
-        "Load cached dataframes, returns False si pas en cache"
-        data = ResultatsSemestreBUTCache.get(self.formsemestre.id)
-        if not data:
-            return False
-        for attr in self._cached_attrs:
-            setattr(self, attr, data[attr])
-        return True
-
-    def store(self):
-        "Cache our dataframes"
-        ResultatsSemestreBUTCache.set(
-            self.formsemestre.id,
-            {attr: getattr(self, attr) for attr in self._cached_attrs},
-        )
-
     def compute(self):
         "Charge les notes et inscriptions et calcule toutes les moyennes"
         (
@@ -100,6 +61,13 @@ class ResultatsSemestreBUT:
         )
         self.etud_moy_gen_ranks = moy_sem.comp_ranks_series(self.etud_moy_gen)
 
+
+class BulletinBUT(ResultatsSemestreBUT):
+    """Génération du bulletin BUT.
+    Cette classe génère des dictionnaires avec toutes les informations
+    du bulletin, qui sont immédiatement traduisibles en JSON.
+    """
+
     def etud_ue_mod_results(self, etud, ue, modimpls) -> dict:
         "dict synthèse résultats dans l'UE pour les modules indiqués"
         d = {}
@@ -233,7 +201,7 @@ class ResultatsSemestreBUT:
             },
             "formsemestre_id": formsemestre.id,
             "etat_inscription": etat_inscription,
-            "options": bulletin_option_affichage(formsemestre),
+            "options": sco_preferences.bulletin_option_affichage(formsemestre.id),
         }
         semestre_infos = {
             "etapes": [str(x.etape_apo) for x in formsemestre.etapes if x.etape_apo],
@@ -298,125 +266,3 @@ class ResultatsSemestreBUT:
             )
 
         return d
-
-
-def bulletin_option_affichage(formsemestre):
-    "dict avec les options d'affichages (préférences) pour ce semestre"
-    prefs = sco_preferences.SemPreferences(formsemestre.id)
-    fields = (
-        "bul_show_abs",
-        "bul_show_abs_modules",
-        "bul_show_ects",
-        "bul_show_codemodules",
-        "bul_show_matieres",
-        "bul_show_rangs",
-        "bul_show_ue_rangs",
-        "bul_show_mod_rangs",
-        "bul_show_moypromo",
-        "bul_show_minmax",
-        "bul_show_minmax_mod",
-        "bul_show_minmax_eval",
-        "bul_show_coef",
-        "bul_show_ue_cap_details",
-        "bul_show_ue_cap_current",
-        "bul_show_temporary",
-        "bul_temporary_txt",
-        "bul_show_uevalid",
-        "bul_show_date_inscr",
-    )
-    # on enlève le "bul_" de la clé:
-    return {field[4:]: prefs[field] for field in fields}
-
-
-# Pour raccorder le code des anciens bulletins qui attendent une NoteTable
-class APCNotesTableCompat:
-    """Implementation partielle de NotesTable pour les formations APC
-    Accès aux notes et rangs.
-    """
-
-    def __init__(self, formsemestre):
-        self.results = ResultatsSemestreBUT(formsemestre)
-        nb_etuds = len(self.results.etuds)
-        self.rangs = self.results.etud_moy_gen_ranks
-        self.moy_min = self.results.etud_moy_gen.min()
-        self.moy_max = self.results.etud_moy_gen.max()
-        self.moy_moy = self.results.etud_moy_gen.mean()
-        self.bonus = defaultdict(lambda: 0.0)  # XXX
-        self.ue_rangs = {
-            u.id: (defaultdict(lambda: 0.0), nb_etuds) for u in self.results.ues
-        }
-        self.mod_rangs = {
-            m.id: (defaultdict(lambda: 0), nb_etuds) for m in self.results.modimpls
-        }
-
-    def get_ues(self):
-        ues = []
-        for ue in self.results.ues:
-            d = ue.to_dict()
-            d.update(
-                {
-                    "max": self.results.etud_moy_ue[ue.id].max(),
-                    "min": self.results.etud_moy_ue[ue.id].min(),
-                    "moy": self.results.etud_moy_ue[ue.id].mean(),
-                    "nb_moy": len(self.results.etud_moy_ue),
-                }
-            )
-            ues.append(d)
-        return ues
-
-    def get_modimpls(self):
-        return [m.to_dict() for m in self.results.modimpls]
-
-    def get_etud_moy_gen(self, etudid):
-        return self.results.etud_moy_gen[etudid]
-
-    def get_moduleimpls_attente(self):
-        return []  # XXX TODO
-
-    def get_etud_rang(self, etudid):
-        return self.rangs[etudid]
-
-    def get_etud_rang_group(self, etudid, group_id):
-        return (None, 0)  # XXX unimplemented TODO
-
-    def get_etud_ue_status(self, etudid, ue_id):
-        return {
-            "cur_moy_ue": self.results.etud_moy_ue[ue_id][etudid],
-            "is_capitalized": False,  # XXX TODO
-        }
-
-    def get_etud_mod_moy(self, moduleimpl_id, etudid):
-        mod_idx = self.results.modimpl_coefs_df.columns.get_loc(moduleimpl_id)
-        etud_idx = self.results.etud_index[etudid]
-        # moyenne sur les UE:
-        self.results.sem_cube[etud_idx, mod_idx].mean()
-
-    def get_mod_stats(self, moduleimpl_id):
-        return {
-            "moy": "-",
-            "max": "-",
-            "min": "-",
-            "nb_notes": "-",
-            "nb_missing": "-",
-            "nb_valid_evals": "-",
-        }
-
-    def get_evals_in_mod(self, moduleimpl_id):
-        mi = ModuleImpl.query.get(moduleimpl_id)
-        evals_results = []
-        for e in mi.evaluations:
-            d = e.to_dict()
-            d["heure_debut"] = e.heure_debut  # datetime.time
-            d["heure_fin"] = e.heure_fin
-            d["jour"] = e.jour  # datetime
-            d["notes"] = {
-                etud.id: {
-                    "etudid": etud.id,
-                    "value": self.results.modimpls_evals_notes[e.moduleimpl_id][e.id][
-                        etud.id
-                    ],
-                }
-                for etud in self.results.etuds
-            }
-            evals_results.append(d)
-        return evals_results
diff --git a/app/but/bulletin_but_xml_compat.py b/app/but/bulletin_but_xml_compat.py
index 9e234dc0b..6e2f14dbf 100644
--- a/app/but/bulletin_but_xml_compat.py
+++ b/app/but/bulletin_but_xml_compat.py
@@ -314,13 +314,3 @@ def bulletin_but_xml_compat(
         return None
     else:
         return sco_xml.XML_HEADER + ElementTree.tostring(doc).decode(scu.SCO_ENCODING)
-
-
-"""
-formsemestre_id=718
-etudid=12496
-from app.but.bulletin_but import *
-mapp.set_sco_dept("RT")
-sem = FormSemestre.query.get(formsemestre_id)
-r = ResultatsSemestreBUT(sem)
-"""
diff --git a/app/comp/res_sem.py b/app/comp/res_sem.py
new file mode 100644
index 000000000..01a2e8720
--- /dev/null
+++ b/app/comp/res_sem.py
@@ -0,0 +1,216 @@
+##############################################################################
+# ScoDoc
+# Copyright (c) 1999 - 2021 Emmanuel Viennet.  All rights reserved.
+# See LICENSE
+##############################################################################
+
+from collections import defaultdict
+from functools import cached_property
+import numpy as np
+import pandas as pd
+from app.scodoc import sco_utils as scu
+from app.scodoc.sco_cache import ResultatsSemestreCache
+from app.scodoc.sco_codes_parcours import UE_SPORT
+
+# Il faut bien distinguer
+#  - ce qui est caché de façon persistente (via redis):
+#      ce sont les attributs listés dans `_cached_attrs`
+#      le stockage et l'invalidation sont gérés dans sco_cache.py
+#
+#  - les valeurs cachées durant le temps d'une requête
+#      (durée de vie de l'instance de ResultatsSemestre)
+#      qui sont notamment les attributs décorés par `@cached_property``
+#
+class ResultatsSemestre:
+    _cached_attrs = (
+        "sem_cube",
+        "modimpl_inscr_df",
+        "modimpl_coefs_df",
+        "etud_moy_ue",
+        "modimpls_evals_poids",
+        "modimpls_evals_notes",
+        "etud_moy_gen",
+        "etud_moy_gen_ranks",
+        "modimpls_evaluations_complete",
+    )
+
+    def __init__(self, formsemestre):
+        self.formsemestre = formsemestre
+        # TODO
+
+    def load_cached(self) -> bool:
+        "Load cached dataframes, returns False si pas en cache"
+        data = ResultatsSemestreCache.get(self.formsemestre.id)
+        if not data:
+            return False
+        for attr in self._cached_attrs:
+            setattr(self, attr, data[attr])
+        return True
+
+    def store(self):
+        "Cache our data"
+        "Cache our dataframes"
+        ResultatsSemestreCache.set(
+            self.formsemestre.id,
+            {attr: getattr(self, attr) for attr in self._cached_attrs},
+        )
+
+    def compute(self):
+        "Charge les notes et inscriptions et calcule toutes les moyennes"
+        # voir ce qui est chargé / calculé ici et dans les sous-classes
+        TODO
+
+    @cached_property
+    def etuds(self):
+        "Liste des inscrits au semestre, sans les démissionnaires"
+        # nb: si les liste des inscrits change, ResultatsSemestre devient invalide
+        return self.formsemestre.get_inscrits(include_dem=False)
+
+    @cached_property
+    def etud_index(self):
+        "dict { etudid : indice dans les inscrits }"
+        return {e.id: idx for idx, e in enumerate(self.etuds)}
+
+    @cached_property
+    def ues(self):
+        "Liste des UE du semestre"
+        return self.formsemestre.query_ues().all()
+
+    @cached_property
+    def modimpls(self):
+        "Liste des modimpls du semestre (triée par numéro de module)"
+        modimpls = self.formsemestre.modimpls.all()
+        modimpls.sort(key=lambda m: m.module.numero)
+        return modimpls
+
+    @cached_property
+    def ressources(self):
+        "Liste des ressources du semestre, triées par numéro de module"
+        return [
+            m for m in self.modimpls if m.module.module_type == scu.ModuleType.RESSOURCE
+        ]
+
+    @cached_property
+    def saes(self):
+        "Liste des SAÉs du semestre, triées par numéro de module"
+        return [m for m in self.modimpls if m.module.module_type == scu.ModuleType.SAE]
+
+
+class StatsMoyenne:
+    """Une moyenne d'un ensemble étudiants sur quelque chose
+    (moyenne générale d'un semestre, d'un module, d'un groupe...)
+    et les statistiques associées: min, max, moy, effectif
+    """
+
+    def __init__(self, vals):
+        """Calcul les statistiques.
+        Les valeurs NAN ou non numériques sont toujours enlevées.
+        """
+        self.moy = np.nanmean(vals)
+        self.min = np.nanmin(vals)
+        self.max = np.nanmax(vals)
+        self.size = len(vals)
+        self.nb_vals = self.size - np.count_nonzero(np.isnan(vals))
+
+    def to_dict(self):
+        return {
+            "min": self.min,
+            "max": self.max,
+            "moy": self.moy,
+            "size": self.size,
+            "nb_vals": self.nb_vals,
+        }
+
+
+# Pour raccorder le code des anciens codes qui attendent une NoteTable
+class NotesTableCompat(ResultatsSemestre):
+    """Implementation partielle de NotesTable WIP TODO
+    Accès aux notes et rangs.
+    """
+
+    _cached_attrs = ResultatsSemestre._cached_attrs + ()
+
+    def __init__(self, formsemestre):
+        super().__init__(formsemestre)
+        nb_etuds = len(self.etuds)
+        self.bonus = defaultdict(lambda: 0.0)  # XXX TODO
+        self.ue_rangs = {u.id: (defaultdict(lambda: 0.0), nb_etuds) for u in self.ues}
+        self.mod_rangs = {
+            m.id: (defaultdict(lambda: 0), nb_etuds) for m in self.modimpls
+        }
+
+    @cached_property
+    def stats_moy_gen(self):
+        """Stats (moy/min/max) sur la moyenne générale"""
+        return StatsMoyenne(self.etud_moy_gen)
+
+    def get_ues_stat_dict(self, filter_sport=False):  # was get_ues()
+        """Liste des UEs, ordonnée par numero.
+        Si filter_sport, retire les UE de type SPORT.
+        Résultat: liste de dicts { champs UE U stats moyenne UE }
+        """
+        ues = []
+        for ue in self.ues:
+            if filter_sport and ue.type == UE_SPORT:
+                continue
+            d = ue.to_dict()
+            d.update(StatsMoyenne(self.etud_moy_ue[ue.id]).to_dict())
+            ues.append(d)
+        return ues
+
+    def get_modimpls(self):
+        return [m.to_dict() for m in self.results.modimpls]
+
+    def get_etud_moy_gen(self, etudid):
+        return self.results.etud_moy_gen[etudid]
+
+    def get_moduleimpls_attente(self):
+        return []  # XXX TODO
+
+    def get_etud_rang(self, etudid):
+        return self.etud_moy_gen_ranks[etudid]
+
+    def get_etud_rang_group(self, etudid, group_id):
+        return (None, 0)  # XXX unimplemented TODO
+
+    def get_etud_ue_status(self, etudid, ue_id):
+        return {
+            "cur_moy_ue": self.results.etud_moy_ue[ue_id][etudid],
+            "is_capitalized": False,  # XXX TODO
+        }
+
+    def get_etud_mod_moy(self, moduleimpl_id, etudid):
+        mod_idx = self.results.modimpl_coefs_df.columns.get_loc(moduleimpl_id)
+        etud_idx = self.results.etud_index[etudid]
+        # moyenne sur les UE:
+        self.results.sem_cube[etud_idx, mod_idx].mean()
+
+    def get_mod_stats(self, moduleimpl_id):
+        return {
+            "moy": "-",
+            "max": "-",
+            "min": "-",
+            "nb_notes": "-",
+            "nb_missing": "-",
+            "nb_valid_evals": "-",
+        }
+
+    def get_evals_in_mod(self, moduleimpl_id):
+        mi = ModuleImpl.query.get(moduleimpl_id)
+        evals_results = []
+        for e in mi.evaluations:
+            d = e.to_dict()
+            d["heure_debut"] = e.heure_debut  # datetime.time
+            d["heure_fin"] = e.heure_fin
+            d["jour"] = e.jour  # datetime
+            d["notes"] = {
+                etud.id: {
+                    "etudid": etud.id,
+                    "value": self.results.modimpls_evals_notes[e.moduleimpl_id][e.id][
+                        etud.id
+                    ],
+                }
+                for etud in self.results.etuds
+            }
+            evals_results.append(d)
+        return evals_results
diff --git a/app/models/formsemestre.py b/app/models/formsemestre.py
index 450ea2ccf..98edbba1e 100644
--- a/app/models/formsemestre.py
+++ b/app/models/formsemestre.py
@@ -84,7 +84,11 @@ class FormSemestre(db.Model):
     etapes = db.relationship(
         "FormSemestreEtape", cascade="all,delete", backref="formsemestre"
     )
-    modimpls = db.relationship("ModuleImpl", backref="formsemestre", lazy="dynamic")
+    modimpls = db.relationship(
+        "ModuleImpl",
+        backref="formsemestre",
+        lazy="dynamic",
+    )
     etuds = db.relationship(
         "Identite",
         secondary="notes_formsemestre_inscription",
diff --git a/app/pe/pe_tagtable.py b/app/pe/pe_tagtable.py
index e32a11735..caba16362 100644
--- a/app/pe/pe_tagtable.py
+++ b/app/pe/pe_tagtable.py
@@ -68,7 +68,7 @@ class TableTag(object):
         self.taglist = []
 
         self.resultats = {}
-        self.rangs = {}
+        self.etud_moy_gen_ranks = {}
         self.statistiques = {}
 
     # *****************************************************************************************************************
@@ -117,15 +117,15 @@ class TableTag(object):
 
     # -----------------------------------------------------------------------------------------------------------
     def get_moy_from_stats(self, tag):
-        """ Renvoie la moyenne des notes calculées pour d'un tag donné"""
+        """Renvoie la moyenne des notes calculées pour d'un tag donné"""
         return self.statistiques[tag][0] if tag in self.statistiques else None
 
     def get_min_from_stats(self, tag):
-        """ Renvoie la plus basse des notes calculées pour d'un tag donné"""
+        """Renvoie la plus basse des notes calculées pour d'un tag donné"""
         return self.statistiques[tag][1] if tag in self.statistiques else None
 
     def get_max_from_stats(self, tag):
-        """ Renvoie la plus haute des notes calculées pour d'un tag donné"""
+        """Renvoie la plus haute des notes calculées pour d'un tag donné"""
         return self.statistiques[tag][2] if tag in self.statistiques else None
 
     # -----------------------------------------------------------------------------------------------------------
@@ -236,7 +236,7 @@ class TableTag(object):
         return moystr
 
     def str_res_d_un_etudiant(self, etudid, delim=";"):
-        """Renvoie sur une ligne les résultats d'un étudiant à tous les tags (par ordre alphabétique). """
+        """Renvoie sur une ligne les résultats d'un étudiant à tous les tags (par ordre alphabétique)."""
         return delim.join(
             [self.str_resTag_d_un_etudiant(tag, etudid) for tag in self.get_all_tags()]
         )
@@ -256,7 +256,7 @@ class TableTag(object):
     # -----------------------------------------------------------------------
 
     def str_tagtable(self, delim=";", decimal_sep=","):
-        """Renvoie une chaine de caractère listant toutes les moyennes, les rangs des étudiants pour tous les tags. """
+        """Renvoie une chaine de caractère listant toutes les moyennes, les rangs des étudiants pour tous les tags."""
         entete = ["etudid", "nom", "prenom"]
         for tag in self.get_all_tags():
             entete += [titre + "_" + tag for titre in ["note", "rang", "nb_inscrit"]]
diff --git a/app/scodoc/notes_table.py b/app/scodoc/notes_table.py
index 052b387e1..69c37694f 100644
--- a/app/scodoc/notes_table.py
+++ b/app/scodoc/notes_table.py
@@ -25,7 +25,9 @@
 #
 ##############################################################################
 
-"""Calculs sur les notes et cache des resultats
+"""Calculs sur les notes et cache des résultats
+
+    Ancien code ScoDoc 7 en cours de rénovation 
 """
 
 from operator import itemgetter
@@ -102,7 +104,7 @@ def comp_ranks(T):
 
 def get_sem_ues_modimpls(formsemestre_id, modimpls=None):
     """Get liste des UE du semestre (à partir des moduleimpls)
-    (utilisé quand on ne peut pas construire nt et faire nt.get_ues())
+    (utilisé quand on ne peut pas construire nt et faire nt.get_ues_stat_dict())
     """
     if modimpls is None:
         modimpls = sco_moduleimpl.moduleimpl_list(formsemestre_id=formsemestre_id)
@@ -316,7 +318,7 @@ class NotesTable:
             self.moy_min = self.moy_max = "NA"
 
         # calcul rangs (/ moyenne generale)
-        self.rangs = comp_ranks(T)
+        self.etud_moy_gen_ranks = comp_ranks(T)
 
         self.rangs_groupes = (
             {}
@@ -417,43 +419,14 @@ class NotesTable:
         else:
             return ' <font color="red">(%s)</font> ' % etat
 
-    def get_ues(self, filter_sport=False, filter_non_inscrit=False, etudid=None):
-        """liste des ue, ordonnée par numero.
-        Si filter_non_inscrit, retire les UE dans lesquelles l'etudiant n'est
-        inscrit à aucun module.
+    def get_ues_stat_dict(self, filter_sport=False):  # was get_ues()
+        """Liste des UEs, ordonnée par numero.
         Si filter_sport, retire les UE de type SPORT
         """
-        if not filter_sport and not filter_non_inscrit:
+        if not filter_sport:
             return self._ues
-
-        if filter_sport:
-            ues_src = [ue for ue in self._ues if ue["type"] != UE_SPORT]
         else:
-            ues_src = self._ues
-        if not filter_non_inscrit:
-            return ues_src
-        ues = []
-        for ue in ues_src:
-            if self.get_etud_ue_status(etudid, ue["ue_id"])["is_capitalized"]:
-                # garde toujours les UE capitalisees
-                has_note = True
-            else:
-                has_note = False
-                # verifie que l'etud. est inscrit a au moins un module de l'UE
-                # (en fait verifie qu'il a une note)
-                modimpls = self.get_modimpls(ue["ue_id"])
-
-                for modi in modimpls:
-                    moy = self.get_etud_mod_moy(modi["moduleimpl_id"], etudid)
-                    try:
-                        float(moy)
-                        has_note = True
-                        break
-                    except:
-                        pass
-            if has_note:
-                ues.append(ue)
-        return ues
+            return [ue for ue in self._ues if ue["type"] != UE_SPORT]
 
     def get_modimpls(self, ue_id=None):
         "liste des modules pour une UE (ou toutes si ue_id==None), triés par matières."
@@ -522,7 +495,7 @@ class NotesTable:
 
         Les moyennes d'UE ne tiennent pas compte des capitalisations.
         """
-        ues = self.get_ues()
+        ues = self.get_ues_stat_dict()
         sum_moy = 0  # la somme des moyennes générales valides
         nb_moy = 0  # le nombre de moyennes générales valides
         for ue in ues:
@@ -561,9 +534,9 @@ class NotesTable:
         i = 0
         for ue in ues:
             i += 1
-            ue["nb_moy"] = len(ue["_notes"])
-            if ue["nb_moy"] > 0:
-                ue["moy"] = sum(ue["_notes"]) / ue["nb_moy"]
+            ue["nb_vals"] = len(ue["_notes"])
+            if ue["nb_vals"] > 0:
+                ue["moy"] = sum(ue["_notes"]) / ue["nb_vals"]
                 ue["max"] = max(ue["_notes"])
                 ue["min"] = min(ue["_notes"])
             else:
@@ -767,7 +740,7 @@ class NotesTable:
         sem_ects_pot_fond = 0.0
         sem_ects_pot_pro = 0.0
 
-        for ue in self.get_ues():
+        for ue in self.get_ues_stat_dict():
             # - On calcule la moyenne d'UE courante:
             if not block_computation:
                 mu = self.comp_etud_moy_ue(etudid, ue_id=ue["ue_id"], cnx=cnx)
@@ -981,7 +954,7 @@ class NotesTable:
         return self.T
 
     def get_etud_rang(self, etudid) -> str:
-        return self.rangs.get(etudid, "999")
+        return self.etud_moy_gen_ranks.get(etudid, "999")
 
     def get_etud_rang_group(self, etudid, group_id):
         """Returns rank of etud in this group and number of etuds in group.
@@ -1347,7 +1320,7 @@ class NotesTable:
 
         # Rappel des épisodes précédents: T est une liste de liste
         # Colonnes: 0 moy_gen, moy_ue1, ..., moy_ue_n, moy_mod1, ..., moy_mod_n, etudid
-        ues = self.get_ues()  # incluant le(s) UE de sport
+        ues = self.get_ues_stat_dict()  # incluant le(s) UE de sport
         for t in self.T:
             etudid = t[-1]
             if etudid in results.etud_moy_gen:  # evite les démissionnaires
@@ -1358,4 +1331,4 @@ class NotesTable:
         # re-trie selon la nouvelle moyenne générale:
         self.T.sort(key=self._row_key)
         # Remplace aussi le rang:
-        self.rangs = results.etud_moy_gen_ranks
+        self.etud_moy_gen_ranks = results.etud_moy_gen_ranks
diff --git a/app/scodoc/sco_abs_views.py b/app/scodoc/sco_abs_views.py
index 4e5aaa469..c719df312 100644
--- a/app/scodoc/sco_abs_views.py
+++ b/app/scodoc/sco_abs_views.py
@@ -118,7 +118,7 @@ def doSignaleAbsence(
         mod = sco_moduleimpl.moduleimpl_list(moduleimpl_id=moduleimpl_id)[0]
         formsemestre_id = mod["formsemestre_id"]
         nt = sco_cache.NotesTableCache.get(formsemestre_id)
-        ues = nt.get_ues(etudid=etudid)
+        ues = nt.get_ues_stat_dict()
         for ue in ues:
             modimpls = nt.get_modimpls(ue_id=ue["ue_id"])
             for modimpl in modimpls:
@@ -175,7 +175,7 @@ def SignaleAbsenceEtud():  # etudid implied
             "abs_require_module", formsemestre_id
         )
         nt = sco_cache.NotesTableCache.get(formsemestre_id)
-        ues = nt.get_ues(etudid=etudid)
+        ues = nt.get_ues_stat_dict()
         if require_module:
             menu_module = """
             <script type="text/javascript">
diff --git a/app/scodoc/sco_apogee_csv.py b/app/scodoc/sco_apogee_csv.py
index 57f6f4416..94c2f86e0 100644
--- a/app/scodoc/sco_apogee_csv.py
+++ b/app/scodoc/sco_apogee_csv.py
@@ -437,7 +437,7 @@ class ApoEtud(dict):
 
         # Elements UE
         decisions_ue = nt.get_etud_decision_ues(etudid)
-        for ue in nt.get_ues():
+        for ue in nt.get_ues_stat_dict():
             if code in ue["code_apogee"].split(","):
                 if self.export_res_ues:
                     if decisions_ue and ue["ue_id"] in decisions_ue:
@@ -973,7 +973,7 @@ class ApoData(object):
                     continue
                 # associé à une UE:
                 nt = sco_cache.NotesTableCache.get(sem["formsemestre_id"])
-                for ue in nt.get_ues():
+                for ue in nt.get_ues_stat_dict():
                     if code in ue["code_apogee"].split(","):
                         s.add(code)
                         continue
diff --git a/app/scodoc/sco_bulletins.py b/app/scodoc/sco_bulletins.py
index 91c912c43..7990ead8d 100644
--- a/app/scodoc/sco_bulletins.py
+++ b/app/scodoc/sco_bulletins.py
@@ -218,10 +218,10 @@ def formsemestre_bulletinetud_dict(formsemestre_id, etudid, version="long"):
     ]  # deprecated / keep it for backward compat in templates
 
     # --- Notes
-    ues = nt.get_ues()
+    ues = nt.get_ues_stat_dict()
     modimpls = nt.get_modimpls()
     moy_gen = nt.get_etud_moy_gen(etudid)
-    I["nb_inscrits"] = len(nt.rangs)
+    I["nb_inscrits"] = len(nt.etud_moy_gen_ranks)
     I["moy_gen"] = scu.fmt_note(moy_gen)
     I["moy_min"] = scu.fmt_note(nt.moy_min)
     I["moy_max"] = scu.fmt_note(nt.moy_max)
@@ -265,7 +265,7 @@ def formsemestre_bulletinetud_dict(formsemestre_id, etudid, version="long"):
     I["rang_gr"] = rang_gr
     I["gr_name"] = gr_name
     I["ninscrits_gr"] = ninscrits_gr
-    I["nbetuds"] = len(nt.rangs)
+    I["nbetuds"] = len(nt.etud_moy_gen_ranks)
     I["nb_demissions"] = nt.nb_demissions
     I["nb_defaillants"] = nt.nb_defaillants
     if prefs["bul_show_rangs"]:
diff --git a/app/scodoc/sco_bulletins_json.py b/app/scodoc/sco_bulletins_json.py
index 81df14d6a..6900a450c 100644
--- a/app/scodoc/sco_bulletins_json.py
+++ b/app/scodoc/sco_bulletins_json.py
@@ -153,9 +153,9 @@ def formsemestre_bulletinetud_published_dict(
         pid = partition["partition_id"]
         partitions_etud_groups[pid] = sco_groups.get_etud_groups_in_partition(pid)
 
-    ues = nt.get_ues()
+    ues = nt.get_ues_stat_dict()
     modimpls = nt.get_modimpls()
-    nbetuds = len(nt.rangs)
+    nbetuds = len(nt.etud_moy_gen_ranks)
     mg = scu.fmt_note(nt.get_etud_moy_gen(etudid))
     if (
         nt.get_moduleimpls_attente()
diff --git a/app/scodoc/sco_bulletins_xml.py b/app/scodoc/sco_bulletins_xml.py
index 39ff1040d..a0d14a136 100644
--- a/app/scodoc/sco_bulletins_xml.py
+++ b/app/scodoc/sco_bulletins_xml.py
@@ -151,9 +151,9 @@ def make_xml_formsemestre_bulletinetud(
         partitions_etud_groups[pid] = sco_groups.get_etud_groups_in_partition(pid)
 
     nt = sco_cache.NotesTableCache.get(formsemestre_id)  # > toutes notes
-    ues = nt.get_ues()
+    ues = nt.get_ues_stat_dict()
     modimpls = nt.get_modimpls()
-    nbetuds = len(nt.rangs)
+    nbetuds = len(nt.etud_moy_gen_ranks)
     mg = scu.fmt_note(nt.get_etud_moy_gen(etudid))
     if (
         nt.get_moduleimpls_attente()
diff --git a/app/scodoc/sco_cache.py b/app/scodoc/sco_cache.py
index c6c2b1498..44af6f5fd 100644
--- a/app/scodoc/sco_cache.py
+++ b/app/scodoc/sco_cache.py
@@ -155,14 +155,14 @@ class EvaluationCache(ScoDocCache):
         cls.delete_many(evaluation_ids)
 
 
-class ResultatsSemestreBUTCache(ScoDocCache):
-    """Cache pour les résultats ResultatsSemestreBUT.
+class ResultatsSemestreCache(ScoDocCache):
+    """Cache pour les résultats ResultatsSemestre.
     Clé: formsemestre_id
     Valeur: { un paquet de dataframes }
     """
 
-    prefix = "RBUT"
-    timeout = 1 * 60  # ttl 1 minutes (en phase de mise au point)
+    prefix = "RSEM"
+    timeout = 60 * 60  # ttl 1 heure (en phase de mise au point)
 
 
 class AbsSemEtudCache(ScoDocCache):
@@ -299,7 +299,7 @@ def invalidate_formsemestre(  # was inval_cache(formsemestre_id=None, pdfonly=Fa
         SemInscriptionsCache.delete_many(formsemestre_ids)
 
     SemBulletinsPDFCache.invalidate_sems(formsemestre_ids)
-    ResultatsSemestreBUTCache.delete_many(formsemestre_ids)
+    ResultatsSemestreCache.delete_many(formsemestre_ids)
 
 
 class DefferedSemCacheManager:
diff --git a/app/scodoc/sco_formsemestre_validation.py b/app/scodoc/sco_formsemestre_validation.py
index 91bbdec3f..c55ab0e2c 100644
--- a/app/scodoc/sco_formsemestre_validation.py
+++ b/app/scodoc/sco_formsemestre_validation.py
@@ -51,6 +51,7 @@ from app.scodoc import sco_formsemestre_edit
 from app.scodoc import sco_formsemestre_inscriptions
 from app.scodoc import sco_formsemestre_status
 from app.scodoc import sco_parcours_dut
+from app.scodoc.sco_parcours_dut import etud_est_inscrit_ue
 from app.scodoc import sco_photos
 from app.scodoc import sco_preferences
 from app.scodoc import sco_pvjury
@@ -543,7 +544,7 @@ def formsemestre_recap_parcours_table(
 
         nt = sco_cache.NotesTableCache.get(
             sem["formsemestre_id"]
-        )  # > get_ues, get_etud_moy_gen, get_etud_ue_status
+        )  # > get_ues_stat_dict, get_etud_moy_gen, get_etud_ue_status
         if is_cur:
             type_sem = "*"  # now unused
             class_sem = "sem_courant"
@@ -582,8 +583,17 @@ def formsemestre_recap_parcours_table(
         else:
             H.append('<td colspan="%d"><em>en cours</em></td>')
         H.append('<td class="rcp_nonass">%s</td>' % ass)  # abs
-        # acronymes UEs
-        ues = nt.get_ues(filter_sport=True, filter_non_inscrit=True, etudid=etudid)
+        # acronymes UEs auxquelles l'étudiant est inscrit:
+        # XXX il est probable que l'on doive ici ajouter les
+        # XXX UE capitalisées
+        ues = nt.get_ues_stat_dict(filter_sport=True)
+        cnx = ndb.GetDBConnexion()
+        ues = [
+            ue
+            for ue in ues
+            if etud_est_inscrit_ue(cnx, etudid, sem["formsemestre_id"], ue["ue_id"])
+        ]
+
         for ue in ues:
             H.append('<td class="ue_acro"><span>%s</span></td>' % ue["acronyme"])
         if len(ues) < Se.nb_max_ue:
diff --git a/app/scodoc/sco_moduleimpl_inscriptions.py b/app/scodoc/sco_moduleimpl_inscriptions.py
index 69cbb7ef0..76a4690be 100644
--- a/app/scodoc/sco_moduleimpl_inscriptions.py
+++ b/app/scodoc/sco_moduleimpl_inscriptions.py
@@ -479,11 +479,13 @@ def get_etuds_with_capitalized_ue(formsemestre_id):
     returns { ue_id : [ { infos } ] }
     """
     UECaps = scu.DictDefault(defaultvalue=[])
-    nt = sco_cache.NotesTableCache.get(formsemestre_id)  # > get_ues, get_etud_ue_status
+    nt = sco_cache.NotesTableCache.get(
+        formsemestre_id
+    )  # > get_ues_stat_dict, get_etud_ue_status
     inscrits = sco_formsemestre_inscriptions.do_formsemestre_inscription_list(
         args={"formsemestre_id": formsemestre_id}
     )
-    ues = nt.get_ues()
+    ues = nt.get_ues_stat_dict()
     for ue in ues:
         for etud in inscrits:
             status = nt.get_etud_ue_status(etud["etudid"], ue["ue_id"])
diff --git a/app/scodoc/sco_parcours_dut.py b/app/scodoc/sco_parcours_dut.py
index acd87110c..af0f80d33 100644
--- a/app/scodoc/sco_parcours_dut.py
+++ b/app/scodoc/sco_parcours_dut.py
@@ -109,7 +109,7 @@ def SituationEtudParcours(etud, formsemestre_id):
     """renvoie une instance de SituationEtudParcours (ou sous-classe spécialisée)"""
     nt = sco_cache.NotesTableCache.get(
         formsemestre_id
-    )  # > get_etud_decision_sem, get_etud_moy_gen, get_ues, get_etud_ue_status, etud_check_conditions_ues
+    )  # > get_etud_decision_sem, get_etud_moy_gen, get_ues_stat_dict, get_etud_ue_status, etud_check_conditions_ues
     parcours = nt.parcours
     #
     if parcours.ECTS_ONLY:
@@ -330,8 +330,10 @@ class SituationEtudParcoursGeneric(object):
         ue_acros = {}  # acronyme ue : 1
         nb_max_ue = 0
         for sem in sems:
-            nt = sco_cache.NotesTableCache.get(sem["formsemestre_id"])  # > get_ues
-            ues = nt.get_ues(filter_sport=True)
+            nt = sco_cache.NotesTableCache.get(
+                sem["formsemestre_id"]
+            )  # > get_ues_stat_dict
+            ues = nt.get_ues_stat_dict(filter_sport=True)
             for ue in ues:
                 ue_acros[ue["acronyme"]] = 1
             nb_ue = len(ues)
@@ -419,9 +421,7 @@ class SituationEtudParcoursGeneric(object):
             self.moy_gen >= (self.parcours.BARRE_MOY - scu.NOTES_TOLERANCE)
         )
         # conserve etat UEs
-        ue_ids = [
-            x["ue_id"] for x in self.nt.get_ues(etudid=self.etudid, filter_sport=True)
-        ]
+        ue_ids = [x["ue_id"] for x in self.nt.get_ues_stat_dict(filter_sport=True)]
         self.ues_status = {}  # ue_id : status
         for ue_id in ue_ids:
             self.ues_status[ue_id] = self.nt.get_etud_ue_status(self.etudid, ue_id)
@@ -903,8 +903,10 @@ def formsemestre_validate_ues(formsemestre_id, etudid, code_etat_sem, assiduite)
     """
     valid_semestre = CODES_SEM_VALIDES.get(code_etat_sem, False)
     cnx = ndb.GetDBConnexion()
-    nt = sco_cache.NotesTableCache.get(formsemestre_id)  # > get_ues, get_etud_ue_status
-    ue_ids = [x["ue_id"] for x in nt.get_ues(etudid=etudid, filter_sport=True)]
+    nt = sco_cache.NotesTableCache.get(
+        formsemestre_id
+    )  # > get_ues_stat_dict, get_etud_ue_status
+    ue_ids = [x["ue_id"] for x in nt.get_ues_stat_dict(filter_sport=True)]
     for ue_id in ue_ids:
         ue_status = nt.get_etud_ue_status(etudid, ue_id)
         if not assiduite:
@@ -1000,7 +1002,7 @@ def formsemestre_has_decisions(formsemestre_id):
 
 
 def etud_est_inscrit_ue(cnx, etudid, formsemestre_id, ue_id):
-    """Vrai si l'étudiant est inscrit a au moins un module de cette UE dans ce semestre"""
+    """Vrai si l'étudiant est inscrit à au moins un module de cette UE dans ce semestre"""
     cursor = cnx.cursor(cursor_factory=ndb.ScoDocCursor)
     cursor.execute(
         """SELECT mi.* 
diff --git a/app/scodoc/sco_poursuite_dut.py b/app/scodoc/sco_poursuite_dut.py
index 4dbd70138..94772dfe9 100644
--- a/app/scodoc/sco_poursuite_dut.py
+++ b/app/scodoc/sco_poursuite_dut.py
@@ -61,7 +61,7 @@ def etud_get_poursuite_info(sem, etud):
                 nt = sco_cache.NotesTableCache.get(s["formsemestre_id"])
                 dec = nt.get_etud_decision_sem(etudid)
                 # Moyennes et rangs des UE
-                ues = nt.get_ues(filter_sport=True)
+                ues = nt.get_ues_stat_dict(filter_sport=True)
                 moy_ues = [
                     (
                         ue["acronyme"],
diff --git a/app/scodoc/sco_preferences.py b/app/scodoc/sco_preferences.py
index 7e08d3558..7d3e45a7b 100644
--- a/app/scodoc/sco_preferences.py
+++ b/app/scodoc/sco_preferences.py
@@ -2266,3 +2266,31 @@ def doc_preferences():
                 )
 
     return "\n".join([" | ".join(x) for x in L])
+
+
+def bulletin_option_affichage(formsemestre_id: int) -> dict:
+    "dict avec les options d'affichages (préférences) pour ce semestre"
+    prefs = SemPreferences(formsemestre_id)
+    fields = (
+        "bul_show_abs",
+        "bul_show_abs_modules",
+        "bul_show_ects",
+        "bul_show_codemodules",
+        "bul_show_matieres",
+        "bul_show_rangs",
+        "bul_show_ue_rangs",
+        "bul_show_mod_rangs",
+        "bul_show_moypromo",
+        "bul_show_minmax",
+        "bul_show_minmax_mod",
+        "bul_show_minmax_eval",
+        "bul_show_coef",
+        "bul_show_ue_cap_details",
+        "bul_show_ue_cap_current",
+        "bul_show_temporary",
+        "bul_temporary_txt",
+        "bul_show_uevalid",
+        "bul_show_date_inscr",
+    )
+    # on enlève le "bul_" de la clé:
+    return {field[4:]: prefs[field] for field in fields}
diff --git a/app/scodoc/sco_prepajury.py b/app/scodoc/sco_prepajury.py
index a9e061e0d..f75ccc2a3 100644
--- a/app/scodoc/sco_prepajury.py
+++ b/app/scodoc/sco_prepajury.py
@@ -52,7 +52,7 @@ def feuille_preparation_jury(formsemestre_id):
     "Feuille excel pour preparation des jurys"
     nt = sco_cache.NotesTableCache.get(
         formsemestre_id
-    )  # > get_etudids, get_etud_moy_gen, get_ues, get_etud_ue_status, get_etud_decision_sem, identdict,
+    )  # > get_etudids, get_etud_moy_gen, get_ues_stat_dict, get_etud_ue_status, get_etud_decision_sem, identdict,
     etudids = nt.get_etudids(sorted=True)  # tri par moy gen
     sem = sco_formsemestre.get_formsemestre(formsemestre_id)
 
@@ -85,8 +85,8 @@ def feuille_preparation_jury(formsemestre_id):
         if Se.prev:
             ntp = sco_cache.NotesTableCache.get(
                 Se.prev["formsemestre_id"]
-            )  # > get_ues, get_etud_ue_status, get_etud_moy_gen, get_etud_decision_sem
-            for ue in ntp.get_ues(filter_sport=True):
+            )  # > get_ues_stat_dict, get_etud_ue_status, get_etud_moy_gen, get_etud_decision_sem
+            for ue in ntp.get_ues_stat_dict(filter_sport=True):
                 ue_status = ntp.get_etud_ue_status(etudid, ue["ue_id"])
                 ue_code_s = (
                     ue["ue_code"] + "_%s" % ntp.sem["semestre_id"]
@@ -102,7 +102,7 @@ def feuille_preparation_jury(formsemestre_id):
                     prev_code[etudid] += "+"  # indique qu'il a servi a compenser
 
         moy[etudid] = nt.get_etud_moy_gen(etudid)
-        for ue in nt.get_ues(filter_sport=True):
+        for ue in nt.get_ues_stat_dict(filter_sport=True):
             ue_status = nt.get_etud_ue_status(etudid, ue["ue_id"])
             ue_code_s = ue["ue_code"] + "_%s" % nt.sem["semestre_id"]
             moy_ue[ue_code_s][etudid] = ue_status["moy"]
@@ -310,9 +310,9 @@ def feuille_preparation_jury(formsemestre_id):
     ws.append_blank_row()
     ws.append_single_cell_row("Titre des UE")
     if prev_moy:
-        for ue in ntp.get_ues(filter_sport=True):
+        for ue in ntp.get_ues_stat_dict(filter_sport=True):
             ws.append_row(ws.make_row(["", "", "", ue["acronyme"], ue["titre"]]))
-    for ue in nt.get_ues(filter_sport=True):
+    for ue in nt.get_ues_stat_dict(filter_sport=True):
         ws.append_row(ws.make_row(["", "", "", ue["acronyme"], ue["titre"]]))
     #
     ws.append_blank_row()
diff --git a/app/scodoc/sco_pvjury.py b/app/scodoc/sco_pvjury.py
index 322486d3f..0e88db9ca 100644
--- a/app/scodoc/sco_pvjury.py
+++ b/app/scodoc/sco_pvjury.py
@@ -161,7 +161,7 @@ def _comp_ects_by_ue_code_and_type(nt, decision_ues):
 
 def _comp_ects_capitalises_by_ue_code(nt, etudid):
     """Calcul somme des ECTS des UE capitalisees"""
-    ues = nt.get_ues()
+    ues = nt.get_ues_stat_dict()
     ects_by_ue_code = {}
     for ue in ues:
         ue_status = nt.get_etud_ue_status(etudid, ue["ue_id"])
diff --git a/app/scodoc/sco_recapcomplet.py b/app/scodoc/sco_recapcomplet.py
index d3f7f6f4a..ddcdc9548 100644
--- a/app/scodoc/sco_recapcomplet.py
+++ b/app/scodoc/sco_recapcomplet.py
@@ -304,9 +304,9 @@ def make_formsemestre_recapcomplet(
     )[0]
     nt = sco_cache.NotesTableCache.get(
         formsemestre_id
-    )  # >  get_modimpls, get_ues, get_table_moyennes_triees, get_etud_decision_sem, get_etud_etat, get_etud_rang, get_nom_short, get_mod_stats, nt.moy_moy, get_etud_decision_sem,
+    )  # >  get_modimpls, get_ues_stat_dict, get_table_moyennes_triees, get_etud_decision_sem, get_etud_etat, get_etud_rang, get_nom_short, get_mod_stats, nt.moy_moy, get_etud_decision_sem,
     modimpls = nt.get_modimpls()
-    ues = nt.get_ues()  # incluant le(s) UE de sport
+    ues = nt.get_ues_stat_dict()  # incluant le(s) UE de sport
     #
     if formsemestre.formation.is_apc():
         nt.apc_recompute_moyennes()
@@ -964,7 +964,7 @@ def _formsemestre_recapcomplet_json(
         etudid = t[-1]
         if is_apc:
             etud = Identite.query.get(etudid)
-            r = bulletin_but.ResultatsSemestreBUT(formsemestre)
+            r = bulletin_but.BulletinBUT(formsemestre)
             bul = r.bulletin_etud(etud, formsemestre)
         else:
             bul = sco_bulletins_json.formsemestre_bulletinetud_published_dict(
diff --git a/app/views/absences.py b/app/views/absences.py
index a3f893518..edb2204cb 100644
--- a/app/views/absences.py
+++ b/app/views/absences.py
@@ -429,19 +429,10 @@ def SignaleAbsenceGrHebdo(
     ]
     #
     modimpls_list = []
-    # Initialize with first student
-    ues = nt.get_ues(etudid=etuds[0]["etudid"])
+    ues = nt.get_ues_stat_dict()
     for ue in ues:
         modimpls_list += nt.get_modimpls(ue_id=ue["ue_id"])
 
-    # Add modules other students are subscribed to
-    for etud in etuds[1:]:
-        modimpls_etud = []
-        ues = nt.get_ues(etudid=etud["etudid"])
-        for ue in ues:
-            modimpls_etud += nt.get_modimpls(ue_id=ue["ue_id"])
-        modimpls_list += [m for m in modimpls_etud if m not in modimpls_list]
-
     menu_module = ""
     for modimpl in modimpls_list:
         if modimpl["moduleimpl_id"] == moduleimpl_id:
@@ -606,19 +597,10 @@ def SignaleAbsenceGrSemestre(
     #
     if etuds:
         modimpls_list = []
-        # Initialize with first student
-        ues = nt.get_ues(etudid=etuds[0]["etudid"])
+        ues = nt.get_ues_stat_dict()
         for ue in ues:
             modimpls_list += nt.get_modimpls(ue_id=ue["ue_id"])
 
-        # Add modules other students are subscribed to
-        for etud in etuds[1:]:
-            modimpls_etud = []
-            ues = nt.get_ues(etudid=etud["etudid"])
-            for ue in ues:
-                modimpls_etud += nt.get_modimpls(ue_id=ue["ue_id"])
-            modimpls_list += [m for m in modimpls_etud if m not in modimpls_list]
-
         menu_module = ""
         for modimpl in modimpls_list:
             if modimpl["moduleimpl_id"] == moduleimpl_id:
@@ -750,8 +732,8 @@ def _gen_form_saisie_groupe(
         if etud["cursem"]:
             nt = sco_cache.NotesTableCache.get(
                 etud["cursem"]["formsemestre_id"]
-            )  # > get_ues, get_etud_ue_status
-            for ue in nt.get_ues():
+            )  # > get_ues_stat_dict, get_etud_ue_status
+            for ue in nt.get_ues_stat_dict():
                 status = nt.get_etud_ue_status(etudid, ue["ue_id"])
                 if status["is_capitalized"]:
                     cap.append(ue["acronyme"])
diff --git a/app/views/notes.py b/app/views/notes.py
index 5523a10e6..836016de8 100644
--- a/app/views/notes.py
+++ b/app/views/notes.py
@@ -296,7 +296,7 @@ def formsemestre_bulletinetud(
                 code_nip=str(code_nip)
             ).first_or_404()
         if format == "json":
-            r = bulletin_but.ResultatsSemestreBUT(formsemestre)
+            r = bulletin_but.BulletinBUT(formsemestre)
             return jsonify(r.bulletin_etud(etud, formsemestre))
         elif format == "html":
             return render_template(

From 0fe5cdb4099b41585273fbf4c3e77d7c4bf30eef Mon Sep 17 00:00:00 2001
From: Emmanuel Viennet <emmanuel.viennet@gmail.com>
Date: Sun, 26 Dec 2021 19:15:47 +0100
Subject: [PATCH 02/10] WIP: refactoring calculs

---
 app/but/bulletin_but.py            |  54 ++---
 app/but/bulletin_but_xml_compat.py |  10 +-
 app/comp/aux.py                    |  37 +++
 app/comp/df_cache.py               |   2 +-
 app/comp/moy_mod.py                | 374 ++++++++++++++++-------------
 app/comp/moy_ue.py                 |  28 +--
 app/comp/res_sem.py                |  77 +++---
 app/models/etudiants.py            |  81 ++++++-
 app/models/moduleimpls.py          |   4 +-
 app/scodoc/notes_table.py          |  10 +-
 app/scodoc/sco_abs_views.py        |  42 ++--
 app/scodoc/sco_apogee_csv.py       |   4 +-
 app/scodoc/sco_bulletins.py        |   4 +-
 app/scodoc/sco_bulletins_json.py   |   2 +-
 app/scodoc/sco_bulletins_xml.py    |   2 +-
 app/scodoc/sco_etud.py             |  37 +--
 app/scodoc/sco_liste_notes.py      |   2 +-
 app/scodoc/sco_page_etud.py        |   3 +-
 app/scodoc/sco_poursuite_dut.py    |   2 +-
 app/scodoc/sco_recapcomplet.py     |   6 +-
 app/scodoc/sco_tag_module.py       |   2 +-
 app/templates/sidebar.html         |  92 ++++---
 app/views/absences.py              |   4 +-
 app/views/scolar.py                |   5 +-
 pylintrc                           |   2 +
 sco_version.py                     |   2 +-
 tests/unit/test_but_modules.py     | 135 +++++------
 tests/unit/test_but_ues.py         |   4 +-
 28 files changed, 580 insertions(+), 447 deletions(-)
 create mode 100644 app/comp/aux.py

diff --git a/app/but/bulletin_but.py b/app/but/bulletin_but.py
index 65756767f..658f8f634 100644
--- a/app/but/bulletin_but.py
+++ b/app/but/bulletin_but.py
@@ -4,19 +4,17 @@
 # See LICENSE
 ##############################################################################
 
+"""Génération bulletin BUT
+"""
+
 import datetime
 from flask import url_for, g
-import numpy as np
-import pandas as pd
-
-from app import db
 
 from app.comp import moy_ue, moy_sem, inscr_mod
-from app.models import ModuleImpl
 from app.scodoc import sco_utils as scu
 from app.scodoc import sco_bulletins_json
 from app.scodoc import sco_preferences
-from app.scodoc.sco_utils import jsnan, fmt_note
+from app.scodoc.sco_utils import fmt_note
 from app.comp.res_sem import ResultatsSemestre, NotesTableCompat
 
 
@@ -37,9 +35,7 @@ class ResultatsSemestreBUT(NotesTableCompat):
         (
             self.sem_cube,
             self.modimpls_evals_poids,
-            self.modimpls_evals_notes,
-            modimpls_evaluations,
-            self.modimpls_evaluations_complete,
+            self.modimpls_results,
         ) = moy_ue.notes_sem_load_cube(self.formsemestre)
         self.modimpl_inscr_df = inscr_mod.df_load_modimpl_inscr(self.formsemestre)
         self.modimpl_coefs_df, _, _ = moy_ue.df_load_modimpl_coefs(
@@ -74,16 +70,16 @@ class BulletinBUT(ResultatsSemestreBUT):
         etud_idx = self.etud_index[etud.id]
         ue_idx = self.modimpl_coefs_df.index.get_loc(ue.id)
         etud_moy_module = self.sem_cube[etud_idx]  # module x UE
-        for mi in modimpls:
-            coef = self.modimpl_coefs_df[mi.id][ue.id]
+        for modimpl in modimpls:
+            coef = self.modimpl_coefs_df[modimpl.id][ue.id]
             if coef > 0:
-                d[mi.module.code] = {
-                    "id": mi.id,
+                d[modimpl.module.code] = {
+                    "id": modimpl.id,
                     "coef": coef,
                     "moyenne": fmt_note(
-                        etud_moy_module[self.modimpl_coefs_df.columns.get_loc(mi.id)][
-                            ue_idx
-                        ]
+                        etud_moy_module[
+                            self.modimpl_coefs_df.columns.get_loc(modimpl.id)
+                        ][ue_idx]
                     ),
                 }
         return d
@@ -117,7 +113,7 @@ class BulletinBUT(ResultatsSemestreBUT):
         avec évaluations de chacun."""
         d = {}
         # etud_idx = self.etud_index[etud.id]
-        for mi in modimpls:
+        for modimpl in modimpls:
             # mod_idx = self.modimpl_coefs_df.columns.get_loc(mi.id)
             # # moyennes indicatives (moyennes de moyennes d'UE)
             # try:
@@ -131,14 +127,15 @@ class BulletinBUT(ResultatsSemestreBUT):
             #     moy_indicative_mod = np.nanmean(self.sem_cube[etud_idx, mod_idx])
             # except RuntimeWarning:  # all nans in np.nanmean
             #     pass
-            d[mi.module.code] = {
-                "id": mi.id,
-                "titre": mi.module.titre,
-                "code_apogee": mi.module.code_apogee,
+            modimpl_results = self.modimpls_results[modimpl.id]
+            d[modimpl.module.code] = {
+                "id": modimpl.id,
+                "titre": modimpl.module.titre,
+                "code_apogee": modimpl.module.code_apogee,
                 "url": url_for(
                     "notes.moduleimpl_status",
                     scodoc_dept=g.scodoc_dept,
-                    moduleimpl_id=mi.id,
+                    moduleimpl_id=modimpl.id,
                 ),
                 "moyenne": {
                     # # moyenne indicative de module: moyenne des UE, ignorant celles sans notes (nan)
@@ -149,16 +146,17 @@ class BulletinBUT(ResultatsSemestreBUT):
                 },
                 "evaluations": [
                     self.etud_eval_results(etud, e)
-                    for eidx, e in enumerate(mi.evaluations)
+                    for e in modimpl.evaluations
                     if e.visibulletin
-                    and self.modimpls_evaluations_complete[mi.id][eidx]
+                    and modimpl_results.evaluations_etat[e.id].is_complete
                 ],
             }
         return d
 
     def etud_eval_results(self, etud, e) -> dict:
         "dict resultats d'un étudiant à une évaluation"
-        eval_notes = self.modimpls_evals_notes[e.moduleimpl_id][e.id]  # pd.Series
+        # eval_notes est une pd.Series avec toutes les notes des étudiants inscrits
+        eval_notes = self.modimpls_results[e.moduleimpl_id].evals_notes[e.id]
         notes_ok = eval_notes.where(eval_notes > scu.NOTES_ABSENCE).dropna()
         d = {
             "id": e.id,
@@ -170,7 +168,7 @@ class BulletinBUT(ResultatsSemestreBUT):
             "poids": {p.ue.acronyme: p.poids for p in e.ue_poids},
             "note": {
                 "value": fmt_note(
-                    self.modimpls_evals_notes[e.moduleimpl_id][e.id][etud.id],
+                    eval_notes[etud.id],
                     note_max=e.note_max,
                 ),
                 "min": fmt_note(notes_ok.min()),
@@ -212,8 +210,8 @@ class BulletinBUT(ResultatsSemestreBUT):
             "numero": formsemestre.semestre_id,
             "groupes": [],  # XXX TODO
             "absences": {  # XXX TODO
-                "injustifie": 1,
-                "total": 33,
+                "injustifie": -1,
+                "total": -1,
             },
         }
         semestre_infos.update(
diff --git a/app/but/bulletin_but_xml_compat.py b/app/but/bulletin_but_xml_compat.py
index 6e2f14dbf..478141cbb 100644
--- a/app/but/bulletin_but_xml_compat.py
+++ b/app/but/bulletin_but_xml_compat.py
@@ -108,8 +108,8 @@ def bulletin_but_xml_compat(
             code_ine=etud.code_ine or "",
             nom=scu.quote_xml_attr(etud.nom),
             prenom=scu.quote_xml_attr(etud.prenom),
-            civilite=scu.quote_xml_attr(etud.civilite_str()),
-            sexe=scu.quote_xml_attr(etud.civilite_str()),  # compat
+            civilite=scu.quote_xml_attr(etud.civilite_str),
+            sexe=scu.quote_xml_attr(etud.civilite_str),  # compat
             photo_url=scu.quote_xml_attr(sco_photos.get_etud_photo_url(etud.id)),
             email=scu.quote_xml_attr(etud.get_first_email() or ""),
             emailperso=scu.quote_xml_attr(etud.get_first_email("emailperso") or ""),
@@ -216,9 +216,9 @@ def bulletin_but_xml_compat(
                                 Element(
                                     "note",
                                     value=scu.fmt_note(
-                                        results.modimpls_evals_notes[e.moduleimpl_id][
-                                            e.id
-                                        ][etud.id]
+                                        results.modimpls_results[
+                                            e.moduleimpl_id
+                                        ].evals_notes[e.id][etud.id]
                                     ),
                                 )
                             )
diff --git a/app/comp/aux.py b/app/comp/aux.py
new file mode 100644
index 000000000..46285a4b1
--- /dev/null
+++ b/app/comp/aux.py
@@ -0,0 +1,37 @@
+##############################################################################
+# ScoDoc
+# Copyright (c) 1999 - 2021 Emmanuel Viennet.  All rights reserved.
+# See LICENSE
+##############################################################################
+
+import numpy as np
+
+"""Quelques classes auxiliaires pour les calculs des notes
+"""
+
+
+class StatsMoyenne:
+    """Une moyenne d'un ensemble étudiants sur quelque chose
+    (moyenne générale d'un semestre, d'un module, d'un groupe...)
+    et les statistiques associées: min, max, moy, effectif
+    """
+
+    def __init__(self, vals):
+        """Calcul les statistiques.
+        Les valeurs NAN ou non numériques sont toujours enlevées.
+        """
+        self.moy = np.nanmean(vals)
+        self.min = np.nanmin(vals)
+        self.max = np.nanmax(vals)
+        self.size = len(vals)
+        self.nb_vals = self.size - np.count_nonzero(np.isnan(vals))
+
+    def to_dict(self):
+        "Tous les attributs dans un dict"
+        return {
+            "min": self.min,
+            "max": self.max,
+            "moy": self.moy,
+            "size": self.size,
+            "nb_vals": self.nb_vals,
+        }
diff --git a/app/comp/df_cache.py b/app/comp/df_cache.py
index dec325e2a..67b59242f 100644
--- a/app/comp/df_cache.py
+++ b/app/comp/df_cache.py
@@ -43,7 +43,7 @@ class ModuleCoefsCache(sco_cache.ScoDocCache):
 class EvaluationsPoidsCache(sco_cache.ScoDocCache):
     """Cache for poids evals
     Clé: moduleimpl_id
-    Valeur: DataFrame (df_load_evaluations_poids)
+    Valeur: DataFrame (load_evaluations_poids)
     """
 
     prefix = "EPC"
diff --git a/app/comp/moy_mod.py b/app/comp/moy_mod.py
index 40616cbab..dc912c286 100644
--- a/app/comp/moy_mod.py
+++ b/app/comp/moy_mod.py
@@ -31,17 +31,217 @@ Rappel: pour éviter les confusions, on appelera *poids* les coefficients d'une
 évaluation dans un module, et *coefficients* ceux utilisés pour le calcul de la
 moyenne générale d'une UE.
 """
+from dataclasses import dataclass
 import numpy as np
 import pandas as pd
-from pandas.core.frame import DataFrame
 
 from app import db
-from app import models
 from app.models import ModuleImpl, Evaluation, EvaluationUEPoids
 from app.scodoc import sco_utils as scu
 
 
-def df_load_evaluations_poids(
+@dataclass
+class EvaluationEtat:
+    """Classe pour stocker quelques infos sur les résultats d'une évaluation"""
+
+    evaluation_id: int
+    nb_attente: int
+    is_complete: bool
+
+
+class ModuleImplResultsAPC:
+    """Les notes des étudiants d'un moduleimpl.
+    Les poids des évals sont à part car on a a besoin sans les notes pour les tableaux
+    de bord.
+    Les attributs sont tous des objets simples cachables dans Redis;
+    les caches sont gérés par  ResultatsSemestre.
+    """
+
+    def __init__(self, moduleimpl: ModuleImpl):
+        self.moduleimpl_id = moduleimpl.id
+        self.module_id = moduleimpl.module.id
+        self.etudids = None
+        "liste des étudiants inscrits au SEMESTRE"
+        self.nb_inscrits_module = None
+        "nombre d'inscrits (non DEM) au module"
+        self.evaluations_completes = []
+        "séquence de booléens, indiquant les évals à prendre en compte."
+        self.evaluations_etat = {}
+        "{ evaluation_id: EvaluationEtat }"
+        #
+        self.evals_notes = None
+        """DataFrame, colonnes: EVALS, Lignes: etudid
+            valeur: notes brutes, float ou NOTES_ATTENTE, NOTES_NEUTRALISE,
+            NOTES_ABSENCE.
+            Les NaN désignent les notes manquantes (non saisies).
+        """
+        self.etuds_moy_module = None
+        """DataFrame, colonnes UE, lignes etud
+            = la note de l'étudiant dans chaque UE pour ce module.
+            ou NaN si les évaluations (dans lesquelles l'étudiant a des notes)
+            ne donnent pas de coef vers cette UE.
+        """
+        self.load_notes()
+
+    def load_notes(self):  # ré-écriture de df_load_modimpl_notes
+        """Charge toutes les notes de toutes les évaluations du module.
+        Dataframe evals_notes
+            colonnes: le nom de la colonne est l'evaluation_id (int)
+            index (lignes): etudid (int)
+
+        L'ensemble des étudiants est celui des inscrits au SEMESTRE.
+
+        Les notes sont "brutes" (séries de floats) et peuvent prendre les valeurs:
+            note : float (valeur enregistrée brute, NON normalisée sur 20)
+            pas de note: NaN (rien en bd, ou étudiant non inscrit au module)
+            absent: NOTES_ABSENCE (NULL en bd)
+            excusé: NOTES_NEUTRALISE (voir sco_utils)
+            attente: NOTES_ATTENTE
+
+        Évaluation "complete" (prise en compte dans les calculs) si:
+        - soit tous les étudiants inscrits au module ont des notes
+        - soit elle a été déclarée "à prise ne compte immédiate" (publish_incomplete)
+
+        Évaluation "attente" (prise en compte dans les calculs, mais il y
+        manque des notes) ssi il y a des étudiants inscrits au semestre et au module
+        qui ont des notes ATT.
+        """
+        moduleimpl = ModuleImpl.query.get(self.moduleimpl_id)
+        self.etudids = self._etudids()
+
+        # --- Calcul nombre d'inscrits pour déterminer les évaluations "completes":
+        # on prend les inscrits au module ET au semestre (donc sans démissionnaires)
+        inscrits_module = {ins.etud.id for ins in moduleimpl.inscriptions}.intersection(
+            self.etudids
+        )
+        self.nb_inscrits_module = len(inscrits_module)
+
+        # dataFrame vide, index = tous les inscrits au SEMESTRE
+        evals_notes = pd.DataFrame(index=self.etudids, dtype=float)
+        self.evaluations_completes = []
+        for evaluation in moduleimpl.evaluations:
+            eval_df = self._load_evaluation_notes(evaluation)
+            # is_complete ssi tous les inscrits (non dem) au semestre ont une note
+            # ou évaluaton déclarée "à prise en compte immédiate"
+            is_complete = (
+                len(set(eval_df.index).intersection(self.etudids))
+                == self.nb_inscrits_module
+            ) or evaluation.publish_incomplete  # immédiate
+            self.evaluations_completes.append(is_complete)
+
+            # NULL en base => ABS (= -999)
+            eval_df.fillna(scu.NOTES_ABSENCE, inplace=True)
+            # Ce merge ne garde que les étudiants inscrits au module
+            # et met à NULL les notes non présentes
+            #  (notes non saisies ou etuds non inscrits au module):
+            evals_notes = evals_notes.merge(
+                eval_df, how="left", left_index=True, right_index=True
+            )
+            # Notes en attente: (on prend dans evals_notes pour ne pas avoir les dem.)
+            nb_att = sum(evals_notes[str(evaluation.id)] == scu.NOTES_ATTENTE)
+            self.evaluations_etat[evaluation.id] = EvaluationEtat(
+                evaluation_id=evaluation.id, nb_attente=nb_att, is_complete=is_complete
+            )
+
+        # Force columns names to integers (evaluation ids)
+        evals_notes.columns = pd.Int64Index(
+            [int(x) for x in evals_notes.columns], dtype="int"
+        )
+        self.evals_notes = evals_notes
+
+    def _load_evaluation_notes(self, evaluation: Evaluation) -> pd.DataFrame:
+        """Charge les notes de l'évaluation
+        Resultat: dataframe, index: etudid ayant une note, valeur: note brute.
+        """
+        eval_df = pd.read_sql_query(
+            """SELECT n.etudid, n.value AS "%(evaluation_id)s"
+            FROM notes_notes n, notes_moduleimpl_inscription i
+            WHERE evaluation_id=%(evaluation_id)s
+            AND n.etudid = i.etudid
+            AND i.moduleimpl_id = %(moduleimpl_id)s
+            """,
+            db.engine,
+            params={
+                "evaluation_id": evaluation.id,
+                "moduleimpl_id": evaluation.moduleimpl.id,
+            },
+            index_col="etudid",
+        )
+        eval_df[str(evaluation.id)] = pd.to_numeric(eval_df[str(evaluation.id)])
+        return eval_df
+
+    def _etudids(self):
+        """L'index du dataframe est la liste des étudiants inscrits au semestre,
+        sans les démissionnaires.
+        """
+        return [
+            e.etudid
+            for e in ModuleImpl.query.get(self.moduleimpl_id).formsemestre.get_inscrits(
+                include_dem=False
+            )
+        ]
+
+    def compute_module_moy(
+        self,
+        evals_poids_df: pd.DataFrame,
+    ) -> pd.DataFrame:
+        """Calcule les moyennes des étudiants dans ce module
+
+        Argument: evals_poids: DataFrame, colonnes: UEs, Lignes: EVALs
+
+        Résultat: DataFrame, colonnes UE, lignes etud
+            = la note de l'étudiant dans chaque UE pour ce module.
+            ou NaN si les évaluations (dans lesquelles l'étudiant a des notes)
+            ne donnent pas de coef vers cette UE.
+        """
+        moduleimpl = ModuleImpl.query.get(self.moduleimpl_id)
+        nb_etuds, nb_evals = self.evals_notes.shape
+        nb_ues = evals_poids_df.shape[1]
+        assert evals_poids_df.shape[0] == nb_evals  # compat notes/poids
+        if nb_etuds == 0:
+            return pd.DataFrame(index=[], columns=evals_poids_df.columns)
+        # Coefficients des évaluations, met à zéro ceux des évals incomplètes:
+        evals_coefs = (
+            np.array(
+                [e.coefficient for e in moduleimpl.evaluations],
+                dtype=float,
+            )
+            * self.evaluations_completes
+        ).reshape(-1, 1)
+        evals_poids = evals_poids_df.values * evals_coefs
+        # -> evals_poids shape : (nb_evals, nb_ues)
+        assert evals_poids.shape == (nb_evals, nb_ues)
+        # Remplace les notes ATT, EXC, ABS, NaN par zéro et mets les notes sur 20:
+        evals_notes = np.where(
+            self.evals_notes.values > scu.NOTES_ABSENCE, self.evals_notes.values, 0.0
+        ) / [e.note_max / 20.0 for e in moduleimpl.evaluations]
+        # Les poids des évals pour les étudiant: là où il a des notes non neutralisées
+        # (ABS n'est  pas neutralisée, mais ATTENTE et NEUTRALISE oui)
+        # Note: les NaN sont remplacés par des 0 dans evals_notes
+        #  et dans dans evals_poids_etuds
+        #  (rappel: la comparaison est toujours false face à un NaN)
+        # shape: (nb_etuds, nb_evals, nb_ues)
+        poids_stacked = np.stack([evals_poids] * nb_etuds)
+        evals_poids_etuds = np.where(
+            np.stack([self.evals_notes.values] * nb_ues, axis=2) > scu.NOTES_NEUTRALISE,
+            poids_stacked,
+            0,
+        )
+        # Calcule la moyenne pondérée sur les notes disponibles:
+        evals_notes_stacked = np.stack([evals_notes] * nb_ues, axis=2)
+        with np.errstate(invalid="ignore"):  # ignore les 0/0 (-> NaN)
+            etuds_moy_module = np.sum(
+                evals_poids_etuds * evals_notes_stacked, axis=1
+            ) / np.sum(evals_poids_etuds, axis=1)
+        self.etuds_moy_module = pd.DataFrame(
+            etuds_moy_module,
+            index=self.evals_notes.index,
+            columns=evals_poids_df.columns,
+        )
+        return self.etuds_moy_module
+
+
+def load_evaluations_poids(
     moduleimpl_id: int, default_poids=1.0
 ) -> tuple[pd.DataFrame, list]:
     """Charge poids des évaluations d'un module et retourne un dataframe
@@ -55,23 +255,25 @@ def df_load_evaluations_poids(
     ues = modimpl.formsemestre.query_ues(with_sport=False).all()
     ue_ids = [ue.id for ue in ues]
     evaluation_ids = [evaluation.id for evaluation in evaluations]
-    df = pd.DataFrame(columns=ue_ids, index=evaluation_ids, dtype=float)
-    for eval_poids in EvaluationUEPoids.query.join(
+    evals_poids = pd.DataFrame(columns=ue_ids, index=evaluation_ids, dtype=float)
+    for ue_poids in EvaluationUEPoids.query.join(
         EvaluationUEPoids.evaluation
     ).filter_by(moduleimpl_id=moduleimpl_id):
-        df[eval_poids.ue_id][eval_poids.evaluation_id] = eval_poids.poids
+        evals_poids[ue_poids.ue_id][ue_poids.evaluation_id] = ue_poids.poids
     if default_poids is not None:
-        df.fillna(value=default_poids, inplace=True)
-    return df, ues
+        evals_poids.fillna(value=default_poids, inplace=True)
+    return evals_poids, ues
 
 
-def check_moduleimpl_conformity(
+def moduleimpl_is_conforme(
     moduleimpl, evals_poids: pd.DataFrame, modules_coefficients: pd.DataFrame
 ) -> bool:
     """Vérifie que les évaluations de ce moduleimpl sont bien conformes
     au PN.
     Un module est dit *conforme* si et seulement si la somme des poids de ses
     évaluations vers une UE de coefficient non nul est non nulle.
+
+    Argument: evals_poids: DataFrame, colonnes: UEs, Lignes: EVALs
     """
     nb_evals, nb_ues = evals_poids.shape
     if nb_evals == 0:
@@ -79,160 +281,10 @@ def check_moduleimpl_conformity(
     if nb_ues == 0:
         return False  # situation absurde (pas d'UE)
     if len(modules_coefficients) != nb_ues:
-        raise ValueError("check_moduleimpl_conformity: nb ue incoherent")
+        raise ValueError("moduleimpl_is_conforme: nb ue incoherent")
     module_evals_poids = evals_poids.transpose().sum(axis=1).to_numpy() != 0
     check = all(
-        (modules_coefficients[moduleimpl.module.id].to_numpy() != 0)
+        (modules_coefficients[moduleimpl.module_id].to_numpy() != 0)
         == module_evals_poids
     )
     return check
-
-
-def df_load_modimpl_notes(moduleimpl_id: int) -> tuple:
-    """Construit un dataframe avec toutes les notes de toutes les évaluations du module.
-    colonnes: le nom de la colonne est l'evaluation_id (int)
-    index (lignes): etudid (int)
-
-    Résultat: (evals_notes, liste de évaluations du moduleimpl,
-              liste de booleens indiquant si l'évaluation est "complete")
-
-    L'ensemble des étudiants est celui des inscrits au SEMESTRE.
-
-    Les notes renvoyées sont "brutes" (séries de floats) et peuvent prendre les valeurs:
-        note : float (valeur enregistrée brute, non normalisée sur 20)
-        pas de note: NaN (rien en bd, ou étudiant non inscrit au module)
-        absent: NOTES_ABSENCE (NULL en bd)
-        excusé: NOTES_NEUTRALISE (voir sco_utils)
-        attente: NOTES_ATTENTE
-
-    L'évaluation "complete" (prise en compte dans les calculs) si:
-    - soit tous les étudiants inscrits au module ont des notes
-    - soit elle a été déclarée "à prise ne compte immédiate" (publish_incomplete)
-
-    N'utilise pas de cache ScoDoc.
-    """
-    # L'index du dataframe est la liste des étudiants inscrits au semestre,
-    # sans les démissionnaires
-    etudids = [
-        e.etudid
-        for e in ModuleImpl.query.get(moduleimpl_id).formsemestre.get_inscrits(
-            include_dem=False
-        )
-    ]
-    evaluations = Evaluation.query.filter_by(moduleimpl_id=moduleimpl_id).all()
-    # --- Calcul nombre d'inscrits pour détermnier si évaluation "complete":
-    if evaluations:
-        # on prend les inscrits au module ET au semestre (donc sans démissionnaires)
-        inscrits_module = {
-            ins.etud.id for ins in evaluations[0].moduleimpl.inscriptions
-        }.intersection(etudids)
-        nb_inscrits_module = len(inscrits_module)
-    else:
-        nb_inscrits_module = 0
-    # empty df with all students:
-    evals_notes = pd.DataFrame(index=etudids, dtype=float)
-    evaluations_completes = []
-    for evaluation in evaluations:
-        eval_df = pd.read_sql_query(
-            """SELECT n.etudid, n.value AS "%(evaluation_id)s"
-            FROM notes_notes n, notes_moduleimpl_inscription i
-            WHERE evaluation_id=%(evaluation_id)s
-            AND n.etudid = i.etudid
-            AND i.moduleimpl_id = %(moduleimpl_id)s
-            ORDER BY n.etudid
-            """,
-            db.engine,
-            params={
-                "evaluation_id": evaluation.id,
-                "moduleimpl_id": evaluation.moduleimpl.id,
-            },
-            index_col="etudid",
-        )
-        eval_df[str(evaluation.id)] = pd.to_numeric(eval_df[str(evaluation.id)])
-        # is_complete ssi tous les inscrits (non dem) au semestre ont une note
-        is_complete = (
-            len(set(eval_df.index).intersection(etudids)) == nb_inscrits_module
-        ) or evaluation.publish_incomplete
-        evaluations_completes.append(is_complete)
-        # NULL en base => ABS (= -999)
-        eval_df.fillna(scu.NOTES_ABSENCE, inplace=True)
-        # Ce merge met à NULL les élements non présents
-        #  (notes non saisies ou etuds non inscrits au module):
-        evals_notes = evals_notes.merge(
-            eval_df, how="left", left_index=True, right_index=True
-        )
-    # Force columns names to integers (evaluation ids)
-    evals_notes.columns = pd.Int64Index(
-        [int(x) for x in evals_notes.columns], dtype="int64"
-    )
-    return evals_notes, evaluations, evaluations_completes
-
-
-def compute_module_moy(
-    evals_notes_df: pd.DataFrame,
-    evals_poids_df: pd.DataFrame,
-    evaluations: list,
-    evaluations_completes: list,
-) -> pd.DataFrame:
-    """Calcule les moyennes des étudiants dans ce module
-
-     - evals_notes : DataFrame, colonnes: EVALS, Lignes: etudid
-        valeur: notes brutes, float ou NOTES_ATTENTE, NOTES_NEUTRALISE,
-        NOTES_ABSENCE.
-        Les NaN désignent les notes manquantes (non saisies).
-
-     - evals_poids: DataFrame, colonnes: UEs, Lignes: EVALs
-
-     - evaluations: séquence d'évaluations (utilisées pour le coef et
-        le barème)
-
-     - evaluations_completes: séquence de booléens indiquant les
-        évals à prendre en compte.
-
-    Résultat: DataFrame, colonnes UE, lignes etud
-        = la note de l'étudiant dans chaque UE pour ce module.
-         ou NaN si les évaluations (dans lesquelles l'étudiant à des notes)
-         ne donnent pas de coef vers cette UE.
-    """
-    nb_etuds, nb_evals = evals_notes_df.shape
-    nb_ues = evals_poids_df.shape[1]
-    assert evals_poids_df.shape[0] == nb_evals  # compat notes/poids
-    if nb_etuds == 0:
-        return pd.DataFrame(index=[], columns=evals_poids_df.columns)
-    # Coefficients des évaluations, met à zéro ceux des évals incomplètes:
-    evals_coefs = (
-        np.array(
-            [e.coefficient for e in evaluations],
-            dtype=float,
-        )
-        * evaluations_completes
-    ).reshape(-1, 1)
-    evals_poids = evals_poids_df.values * evals_coefs
-    # -> evals_poids shape : (nb_evals, nb_ues)
-    assert evals_poids.shape == (nb_evals, nb_ues)
-    # Remplace les notes ATT, EXC, ABS, NaN par zéro et mets les notes sur 20:
-    evals_notes = np.where(
-        evals_notes_df.values > scu.NOTES_ABSENCE, evals_notes_df.values, 0.0
-    ) / [e.note_max / 20.0 for e in evaluations]
-    # Les poids des évals pour les étudiant: là où il a des notes non neutralisées
-    # (ABS n'est  pas neutralisée, mais ATTENTE et NEUTRALISE oui)
-    # Note: les NaN sont remplacés par des 0 dans evals_notes
-    #  et dans dans evals_poids_etuds
-    #  (rappel: la comparaison est toujours false face à un NaN)
-    # shape: (nb_etuds, nb_evals, nb_ues)
-    poids_stacked = np.stack([evals_poids] * nb_etuds)
-    evals_poids_etuds = np.where(
-        np.stack([evals_notes_df.values] * nb_ues, axis=2) > scu.NOTES_NEUTRALISE,
-        poids_stacked,
-        0,
-    )
-    # Calcule la moyenne pondérée sur les notes disponibles:
-    evals_notes_stacked = np.stack([evals_notes] * nb_ues, axis=2)
-    with np.errstate(invalid="ignore"):  # ignore les 0/0 (-> NaN)
-        etuds_moy_module = np.sum(
-            evals_poids_etuds * evals_notes_stacked, axis=1
-        ) / np.sum(evals_poids_etuds, axis=1)
-    etuds_moy_module_df = pd.DataFrame(
-        etuds_moy_module, index=evals_notes_df.index, columns=evals_poids_df.columns
-    )
-    return etuds_moy_module_df
diff --git a/app/comp/moy_ue.py b/app/comp/moy_ue.py
index 74994f26d..0c640fe93 100644
--- a/app/comp/moy_ue.py
+++ b/app/comp/moy_ue.py
@@ -34,7 +34,6 @@ from app import db
 from app import models
 from app.models import UniteEns, Module, ModuleImpl, ModuleUECoef
 from app.comp import moy_mod
-from app.models.formsemestre import FormSemestre
 from app.scodoc import sco_codes_parcours
 
 
@@ -134,34 +133,21 @@ def notes_sem_load_cube(formsemestre):
     Resultat:
         sem_cube : ndarray (etuds x modimpls x UEs)
         modimpls_evals_poids dict { modimpl.id : evals_poids }
-        modimpls_evals_notes dict { modimpl.id : evals_notes }
-        modimpls_evaluations dict { modimpl.id : liste des évaluations }
-        modimpls_evaluations_complete: {modimpl_id : liste de booleens (complete/non)}
+        modimpls_results dict { modimpl.id : ModuleImplResultsAPC }
     """
+    modimpls_results = {}
     modimpls_evals_poids = {}
-    modimpls_evals_notes = {}
-    modimpls_evaluations = {}
-    modimpls_evaluations_complete = {}
     modimpls_notes = []
     for modimpl in formsemestre.modimpls:
-        evals_notes, evaluations, evaluations_completes = moy_mod.df_load_modimpl_notes(
-            modimpl.id
-        )
-        evals_poids, ues = moy_mod.df_load_evaluations_poids(modimpl.id)
-        etuds_moy_module = moy_mod.compute_module_moy(
-            evals_notes, evals_poids, evaluations, evaluations_completes
-        )
-        modimpls_evals_poids[modimpl.id] = evals_poids
-        modimpls_evals_notes[modimpl.id] = evals_notes
-        modimpls_evaluations[modimpl.id] = evaluations
-        modimpls_evaluations_complete[modimpl.id] = evaluations_completes
+        mod_results = moy_mod.ModuleImplResultsAPC(modimpl)
+        evals_poids, _ = moy_mod.load_evaluations_poids(modimpl.id)
+        etuds_moy_module = mod_results.compute_module_moy(evals_poids)
+        modimpls_results[modimpl.id] = mod_results
         modimpls_notes.append(etuds_moy_module)
     return (
         notes_sem_assemble_cube(modimpls_notes),
         modimpls_evals_poids,
-        modimpls_evals_notes,
-        modimpls_evaluations,
-        modimpls_evaluations_complete,
+        modimpls_results,
     )
 
 
diff --git a/app/comp/res_sem.py b/app/comp/res_sem.py
index 01a2e8720..c0b78b539 100644
--- a/app/comp/res_sem.py
+++ b/app/comp/res_sem.py
@@ -8,6 +8,8 @@ from collections import defaultdict
 from functools import cached_property
 import numpy as np
 import pandas as pd
+from app.comp.aux import StatsMoyenne
+from app.models import ModuleImpl
 from app.scodoc import sco_utils as scu
 from app.scodoc.sco_cache import ResultatsSemestreCache
 from app.scodoc.sco_codes_parcours import UE_SPORT
@@ -28,14 +30,20 @@ class ResultatsSemestre:
         "modimpl_coefs_df",
         "etud_moy_ue",
         "modimpls_evals_poids",
-        "modimpls_evals_notes",
+        "modimpls_results",
         "etud_moy_gen",
         "etud_moy_gen_ranks",
-        "modimpls_evaluations_complete",
     )
 
     def __init__(self, formsemestre):
         self.formsemestre = formsemestre
+        # BUT ou standard ? (apc == "approche par compétences")
+        self.is_apc = formsemestre.formation.is_apc()
+        # Attributs "virtuels", définis pas les sous-classes
+        #  ResultatsSemestreBUT ou ResultatsSemestreStd
+        self.etud_moy_ue = {}
+        self.etud_moy_gen = {}
+        self.etud_moy_gen_ranks = {}
         # TODO
 
     def load_cached(self) -> bool:
@@ -49,7 +57,6 @@ class ResultatsSemestre:
 
     def store(self):
         "Cache our data"
-        "Cache our dataframes"
         ResultatsSemestreCache.set(
             self.formsemestre.id,
             {attr: getattr(self, attr) for attr in self._cached_attrs},
@@ -58,7 +65,7 @@ class ResultatsSemestre:
     def compute(self):
         "Charge les notes et inscriptions et calcule toutes les moyennes"
         # voir ce qui est chargé / calculé ici et dans les sous-classes
-        TODO
+        raise NotImplementedError()
 
     @cached_property
     def etuds(self):
@@ -78,9 +85,22 @@ class ResultatsSemestre:
 
     @cached_property
     def modimpls(self):
-        "Liste des modimpls du semestre (triée par numéro de module)"
+        """Liste des modimpls du semestre
+        - triée par numéro de module en APC
+        - triée par numéros d'UE/matières/modules pour les formations standard.
+        """
         modimpls = self.formsemestre.modimpls.all()
-        modimpls.sort(key=lambda m: m.module.numero)
+        if self.is_apc:
+            modimpls.sort(key=lambda m: (m.module.numero, m.module.code))
+        else:
+            modimpls.sort(
+                key=lambda m: (
+                    m.module.ue.numero,
+                    m.module.matiere.numero,
+                    m.module.numero,
+                    m.module.code,
+                )
+            )
         return modimpls
 
     @cached_property
@@ -96,32 +116,6 @@ class ResultatsSemestre:
         return [m for m in self.modimpls if m.module.module_type == scu.ModuleType.SAE]
 
 
-class StatsMoyenne:
-    """Une moyenne d'un ensemble étudiants sur quelque chose
-    (moyenne générale d'un semestre, d'un module, d'un groupe...)
-    et les statistiques associées: min, max, moy, effectif
-    """
-
-    def __init__(self, vals):
-        """Calcul les statistiques.
-        Les valeurs NAN ou non numériques sont toujours enlevées.
-        """
-        self.moy = np.nanmean(vals)
-        self.min = np.nanmin(vals)
-        self.max = np.nanmax(vals)
-        self.size = len(vals)
-        self.nb_vals = self.size - np.count_nonzero(np.isnan(vals))
-
-    def to_dict(self):
-        return {
-            "min": self.min,
-            "max": self.max,
-            "moy": self.moy,
-            "size": self.size,
-            "nb_vals": self.nb_vals,
-        }
-
-
 # Pour raccorder le code des anciens codes qui attendent une NoteTable
 class NotesTableCompat(ResultatsSemestre):
     """Implementation partielle de NotesTable WIP TODO
@@ -158,11 +152,22 @@ class NotesTableCompat(ResultatsSemestre):
             ues.append(d)
         return ues
 
-    def get_modimpls(self):
-        return [m.to_dict() for m in self.results.modimpls]
+    def get_modimpls_dict(self, ue_id=None):
+        """Liste des modules pour une UE (ou toutes si ue_id==None),
+        triés par numéros (selon le type de formation)
+        """
+        if ue_id is None:
+            return [m.to_dict() for m in self.modimpls]
+        else:
+            return [m.to_dict() for m in self.modimpls if m.module.ue.id == ue_id]
 
-    def get_etud_moy_gen(self, etudid):
-        return self.results.etud_moy_gen[etudid]
+    def get_etud_moy_gen(self, etudid):  # -> float | str
+        """Moyenne générale de cet etudiant dans ce semestre.
+        Prend en compte les UE capitalisées. (TODO)
+        Si apc, moyenne indicative.
+        Si pas de notes: 'NA'
+        """
+        return self.etud_moy_gen[etudid]
 
     def get_moduleimpls_attente(self):
         return []  # XXX TODO
diff --git a/app/models/etudiants.py b/app/models/etudiants.py
index 0ae36bd28..220bf28be 100644
--- a/app/models/etudiants.py
+++ b/app/models/etudiants.py
@@ -4,7 +4,9 @@
     et données rattachées (adresses, annotations, ...)
 """
 
-from flask import g, url_for
+from functools import cached_property
+from flask import abort, url_for
+from flask import g, request
 
 from app import db
 from app import models
@@ -53,14 +55,24 @@ class Identite(db.Model):
     def __repr__(self):
         return f"<Etud {self.id} {self.nom} {self.prenom}>"
 
+    @classmethod
+    def from_request(cls, etudid=None, code_nip=None):
+        """Etudiant à partir de l'etudid ou du code_nip, soit
+        passés en argument soit retrouvés directement dans la requête web.
+        Erreur 404 si inexistant.
+        """
+        args = make_etud_args(etudid=etudid, code_nip=code_nip)
+        return Identite.query.filter_by(**args).first_or_404()
+
+    @property
     def civilite_str(self):
         """returns 'M.' ou 'Mme' ou '' (pour le genre neutre,
         personnes ne souhaitant pas d'affichage).
         """
         return {"M": "M.", "F": "Mme", "X": ""}[self.civilite]
 
-    def nom_disp(self):
-        "nom à afficher"
+    def nom_disp(self) -> str:
+        "Nom à afficher"
         if self.nom_usuel:
             return (
                 (self.nom_usuel + " (" + self.nom + ")") if self.nom else self.nom_usuel
@@ -68,8 +80,33 @@ class Identite(db.Model):
         else:
             return self.nom
 
+    @cached_property
+    def nomprenom(self, reverse=False) -> str:
+        """Civilité/nom/prenom pour affichages: "M. Pierre Dupont"
+        Si reverse, "Dupont Pierre", sans civilité.
+        """
+        nom = self.nom_usuel or self.nom
+        prenom = self.prenom_str
+        if reverse:
+            fields = (nom, prenom)
+        else:
+            fields = (self.civilite_str, prenom, nom)
+        return " ".join([x for x in fields if x])
+
+    @property
+    def prenom_str(self):
+        """Prénom à afficher. Par exemple: "Jean-Christophe" """
+        if not self.prenom:
+            return ""
+        frags = self.prenom.split()
+        r = []
+        for frag in frags:
+            fields = frag.split("-")
+            r.append("-".join([x.lower().capitalize() for x in fields]))
+        return " ".join(r)
+
     def get_first_email(self, field="email") -> str:
-        "le mail associé à la première adrese de l'étudiant, ou None"
+        "Le mail associé à la première adrese de l'étudiant, ou None"
         return self.adresses[0].email or None if self.adresses.count() > 0 else None
 
     def to_dict_bul(self, include_urls=True):
@@ -120,6 +157,42 @@ class Identite(db.Model):
         return False
 
 
+def make_etud_args(
+    etudid=None, code_nip=None, use_request=True, raise_exc=False, abort_404=True
+) -> dict:
+    """forme args dict pour requete recherche etudiant
+    On peut specifier etudid
+    ou bien (si use_request) cherche dans la requete http: etudid, code_nip, code_ine
+    (dans cet ordre).
+
+    Résultat: dict avec soit "etudid", soit "code_nip", soit "code_ine"
+    """
+    args = None
+    if etudid:
+        args = {"etudid": etudid}
+    elif code_nip:
+        args = {"code_nip": code_nip}
+    elif use_request:  # use form from current request (Flask global)
+        if request.method == "POST":
+            vals = request.form
+        elif request.method == "GET":
+            vals = request.args
+        else:
+            vals = {}
+        if "etudid" in vals:
+            args = {"etudid": int(vals["etudid"])}
+        elif "code_nip" in vals:
+            args = {"code_nip": str(vals["code_nip"])}
+        elif "code_ine" in vals:
+            args = {"code_ine": str(vals["code_ine"])}
+    if not args:
+        if abort_404:
+            abort(404, "pas d'étudiant sélectionné")
+        elif raise_exc:
+            raise ValueError("make_etud_args: pas d'étudiant sélectionné !")
+    return args
+
+
 class Adresse(db.Model):
     """Adresse d'un étudiant
     (le modèle permet plusieurs adresses, mais l'UI n'en gère qu'une seule)
diff --git a/app/models/moduleimpls.py b/app/models/moduleimpls.py
index 172fe0767..fe48555ef 100644
--- a/app/models/moduleimpls.py
+++ b/app/models/moduleimpls.py
@@ -50,7 +50,7 @@ class ModuleImpl(db.Model):
         if evaluations_poids is None:
             from app.comp import moy_mod
 
-            evaluations_poids, _ = moy_mod.df_load_evaluations_poids(self.id)
+            evaluations_poids, _ = moy_mod.load_evaluations_poids(self.id)
             df_cache.EvaluationsPoidsCache.set(self.id, evaluations_poids)
         return evaluations_poids
 
@@ -69,7 +69,7 @@ class ModuleImpl(db.Model):
             return True
         from app.comp import moy_mod
 
-        return moy_mod.check_moduleimpl_conformity(
+        return moy_mod.moduleimpl_is_conforme(
             self,
             self.get_evaluations_poids(),
             self.module.formation.get_module_coefs(self.module.semestre_id),
diff --git a/app/scodoc/notes_table.py b/app/scodoc/notes_table.py
index 69c37694f..abbfec96b 100644
--- a/app/scodoc/notes_table.py
+++ b/app/scodoc/notes_table.py
@@ -296,7 +296,7 @@ class NotesTable:
             for ue in self._ues:
                 is_cap[ue["ue_id"]] = ue_status[ue["ue_id"]]["is_capitalized"]
 
-            for modimpl in self.get_modimpls():
+            for modimpl in self.get_modimpls_dict():
                 val = self.get_etud_mod_moy(modimpl["moduleimpl_id"], etudid)
                 if is_cap[modimpl["module"]["ue_id"]]:
                     t.append("-c-")
@@ -428,8 +428,8 @@ class NotesTable:
         else:
             return [ue for ue in self._ues if ue["type"] != UE_SPORT]
 
-    def get_modimpls(self, ue_id=None):
-        "liste des modules pour une UE (ou toutes si ue_id==None), triés par matières."
+    def get_modimpls_dict(self, ue_id=None):
+        "Liste des modules pour une UE (ou toutes si ue_id==None), triés par matières."
         if ue_id is None:
             r = self._modimpls
         else:
@@ -564,7 +564,7 @@ class NotesTable:
         Si non inscrit, moy == 'NI' et sum_coefs==0
         """
         assert ue_id
-        modimpls = self.get_modimpls(ue_id)
+        modimpls = self.get_modimpls_dict(ue_id)
         nb_notes = 0  # dans cette UE
         sum_notes = 0.0
         sum_coefs = 0.0
@@ -921,7 +921,7 @@ class NotesTable:
 
         return infos
 
-    def get_etud_moy_gen(self, etudid):
+    def get_etud_moy_gen(self, etudid):  # -> float | str
         """Moyenne generale de cet etudiant dans ce semestre.
         Prend en compte les UE capitalisées.
         Si pas de notes: 'NA'
diff --git a/app/scodoc/sco_abs_views.py b/app/scodoc/sco_abs_views.py
index c719df312..27de71d7d 100644
--- a/app/scodoc/sco_abs_views.py
+++ b/app/scodoc/sco_abs_views.py
@@ -32,6 +32,8 @@ import datetime
 
 from flask import url_for, g, request, abort
 
+from app import log
+from app.models import Identite
 import app.scodoc.sco_utils as scu
 from app.scodoc import notesdb as ndb
 from app.scodoc.scolog import logdb
@@ -46,7 +48,6 @@ from app.scodoc import sco_groups
 from app.scodoc import sco_moduleimpl
 from app.scodoc import sco_photos
 from app.scodoc import sco_preferences
-from app import log
 from app.scodoc.sco_exceptions import ScoValueError
 
 
@@ -71,8 +72,8 @@ def doSignaleAbsence(
         etudid: etudiant concerné. Si non spécifié, cherche dans
         les paramètres de la requête courante.
     """
-    etud = sco_etud.get_etud_info(filled=True, etudid=etudid)[0]
-    etudid = etud["etudid"]
+    etud = Identite.from_request(etudid)
+
     if not moduleimpl_id:
         moduleimpl_id = None
     description_abs = description
@@ -82,7 +83,7 @@ def doSignaleAbsence(
     for jour in dates:
         if demijournee == 2:
             sco_abs.add_absence(
-                etudid,
+                etud.id,
                 jour,
                 False,
                 estjust,
@@ -90,7 +91,7 @@ def doSignaleAbsence(
                 moduleimpl_id,
             )
             sco_abs.add_absence(
-                etudid,
+                etud.id,
                 jour,
                 True,
                 estjust,
@@ -100,7 +101,7 @@ def doSignaleAbsence(
             nbadded += 2
         else:
             sco_abs.add_absence(
-                etudid,
+                etud.id,
                 jour,
                 demijournee,
                 estjust,
@@ -113,27 +114,27 @@ def doSignaleAbsence(
         J = ""
     else:
         J = "NON "
-    M = ""
+    indication_module = ""
     if moduleimpl_id and moduleimpl_id != "NULL":
         mod = sco_moduleimpl.moduleimpl_list(moduleimpl_id=moduleimpl_id)[0]
         formsemestre_id = mod["formsemestre_id"]
         nt = sco_cache.NotesTableCache.get(formsemestre_id)
         ues = nt.get_ues_stat_dict()
         for ue in ues:
-            modimpls = nt.get_modimpls(ue_id=ue["ue_id"])
+            modimpls = nt.get_modimpls_dict(ue_id=ue["ue_id"])
             for modimpl in modimpls:
                 if modimpl["moduleimpl_id"] == moduleimpl_id:
-                    M = "dans le module %s" % modimpl["module"]["code"]
+                    indication_module = "dans le module %s" % modimpl["module"]["code"]
     H = [
         html_sco_header.sco_header(
-            page_title="Signalement d'une absence pour %(nomprenom)s" % etud,
+            page_title=f"Signalement d'une absence pour {etud.nomprenom}",
         ),
         """<h2>Signalement d'absences</h2>""",
     ]
     if dates:
         H.append(
             """<p>Ajout de %d absences <b>%sjustifiées</b> du %s au %s %s</p>"""
-            % (nbadded, J, datedebut, datefin, M)
+            % (nbadded, J, datedebut, datefin, indication_module)
         )
     else:
         H.append(
@@ -142,11 +143,18 @@ def doSignaleAbsence(
         )
 
     H.append(
-        """<ul><li><a href="SignaleAbsenceEtud?etudid=%(etudid)s">Autre absence pour <b>%(nomprenom)s</b></a></li>
-                    <li><a href="CalAbs?etudid=%(etudid)s">Calendrier de ses absences</a></li>
-                </ul>
-              <hr>"""
-        % etud
+        f"""<ul>
+        <li><a href="{url_for("absences.SignaleAbsenceEtud", 
+            scodoc_dept=g.scodoc_dept, etudid=etud.id
+        )}">Autre absence pour <b>{etud.nomprenom}</b></a>
+        </li>
+        <li><a href="{url_for("absences.CalAbs", 
+            scodoc_dept=g.scodoc_dept, etudid=etud.id
+        )}">Calendrier de ses absences</a>
+        </li>
+        </ul>
+        <hr>
+        """
     )
     H.append(sco_find_etud.form_search_etud())
     H.append(html_sco_header.sco_footer())
@@ -200,7 +208,7 @@ def SignaleAbsenceEtud():  # etudid implied
         menu_module += """<option value="" selected>(Module)</option>"""
 
         for ue in ues:
-            modimpls = nt.get_modimpls(ue_id=ue["ue_id"])
+            modimpls = nt.get_modimpls_dict(ue_id=ue["ue_id"])
             for modimpl in modimpls:
                 menu_module += (
                     """<option value="%(modimpl_id)s">%(modname)s</option>\n"""
diff --git a/app/scodoc/sco_apogee_csv.py b/app/scodoc/sco_apogee_csv.py
index 94c2f86e0..74a9823dd 100644
--- a/app/scodoc/sco_apogee_csv.py
+++ b/app/scodoc/sco_apogee_csv.py
@@ -456,7 +456,7 @@ class ApoEtud(dict):
                     return VOID_APO_RES
 
         # Elements Modules
-        modimpls = nt.get_modimpls()
+        modimpls = nt.get_modimpls_dict()
         module_code_found = False
         for modimpl in modimpls:
             if code in modimpl["module"]["code_apogee"].split(","):
@@ -978,7 +978,7 @@ class ApoData(object):
                         s.add(code)
                         continue
                 # associé à un module:
-                modimpls = nt.get_modimpls()
+                modimpls = nt.get_modimpls_dict()
                 for modimpl in modimpls:
                     if code in modimpl["module"]["code_apogee"].split(","):
                         s.add(code)
diff --git a/app/scodoc/sco_bulletins.py b/app/scodoc/sco_bulletins.py
index 7990ead8d..0a3fd9598 100644
--- a/app/scodoc/sco_bulletins.py
+++ b/app/scodoc/sco_bulletins.py
@@ -219,7 +219,7 @@ def formsemestre_bulletinetud_dict(formsemestre_id, etudid, version="long"):
 
     # --- Notes
     ues = nt.get_ues_stat_dict()
-    modimpls = nt.get_modimpls()
+    modimpls = nt.get_modimpls_dict()
     moy_gen = nt.get_etud_moy_gen(etudid)
     I["nb_inscrits"] = len(nt.etud_moy_gen_ranks)
     I["moy_gen"] = scu.fmt_note(moy_gen)
@@ -352,7 +352,7 @@ def formsemestre_bulletinetud_dict(formsemestre_id, etudid, version="long"):
                     etudid,
                     formsemestre_id,
                     ue_status["capitalized_ue_id"],
-                    nt_cap.get_modimpls(),
+                    nt_cap.get_modimpls_dict(),
                     nt_cap,
                     version,
                 )
diff --git a/app/scodoc/sco_bulletins_json.py b/app/scodoc/sco_bulletins_json.py
index 6900a450c..5300d6a26 100644
--- a/app/scodoc/sco_bulletins_json.py
+++ b/app/scodoc/sco_bulletins_json.py
@@ -154,7 +154,7 @@ def formsemestre_bulletinetud_published_dict(
         partitions_etud_groups[pid] = sco_groups.get_etud_groups_in_partition(pid)
 
     ues = nt.get_ues_stat_dict()
-    modimpls = nt.get_modimpls()
+    modimpls = nt.get_modimpls_dict()
     nbetuds = len(nt.etud_moy_gen_ranks)
     mg = scu.fmt_note(nt.get_etud_moy_gen(etudid))
     if (
diff --git a/app/scodoc/sco_bulletins_xml.py b/app/scodoc/sco_bulletins_xml.py
index a0d14a136..4e3f0fcee 100644
--- a/app/scodoc/sco_bulletins_xml.py
+++ b/app/scodoc/sco_bulletins_xml.py
@@ -152,7 +152,7 @@ def make_xml_formsemestre_bulletinetud(
 
     nt = sco_cache.NotesTableCache.get(formsemestre_id)  # > toutes notes
     ues = nt.get_ues_stat_dict()
-    modimpls = nt.get_modimpls()
+    modimpls = nt.get_modimpls_dict()
     nbetuds = len(nt.etud_moy_gen_ranks)
     mg = scu.fmt_note(nt.get_etud_moy_gen(etudid))
     if (
diff --git a/app/scodoc/sco_etud.py b/app/scodoc/sco_etud.py
index 7dc30c829..8771eced7 100644
--- a/app/scodoc/sco_etud.py
+++ b/app/scodoc/sco_etud.py
@@ -38,7 +38,7 @@ from flask_mail import Message
 
 from app import email
 from app import log
-
+from app.models.etudiants import make_etud_args
 import app.scodoc.sco_utils as scu
 import app.scodoc.notesdb as ndb
 from app.scodoc.sco_exceptions import ScoGenError, ScoValueError
@@ -87,6 +87,8 @@ def force_uppercase(s):
 def format_nomprenom(etud, reverse=False):
     """Formatte civilité/nom/prenom pour affichages: "M. Pierre Dupont"
     Si reverse, "Dupont Pierre", sans civilité.
+
+    DEPRECATED: utiliser Identite.nomprenom
     """
     nom = etud.get("nom_disp", "") or etud.get("nom_usuel", "") or etud["nom"]
     prenom = format_prenom(etud["prenom"])
@@ -99,7 +101,9 @@ def format_nomprenom(etud, reverse=False):
 
 
 def format_prenom(s):
-    "Formatte prenom etudiant pour affichage"
+    """Formatte prenom etudiant pour affichage
+    DEPRECATED: utiliser Identite.prenom_str
+    """
     if not s:
         return ""
     frags = s.split()
@@ -590,35 +594,6 @@ etudident_edit = _etudidentEditor.edit
 etudident_create = _etudidentEditor.create
 
 
-def make_etud_args(etudid=None, code_nip=None, use_request=True, raise_exc=True):
-    """forme args dict pour requete recherche etudiant
-    On peut specifier etudid
-    ou bien (si use_request) cherche dans la requete http: etudid, code_nip, code_ine
-    (dans cet ordre).
-    """
-    args = None
-    if etudid:
-        args = {"etudid": etudid}
-    elif code_nip:
-        args = {"code_nip": code_nip}
-    elif use_request:  # use form from current request (Flask global)
-        if request.method == "POST":
-            vals = request.form
-        elif request.method == "GET":
-            vals = request.args
-        else:
-            vals = {}
-        if "etudid" in vals:
-            args = {"etudid": int(vals["etudid"])}
-        elif "code_nip" in vals:
-            args = {"code_nip": str(vals["code_nip"])}
-        elif "code_ine" in vals:
-            args = {"code_ine": str(vals["code_ine"])}
-    if not args and raise_exc:
-        raise ValueError("getEtudInfo: no parameter !")
-    return args
-
-
 def log_unknown_etud():
     """Log request: cas ou getEtudInfo n'a pas ramene de resultat"""
     etud_args = make_etud_args(raise_exc=False)
diff --git a/app/scodoc/sco_liste_notes.py b/app/scodoc/sco_liste_notes.py
index 6da2e3f8c..3ac60a223 100644
--- a/app/scodoc/sco_liste_notes.py
+++ b/app/scodoc/sco_liste_notes.py
@@ -240,7 +240,7 @@ def _make_table_notes(
     if is_apc:
         modimpl = ModuleImpl.query.get(moduleimpl_id)
         is_conforme = modimpl.check_apc_conformity()
-        evals_poids, ues = moy_mod.df_load_evaluations_poids(moduleimpl_id)
+        evals_poids, ues = moy_mod.load_evaluations_poids(moduleimpl_id)
         if not ues:
             is_apc = False
     else:
diff --git a/app/scodoc/sco_page_etud.py b/app/scodoc/sco_page_etud.py
index 573d79455..a16fab1e3 100644
--- a/app/scodoc/sco_page_etud.py
+++ b/app/scodoc/sco_page_etud.py
@@ -36,6 +36,7 @@ from flask_login import current_user
 import app.scodoc.sco_utils as scu
 import app.scodoc.notesdb as ndb
 from app import log
+from app.models.etudiants import make_etud_args
 from app.scodoc import html_sco_header
 from app.scodoc import htmlutils
 from app.scodoc import sco_archives_etud
@@ -156,7 +157,7 @@ def ficheEtud(etudid=None):
         # la sidebar est differente s'il y a ou pas un etudid
         # voir html_sidebar.sidebar()
         g.etudid = etudid
-    args = sco_etud.make_etud_args(etudid=etudid)
+    args = make_etud_args(etudid=etudid)
     etuds = sco_etud.etudident_list(cnx, args)
     if not etuds:
         log("ficheEtud: etudid=%s request.args=%s" % (etudid, request.args))
diff --git a/app/scodoc/sco_poursuite_dut.py b/app/scodoc/sco_poursuite_dut.py
index 94772dfe9..8a36f685e 100644
--- a/app/scodoc/sco_poursuite_dut.py
+++ b/app/scodoc/sco_poursuite_dut.py
@@ -75,7 +75,7 @@ def etud_get_poursuite_info(sem, etud):
                 ]
 
                 # Moyennes et rang des modules
-                modimpls = nt.get_modimpls()  # recupération des modules
+                modimpls = nt.get_modimpls_dict()  # recupération des modules
                 modules = []
                 rangs = []
                 for ue in ues:  # on parcourt chaque UE
diff --git a/app/scodoc/sco_recapcomplet.py b/app/scodoc/sco_recapcomplet.py
index ddcdc9548..cfd3634ec 100644
--- a/app/scodoc/sco_recapcomplet.py
+++ b/app/scodoc/sco_recapcomplet.py
@@ -302,10 +302,8 @@ def make_formsemestre_recapcomplet(
     sem = sco_formsemestre.do_formsemestre_list(
         args={"formsemestre_id": formsemestre_id}
     )[0]
-    nt = sco_cache.NotesTableCache.get(
-        formsemestre_id
-    )  # >  get_modimpls, get_ues_stat_dict, get_table_moyennes_triees, get_etud_decision_sem, get_etud_etat, get_etud_rang, get_nom_short, get_mod_stats, nt.moy_moy, get_etud_decision_sem,
-    modimpls = nt.get_modimpls()
+    nt = sco_cache.NotesTableCache.get(formsemestre_id)
+    modimpls = nt.get_modimpls_dict()
     ues = nt.get_ues_stat_dict()  # incluant le(s) UE de sport
     #
     if formsemestre.formation.is_apc():
diff --git a/app/scodoc/sco_tag_module.py b/app/scodoc/sco_tag_module.py
index 50ec8f01c..88040957b 100644
--- a/app/scodoc/sco_tag_module.py
+++ b/app/scodoc/sco_tag_module.py
@@ -270,7 +270,7 @@ def get_etud_tagged_modules(etudid, tagname):
     R = []
     for sem in etud["sems"]:
         nt = sco_cache.NotesTableCache.get(sem["formsemestre_id"])
-        modimpls = nt.get_modimpls()
+        modimpls = nt.get_modimpls_dict()
         for modimpl in modimpls:
             tags = module_tag_list(module_id=modimpl["module_id"])
             if tagname in tags:
diff --git a/app/templates/sidebar.html b/app/templates/sidebar.html
index ba55e6886..3334dbb6a 100644
--- a/app/templates/sidebar.html
+++ b/app/templates/sidebar.html
@@ -3,96 +3,92 @@
 <div class="sidebar">
     {# sidebar_common #}
     <a class="scodoc_title" href="{{
-        url_for("scodoc.index", scodoc_dept=g.scodoc_dept)
-    }}">ScoDoc 9.1</a>
+        url_for("scodoc.index", scodoc_dept=g.scodoc_dept) }}">ScoDoc 9.2a</a>
     <div id="authuser"><a id="authuserlink" href="{{
-            url_for("users.user_info_page", 
-            scodoc_dept=g.scodoc_dept, user_name=current_user.user_name)
-        }}">{{current_user.user_name}}</a>
-        <br/><a id="deconnectlink" href="{{url_for("auth.logout")}}">déconnexion</a>
+            url_for("users.user_info_page", scodoc_dept=g.scodoc_dept, user_name=current_user.user_name)
+            }}">{{current_user.user_name}}</a>
+        <br /><a id="deconnectlink" href="{{url_for("auth.logout")}}">déconnexion</a>
     </div>
 
     {% block sidebar_dept %}
     <h2 class="insidebar">Dépt. {{ sco.prefs["DeptName"] }}</h2>
     <a href="{{ url_for('scolar.index_html', scodoc_dept=g.scodoc_dept) }}" class="sidebar">Accueil</a> <br />
     {% if sco.prefs["DeptIntranetURL"] %}
-    <a href="{{ sco.prefs["DeptIntranetURL"] }}" class="sidebar">
+    <a href="{{ sco.prefs[" DeptIntranetURL"] }}" class="sidebar">
         {{ sco.prefs["DeptIntranetTitle"] }}</a>
     {% endif %}
-    <br />
+    <br>
     {% endblock %}
 
     <h2 class="insidebar">Scolarité</h2>
-    <a href="{{url_for("scolar.index_html", scodoc_dept=g.scodoc_dept)}}" class="sidebar">Semestres</a> <br/> 
-    <a href="{{url_for("notes.index_html", scodoc_dept=g.scodoc_dept)}}" class="sidebar">Programmes</a> <br/> 
-    <a href="{{url_for("absences.index_html", scodoc_dept=g.scodoc_dept)}}" class="sidebar">Absences</a> <br/>
+    <a href="{{url_for("scolar.index_html", scodoc_dept=g.scodoc_dept)}}" class="sidebar">Semestres</a> <br>
+    <a href="{{url_for("notes.index_html", scodoc_dept=g.scodoc_dept)}}" class="sidebar">Programmes</a> <br>
+    <a href="{{url_for("absences.index_html", scodoc_dept=g.scodoc_dept)}}" class="sidebar">Absences</a> <br>
 
-    {% if current_user.has_permission(sco.Permission.ScoUsersAdmin) 
-        or current_user.has_permission(sco.Permission.ScoUsersView)
+    {% if current_user.has_permission(sco.Permission.ScoUsersAdmin)
+    or current_user.has_permission(sco.Permission.ScoUsersView)
     %}
-    <a href="{{url_for("users.index_html", scodoc_dept=g.scodoc_dept)}}" class="sidebar">Utilisateurs</a> <br/>
+    <a href="{{url_for("users.index_html", scodoc_dept=g.scodoc_dept)}}" class="sidebar">Utilisateurs</a> <br />
     {% endif %}
 
     {% if current_user.has_permission(sco.Permission.ScoChangePreferences) %}
-    <a href="{{url_for("scolar.edit_preferences", scodoc_dept=g.scodoc_dept)}}" 
-            class="sidebar">Paramétrage</a> <br/>
+    <a href="{{url_for("scolar.edit_preferences", scodoc_dept=g.scodoc_dept)}}" class="sidebar">Paramétrage</a> <br>
     {% endif %}
     {# /sidebar_common #}
 
-    <div class="box-chercheetud">Chercher étudiant:<br/>
-     <form method="get" id="form-chercheetud" 
-      action="{{ url_for('scolar.search_etud_in_dept', scodoc_dept=g.scodoc_dept) }}">
-      <div>
-       <input type="text" size="12" id="in-expnom" name="expnom" spellcheck="false"/>
-      </div>
-     </form>
+    <div class="box-chercheetud">Chercher étudiant:<br>
+        <form method="get" id="form-chercheetud"
+            action="{{ url_for('scolar.search_etud_in_dept', scodoc_dept=g.scodoc_dept) }}">
+            <div>
+                <input type="text" size="12" id="in-expnom" name="expnom" spellcheck="false" />
+            </div>
+        </form>
     </div>
 
     <div class="etud-insidebar">
-    {% if sco.etud %}
-    <h2 id="insidebar-etud"><a href="{{url_for(
-            "scolar.ficheEtud", scodoc_dept=g.scodoc_dept, etudid=sco.etud.id
-        )}}" class="sidebar">
-        <span class="fontred">{{sco.etud.civilite_str()}} {{sco.etud.nom_disp()}}</span></a>
-    </h2>
-    <b>Absences</b>
+        {% if sco.etud %}
+        <h2 id="insidebar-etud"><a href="{{url_for(
+            "scolar.ficheEtud", scodoc_dept=g.scodoc_dept, etudid=sco.etud.id )}}" class="sidebar">
+                <span class="fontred">{{sco.etud.nomprenom}}</span></a>
+        </h2>
+        <b>Absences</b>
         {% if sco.etud_cur_sem %}
         <span title="absences du {{ sco.etud_cur_sem['date_debut'] }}
         au {{ sco.etud_cur_sem['date_fin'] }}">(1/2 j.)
-                <br/>{{sco.nbabsjust}} J., {{sco.nbabsnj}} N.J.</span>
+            <br />{{sco.nbabsjust}} J., {{sco.nbabsnj}} N.J.</span>
         {% endif %}
-    <ul>
-    {% if current_user.has_permission(sco.Permission.ScoAbsChange) %}
-      <li><a href="{{ url_for('absences.SignaleAbsenceEtud', scodoc_dept=g.scodoc_dept,
+        <ul>
+            {% if current_user.has_permission(sco.Permission.ScoAbsChange) %}
+            <li><a href="{{ url_for('absences.SignaleAbsenceEtud', scodoc_dept=g.scodoc_dept,
                     etudid=sco.etud.id) }}">Ajouter</a></li>
-      <li><a href="{{ url_for('absences.JustifAbsenceEtud', scodoc_dept=g.scodoc_dept,
+            <li><a href="{{ url_for('absences.JustifAbsenceEtud', scodoc_dept=g.scodoc_dept,
                     etudid=sco.etud.id) }}">Justifier</a></li>
-      <li><a href="{{ url_for('absences.AnnuleAbsenceEtud', scodoc_dept=g.scodoc_dept, 
+            <li><a href="{{ url_for('absences.AnnuleAbsenceEtud', scodoc_dept=g.scodoc_dept, 
                     etudid=sco.etud.id) }}">Supprimer</a></li>
-      {% if sco.prefs["handle_billets_abs"] %}
-      <li><a href="{{ url_for('absences.listeBilletsEtud', scodoc_dept=g.scodoc_dept, 
+            {% if sco.prefs["handle_billets_abs"] %}
+            <li><a href="{{ url_for('absences.listeBilletsEtud', scodoc_dept=g.scodoc_dept, 
                     etudid=sco.etud.id) }}">Billets</a></li>
-      {% endif %}
-    {% endif %}
-      <li><a href="{{ url_for('absences.CalAbs', scodoc_dept=g.scodoc_dept, 
+            {% endif %}
+            {% endif %}
+            <li><a href="{{ url_for('absences.CalAbs', scodoc_dept=g.scodoc_dept, 
                     etudid=sco.etud.id) }}">Calendrier</a></li>
-      <li><a href="{{ url_for('absences.ListeAbsEtud', scodoc_dept=g.scodoc_dept, 
+            <li><a href="{{ url_for('absences.ListeAbsEtud', scodoc_dept=g.scodoc_dept, 
                     etudid=sco.etud.id) }}">Liste</a></li>
-    </ul>
-    {% endif %}
-    </div>  {# /etud-insidebar #}
+        </ul>
+        {% endif %}
+    </div> {# /etud-insidebar #}
 
     {# LOGO #}
     <div class="logo-insidebar">
         <div class="sidebar-bottom"><a href="{{ url_for( 'scodoc.about', 
         scodoc_dept=g.scodoc_dept ) }}" class="sidebar">À propos</a>
-        <br/>
-        <a href="{{ sco.scu.SCO_USER_MANUAL }}" target="_blank" class="sidebar">Aide</a>
+            <br />
+            <a href="{{ sco.scu.SCO_USER_MANUAL }}" target="_blank" class="sidebar">Aide</a>
         </div>
     </div>
     <div class="logo-logo">
         <a href="{{ url_for( 'scodoc.about', scodoc_dept=g.scodoc_dept ) }}">
-                {{ sco.scu.icontag("scologo_img", no_size=True) | safe}}</a>
+            {{ sco.scu.icontag("scologo_img", no_size=True) | safe}}</a>
     </div>
 </div>
 <!-- end of sidebar -->
\ No newline at end of file
diff --git a/app/views/absences.py b/app/views/absences.py
index edb2204cb..37753d671 100644
--- a/app/views/absences.py
+++ b/app/views/absences.py
@@ -431,7 +431,7 @@ def SignaleAbsenceGrHebdo(
     modimpls_list = []
     ues = nt.get_ues_stat_dict()
     for ue in ues:
-        modimpls_list += nt.get_modimpls(ue_id=ue["ue_id"])
+        modimpls_list += nt.get_modimpls_dict(ue_id=ue["ue_id"])
 
     menu_module = ""
     for modimpl in modimpls_list:
@@ -599,7 +599,7 @@ def SignaleAbsenceGrSemestre(
         modimpls_list = []
         ues = nt.get_ues_stat_dict()
         for ue in ues:
-            modimpls_list += nt.get_modimpls(ue_id=ue["ue_id"])
+            modimpls_list += nt.get_modimpls_dict(ue_id=ue["ue_id"])
 
         menu_module = ""
         for modimpl in modimpls_list:
diff --git a/app/views/scolar.py b/app/views/scolar.py
index b83dbcace..f79c5798d 100644
--- a/app/views/scolar.py
+++ b/app/views/scolar.py
@@ -41,6 +41,7 @@ from flask_wtf import FlaskForm
 from flask_wtf.file import FileField, FileAllowed
 from wtforms import SubmitField
 
+from app import log
 from app.decorators import (
     scodoc,
     scodoc7func,
@@ -50,12 +51,12 @@ from app.decorators import (
     login_required,
 )
 from app.models.etudiants import Identite
+from app.models.etudiants import make_etud_args
 
 from app.views import scolar_bp as bp
 
 import app.scodoc.sco_utils as scu
 import app.scodoc.notesdb as ndb
-from app import log
 from app.scodoc.scolog import logdb
 from app.scodoc.sco_permissions import Permission
 from app.scodoc.sco_exceptions import (
@@ -455,7 +456,7 @@ def etud_info(etudid=None, format="xml"):
     if not format in ("xml", "json"):
         raise ScoValueError("format demandé non supporté par cette fonction.")
     t0 = time.time()
-    args = sco_etud.make_etud_args(etudid=etudid)
+    args = make_etud_args(etudid=etudid)
     cnx = ndb.GetDBConnexion()
     etuds = sco_etud.etudident_list(cnx, args)
     if not etuds:
diff --git a/pylintrc b/pylintrc
index 057a85cd0..21454d07e 100644
--- a/pylintrc
+++ b/pylintrc
@@ -19,3 +19,5 @@ ignored-classes=Permission,
 # and thus existing member attributes cannot be deduced by static analysis). It
 # supports qualified module names, as well as Unix pattern matching.
 ignored-modules=entreprises
+
+good-names=d,e,f,i,j,k,t,u,v,x,y,z,H,F,ue
\ No newline at end of file
diff --git a/sco_version.py b/sco_version.py
index bc906576b..84e9b0f57 100644
--- a/sco_version.py
+++ b/sco_version.py
@@ -1,7 +1,7 @@
 # -*- mode: python -*-
 # -*- coding: utf-8 -*-
 
-SCOVERSION = "9.1.16"
+SCOVERSION = "9.2.0a"
 
 SCONAME = "ScoDoc"
 
diff --git a/tests/unit/test_but_modules.py b/tests/unit/test_but_modules.py
index a73c98bbc..07705c211 100644
--- a/tests/unit/test_but_modules.py
+++ b/tests/unit/test_but_modules.py
@@ -4,6 +4,8 @@ et calcul moyennes modules
 """
 import numpy as np
 import pandas as pd
+from app.models.modules import Module
+from app.models.moduleimpls import ModuleImpl
 
 from tests.unit import setup
 from app import db
@@ -135,70 +137,72 @@ def test_module_conformity(test_client):
     )
     assert isinstance(modules_coefficients, pd.DataFrame)
     assert modules_coefficients.shape == (nb_ues, nb_mods)
-    evals_poids, ues = moy_mod.df_load_evaluations_poids(evaluation.moduleimpl_id)
+    evals_poids, ues = moy_mod.load_evaluations_poids(evaluation.moduleimpl_id)
     assert isinstance(evals_poids, pd.DataFrame)
     assert len(ues) == nb_ues
     assert all(evals_poids.dtypes == np.float64)
     assert evals_poids.shape == (nb_evals, nb_ues)
-    assert not moy_mod.check_moduleimpl_conformity(
+    assert not moy_mod.moduleimpl_is_conforme(
         evaluation.moduleimpl, evals_poids, modules_coefficients
     )
 
 
-def test_module_moy_elem(test_client):
-    """Vérification calcul moyenne d'un module
-    (notes entrées dans un DataFrame sans passer par ScoDoc)
-    """
-    # Création de deux évaluations:
-    e1 = Evaluation(note_max=20.0, coefficient=1.0)
-    e2 = Evaluation(note_max=20.0, coefficient=1.0)
-    db.session.add(e1)
-    db.session.add(e2)
-    db.session.commit()
-    # Repris du notebook CalculNotesBUT.ipynb
-    data = [  # Les notes de chaque étudiant dans les 2 evals:
-        {
-            e1.id: 11.0,
-            e2.id: 16.0,
-        },
-        {
-            e1.id: None,  # une absence
-            e2.id: 17.0,
-        },
-        {
-            e1.id: 13.0,
-            e2.id: NOTES_NEUTRALISE,  # une abs EXC
-        },
-        {
-            e1.id: 14.0,
-            e2.id: 19.0,
-        },
-        {
-            e1.id: NOTES_ATTENTE,  # une ATT (traitée comme EXC)
-            e2.id: None,  # et une ABS
-        },
-    ]
-    evals_notes_df = pd.DataFrame(
-        data, index=["etud1", "etud2", "etud3", "etud4", "etud5"]
-    )
-    # Poids des évaluations (1 ligne / évaluation)
-    data = [
-        {"UE1": 1, "UE2": 0, "UE3": 0},
-        {"UE1": 2, "UE2": 5, "UE3": 0},
-    ]
-    evals_poids_df = pd.DataFrame(data, index=[e1.id, e2.id], dtype=float)
-    evaluations = [e1, e2]
-    etuds_moy_module_df = moy_mod.compute_module_moy(
-        evals_notes_df.fillna(0.0), evals_poids_df, evaluations, [True, True]
-    )
-    NAN = 666.0  # pour pouvoir comparer NaN et NaN (car NaN != NaN)
-    r = etuds_moy_module_df.fillna(NAN)
-    assert tuple(r.loc["etud1"]) == (14 + 1 / 3, 16.0, NAN)
-    assert tuple(r.loc["etud2"]) == (11 + 1 / 3, 17.0, NAN)
-    assert tuple(r.loc["etud3"]) == (13, NAN, NAN)
-    assert tuple(r.loc["etud4"]) == (17 + 1 / 3, 19, NAN)
-    assert tuple(r.loc["etud5"]) == (0.0, 0.0, NAN)
-    # note: les notes UE3 sont toutes NAN car les poids vers l'UE3 sont nuls
+# En ScoDoc 9.2  test ne peut plus exister car compute_module_moy
+# est maintenant incorporé dans la classe ModuleImplResultsAPC
+# def test_module_moy_elem(test_client):
+#     """Vérification calcul moyenne d'un module
+#     (notes entrées dans un DataFrame sans passer par ScoDoc)
+#     """
+#     # Création de deux évaluations:
+#     e1 = Evaluation(note_max=20.0, coefficient=1.0)
+#     e2 = Evaluation(note_max=20.0, coefficient=1.0)
+#     db.session.add(e1)
+#     db.session.add(e2)
+#     db.session.flush()
+#     # Repris du notebook CalculNotesBUT.ipynb
+#     data = [  # Les notes de chaque étudiant dans les 2 evals:
+#         {
+#             e1.id: 11.0,
+#             e2.id: 16.0,
+#         },
+#         {
+#             e1.id: None,  # une absence
+#             e2.id: 17.0,
+#         },
+#         {
+#             e1.id: 13.0,
+#             e2.id: NOTES_NEUTRALISE,  # une abs EXC
+#         },
+#         {
+#             e1.id: 14.0,
+#             e2.id: 19.0,
+#         },
+#         {
+#             e1.id: NOTES_ATTENTE,  # une ATT (traitée comme EXC)
+#             e2.id: None,  # et une ABS
+#         },
+#     ]
+#     evals_notes_df = pd.DataFrame(
+#         data, index=["etud1", "etud2", "etud3", "etud4", "etud5"]
+#     )
+#     # Poids des évaluations (1 ligne / évaluation)
+#     data = [
+#         {"UE1": 1, "UE2": 0, "UE3": 0},
+#         {"UE1": 2, "UE2": 5, "UE3": 0},
+#     ]
+#     evals_poids_df = pd.DataFrame(data, index=[e1.id, e2.id], dtype=float)
+#     evaluations = [e1, e2]
+#     etuds_moy_module_df = moy_mod.compute_module_moy(
+#         evals_notes_df.fillna(0.0), evals_poids_df, evaluations, [True, True]
+#     )
+#     NAN = 666.0  # pour pouvoir comparer NaN et NaN (car NaN != NaN)
+#     r = etuds_moy_module_df.fillna(NAN)
+#     assert tuple(r.loc["etud1"]) == (14 + 1 / 3, 16.0, NAN)
+#     assert tuple(r.loc["etud2"]) == (11 + 1 / 3, 17.0, NAN)
+#     assert tuple(r.loc["etud3"]) == (13, NAN, NAN)
+#     assert tuple(r.loc["etud4"]) == (17 + 1 / 3, 19, NAN)
+#     assert tuple(r.loc["etud5"]) == (0.0, 0.0, NAN)
+#     # note: les notes UE3 sont toutes NAN car les poids vers l'UE3 sont nuls
 
 
 def test_module_moy(test_client):
@@ -237,7 +241,7 @@ def test_module_moy(test_client):
     nb_evals = models.Evaluation.query.filter_by(moduleimpl_id=moduleimpl_id).count()
     assert nb_evals == 2
     nb_ues = 3
-
+    modimpl = ModuleImpl.query.get(moduleimpl_id)
     # --- Change les notes et recalcule les moyennes du module
     # (rappel: on a deux évaluations: evaluation1, evaluation2, et un seul étudiant)
     def change_notes(n1, n2):
@@ -245,17 +249,14 @@ def test_module_moy(test_client):
         _ = sco_saisie_notes.notes_add(G.default_user, evaluation1.id, [(etudid, n1)])
         _ = sco_saisie_notes.notes_add(G.default_user, evaluation2.id, [(etudid, n2)])
         # Calcul de la moyenne du module
-        evals_poids, ues = moy_mod.df_load_evaluations_poids(moduleimpl_id)
+        evals_poids, ues = moy_mod.load_evaluations_poids(moduleimpl_id)
         assert evals_poids.shape == (nb_evals, nb_ues)
-        evals_notes, evaluations, evaluations_completes = moy_mod.df_load_modimpl_notes(
-            moduleimpl_id
-        )
-        assert evals_notes[evaluations[0].id].dtype == np.float64
-        assert evaluation1.id == evaluations[0].id
-        assert evaluation2.id == evaluations[1].id
-        etuds_moy_module = moy_mod.compute_module_moy(
-            evals_notes, evals_poids, evaluations, evaluations_completes
-        )
+
+        mod_results = moy_mod.ModuleImplResultsAPC(modimpl)
+        evals_notes = mod_results.evals_notes
+        assert evals_notes[evaluation1.id].dtype == np.float64
+
+        etuds_moy_module = mod_results.compute_module_moy(evals_poids)
         return etuds_moy_module
 
     # --- Notes ordinaires:
diff --git a/tests/unit/test_but_ues.py b/tests/unit/test_but_ues.py
index d27463f40..947e2f11c 100644
--- a/tests/unit/test_but_ues.py
+++ b/tests/unit/test_but_ues.py
@@ -69,7 +69,7 @@ def test_ue_moy(test_client):
         _ = sco_saisie_notes.notes_add(G.default_user, evaluation1.id, [(etudid, n1)])
         _ = sco_saisie_notes.notes_add(G.default_user, evaluation2.id, [(etudid, n2)])
         # Recalcul des moyennes
-        sem_cube, _, _, _, _ = moy_ue.notes_sem_load_cube(formsemestre)
+        sem_cube, _, _ = moy_ue.notes_sem_load_cube(formsemestre)
         etuds = formsemestre.etuds.all()
         etud_moy_ue = moy_ue.compute_ue_moys(
             sem_cube, etuds, modimpls, ues, modimpl_inscr_df, modimpl_coefs_df
@@ -112,7 +112,7 @@ def test_ue_moy(test_client):
         exception_raised = True
     assert exception_raised
     # Recalcule les notes:
-    sem_cube, _, _, _, _ = moy_ue.notes_sem_load_cube(formsemestre)
+    sem_cube, _, _ = moy_ue.notes_sem_load_cube(formsemestre)
     etuds = formsemestre.etuds.all()
     etud_moy_ue = moy_ue.compute_ue_moys(
         sem_cube, etuds, modimpls, ues, modimpl_inscr_df, modimpl_coefs_df

From 25deaaae7f702d23b41e792fac018d53d3eb9ef9 Mon Sep 17 00:00:00 2001
From: Emmanuel Viennet <emmanuel.viennet@gmail.com>
Date: Tue, 28 Dec 2021 16:17:07 +0100
Subject: [PATCH 03/10] Add modeline to all jinja2 templates

---
 app/templates/about.html                      |  1 +
 app/templates/auth/change_password.html       |  1 +
 app/templates/auth/login.html                 |  1 +
 app/templates/auth/register.html              |  1 +
 app/templates/auth/reset_password.html        |  3 +-
 .../auth/reset_password_request.html          |  1 +
 app/templates/auth/toogle_active_user.html    |  1 +
 app/templates/auth/user_info_page.html        | 53 ++++++++++---------
 app/templates/base.html                       |  1 +
 app/templates/but/bulletin.html               |  1 +
 app/templates/but/refcomp_assoc.html          |  1 +
 app/templates/but/refcomp_load.html           |  1 +
 app/templates/but/refcomp_show.html           |  1 +
 app/templates/but/refcomp_table.html          |  1 +
 app/templates/config_dept.html                |  1 +
 app/templates/configuration.html              |  1 +
 app/templates/create_dept.html                |  1 +
 app/templates/error_500.html                  |  6 ++-
 app/templates/error_access_denied.html        |  1 +
 app/templates/formsemestre_header.html        |  1 +
 app/templates/main/index.html                 |  1 +
 app/templates/pn/form_descr.html              |  1 +
 app/templates/pn/form_mods.html               |  1 +
 app/templates/pn/form_modules_ue_coefs.html   |  1 +
 app/templates/pn/form_ues.html                |  1 +
 app/templates/pn/ue_infos.html                |  1 +
 app/templates/sco_page.html                   |  1 +
 app/templates/sco_value_error.html            |  1 +
 app/templates/scodoc.html                     |  3 +-
 app/templates/scolar/affect_groups.html       |  2 +-
 app/templates/scolar/photos_import_files.html |  1 +
 app/templates/scolar/photos_import_files.txt  |  2 +-
 app/templates/sidebar.html                    | 19 +++----
 app/templates/sidebar_dept.html               |  1 +
 34 files changed, 74 insertions(+), 41 deletions(-)

diff --git a/app/templates/about.html b/app/templates/about.html
index 2dc506915..0b2eed389 100644
--- a/app/templates/about.html
+++ b/app/templates/about.html
@@ -1,3 +1,4 @@
+{# -*- mode: jinja-html -*- #}
 {% extends 'base.html' %}
 {% import 'bootstrap/wtf.html' as wtf %}
 
diff --git a/app/templates/auth/change_password.html b/app/templates/auth/change_password.html
index 2bec77622..57db80c71 100644
--- a/app/templates/auth/change_password.html
+++ b/app/templates/auth/change_password.html
@@ -1,3 +1,4 @@
+{# -*- mode: jinja-html -*- #}
 {% extends "base.html" %}
 {% import 'bootstrap/wtf.html' as wtf %}
 
diff --git a/app/templates/auth/login.html b/app/templates/auth/login.html
index d636e053e..1764e2d23 100644
--- a/app/templates/auth/login.html
+++ b/app/templates/auth/login.html
@@ -1,3 +1,4 @@
+{# -*- mode: jinja-html -*- #}
 {% extends 'base.html' %}
 {% import 'bootstrap/wtf.html' as wtf %}
 
diff --git a/app/templates/auth/register.html b/app/templates/auth/register.html
index 35e6a2abd..3c720079c 100644
--- a/app/templates/auth/register.html
+++ b/app/templates/auth/register.html
@@ -1,3 +1,4 @@
+{# -*- mode: jinja-html -*- #}
 {% extends "base.html" %}
 {% import 'bootstrap/wtf.html' as wtf %}
 
diff --git a/app/templates/auth/reset_password.html b/app/templates/auth/reset_password.html
index 261e37db0..fdf1215aa 100644
--- a/app/templates/auth/reset_password.html
+++ b/app/templates/auth/reset_password.html
@@ -1,3 +1,4 @@
+{# -*- mode: jinja-html -*- #}
 {% extends "base.html" %}
 {% import 'bootstrap/wtf.html' as wtf %}
 
@@ -5,7 +6,7 @@
 <h1>Changez votre mot de passe ScoDoc</h1>
 
 <div class="row" style="margin-top: 30px;">
-<div class="col-md-4">Votre identifiant: <b>{{user.user_name}}</b></div>
+    <div class="col-md-4">Votre identifiant: <b>{{user.user_name}}</b></div>
 </div>
 
 <div class="row" style="margin-top: 30px;">
diff --git a/app/templates/auth/reset_password_request.html b/app/templates/auth/reset_password_request.html
index 99a37fb2f..a5b661558 100644
--- a/app/templates/auth/reset_password_request.html
+++ b/app/templates/auth/reset_password_request.html
@@ -1,3 +1,4 @@
+{# -*- mode: jinja-html -*- #}
 {% extends "base.html" %}
 {% import 'bootstrap/wtf.html' as wtf %}
 
diff --git a/app/templates/auth/toogle_active_user.html b/app/templates/auth/toogle_active_user.html
index d5ec678d4..381531007 100644
--- a/app/templates/auth/toogle_active_user.html
+++ b/app/templates/auth/toogle_active_user.html
@@ -1,3 +1,4 @@
+{# -*- mode: jinja-html -*- #}
 {% extends "base.html" %}
 {% import 'bootstrap/wtf.html' as wtf %}
 
diff --git a/app/templates/auth/user_info_page.html b/app/templates/auth/user_info_page.html
index 695929991..8a287c01d 100644
--- a/app/templates/auth/user_info_page.html
+++ b/app/templates/auth/user_info_page.html
@@ -1,3 +1,4 @@
+{# -*- mode: jinja-html -*- #}
 {% extends "base.html" %}
 {% import 'bootstrap/wtf.html' as wtf %}
 
@@ -5,16 +6,16 @@
 
 <h2>Utilisateur: {{user.user_name}} ({{'actif' if user.active else 'fermé'}})</h2>
 <p>
-<b>Login :</b> {{user.user_name}}<br/>
-<b>Nom :</b> {{user.nom or ""}}<br/>
-<b>Prénom :</b> {{user.prenom or ""}}<br/>
-<b>Mail :</b> {{user.email}}<br/>
-<b>Roles :</b> {{user.get_roles_string()}}<br/>
-<b>Dept :</b> {{user.dept or ""}}<br/>
-<b>Dernière modif mot de passe:</b> 
-{{user.date_modif_passwd.isoformat() if user.date_modif_passwd else ""}}<br/>
-<b>Date d'expiration:</b> 
-{{user.date_expiration.isoformat() if user.date_expiration else "(sans limite)"}}
+    <b>Login :</b> {{user.user_name}}<br>
+    <b>Nom :</b> {{user.nom or ""}}<br>
+    <b>Prénom :</b> {{user.prenom or ""}}<br>
+    <b>Mail :</b> {{user.email}}<br>
+    <b>Roles :</b> {{user.get_roles_string()}}<br>
+    <b>Dept :</b> {{user.dept or ""}}<br>
+    <b>Dernière modif mot de passe:</b>
+    {{user.date_modif_passwd.isoformat() if user.date_modif_passwd else ""}}<br>
+    <b>Date d'expiration:</b>
+    {{user.date_expiration.isoformat() if user.date_expiration else "(sans limite)"}}
 <p>
 <ul>
     <li><a class="stdlink" href="{{
@@ -27,33 +28,33 @@
             url_for('users.create_user_form', scodoc_dept=g.scodoc_dept, 
             user_name=user.user_name, edit=1)
         }}">modifier ce compte</a>
-        </li>
-        <li><a class="stdlink" href="{{
+    </li>
+    <li><a class="stdlink" href="{{
             url_for('users.toggle_active_user', scodoc_dept=g.scodoc_dept, 
             user_name=user.user_name)
         }}">{{"désactiver" if user.active else "activer"}} ce compte</a>
-        </li>
+    </li>
     {% endif %}
 </ul>
 
 {% if current_user.id == user.id %}
-<p><b>Se déconnecter: 
-<a class="stdlink" href="{{url_for('auth.logout')}}">logout</a>
-</b></p>
+<p><b>Se déconnecter:
+        <a class="stdlink" href="{{url_for('auth.logout')}}">logout</a>
+    </b></p>
 {% endif %}
 
 {# Liste des permissions #}
 <div class="permissions">
-<p>Permissions de cet utilisateur dans le département {dept}:</p>
-<ul>
-{% for p in Permission.description %}
-    <li>{{Permission.description[p]}} : 
-    {{
-        "oui" if user.has_permission(Permission.get_by_name(p), dept) else "non"
-    }}
-    </li>
-{% endfor %}
-</ul>
+    <p>Permissions de cet utilisateur dans le département {dept}:</p>
+    <ul>
+        {% for p in Permission.description %}
+        <li>{{Permission.description[p]}} :
+            {{
+            "oui" if user.has_permission(Permission.get_by_name(p), dept) else "non"
+            }}
+        </li>
+        {% endfor %}
+    </ul>
 </div>
 
 {% if current_user.has_permission(Permission.ScoUsersAdmin, dept) %}
diff --git a/app/templates/base.html b/app/templates/base.html
index 815ba7b76..adf70171b 100644
--- a/app/templates/base.html
+++ b/app/templates/base.html
@@ -1,3 +1,4 @@
+{# -*- mode: jinja-html -*- #}
 {% extends 'bootstrap/base.html' %}
 
 {% block styles %}
diff --git a/app/templates/but/bulletin.html b/app/templates/but/bulletin.html
index 27146ed4a..ff0682fce 100644
--- a/app/templates/but/bulletin.html
+++ b/app/templates/but/bulletin.html
@@ -1,3 +1,4 @@
+{# -*- mode: jinja-html -*- #}
 {% extends "sco_page.html" %}
 
 {% block styles %}
diff --git a/app/templates/but/refcomp_assoc.html b/app/templates/but/refcomp_assoc.html
index 1b30d4636..9f8335be2 100644
--- a/app/templates/but/refcomp_assoc.html
+++ b/app/templates/but/refcomp_assoc.html
@@ -1,3 +1,4 @@
+{# -*- mode: jinja-html -*- #}
 {% extends "base.html" %}
 {% import 'bootstrap/wtf.html' as wtf %}
 
diff --git a/app/templates/but/refcomp_load.html b/app/templates/but/refcomp_load.html
index caac1a5e3..9bf70470b 100644
--- a/app/templates/but/refcomp_load.html
+++ b/app/templates/but/refcomp_load.html
@@ -1,3 +1,4 @@
+{# -*- mode: jinja-html -*- #}
 {% extends "base.html" %}
 {% import 'bootstrap/wtf.html' as wtf %}
 
diff --git a/app/templates/but/refcomp_show.html b/app/templates/but/refcomp_show.html
index 07e45543f..fb7357d21 100644
--- a/app/templates/but/refcomp_show.html
+++ b/app/templates/but/refcomp_show.html
@@ -1,3 +1,4 @@
+{# -*- mode: jinja-html -*- #}
 {% extends "sco_page.html" %}
 
 {% block app_content %}
diff --git a/app/templates/but/refcomp_table.html b/app/templates/but/refcomp_table.html
index 2095dc9ff..6c7b05f0c 100644
--- a/app/templates/but/refcomp_table.html
+++ b/app/templates/but/refcomp_table.html
@@ -1,3 +1,4 @@
+{# -*- mode: jinja-html -*- #}
 {% extends "sco_page.html" %}
 {% import 'bootstrap/wtf.html' as wtf %}
 
diff --git a/app/templates/config_dept.html b/app/templates/config_dept.html
index c602c5f32..bb5ed80c1 100644
--- a/app/templates/config_dept.html
+++ b/app/templates/config_dept.html
@@ -1,3 +1,4 @@
+{# -*- mode: jinja-html -*- #}
 {% macro render_field(field) %}
 <div>
     <span class="wtf-field">{{ field.label }} :</span>
diff --git a/app/templates/configuration.html b/app/templates/configuration.html
index b874d48db..d4df6ed4a 100644
--- a/app/templates/configuration.html
+++ b/app/templates/configuration.html
@@ -1,3 +1,4 @@
+{# -*- mode: jinja-html -*- #}
 {% extends 'base.html' %}
 {% import 'bootstrap/wtf.html' as wtf %}
 
diff --git a/app/templates/create_dept.html b/app/templates/create_dept.html
index 4e3f8a467..7745af7a0 100644
--- a/app/templates/create_dept.html
+++ b/app/templates/create_dept.html
@@ -1,3 +1,4 @@
+{# -*- mode: jinja-html -*- #}
 {% extends "base.html" %}
 {% import 'bootstrap/wtf.html' as wtf %}
 
diff --git a/app/templates/error_500.html b/app/templates/error_500.html
index d986a00da..23a5c6095 100644
--- a/app/templates/error_500.html
+++ b/app/templates/error_500.html
@@ -1,11 +1,13 @@
+{# -*- mode: jinja-html -*- #}
 {% extends 'base.html' %}
 {% import 'bootstrap/wtf.html' as wtf %}
 
 {% block title %}Une erreur est survenue !{% endblock %}
 {% block body %}
 <h1>Une erreur est survenue !</h1>
-<p>Oups...</tt> <span style="color:red;"><b>ScoDoc version <span style="font-size: 120%;">{{SCOVERSION}}</span></b></span> a
-    un problème, désolé.</p>
+<p>Oups...</tt> <span style="color:red;"><b>ScoDoc version
+    <span style="font-size: 120%;">{{SCOVERSION}}</span></b></span> 
+    a un problème, désolé.</p>
 <p><tt style="font-size:60%">{{date}}</tt></p>
 
 <p> Si le problème persiste, contacter l'administrateur de votre site,
diff --git a/app/templates/error_access_denied.html b/app/templates/error_access_denied.html
index 5a765b761..516361d5c 100644
--- a/app/templates/error_access_denied.html
+++ b/app/templates/error_access_denied.html
@@ -1,3 +1,4 @@
+{# -*- mode: jinja-html -*- #}
 {% extends 'base.html' %}
 {% import 'bootstrap/wtf.html' as wtf %}
 
diff --git a/app/templates/formsemestre_header.html b/app/templates/formsemestre_header.html
index 441a32872..aa8464ef4 100644
--- a/app/templates/formsemestre_header.html
+++ b/app/templates/formsemestre_header.html
@@ -1,3 +1,4 @@
+{# -*- mode: jinja-html -*- #}
 {# Description un semestre (barre de menu et infos) #}
 <!-- formsemestre_header -->
 <div class="formsemestre_page_title">
diff --git a/app/templates/main/index.html b/app/templates/main/index.html
index 6e21ac465..35005c95d 100644
--- a/app/templates/main/index.html
+++ b/app/templates/main/index.html
@@ -1,3 +1,4 @@
+{# -*- mode: jinja-html -*- #}
 {% extends 'base.html' %}
 {% import 'bootstrap/wtf.html' as wtf %}
 
diff --git a/app/templates/pn/form_descr.html b/app/templates/pn/form_descr.html
index 347180257..6a0cda4ea 100644
--- a/app/templates/pn/form_descr.html
+++ b/app/templates/pn/form_descr.html
@@ -1,3 +1,4 @@
+{# -*- mode: jinja-html -*- #}
 {# Chapeau description d'une formation #}
 
 <div class="formation_descr">
diff --git a/app/templates/pn/form_mods.html b/app/templates/pn/form_mods.html
index 90faee024..cba283478 100644
--- a/app/templates/pn/form_mods.html
+++ b/app/templates/pn/form_mods.html
@@ -1,3 +1,4 @@
+{# -*- mode: jinja-html -*- #}
 {# Édition liste modules APC (SAÉ ou ressources) #}
 
 <div class="formation_list_modules formation_list_modules_{{module_type.name}}">
diff --git a/app/templates/pn/form_modules_ue_coefs.html b/app/templates/pn/form_modules_ue_coefs.html
index c94fe60c1..186a8e7fd 100644
--- a/app/templates/pn/form_modules_ue_coefs.html
+++ b/app/templates/pn/form_modules_ue_coefs.html
@@ -1,3 +1,4 @@
+{# -*- mode: jinja-html -*- #}
 <h2>Édition des coefficients des modules vers les UEs</h2>
 <div class="help">
     Double-cliquer pour changer une valeur.
diff --git a/app/templates/pn/form_ues.html b/app/templates/pn/form_ues.html
index 69d698391..cc9812dc5 100644
--- a/app/templates/pn/form_ues.html
+++ b/app/templates/pn/form_ues.html
@@ -1,3 +1,4 @@
+{# -*- mode: jinja-html -*- #}
 {# Édition liste UEs APC #}
 <div class="formation_list_ues">
     <div class="formation_list_ues_titre">Unités d'Enseignement (UEs)</div>
diff --git a/app/templates/pn/ue_infos.html b/app/templates/pn/ue_infos.html
index f1757c734..b45c0b9bc 100644
--- a/app/templates/pn/ue_infos.html
+++ b/app/templates/pn/ue_infos.html
@@ -1,3 +1,4 @@
+{# -*- mode: jinja-html -*- #}
 {# Informations sur une UE #}
 {% extends "sco_page.html" %}
 
diff --git a/app/templates/sco_page.html b/app/templates/sco_page.html
index 249bfb39e..e593d9c0c 100644
--- a/app/templates/sco_page.html
+++ b/app/templates/sco_page.html
@@ -1,3 +1,4 @@
+{# -*- mode: jinja-html -*- #}
 {% extends 'bootstrap/base.html' %}
 
 {% block styles %}
diff --git a/app/templates/sco_value_error.html b/app/templates/sco_value_error.html
index 9b7f3b547..36ed8d206 100644
--- a/app/templates/sco_value_error.html
+++ b/app/templates/sco_value_error.html
@@ -1,3 +1,4 @@
+{# -*- mode: jinja-html -*- #}
 {% extends 'base.html' %}
 {% import 'bootstrap/wtf.html' as wtf %}
 
diff --git a/app/templates/scodoc.html b/app/templates/scodoc.html
index 2aaf9e22c..2b8255e51 100644
--- a/app/templates/scodoc.html
+++ b/app/templates/scodoc.html
@@ -1,3 +1,4 @@
+{# -*- mode: jinja-html -*- #}
 {% extends 'base.html' %}
 {% import 'bootstrap/wtf.html' as wtf %}
 
@@ -23,7 +24,7 @@
     </li>
     {% endfor %}
     {% if current_user.is_administrator() %}
-        <li><a href="{{ url_for('scodoc.create_dept') }}">créer un nouveau département</a></li>
+    <li><a href="{{ url_for('scodoc.create_dept') }}">créer un nouveau département</a></li>
     {% endif %}
 </ul>
 
diff --git a/app/templates/scolar/affect_groups.html b/app/templates/scolar/affect_groups.html
index 56393575d..2dc3a1f60 100644
--- a/app/templates/scolar/affect_groups.html
+++ b/app/templates/scolar/affect_groups.html
@@ -1,4 +1,4 @@
-
+{# -*- mode: jinja-html -*- #}
 {{ sco_header|safe }}
 <h2 class="formsemestre">Affectation aux groupes de {{ partition["partition_name"] }}</h2>
 
diff --git a/app/templates/scolar/photos_import_files.html b/app/templates/scolar/photos_import_files.html
index f4bae574a..460d7d7e4 100644
--- a/app/templates/scolar/photos_import_files.html
+++ b/app/templates/scolar/photos_import_files.html
@@ -1,3 +1,4 @@
+{# -*- mode: jinja-html -*- #}
 {% extends 'base.html' %}
 
 {% block app_content %}
diff --git a/app/templates/scolar/photos_import_files.txt b/app/templates/scolar/photos_import_files.txt
index d9aab53ee..cb6777b5c 100755
--- a/app/templates/scolar/photos_import_files.txt
+++ b/app/templates/scolar/photos_import_files.txt
@@ -1,4 +1,4 @@
-
+{# -*- mode: jinja-raw -*- #}
 Importation des photo effectuée
 
 {% if ignored_zipfiles %}
diff --git a/app/templates/sidebar.html b/app/templates/sidebar.html
index 3334dbb6a..eb5df4afa 100644
--- a/app/templates/sidebar.html
+++ b/app/templates/sidebar.html
@@ -1,13 +1,14 @@
 {# Barre marge gauche ScoDoc #}
+{# -*- mode: jinja-html -*- #}
 <!-- sidebar -->
 <div class="sidebar">
     {# sidebar_common #}
     <a class="scodoc_title" href="{{
-        url_for("scodoc.index", scodoc_dept=g.scodoc_dept) }}">ScoDoc 9.2a</a>
+        url_for(" scodoc.index", scodoc_dept=g.scodoc_dept) }}">ScoDoc 9.2a</a>
     <div id="authuser"><a id="authuserlink" href="{{
-            url_for("users.user_info_page", scodoc_dept=g.scodoc_dept, user_name=current_user.user_name)
+            url_for(" users.user_info_page", scodoc_dept=g.scodoc_dept, user_name=current_user.user_name)
             }}">{{current_user.user_name}}</a>
-        <br /><a id="deconnectlink" href="{{url_for("auth.logout")}}">déconnexion</a>
+        <br /><a id="deconnectlink" href="{{url_for(" auth.logout")}}">déconnexion</a>
     </div>
 
     {% block sidebar_dept %}
@@ -21,18 +22,18 @@
     {% endblock %}
 
     <h2 class="insidebar">Scolarité</h2>
-    <a href="{{url_for("scolar.index_html", scodoc_dept=g.scodoc_dept)}}" class="sidebar">Semestres</a> <br>
-    <a href="{{url_for("notes.index_html", scodoc_dept=g.scodoc_dept)}}" class="sidebar">Programmes</a> <br>
-    <a href="{{url_for("absences.index_html", scodoc_dept=g.scodoc_dept)}}" class="sidebar">Absences</a> <br>
+    <a href="{{url_for(" scolar.index_html", scodoc_dept=g.scodoc_dept)}}" class="sidebar">Semestres</a> <br>
+    <a href="{{url_for(" notes.index_html", scodoc_dept=g.scodoc_dept)}}" class="sidebar">Programmes</a> <br>
+    <a href="{{url_for(" absences.index_html", scodoc_dept=g.scodoc_dept)}}" class="sidebar">Absences</a> <br>
 
     {% if current_user.has_permission(sco.Permission.ScoUsersAdmin)
     or current_user.has_permission(sco.Permission.ScoUsersView)
     %}
-    <a href="{{url_for("users.index_html", scodoc_dept=g.scodoc_dept)}}" class="sidebar">Utilisateurs</a> <br />
+    <a href="{{url_for(" users.index_html", scodoc_dept=g.scodoc_dept)}}" class="sidebar">Utilisateurs</a> <br />
     {% endif %}
 
     {% if current_user.has_permission(sco.Permission.ScoChangePreferences) %}
-    <a href="{{url_for("scolar.edit_preferences", scodoc_dept=g.scodoc_dept)}}" class="sidebar">Paramétrage</a> <br>
+    <a href="{{url_for(" scolar.edit_preferences", scodoc_dept=g.scodoc_dept)}}" class="sidebar">Paramétrage</a> <br>
     {% endif %}
     {# /sidebar_common #}
 
@@ -48,7 +49,7 @@
     <div class="etud-insidebar">
         {% if sco.etud %}
         <h2 id="insidebar-etud"><a href="{{url_for(
-            "scolar.ficheEtud", scodoc_dept=g.scodoc_dept, etudid=sco.etud.id )}}" class="sidebar">
+            " scolar.ficheEtud", scodoc_dept=g.scodoc_dept, etudid=sco.etud.id )}}" class="sidebar">
                 <span class="fontred">{{sco.etud.nomprenom}}</span></a>
         </h2>
         <b>Absences</b>
diff --git a/app/templates/sidebar_dept.html b/app/templates/sidebar_dept.html
index 2e694b438..d8458f51e 100644
--- a/app/templates/sidebar_dept.html
+++ b/app/templates/sidebar_dept.html
@@ -1,3 +1,4 @@
+{# -*- mode: jinja-html -*- #}
 <h2 class="insidebar"><a href="{{ 
     url_for('scolar.index_html', scodoc_dept=g.scodoc_dept) 
     }}">Dépt. {{ prefs["DeptName"] }}</a>

From 9b5b4777e25a2d02f9c4460b9af005452f3c2591 Mon Sep 17 00:00:00 2001
From: Emmanuel Viennet <emmanuel.viennet@gmail.com>
Date: Wed, 29 Dec 2021 19:30:49 +0100
Subject: [PATCH 04/10] Messages erreurs quand saisie champs trop longs

---
 app/models/absences.py                  |  3 ---
 app/models/entreprises.py               |  3 ---
 app/models/etudiants.py                 |  3 ---
 app/models/evaluations.py               |  3 ---
 app/models/events.py                    |  2 --
 app/models/groups.py                    |  2 --
 app/models/notes.py                     |  1 -
 app/scodoc/notesdb.py                   |  5 ++++-
 app/scodoc/sco_edit_formation.py        |  2 ++
 app/scodoc/sco_edit_module.py           | 12 +++++++-----
 app/scodoc/sco_edit_ue.py               |  2 ++
 app/scodoc/sco_formsemestre_edit.py     |  3 +++
 app/scodoc/sco_groups.py                |  6 +++++-
 app/static/js/groupmgr.js               |  4 ++++
 app/templates/scolar/affect_groups.html |  2 +-
 15 files changed, 28 insertions(+), 25 deletions(-)

diff --git a/app/models/absences.py b/app/models/absences.py
index 658a390de..bbff2c5cf 100644
--- a/app/models/absences.py
+++ b/app/models/absences.py
@@ -4,9 +4,6 @@
 """
 
 from app import db
-from app.models import APO_CODE_STR_LEN
-from app.models import SHORT_STR_LEN
-from app.models import CODE_STR_LEN
 
 
 class Absence(db.Model):
diff --git a/app/models/entreprises.py b/app/models/entreprises.py
index bdb5672a8..c5d05e934 100644
--- a/app/models/entreprises.py
+++ b/app/models/entreprises.py
@@ -4,9 +4,6 @@
 """
 
 from app import db
-from app.models import APO_CODE_STR_LEN
-from app.models import SHORT_STR_LEN
-from app.models import CODE_STR_LEN
 
 
 class Entreprise(db.Model):
diff --git a/app/models/etudiants.py b/app/models/etudiants.py
index 0ae36bd28..9c8457fac 100644
--- a/app/models/etudiants.py
+++ b/app/models/etudiants.py
@@ -8,9 +8,6 @@ from flask import g, url_for
 
 from app import db
 from app import models
-from app.models import APO_CODE_STR_LEN
-from app.models import SHORT_STR_LEN
-from app.models import CODE_STR_LEN
 
 
 class Identite(db.Model):
diff --git a/app/models/evaluations.py b/app/models/evaluations.py
index e0733fb77..4f06fb75f 100644
--- a/app/models/evaluations.py
+++ b/app/models/evaluations.py
@@ -4,9 +4,6 @@
 """
 
 from app import db
-from app.models import APO_CODE_STR_LEN
-from app.models import SHORT_STR_LEN
-from app.models import CODE_STR_LEN
 from app.models import UniteEns
 
 import app.scodoc.notesdb as ndb
diff --git a/app/models/events.py b/app/models/events.py
index 0cdd7e930..55b34d38d 100644
--- a/app/models/events.py
+++ b/app/models/events.py
@@ -4,9 +4,7 @@
 """
 
 from app import db
-from app.models import APO_CODE_STR_LEN
 from app.models import SHORT_STR_LEN
-from app.models import CODE_STR_LEN
 
 
 class Scolog(db.Model):
diff --git a/app/models/groups.py b/app/models/groups.py
index 688744b09..902298ccf 100644
--- a/app/models/groups.py
+++ b/app/models/groups.py
@@ -5,9 +5,7 @@
 from typing import Any
 
 from app import db
-from app.models import APO_CODE_STR_LEN
 from app.models import SHORT_STR_LEN
-from app.models import CODE_STR_LEN
 from app.models import GROUPNAME_STR_LEN
 
 
diff --git a/app/models/notes.py b/app/models/notes.py
index df2766d04..fa8dc8d10 100644
--- a/app/models/notes.py
+++ b/app/models/notes.py
@@ -4,7 +4,6 @@
 """
 
 from app import db
-from app.models import APO_CODE_STR_LEN
 from app.models import SHORT_STR_LEN
 from app.models import CODE_STR_LEN
 
diff --git a/app/scodoc/notesdb.py b/app/scodoc/notesdb.py
index 5418c3ce2..3de5c281f 100644
--- a/app/scodoc/notesdb.py
+++ b/app/scodoc/notesdb.py
@@ -265,8 +265,11 @@ def DBUpdateArgs(cnx, table, vals, where=None, commit=False, convert_empty_to_nu
         cursor.execute(req, vals)
         # log('req=%s\n'%req)
         # log('vals=%s\n'%vals)
+    except psycopg2.errors.StringDataRightTruncation:
+        cnx.rollback()
+        raise ScoValueError("champs de texte trop long !")
     except:
-        cnx.commit()  # get rid of this transaction
+        cnx.rollback()  # get rid of this transaction
         log('Exception in DBUpdateArgs:\n\treq="%s"\n\tvals="%s"\n' % (req, vals))
         raise  # and re-raise exception
     if commit:
diff --git a/app/scodoc/sco_edit_formation.py b/app/scodoc/sco_edit_formation.py
index bd01abaec..4901f494d 100644
--- a/app/scodoc/sco_edit_formation.py
+++ b/app/scodoc/sco_edit_formation.py
@@ -33,6 +33,7 @@ from flask import g, url_for, request
 
 from app import db
 from app import log
+from app.models import SHORT_STR_LEN
 from app.models.formations import Formation
 from app.models.modules import Module
 
@@ -209,6 +210,7 @@ def formation_edit(formation_id=None, create=False):
                     "size": 12,
                     "title": "Code formation",
                     "explanation": "code interne. Toutes les formations partageant le même code sont compatibles (compensation de semestres, capitalisation d'UE).  Laisser vide si vous ne savez pas, ou entrer le code d'une formation existante.",
+                    "validator": lambda val, _: len(val) < SHORT_STR_LEN,
                 },
             ),
             (
diff --git a/app/scodoc/sco_edit_module.py b/app/scodoc/sco_edit_module.py
index 24232164a..ee87f7e72 100644
--- a/app/scodoc/sco_edit_module.py
+++ b/app/scodoc/sco_edit_module.py
@@ -32,6 +32,7 @@ import flask
 from flask import url_for, render_template
 from flask import g, request
 from flask_login import current_user
+from app.models import APO_CODE_STR_LEN
 from app.models import Matiere, Module, UniteEns
 
 import app.scodoc.notesdb as ndb
@@ -397,21 +398,21 @@ def module_delete(module_id=None):
         return flask.redirect(dest_url)
 
 
-def do_module_edit(val):
+def do_module_edit(vals: dict) -> None:
     "edit a module"
     from app.scodoc import sco_edit_formation
 
     # check
-    mod = module_list({"module_id": val["module_id"]})[0]
+    mod = module_list({"module_id": vals["module_id"]})[0]
     if module_is_locked(mod["module_id"]):
         # formation verrouillée: empeche de modifier certains champs:
         protected_fields = ("coefficient", "ue_id", "matiere_id", "semestre_id")
         for f in protected_fields:
-            if f in val:
-                del val[f]
+            if f in vals:
+                del vals[f]
     # edit
     cnx = ndb.GetDBConnexion()
-    _moduleEditor.edit(cnx, val)
+    _moduleEditor.edit(cnx, vals)
     Formation.query.get(mod["formation_id"]).invalidate_cached_sems()
 
 
@@ -604,6 +605,7 @@ def module_edit(module_id=None):
                 "title": "Code Apogée",
                 "size": 25,
                 "explanation": "(optionnel) code élément pédagogique Apogée ou liste de codes ELP séparés par des virgules",
+                "validator": lambda val, _: len(val) < APO_CODE_STR_LEN,
             },
         ),
         (
diff --git a/app/scodoc/sco_edit_ue.py b/app/scodoc/sco_edit_ue.py
index cdc83a042..192ed8d3d 100644
--- a/app/scodoc/sco_edit_ue.py
+++ b/app/scodoc/sco_edit_ue.py
@@ -33,6 +33,7 @@ from flask import url_for, render_template
 from flask import g, request
 from flask_login import current_user
 
+from app.models import APO_CODE_STR_LEN
 from app.models import Formation, UniteEns, ModuleImpl, Module
 import app.scodoc.notesdb as ndb
 import app.scodoc.sco_utils as scu
@@ -324,6 +325,7 @@ def ue_edit(ue_id=None, create=False, formation_id=None):
                 "title": "Code Apogée",
                 "size": 25,
                 "explanation": "(optionnel) code élément pédagogique Apogée ou liste de codes ELP séparés par des virgules",
+                "validator": lambda val, _: len(val) < APO_CODE_STR_LEN,
             },
         ),
         (
diff --git a/app/scodoc/sco_formsemestre_edit.py b/app/scodoc/sco_formsemestre_edit.py
index 2f9308f7e..bf90fe26a 100644
--- a/app/scodoc/sco_formsemestre_edit.py
+++ b/app/scodoc/sco_formsemestre_edit.py
@@ -33,6 +33,7 @@ from flask_login import current_user
 
 from app import db
 from app.auth.models import User
+from app.models import APO_CODE_STR_LEN, SHORT_STR_LEN
 from app.models import ModuleImpl, Evaluation, EvaluationUEPoids
 import app.scodoc.notesdb as ndb
 import app.scodoc.sco_utils as scu
@@ -359,6 +360,7 @@ def do_formsemestre_createwithmodules(edit=False):
     mf_manual = {
         "size": 12,
         "template": '<tr%(item_dom_attr)s><td class="tf-fieldlabel">%(label)s</td><td class="tf-field">%(elem)s',
+        "validator": lambda val, _: len(val) < APO_CODE_STR_LEN,
     }
     if etapes:
         mf = {
@@ -495,6 +497,7 @@ def do_formsemestre_createwithmodules(edit=False):
                 "size": 8,
                 "title": "Couleur fond des bulletins",
                 "explanation": "version web seulement (ex: #ffeeee)",
+                "validator": lambda val, _: len(val) < SHORT_STR_LEN,
             },
         ),
         (
diff --git a/app/scodoc/sco_groups.py b/app/scodoc/sco_groups.py
index da46270d6..44aa77971 100644
--- a/app/scodoc/sco_groups.py
+++ b/app/scodoc/sco_groups.py
@@ -45,6 +45,7 @@ from flask import g, request
 from flask import url_for, make_response
 
 from app import db
+from app.models import GROUPNAME_STR_LEN, SHORT_STR_LEN
 from app.models.groups import Partition
 import app.scodoc.sco_utils as scu
 import app.scodoc.notesdb as ndb
@@ -870,10 +871,11 @@ def editPartitionForm(formsemestre_id=None):
             page_title="Partitions...",
             javascripts=["js/editPartitionForm.js"],
         ),
+        # limite à SHORT_STR_LEN
         r"""<script type="text/javascript">
           function checkname() {
  var val = document.editpart.partition_name.value.replace(/^\s+/, "").replace(/\s+$/, "");
- if (val.length > 0) {
+ if ((val.length > 0)&&(val.length < 32)) {
    document.editpart.ok.disabled = false;
  } else {
    document.editpart.ok.disabled = true;
@@ -1124,6 +1126,7 @@ def partition_rename(partition_id):
                     "default": partition["partition_name"],
                     "allow_null": False,
                     "size": 12,
+                    "validator": lambda val, _: len(val) < SHORT_STR_LEN,
                 },
             ),
         ),
@@ -1231,6 +1234,7 @@ def group_rename(group_id):
                     "default": group["group_name"],
                     "size": 12,
                     "allow_null": False,
+                    "validator": lambda val, _: len(val) < GROUPNAME_STR_LEN,
                 },
             ),
         ),
diff --git a/app/static/js/groupmgr.js b/app/static/js/groupmgr.js
index de0e512d7..690b7f522 100644
--- a/app/static/js/groupmgr.js
+++ b/app/static/js/groupmgr.js
@@ -256,6 +256,10 @@ function createGroup() {
         alert("Nom de groupe vide !");
         return false;
     }
+    if (group_name.length >= 32) { // SHORT_STR_LEN
+        alert("Nom de groupe trop long !");
+        return false;
+    }
     // check name:
     for (var group_id in groupBoxes) {
         if (group_id != 'extend') {
diff --git a/app/templates/scolar/affect_groups.html b/app/templates/scolar/affect_groups.html
index 56393575d..8d01eca3e 100644
--- a/app/templates/scolar/affect_groups.html
+++ b/app/templates/scolar/affect_groups.html
@@ -1,4 +1,4 @@
-
+{# -*- mode: jinja-html -*- #} 
 {{ sco_header|safe }}
 <h2 class="formsemestre">Affectation aux groupes de {{ partition["partition_name"] }}</h2>
 

From 1a472bd19df1c36eb9235f8a294678e5615c0f91 Mon Sep 17 00:00:00 2001
From: Emmanuel Viennet <emmanuel.viennet@gmail.com>
Date: Thu, 30 Dec 2021 23:58:38 +0100
Subject: [PATCH 05/10] WIP: unification calculs

---
 app/but/bulletin_but.py        |  43 +-------
 app/comp/moy_mod.py            |  98 +++++++++++++----
 app/comp/moy_sem.py            |   2 +-
 app/comp/moy_ue.py             |  88 +++++++++++++--
 app/comp/res_but.py            |  65 +++++++++++
 app/comp/res_classic.py        |  95 +++++++++++++++++
 app/comp/res_sem.py            | 190 ++++++++++++++++++++++++++-------
 app/models/etudiants.py        |  16 +++
 app/models/formsemestre.py     |   8 +-
 app/scodoc/notes_table.py      |   4 +-
 app/scodoc/sco_recapcomplet.py |   3 +
 tests/unit/test_but_ues.py     |   4 +-
 12 files changed, 503 insertions(+), 113 deletions(-)
 create mode 100644 app/comp/res_but.py
 create mode 100644 app/comp/res_classic.py

diff --git a/app/but/bulletin_but.py b/app/but/bulletin_but.py
index 658f8f634..e788d08c1 100644
--- a/app/but/bulletin_but.py
+++ b/app/but/bulletin_but.py
@@ -10,52 +10,11 @@
 import datetime
 from flask import url_for, g
 
-from app.comp import moy_ue, moy_sem, inscr_mod
 from app.scodoc import sco_utils as scu
 from app.scodoc import sco_bulletins_json
 from app.scodoc import sco_preferences
 from app.scodoc.sco_utils import fmt_note
-from app.comp.res_sem import ResultatsSemestre, NotesTableCompat
-
-
-class ResultatsSemestreBUT(NotesTableCompat):
-    """Résultats BUT: organisation des calculs"""
-
-    _cached_attrs = NotesTableCompat._cached_attrs + ()
-
-    def __init__(self, formsemestre):
-        super().__init__(formsemestre)
-
-        if not self.load_cached():
-            self.compute()
-            self.store()
-
-    def compute(self):
-        "Charge les notes et inscriptions et calcule toutes les moyennes"
-        (
-            self.sem_cube,
-            self.modimpls_evals_poids,
-            self.modimpls_results,
-        ) = moy_ue.notes_sem_load_cube(self.formsemestre)
-        self.modimpl_inscr_df = inscr_mod.df_load_modimpl_inscr(self.formsemestre)
-        self.modimpl_coefs_df, _, _ = moy_ue.df_load_modimpl_coefs(
-            self.formsemestre, ues=self.ues, modimpls=self.modimpls
-        )
-        # l'idx de la colonne du mod modimpl.id est
-        #       modimpl_coefs_df.columns.get_loc(modimpl.id)
-        # idx de l'UE: modimpl_coefs_df.index.get_loc(ue.id)
-        self.etud_moy_ue = moy_ue.compute_ue_moys(
-            self.sem_cube,
-            self.etuds,
-            self.modimpls,
-            self.ues,
-            self.modimpl_inscr_df,
-            self.modimpl_coefs_df,
-        )
-        self.etud_moy_gen = moy_sem.compute_sem_moys(
-            self.etud_moy_ue, self.modimpl_coefs_df
-        )
-        self.etud_moy_gen_ranks = moy_sem.comp_ranks_series(self.etud_moy_gen)
+from app.comp.res_but import ResultatsSemestreBUT
 
 
 class BulletinBUT(ResultatsSemestreBUT):
diff --git a/app/comp/moy_mod.py b/app/comp/moy_mod.py
index dc912c286..5b217b3fd 100644
--- a/app/comp/moy_mod.py
+++ b/app/comp/moy_mod.py
@@ -27,6 +27,8 @@
 
 """Fonctions de calcul des moyennes de modules (modules, ressources ou SAÉ)
 
+Pour les formations classiques et le BUT
+
 Rappel: pour éviter les confusions, on appelera *poids* les coefficients d'une
 évaluation dans un module, et *coefficients* ceux utilisés pour le calcul de la
 moyenne générale d'une UE.
@@ -49,10 +51,11 @@ class EvaluationEtat:
     is_complete: bool
 
 
-class ModuleImplResultsAPC:
-    """Les notes des étudiants d'un moduleimpl.
-    Les poids des évals sont à part car on a a besoin sans les notes pour les tableaux
-    de bord.
+class ModuleImplResults:
+    """Classe commune à toutes les formations (standard et APC).
+    Les notes des étudiants d'un moduleimpl.
+    Les poids des évals sont à part car on en a besoin sans les notes pour les
+    tableaux de bord.
     Les attributs sont tous des objets simples cachables dans Redis;
     les caches sont gérés par  ResultatsSemestre.
     """
@@ -181,6 +184,31 @@ class ModuleImplResultsAPC:
             )
         ]
 
+    def get_evaluations_coefs(self, moduleimpl: ModuleImpl) -> np.array:
+        """Coefficients des évaluations, met à zéro ceux des évals incomplètes.
+        Résultat: 2d-array of floats, shape (nb_evals, 1)
+        """
+        return (
+            np.array(
+                [e.coefficient for e in moduleimpl.evaluations],
+                dtype=float,
+            )
+            * self.evaluations_completes
+        ).reshape(-1, 1)
+
+    def get_eval_notes_sur_20(self, moduleimpl: ModuleImpl) -> np.array:
+        """Les notes des évaluations,
+        remplace les  ATT, EXC, ABS, NaN par zéro et mets les notes sur 20.
+        Résultat: 2d array of floats, shape nb_etuds x nb_evaluations
+        """
+        return np.where(
+            self.evals_notes.values > scu.NOTES_ABSENCE, self.evals_notes.values, 0.0
+        ) / [e.note_max / 20.0 for e in moduleimpl.evaluations]
+
+
+class ModuleImplResultsAPC(ModuleImplResults):
+    "Calcul des moyennes de modules à la mode BUT"
+
     def compute_module_moy(
         self,
         evals_poids_df: pd.DataFrame,
@@ -200,22 +228,14 @@ class ModuleImplResultsAPC:
         assert evals_poids_df.shape[0] == nb_evals  # compat notes/poids
         if nb_etuds == 0:
             return pd.DataFrame(index=[], columns=evals_poids_df.columns)
-        # Coefficients des évaluations, met à zéro ceux des évals incomplètes:
-        evals_coefs = (
-            np.array(
-                [e.coefficient for e in moduleimpl.evaluations],
-                dtype=float,
-            )
-            * self.evaluations_completes
-        ).reshape(-1, 1)
+        evals_coefs = self.get_evaluations_coefs(moduleimpl)
         evals_poids = evals_poids_df.values * evals_coefs
         # -> evals_poids shape : (nb_evals, nb_ues)
         assert evals_poids.shape == (nb_evals, nb_ues)
-        # Remplace les notes ATT, EXC, ABS, NaN par zéro et mets les notes sur 20:
-        evals_notes = np.where(
-            self.evals_notes.values > scu.NOTES_ABSENCE, self.evals_notes.values, 0.0
-        ) / [e.note_max / 20.0 for e in moduleimpl.evaluations]
-        # Les poids des évals pour les étudiant: là où il a des notes non neutralisées
+        evals_notes_20 = self.get_eval_notes_sur_20(moduleimpl)
+
+        # Les poids des évals pour chaque étudiant: là où il a des notes
+        # non neutralisées
         # (ABS n'est  pas neutralisée, mais ATTENTE et NEUTRALISE oui)
         # Note: les NaN sont remplacés par des 0 dans evals_notes
         #  et dans dans evals_poids_etuds
@@ -228,7 +248,7 @@ class ModuleImplResultsAPC:
             0,
         )
         # Calcule la moyenne pondérée sur les notes disponibles:
-        evals_notes_stacked = np.stack([evals_notes] * nb_ues, axis=2)
+        evals_notes_stacked = np.stack([evals_notes_20] * nb_ues, axis=2)
         with np.errstate(invalid="ignore"):  # ignore les 0/0 (-> NaN)
             etuds_moy_module = np.sum(
                 evals_poids_etuds * evals_notes_stacked, axis=1
@@ -288,3 +308,45 @@ def moduleimpl_is_conforme(
         == module_evals_poids
     )
     return check
+
+
+class ModuleImplResultsClassic(ModuleImplResults):
+    "Calcul des moyennes de modules des formations classiques"
+
+    def compute_module_moy(self) -> pd.Series:
+        """Calcule les moyennes des étudiants dans ce module
+
+        Résultat: Series, lignes etud
+            = la note (moyenne) de l'étudiant pour ce module.
+            ou NaN si les évaluations (dans lesquelles l'étudiant a des notes)
+            ne donnent pas de coef.
+        """
+        modimpl = ModuleImpl.query.get(self.moduleimpl_id)
+        nb_etuds, nb_evals = self.evals_notes.shape
+        if nb_etuds == 0:
+            return pd.Series()
+        evals_coefs = self.get_evaluations_coefs(modimpl).reshape(-1)
+        assert evals_coefs.shape == (nb_evals,)
+        evals_notes_20 = self.get_eval_notes_sur_20(modimpl)
+        # Les coefs des évals pour chaque étudiant: là où il a des notes
+        #  non neutralisées
+        # (ABS n'est  pas neutralisée, mais ATTENTE et NEUTRALISE oui)
+        # Note: les NaN sont remplacés par des 0 dans evals_notes
+        #  et dans dans evals_poids_etuds
+        #  (rappel: la comparaison est toujours False face à un NaN)
+        # shape: (nb_etuds, nb_evals)
+        coefs_stacked = np.stack([evals_coefs] * nb_etuds)
+        evals_coefs_etuds = np.where(
+            self.evals_notes.values > scu.NOTES_NEUTRALISE, coefs_stacked, 0
+        )
+        # Calcule la moyenne pondérée sur les notes disponibles:
+        with np.errstate(invalid="ignore"):  # ignore les 0/0 (-> NaN)
+            etuds_moy_module = np.sum(
+                evals_coefs_etuds * evals_notes_20, axis=1
+            ) / np.sum(evals_coefs_etuds, axis=1)
+
+        self.etuds_moy_module = pd.Series(
+            etuds_moy_module,
+            index=self.evals_notes.index,
+        )
+        return self.etuds_moy_module
diff --git a/app/comp/moy_sem.py b/app/comp/moy_sem.py
index 037b4cd06..b9e93475c 100644
--- a/app/comp/moy_sem.py
+++ b/app/comp/moy_sem.py
@@ -31,7 +31,7 @@ import numpy as np
 import pandas as pd
 
 
-def compute_sem_moys(etud_moy_ue_df, modimpl_coefs_df):
+def compute_sem_moys_apc(etud_moy_ue_df, modimpl_coefs_df):
     """Calcule la moyenne générale indicative
     = moyenne des moyennes d'UE, pondérée par la somme de leurs coefs
 
diff --git a/app/comp/moy_ue.py b/app/comp/moy_ue.py
index 0c640fe93..1ca76334a 100644
--- a/app/comp/moy_ue.py
+++ b/app/comp/moy_ue.py
@@ -25,7 +25,7 @@
 #
 ##############################################################################
 
-"""Fonctions de calcul des moyennes d'UE
+"""Fonctions de calcul des moyennes d'UE (classiques ou BUT)
 """
 import numpy as np
 import pandas as pd
@@ -34,13 +34,14 @@ from app import db
 from app import models
 from app.models import UniteEns, Module, ModuleImpl, ModuleUECoef
 from app.comp import moy_mod
+from app.models.formsemestre import FormSemestre
 from app.scodoc import sco_codes_parcours
 
 
 def df_load_module_coefs(formation_id: int, semestre_idx: int = None) -> pd.DataFrame:
-    """Charge les coefs des modules de la formation pour le semestre indiqué.
+    """Charge les coefs APC des modules de la formation pour le semestre indiqué.
 
-    Ces coefs lient les modules à chaque UE.
+    En APC, ces coefs lient les modules à chaque UE.
 
     Résultat: (module_coefs_df, ues, modules)
         DataFrame rows = UEs, columns = modules, value = coef.
@@ -85,7 +86,7 @@ def df_load_module_coefs(formation_id: int, semestre_idx: int = None) -> pd.Data
 def df_load_modimpl_coefs(
     formsemestre: models.FormSemestre, ues=None, modimpls=None
 ) -> pd.DataFrame:
-    """Charge les coefs des modules du formsemestre indiqué.
+    """Charge les coefs APC des modules du formsemestre indiqué.
 
     Comme df_load_module_coefs mais prend seulement les UE
     et modules du formsemestre.
@@ -126,7 +127,7 @@ def notes_sem_assemble_cube(modimpls_notes: list[pd.DataFrame]) -> np.ndarray:
     return modimpls_notes.swapaxes(0, 1)
 
 
-def notes_sem_load_cube(formsemestre):
+def notes_sem_load_cube(formsemestre: FormSemestre) -> tuple:
     """Calcule le cube des notes du semestre
     (charge toutes les notes, calcule les moyenne des modules
     et assemble le cube)
@@ -151,7 +152,7 @@ def notes_sem_load_cube(formsemestre):
     )
 
 
-def compute_ue_moys(
+def compute_ue_moys_apc(
     sem_cube: np.array,
     etuds: list,
     modimpls: list,
@@ -159,7 +160,7 @@ def compute_ue_moys(
     modimpl_inscr_df: pd.DataFrame,
     modimpl_coefs_df: pd.DataFrame,
 ) -> pd.DataFrame:
-    """Calcul de la moyenne d'UE
+    """Calcul de la moyenne d'UE en mode APC (BUT).
     La moyenne d'UE est un nombre (note/20), ou NI ou NA ou ERR
     NI non inscrit à (au moins un) module de cette UE
     NA pas de notes disponibles
@@ -168,11 +169,11 @@ def compute_ue_moys(
     sem_cube: notes moyennes aux modules
                 ndarray (etuds x modimpls x UEs)
                 (floats avec des NaN)
-    etuds : lites des étudiants (dim. 0 du cube)
+    etuds : listes des étudiants (dim. 0 du cube)
     modimpls : liste des modules à considérer (dim. 1 du cube)
     ues : liste des UE (dim. 2 du cube)
-    module_inscr_df: matrice d'inscription du semestre (etud x modimpl)
-    module_coefs_df: matrice coefficients (UE x modimpl)
+    modimpl_inscr_df: matrice d'inscription du semestre (etud x modimpl)
+    modimpl_coefs_df: matrice coefficients (UE x modimpl)
 
     Resultat: DataFrame columns UE, rows etudid
     """
@@ -214,3 +215,70 @@ def compute_ue_moys(
     return pd.DataFrame(
         etud_moy_ue, index=modimpl_inscr_df.index, columns=modimpl_coefs_df.index
     )
+
+
+def compute_ue_moys_classic(
+    formsemestre: FormSemestre,
+    sem_matrix: np.array,
+    ues: list,
+    modimpl_inscr_df: pd.DataFrame,
+    modimpl_coefs: np.array,
+) -> pd.DataFrame:
+    """Calcul de la moyenne d'UE en mode classique.
+    La moyenne d'UE est un nombre (note/20), ou NI ou NA ou ERR
+    NI non inscrit à (au moins un) module de cette UE
+    NA pas de notes disponibles
+    ERR erreur dans une formule utilisateur. [XXX pas encore gérées ici]
+
+    sem_matrix: notes moyennes aux modules
+                ndarray (etuds x modimpls)
+                (floats avec des NaN)
+    etuds : listes des étudiants (dim. 0 de la matrice)
+    ues : liste des UE
+    modimpl_inscr_df: matrice d'inscription du semestre (etud x modimpl)
+    modimpl_coefs: vecteur des coefficients de modules
+
+    Résultat:
+     - moyennes générales: pd.Series, index etudid
+     - moyennes d'UE: DataFrame columns UE, rows etudid
+    """
+    nb_etuds, nb_modules = sem_matrix.shape
+    assert len(modimpl_coefs) == nb_modules
+    nb_ues = len(ues)
+    modimpl_inscr = modimpl_inscr_df.values
+    # Enlève les NaN du numérateur:
+    sem_matrix_no_nan = np.nan_to_num(sem_matrix, nan=0.0)
+    # Ne prend pas en compte les notes des étudiants non inscrits au module:
+    # Annule les notes:
+    sem_matrix_inscrits = np.where(modimpl_inscr, sem_matrix_no_nan, 0.0)
+    # Annule les coefs des modules où l'étudiant n'est pas inscrit:
+    modimpl_coefs_etuds = np.where(
+        modimpl_inscr, np.stack([modimpl_coefs.T] * nb_etuds), 0.0
+    )
+    # Annule les coefs des modules NaN (nb_etuds x nb_mods)
+    modimpl_coefs_etuds_no_nan = np.where(
+        np.isnan(sem_matrix), 0.0, modimpl_coefs_etuds
+    )
+    # Calcul des moyennes générales:
+    with np.errstate(invalid="ignore"):  # ignore les 0/0 (-> NaN)
+        etud_moy_gen = np.sum(
+            modimpl_coefs_etuds_no_nan * sem_matrix_inscrits, axis=1
+        ) / np.sum(modimpl_coefs_etuds_no_nan, axis=1)
+    etud_moy_gen_s = pd.Series(etud_moy_gen, index=modimpl_inscr_df.index)
+    # Calcul des moyennes d'UE
+    ue_modules = np.array(
+        [[m.module.ue == ue for m in formsemestre.modimpls] for ue in ues]
+    )[..., np.newaxis]
+    modimpl_coefs_etuds_no_nan_stacked = np.stack(
+        [modimpl_coefs_etuds_no_nan.T] * nb_ues
+    )
+    # nb_ue x nb_etuds x nb_mods : coefs prenant en compte NaN et inscriptions
+    coefs = (modimpl_coefs_etuds_no_nan_stacked * ue_modules).swapaxes(1, 2)
+    with np.errstate(invalid="ignore"):  # ignore les 0/0 (-> NaN)
+        etud_moy_ue = (
+            np.sum(coefs * sem_matrix_inscrits, axis=2) / np.sum(coefs, axis=2)
+        ).T
+    etud_moy_ue_df = pd.DataFrame(
+        etud_moy_ue, index=modimpl_inscr_df.index, columns=[ue.id for ue in ues]
+    )
+    return etud_moy_gen_s, etud_moy_ue_df
diff --git a/app/comp/res_but.py b/app/comp/res_but.py
new file mode 100644
index 000000000..c3c548ac2
--- /dev/null
+++ b/app/comp/res_but.py
@@ -0,0 +1,65 @@
+##############################################################################
+# ScoDoc
+# Copyright (c) 1999 - 2021 Emmanuel Viennet.  All rights reserved.
+# See LICENSE
+##############################################################################
+
+"""Résultats semestres BUT
+"""
+
+from app.comp import moy_ue, moy_sem, inscr_mod
+from app.comp.res_sem import NotesTableCompat
+
+
+class ResultatsSemestreBUT(NotesTableCompat):
+    """Résultats BUT: organisation des calculs"""
+
+    _cached_attrs = NotesTableCompat._cached_attrs + (
+        "modimpl_coefs_df",
+        "modimpls_evals_poids",
+        "sem_cube",
+    )
+
+    def __init__(self, formsemestre):
+        super().__init__(formsemestre)
+
+        if not self.load_cached():
+            self.compute()
+            self.store()
+
+    def compute(self):
+        "Charge les notes et inscriptions et calcule les moyennes d'UE et gen."
+        (
+            self.sem_cube,
+            self.modimpls_evals_poids,
+            self.modimpls_results,
+        ) = moy_ue.notes_sem_load_cube(self.formsemestre)
+        self.modimpl_inscr_df = inscr_mod.df_load_modimpl_inscr(self.formsemestre)
+        self.modimpl_coefs_df, _, _ = moy_ue.df_load_modimpl_coefs(
+            self.formsemestre, ues=self.ues, modimpls=self.modimpls
+        )
+        # l'idx de la colonne du mod modimpl.id est
+        #       modimpl_coefs_df.columns.get_loc(modimpl.id)
+        # idx de l'UE: modimpl_coefs_df.index.get_loc(ue.id)
+        self.etud_moy_ue = moy_ue.compute_ue_moys_apc(
+            self.sem_cube,
+            self.etuds,
+            self.modimpls,
+            self.ues,
+            self.modimpl_inscr_df,
+            self.modimpl_coefs_df,
+        )
+        self.etud_moy_gen = moy_sem.compute_sem_moys_apc(
+            self.etud_moy_ue, self.modimpl_coefs_df
+        )
+        self.etud_moy_gen_ranks = moy_sem.comp_ranks_series(self.etud_moy_gen)
+
+    def get_etud_mod_moy(self, moduleimpl_id: int, etudid: int) -> float:
+        """La moyenne de l'étudiant dans le moduleimpl
+        En APC, il s'agit d'une moyenne indicative sans valeur.
+        Result: valeur float (peut être naN) ou chaîne "NI" (non inscrit ou DEM)
+        """
+        mod_idx = self.modimpl_coefs_df.columns.get_loc(moduleimpl_id)
+        etud_idx = self.etud_index[etudid]
+        # moyenne sur les UE:
+        return self.sem_cube[etud_idx, mod_idx].mean()
diff --git a/app/comp/res_classic.py b/app/comp/res_classic.py
new file mode 100644
index 000000000..c11912673
--- /dev/null
+++ b/app/comp/res_classic.py
@@ -0,0 +1,95 @@
+##############################################################################
+# ScoDoc
+# Copyright (c) 1999 - 2021 Emmanuel Viennet.  All rights reserved.
+# See LICENSE
+##############################################################################
+
+"""Résultats semestres classiques (non APC)
+"""
+import numpy as np
+import pandas as pd
+from app.comp import moy_mod, moy_ue, moy_sem, inscr_mod
+from app.comp.res_sem import NotesTableCompat
+from app.models.formsemestre import FormSemestre
+
+
+class ResultatsSemestreClassic(NotesTableCompat):
+    """Résultats du semestre (formation classique): organisation des calculs."""
+
+    _cached_attrs = NotesTableCompat._cached_attrs + (
+        "modimpl_coefs",
+        "modimpl_idx",
+        "sem_matrix",
+    )
+
+    def __init__(self, formsemestre):
+        super().__init__(formsemestre)
+
+        if not self.load_cached():
+            self.compute()
+            self.store()
+        # recalculé (aussi rapide que de les cacher)
+        self.moy_min = self.etud_moy_gen.min()
+        self.moy_max = self.etud_moy_gen.max()
+        self.moy_moy = self.etud_moy_gen.mean()
+
+    def compute(self):
+        "Charge les notes et inscriptions et calcule les moyennes d'UE et gen."
+        self.sem_matrix, self.modimpls_results = notes_sem_load_matrix(
+            self.formsemestre
+        )
+        self.modimpl_inscr_df = inscr_mod.df_load_modimpl_inscr(self.formsemestre)
+        self.modimpl_coefs = np.array(
+            [m.module.coefficient for m in self.formsemestre.modimpls]
+        )
+        self.modimpl_idx = {m.id: i for i, m in enumerate(self.formsemestre.modimpls)}
+        "l'idx de la colonne du mod modimpl.id est modimpl_idx[modimpl.id]"
+
+        self.etud_moy_gen, self.etud_moy_ue = moy_ue.compute_ue_moys_classic(
+            self.formsemestre,
+            self.sem_matrix,
+            self.ues,
+            self.modimpl_inscr_df,
+            self.modimpl_coefs,
+        )
+        self.etud_moy_gen_ranks = moy_sem.comp_ranks_series(self.etud_moy_gen)
+
+    def get_etud_mod_moy(self, moduleimpl_id: int, etudid: int) -> float:
+        """La moyenne de l'étudiant dans le moduleimpl
+        Result: valeur float (peut être NaN) ou chaîne "NI" (non inscrit ou DEM)
+        """
+        return self.modimpls_results[moduleimpl_id].etuds_moy_module.get(etudid, "NI")
+
+
+def notes_sem_load_matrix(formsemestre: FormSemestre) -> tuple:
+    """Calcule la matrice des notes du semestre
+    (charge toutes les notes, calcule les moyenne des modules
+    et assemble la matrice)
+    Resultat:
+        sem_matrix : 2d-array (etuds x modimpls)
+        modimpls_results dict { modimpl.id : ModuleImplResultsClassic }
+    """
+    modimpls_results = {}
+    modimpls_notes = []
+    for modimpl in formsemestre.modimpls:
+        mod_results = moy_mod.ModuleImplResultsClassic(modimpl)
+        etuds_moy_module = mod_results.compute_module_moy()
+        modimpls_results[modimpl.id] = mod_results
+        modimpls_notes.append(etuds_moy_module)
+    return (
+        notes_sem_assemble_matrix(modimpls_notes),
+        modimpls_results,
+    )
+
+
+def notes_sem_assemble_matrix(modimpls_notes: list[pd.Series]) -> np.ndarray:
+    """Réuni les notes moyennes des modules du semestre en une matrice
+
+    modimpls_notes : liste des moyennes de module
+                     (Series rendus par compute_module_moy, index: etud)
+    Resultat: ndarray (etud x module)
+    """
+    modimpls_notes_arr = [s.values for s in modimpls_notes]
+    modimpls_notes = np.stack(modimpls_notes_arr)
+    # passe de (mod x etud) à (etud x mod)
+    return modimpls_notes.T
diff --git a/app/comp/res_sem.py b/app/comp/res_sem.py
index c0b78b539..a73c46b09 100644
--- a/app/comp/res_sem.py
+++ b/app/comp/res_sem.py
@@ -9,10 +9,10 @@ from functools import cached_property
 import numpy as np
 import pandas as pd
 from app.comp.aux import StatsMoyenne
-from app.models import ModuleImpl
+from app.models import FormSemestre, ModuleImpl
 from app.scodoc import sco_utils as scu
 from app.scodoc.sco_cache import ResultatsSemestreCache
-from app.scodoc.sco_codes_parcours import UE_SPORT
+from app.scodoc.sco_codes_parcours import UE_SPORT, ATT, DEF
 
 # Il faut bien distinguer
 #  - ce qui est caché de façon persistente (via redis):
@@ -25,17 +25,14 @@ from app.scodoc.sco_codes_parcours import UE_SPORT
 #
 class ResultatsSemestre:
     _cached_attrs = (
-        "sem_cube",
-        "modimpl_inscr_df",
-        "modimpl_coefs_df",
-        "etud_moy_ue",
-        "modimpls_evals_poids",
-        "modimpls_results",
-        "etud_moy_gen",
         "etud_moy_gen_ranks",
+        "etud_moy_gen",
+        "etud_moy_ue",
+        "modimpl_inscr_df",
+        "modimpls_results",
     )
 
-    def __init__(self, formsemestre):
+    def __init__(self, formsemestre: FormSemestre):
         self.formsemestre = formsemestre
         # BUT ou standard ? (apc == "approche par compétences")
         self.is_apc = formsemestre.formation.is_apc()
@@ -70,7 +67,7 @@ class ResultatsSemestre:
     @cached_property
     def etuds(self):
         "Liste des inscrits au semestre, sans les démissionnaires"
-        # nb: si les liste des inscrits change, ResultatsSemestre devient invalide
+        # nb: si la liste des inscrits change, ResultatsSemestre devient invalide
         return self.formsemestre.get_inscrits(include_dem=False)
 
     @cached_property
@@ -119,12 +116,16 @@ class ResultatsSemestre:
 # Pour raccorder le code des anciens codes qui attendent une NoteTable
 class NotesTableCompat(ResultatsSemestre):
     """Implementation partielle de NotesTable WIP TODO
-    Accès aux notes et rangs.
+
+    Les méthodes définies dans cette classe sont là
+    pour conserver la compatibilité abvec les codes anciens et
+    il n'est pas recommandé de les utiliser dans de nouveaux
+    développements (API malcommode et peu efficace).
     """
 
     _cached_attrs = ResultatsSemestre._cached_attrs + ()
 
-    def __init__(self, formsemestre):
+    def __init__(self, formsemestre: FormSemestre):
         super().__init__(formsemestre)
         nb_etuds = len(self.etuds)
         self.bonus = defaultdict(lambda: 0.0)  # XXX TODO
@@ -132,6 +133,30 @@ class NotesTableCompat(ResultatsSemestre):
         self.mod_rangs = {
             m.id: (defaultdict(lambda: 0), nb_etuds) for m in self.modimpls
         }
+        self.moy_min = "NA"
+        self.moy_max = "NA"
+
+    def get_etudids(self, sorted=False) -> list[int]:
+        """Liste des etudids inscrits, incluant les démissionnaires.
+        Si sorted, triée par moy. générale décroissante
+        Sinon, triée par ordre alphabetique de NOM
+        """
+        # Note: pour avoir les inscrits non triés,
+        # utiliser [ ins.etudid for ins in self.formsemestre.inscriptions ]
+        if sorted:
+            # Tri par moy. generale décroissante
+            return [x[-1] for x in self.T]
+
+        return [x["etudid"] for x in self.inscrlist]
+
+    @cached_property
+    def inscrlist(self) -> list[dict]:  # utilisé par PE seulement
+        """Liste de dict etud, avec démissionnaires
+        classée dans l'ordre alphabétique de noms.
+        """
+        etuds = self.formsemestre.get_inscrits(include_dem=True)
+        etuds.sort(key=lambda e: e.sort_key)
+        return [e.to_dict_scodoc7() for e in etuds]
 
     @cached_property
     def stats_moy_gen(self):
@@ -161,6 +186,33 @@ class NotesTableCompat(ResultatsSemestre):
         else:
             return [m.to_dict() for m in self.modimpls if m.module.ue.id == ue_id]
 
+    def get_etud_decision_sem(self, etudid: int) -> dict:
+        """Decision du jury prise pour cet etudiant, ou None s'il n'y en pas eu.
+        { 'code' : None|ATT|..., 'assidu' : 0|1, 'event_date' : , compense_formsemestre_id }
+        Si état défaillant, force le code a DEF
+        """
+        if self.get_etud_etat(etudid) == DEF:
+            return {
+                "code": DEF,
+                "assidu": False,
+                "event_date": "",
+                "compense_formsemestre_id": None,
+            }
+        else:
+            return {
+                "code": ATT,  # XXX TODO
+                "assidu": True,  # XXX TODO
+                "event_date": "",
+                "compense_formsemestre_id": None,
+            }
+
+    def get_etud_etat(self, etudid: int) -> str:
+        "Etat de l'etudiant: 'I', 'D', DEF ou '' (si pas connu dans ce semestre)"
+        ins = self.formsemestre.etuds_inscriptions.get(etudid, None)
+        if ins is None:
+            return ""
+        return ins.etat
+
     def get_etud_moy_gen(self, etudid):  # -> float | str
         """Moyenne générale de cet etudiant dans ce semestre.
         Prend en compte les UE capitalisées. (TODO)
@@ -169,38 +221,27 @@ class NotesTableCompat(ResultatsSemestre):
         """
         return self.etud_moy_gen[etudid]
 
-    def get_moduleimpls_attente(self):
-        return []  # XXX TODO
+    def get_etud_mod_moy(self, moduleimpl_id: int, etudid: int) -> float:
+        """La moyenne de l'étudiant dans le moduleimpl
+        En APC, il s'agira d'une moyenne indicative sans valeur.
+        Result: valeur float (peut être naN) ou chaîne "NI" (non inscrit ou DEM)
+        """
+        raise NotImplementedError()  # virtual method
 
-    def get_etud_rang(self, etudid):
-        return self.etud_moy_gen_ranks[etudid]
-
-    def get_etud_rang_group(self, etudid, group_id):
-        return (None, 0)  # XXX unimplemented TODO
-
-    def get_etud_ue_status(self, etudid, ue_id):
+    def get_etud_ue_status(self, etudid: int, ue_id: int):
         return {
             "cur_moy_ue": self.results.etud_moy_ue[ue_id][etudid],
             "is_capitalized": False,  # XXX TODO
         }
 
-    def get_etud_mod_moy(self, moduleimpl_id, etudid):
-        mod_idx = self.results.modimpl_coefs_df.columns.get_loc(moduleimpl_id)
-        etud_idx = self.results.etud_index[etudid]
-        # moyenne sur les UE:
-        self.results.sem_cube[etud_idx, mod_idx].mean()
+    def get_etud_rang(self, etudid: int):
+        return self.etud_moy_gen_ranks.get(etudid, 99999)  # XXX
 
-    def get_mod_stats(self, moduleimpl_id):
-        return {
-            "moy": "-",
-            "max": "-",
-            "min": "-",
-            "nb_notes": "-",
-            "nb_missing": "-",
-            "nb_valid_evals": "-",
-        }
+    def get_etud_rang_group(self, etudid: int, group_id: int):
+        return (None, 0)  # XXX unimplemented TODO
 
-    def get_evals_in_mod(self, moduleimpl_id):
+    def get_evals_in_mod(self, moduleimpl_id: int) -> list[dict]:
+        "liste des évaluations valides dans un module"
         mi = ModuleImpl.query.get(moduleimpl_id)
         evals_results = []
         for e in mi.evaluations:
@@ -219,3 +260,78 @@ class NotesTableCompat(ResultatsSemestre):
             }
             evals_results.append(d)
         return evals_results
+
+    def get_moduleimpls_attente(self):
+        return []  # XXX TODO
+
+    def get_mod_stats(self, moduleimpl_id):
+        return {
+            "moy": "-",
+            "max": "-",
+            "min": "-",
+            "nb_notes": "-",
+            "nb_missing": "-",
+            "nb_valid_evals": "-",
+        }
+
+    def get_nom_short(self, etudid):
+        "formatte nom d'un etud (pour table recap)"
+        etud = self.identdict[etudid]
+        return (
+            (etud["nom_usuel"] or etud["nom"]).upper()
+            + " "
+            + etud["prenom"].capitalize()[:2]
+            + "."
+        )
+
+    @cached_property
+    def T(self):
+        return self.get_table_moyennes_triees()
+
+    def get_table_moyennes_triees(self) -> list:
+        """Result: liste de tuples
+        moy_gen, moy_ue_0, ..., moy_ue_n, moy_mod1, ..., moy_mod_n, etudid
+        """
+        table_moyennes = []
+        etuds_inscriptions = self.formsemestre.etuds_inscriptions
+
+        for etudid in etuds_inscriptions:
+            moy_gen = self.etud_moy_gen.get(etudid, False)
+            if moy_gen is False:
+                # pas de moyenne: démissionnaire ou def
+                t = ["-"] + ["0.00"] * len(self.ues) + ["NI"] * len(self.modimpls)
+            else:
+                moy_ues = self.etud_moy_ue.loc[etudid]
+                t = [moy_gen] + list(moy_ues)
+                # TODO UE capitalisées: ne pas afficher moyennes modules
+                for modimpl in self.modimpls:
+                    val = self.get_etud_mod_moy(modimpl.id, etudid)
+                    t.append(val)
+            t.append(etudid)
+            table_moyennes.append(t)
+        # tri par moyennes décroissantes,
+        # en laissant les démissionnaires à la fin, par ordre alphabetique
+        etuds = [ins.etud for ins in etuds_inscriptions.values()]
+        etuds.sort(key=lambda e: e.sort_key)
+        self._rang_alpha = {e.id: i for i, e in enumerate(etuds)}
+        table_moyennes.sort(key=self._row_key)
+        return table_moyennes
+
+    def _row_key(self, x):
+        """clé de tri par moyennes décroissantes,
+        en laissant les demissionnaires à la fin, par ordre alphabetique.
+        (moy_gen, rang_alpha)
+        """
+        try:
+            moy = -float(x[0])
+        except (ValueError, TypeError):
+            moy = 1000.0
+        return (moy, self._rang_alpha[x[-1]])
+
+    @cached_property
+    def identdict(self) -> dict:
+        """{ etudid : etud_dict } pour tous les inscrits au semestre"""
+        return {
+            ins.etud.id: ins.etud.to_dict_scodoc7()
+            for ins in self.formsemestre.inscriptions
+        }
diff --git a/app/models/etudiants.py b/app/models/etudiants.py
index eb018e704..4fd756a9d 100644
--- a/app/models/etudiants.py
+++ b/app/models/etudiants.py
@@ -13,6 +13,7 @@ from app import models
 from app.models import APO_CODE_STR_LEN
 from app.models import SHORT_STR_LEN
 from app.models import CODE_STR_LEN
+from app.scodoc import notesdb as ndb
 
 
 class Identite(db.Model):
@@ -105,10 +106,25 @@ class Identite(db.Model):
             r.append("-".join([x.lower().capitalize() for x in fields]))
         return " ".join(r)
 
+    @cached_property
+    def sort_key(self) -> tuple:
+        "clé pour tris par ordre alphabétique"
+        return (self.nom_usuel or self.nom).lower(), self.prenom.lower()
+
     def get_first_email(self, field="email") -> str:
         "Le mail associé à la première adrese de l'étudiant, ou None"
         return self.adresses[0].email or None if self.adresses.count() > 0 else None
 
+    def to_dict_scodoc7(self):
+        """Représentation dictionnaire,
+        compatible ScoDoc7 mais sans infos admission
+        """
+        e = dict(self.__dict__)
+        e.pop("_sa_instance_state", None)
+        # ScoDoc7 output_formators: (backward compat)
+        e["date_naissance"] = ndb.DateISOtoDMY(e["date_naissance"])
+        return {k: e[k] or "" for k in e}  # convert_null_outputs_to_empty
+
     def to_dict_bul(self, include_urls=True):
         """Infos exportées dans les bulletins"""
         from app.scodoc import sco_photos
diff --git a/app/models/formsemestre.py b/app/models/formsemestre.py
index 4ada23e87..928dd6093 100644
--- a/app/models/formsemestre.py
+++ b/app/models/formsemestre.py
@@ -3,6 +3,7 @@
 """ScoDoc models: formsemestre
 """
 import datetime
+from functools import cached_property
 
 import flask_sqlalchemy
 
@@ -251,7 +252,7 @@ class FormSemestre(db.Model):
             etudid, self.date_debut.isoformat(), self.date_fin.isoformat()
         )
 
-    def get_inscrits(self, include_dem=False) -> list:
+    def get_inscrits(self, include_dem=False) -> list[Identite]:
         """Liste des étudiants inscrits à ce semestre
         Si all, tous les étudiants, avec les démissionnaires.
         """
@@ -260,6 +261,11 @@ class FormSemestre(db.Model):
         else:
             return [ins.etud for ins in self.inscriptions if ins.etat == scu.INSCRIT]
 
+    @cached_property
+    def etuds_inscriptions(self) -> dict:
+        """Map { etudid : inscription }"""
+        return {ins.etud.id: ins for ins in self.inscriptions}
+
 
 # Association id des utilisateurs responsables (aka directeurs des etudes) du semestre
 notes_formsemestre_responsables = db.Table(
diff --git a/app/scodoc/notes_table.py b/app/scodoc/notes_table.py
index abbfec96b..ce8426f8c 100644
--- a/app/scodoc/notes_table.py
+++ b/app/scodoc/notes_table.py
@@ -202,7 +202,7 @@ class NotesTable:
         self.inscrlist.sort(key=itemgetter("nomp"))
 
         # { etudid : rang dans l'ordre alphabetique }
-        self.rang_alpha = {e["etudid"]: i for i, e in enumerate(self.inscrlist)}
+        self._rang_alpha = {e["etudid"]: i for i, e in enumerate(self.inscrlist)}
 
         self.bonus = scu.DictDefault(defaultvalue=0)
         # Notes dans les modules  { moduleimpl_id : { etudid: note_moyenne_dans_ce_module } }
@@ -366,7 +366,7 @@ class NotesTable:
             moy = -float(x[0])
         except (ValueError, TypeError):
             moy = 1000.0
-        return (moy, self.rang_alpha[x[-1]])
+        return (moy, self._rang_alpha[x[-1]])
 
     def get_etudids(self, sorted=False):
         if sorted:
diff --git a/app/scodoc/sco_recapcomplet.py b/app/scodoc/sco_recapcomplet.py
index cfd3634ec..6f394455e 100644
--- a/app/scodoc/sco_recapcomplet.py
+++ b/app/scodoc/sco_recapcomplet.py
@@ -37,6 +37,7 @@ from flask import make_response
 
 from app import log
 from app.but import bulletin_but
+from app.comp.res_classic import ResultatsSemestreClassic
 from app.models import FormSemestre
 from app.models.etudiants import Identite
 
@@ -303,6 +304,8 @@ def make_formsemestre_recapcomplet(
         args={"formsemestre_id": formsemestre_id}
     )[0]
     nt = sco_cache.NotesTableCache.get(formsemestre_id)
+    # XXX EXPERIMENTAL
+    # nt = ResultatsSemestreClassic(formsemestre)
     modimpls = nt.get_modimpls_dict()
     ues = nt.get_ues_stat_dict()  # incluant le(s) UE de sport
     #
diff --git a/tests/unit/test_but_ues.py b/tests/unit/test_but_ues.py
index 947e2f11c..8f9ec3ece 100644
--- a/tests/unit/test_but_ues.py
+++ b/tests/unit/test_but_ues.py
@@ -71,7 +71,7 @@ def test_ue_moy(test_client):
         # Recalcul des moyennes
         sem_cube, _, _ = moy_ue.notes_sem_load_cube(formsemestre)
         etuds = formsemestre.etuds.all()
-        etud_moy_ue = moy_ue.compute_ue_moys(
+        etud_moy_ue = moy_ue.compute_ue_moys_apc(
             sem_cube, etuds, modimpls, ues, modimpl_inscr_df, modimpl_coefs_df
         )
         return etud_moy_ue
@@ -114,7 +114,7 @@ def test_ue_moy(test_client):
     # Recalcule les notes:
     sem_cube, _, _ = moy_ue.notes_sem_load_cube(formsemestre)
     etuds = formsemestre.etuds.all()
-    etud_moy_ue = moy_ue.compute_ue_moys(
+    etud_moy_ue = moy_ue.compute_ue_moys_apc(
         sem_cube, etuds, modimpls, ues, modimpl_inscr_df, modimpl_coefs_df
     )
     assert etud_moy_ue[ue1.id][etudid] == n1

From 9f3f2b33e3acc59022bf72a78c4aa17715d46025 Mon Sep 17 00:00:00 2001
From: Jean-Marie PLACE <jean-marie.place@univ-lille1.fr>
Date: Fri, 24 Dec 2021 06:08:35 +0100
Subject: [PATCH 06/10] ajoute test_logos

---
 tests/api/test_api_logos.py     |  56 +++++++++++++
 tests/unit/config_test_logos.py | 136 ++++++++++++++++++++++++++++++++
 tests/unit/setup.py             |   1 +
 tests/unit/test_logos.py        | 120 ++++++++--------------------
 4 files changed, 224 insertions(+), 89 deletions(-)
 create mode 100644 tests/api/test_api_logos.py
 create mode 100644 tests/unit/config_test_logos.py

diff --git a/tests/api/test_api_logos.py b/tests/api/test_api_logos.py
new file mode 100644
index 000000000..22fcf709d
--- /dev/null
+++ b/tests/api/test_api_logos.py
@@ -0,0 +1,56 @@
+#!/usr/bin/env python3
+# -*- mode: python -*-
+# -*- coding: utf-8 -*-
+
+"""Exemple utilisation API ScoDoc 9 avec jeton obtenu par basic authentication
+
+utilisation:
+    à faire fonctionner en environnment de test (FLASK_ENV=test dans le fichier .env)
+    pytest tests/api/test_api_logos.py
+"""
+
+import pytest
+
+from scodoc import app
+from tests.unit.config_test_logos import (
+    create_super_token,
+    create_admin_token,
+    create_lambda_token,
+    create_logos,
+    create_dept,
+)
+
+
+def test_super_access(create_super_token):
+    dept1, dept2, dept3, token = create_super_token
+    HEADERS = {"Authorization": f"Bearer {token}"}
+    with app.test_client() as client:
+        response = client.get("/ScoDoc/api/logos", headers=HEADERS)
+        assert response.status_code == 200
+        assert response.json is not None
+
+
+def test_admin_access(create_admin_token):
+    dept1, dept2, dept3, token = create_admin_token
+    headers = {"Authorization": f"Bearer {token}"}
+    with app.test_client() as client:
+        response = client.get("/ScoDoc/api/logos", headers=headers)
+        assert response.status_code == 401
+
+
+def test_lambda_access(create_lambda_token):
+    dept1, dept2, dept3, token = create_lambda_token
+    headers = {"Authorization": f"Bearer {token}"}
+    with app.test_client() as client:
+        response = client.get("/ScoDoc/api/logos", headers=headers)
+        assert response.status_code == 401
+
+
+def test_initial_with_header_and_footer(create_super_token):
+    dept1, dept2, dept3, token = create_super_token
+    headers = {"Authorization": f"Bearer {token}"}
+    with app.test_client() as client:
+        response = client.get("/ScoDoc/api/logos", headers=headers)
+        assert response.status_code == 200
+        assert response.json is not None
+        assert len(response.json) == 7
diff --git a/tests/unit/config_test_logos.py b/tests/unit/config_test_logos.py
new file mode 100644
index 000000000..f4daf25be
--- /dev/null
+++ b/tests/unit/config_test_logos.py
@@ -0,0 +1,136 @@
+# -*- coding: utf-8 -*-
+
+"""Test Logos
+    Mise en place de l'environnement de test pour logos
+"""
+from pathlib import Path
+from shutil import copytree, rmtree, copy
+
+import pytest
+
+import app.scodoc.sco_utils as scu
+from app import db, Departement
+from app.auth.models import User, Role
+from config import TestConfig
+from scodoc import app
+from tests.conftest import test_client
+
+RESOURCES_DIR = "/opt/scodoc/tests/ressources/test_logos"
+
+
+@pytest.fixture
+def create_dept(test_client):
+    """Crée 3 départements:
+    return departements object
+    """
+    client = test_client
+    dept1 = Departement(acronym="RT")
+    dept2 = Departement(acronym="INFO")
+    dept3 = Departement(acronym="GEA")
+    db.session.add(dept1)
+    db.session.add(dept2)
+    db.session.add(dept3)
+    db.session.commit()
+    yield dept1, dept2, dept3
+    db.session.delete(dept1)
+    db.session.delete(dept2)
+    db.session.delete(dept3)
+    db.session.commit()
+
+
+@pytest.fixture
+def create_logos(create_dept):
+    """Crée les logos:
+    ...logos --+-- logo_A.jpg
+               +-- logo_C.jpg
+               +-- logo_D.png
+               +-- logo_E.jpg
+               +-- logo_F.jpeg
+               +-- logos_{d1} --+-- logo_A.jpg
+               |                +-- logo_B.jpg
+               +-- logos_{d2} --+-- logo_A.jpg
+
+    """
+    dept1, dept2, dept3 = create_dept
+    dept1_id = dept1.id
+    dept2_id = dept2.id
+    FILE_LIST = ["logo_A.jpg", "logo_C.jpg", "logo_D.png", "logo_E.jpg", "logo_F.jpeg"]
+    for filename in FILE_LIST:
+        from_path = Path(RESOURCES_DIR).joinpath(filename)
+        to_path = Path(scu.SCODOC_LOGOS_DIR).joinpath(filename)
+        copy(from_path.absolute(), to_path.absolute())
+    copytree(
+        f"{RESOURCES_DIR}/logos_1",
+        f"{scu.SCODOC_LOGOS_DIR}/logos_{dept1_id}",
+    )
+    copytree(
+        f"{RESOURCES_DIR}/logos_2",
+        f"{scu.SCODOC_LOGOS_DIR}/logos_{dept2_id}",
+    )
+    yield dept1, dept2, dept3
+    rmtree(f"{scu.SCODOC_LOGOS_DIR}/logos_{dept1_id}")
+    rmtree(f"{scu.SCODOC_LOGOS_DIR}/logos_{dept2_id}")
+    # rm files
+    for filename in FILE_LIST:
+        to_path = Path(scu.SCODOC_LOGOS_DIR).joinpath(filename)
+        to_path.unlink()
+
+
+def get_token(user_name):
+    with app.test_client() as client:
+        response = client.post("/ScoDoc/api/tokens", auth=(user_name, user_name))
+        assert response.status_code == 200
+        token = response.json["token"]
+        user = User.check_token(token) if token else None
+        assert user.user_name == user_name
+        app.logger.info(f"{user.user_name}: token obtained: {token}")
+        return token
+
+
+@pytest.fixture
+def create_super_token(create_logos):
+    dept1, dept2, dept3 = create_logos
+    # change super_admin password
+    # utilisateur mozart -> super
+    user_name = "mozart"
+    u = User.query.filter_by(user_name=user_name).first()
+    if u is None:
+        u = User(user_name=user_name)
+    u.set_password(user_name)
+    if "SuperAdmin" not in {r.name for r in u.roles}:
+        super_role = Role.query.filter_by(name="SuperAdmin").first()
+        u.add_role(super_role, None)
+    db.session.add(u)
+    db.session.commit()
+    return dept1, dept2, dept3, get_token(u.user_name)
+
+
+@pytest.fixture
+def create_admin_token(create_logos):
+    dept1, dept2, dept3 = create_logos
+    # utilisateur bach -> admin
+    user_name = "bach"
+    u = User.query.filter_by(user_name=user_name).first()
+    if u is None:
+        u = User(user_name=user_name)
+    u.set_password(user_name)
+    if "Admin" not in {r.name for r in u.roles}:
+        admin_role = Role.query.filter_by(name=user_name).first()
+        u.add_role(admin_role, TestConfig.DEPT_TEST)
+    db.session.add(u)
+    db.session.commit()
+    return dept1, dept2, dept3, get_token(u.user_name)
+
+
+@pytest.fixture
+def create_lambda_token(create_logos):
+    dept1, dept2, dept3 = create_logos
+    # utilisateur vivaldi -> lambda
+    user_name = "vivaldi"
+    u = User.query.filter_by(user_name=user_name).first()
+    if u is None:
+        u = User(user_name=user_name)
+    u.set_password(user_name)
+    db.session.add(u)
+    db.session.commit()
+    return dept1, dept2, dept3, get_token(user_name)
diff --git a/tests/unit/setup.py b/tests/unit/setup.py
index dbd202afc..f043ba597 100644
--- a/tests/unit/setup.py
+++ b/tests/unit/setup.py
@@ -6,6 +6,7 @@ from tests.unit import sco_fake_gen
 from app import db
 from app import models
 
+import app.scodoc.sco_utils as scu
 from app.scodoc import sco_codes_parcours
 
 
diff --git a/tests/unit/test_logos.py b/tests/unit/test_logos.py
index b5cf42389..2ea9fb063 100644
--- a/tests/unit/test_logos.py
+++ b/tests/unit/test_logos.py
@@ -2,131 +2,69 @@
 
 """Test Logos
 
-
 Utiliser comme: 
     pytest tests/unit/test_logos.py
-
 """
 from pathlib import Path
-from shutil import copytree, copy, rmtree
+from shutil import copy
 
 import pytest as pytest
 from _pytest.python_api import approx
 
 import app
-from app import db
-from app.models import Departement
 import app.scodoc.sco_utils as scu
 from app.scodoc.sco_logos import (
     find_logo,
     Logo,
     list_logos,
-    GLOBAL,
     write_logo,
     delete_logo,
 )
-
-RESOURCES_DIR = "/opt/scodoc/tests/ressources/test_logos"
-
-
-@pytest.fixture
-def create_dept(test_client):
-    """Crée 2 départements:
-    return departements object
-    """
-    dept1 = Departement(acronym="RT")
-    dept2 = Departement(acronym="INFO")
-    dept3 = Departement(acronym="GEA")
-    db.session.add(dept1)
-    db.session.add(dept2)
-    db.session.add(dept3)
-    db.session.commit()
-    yield dept1, dept2, dept3
-    db.session.delete(dept1)
-    db.session.delete(dept2)
-    db.session.delete(dept3)
-    db.session.commit()
-
-
-@pytest.fixture
-def create_logos(create_dept):
-    """Crée les logos:
-    ...logos --+-- logo_A.jpg
-               +-- logo_C.jpg
-               +-- logo_D.png
-               +-- logo_E.jpg
-               +-- logo_F.jpeg
-               +-- logos_{d1} --+-- logo_A.jpg
-               |                +-- logo_B.jpg
-               +-- logos_{d2} --+-- logo_A.jpg
-
-    """
-    dept1, dept2, dept3 = create_dept
-    d1 = dept1.id
-    d2 = dept2.id
-    d3 = dept3.id
-    FILE_LIST = ["logo_A.jpg", "logo_C.jpg", "logo_D.png", "logo_E.jpg", "logo_F.jpeg"]
-    for fn in FILE_LIST:
-        from_path = Path(RESOURCES_DIR).joinpath(fn)
-        to_path = Path(scu.SCODOC_LOGOS_DIR).joinpath(fn)
-        copy(from_path.absolute(), to_path.absolute())
-    copytree(
-        f"{RESOURCES_DIR}/logos_1",
-        f"{scu.SCODOC_LOGOS_DIR}/logos_{d1}",
-    )
-    copytree(
-        f"{RESOURCES_DIR}/logos_2",
-        f"{scu.SCODOC_LOGOS_DIR}/logos_{d2}",
-    )
-    yield None
-    rmtree(f"{scu.SCODOC_LOGOS_DIR}/logos_{d1}")
-    rmtree(f"{scu.SCODOC_LOGOS_DIR}/logos_{d2}")
-    # rm files
-    for fn in FILE_LIST:
-        to_path = Path(scu.SCODOC_LOGOS_DIR).joinpath(fn)
-        to_path.unlink()
+from tests.unit.config_test_logos import create_dept, create_logos, RESOURCES_DIR
 
 
 def test_select_global_only(create_logos):
+    dept1, dept2, dept3 = create_logos
     C_logo = app.scodoc.sco_logos.find_logo(logoname="C")
     assert C_logo.filepath == f"{scu.SCODOC_LOGOS_DIR}/logo_C.jpg"
 
 
-def test_select_local_only(create_dept, create_logos):
-    dept1, dept2, dept3 = create_dept
+def test_select_local_only(create_logos):
+    dept1, dept2, dept3 = create_logos
     B_logo = app.scodoc.sco_logos.find_logo(logoname="B", dept_id=dept1.id)
     assert B_logo.filepath == f"{scu.SCODOC_LOGOS_DIR}/logos_{dept1.id}/logo_B.jpg"
 
 
-def test_select_local_override_global(create_dept, create_logos):
-    dept1, dept2, dept3 = create_dept
+def test_select_local_override_global(create_logos):
+    dept1, dept2, dept3 = create_logos
     A1_logo = app.scodoc.sco_logos.find_logo(logoname="A", dept_id=dept1.id)
     assert A1_logo.filepath == f"{scu.SCODOC_LOGOS_DIR}/logos_{dept1.id}/logo_A.jpg"
 
 
-def test_select_global_with_strict(create_dept, create_logos):
-    dept1, dept2, dept3 = create_dept
+def test_select_global_with_strict(create_logos):
+    dept1, dept2, dept3 = create_logos
     A_logo = app.scodoc.sco_logos.find_logo(logoname="A", dept_id=dept1.id, strict=True)
     assert A_logo.filepath == f"{scu.SCODOC_LOGOS_DIR}/logos_{dept1.id}/logo_A.jpg"
 
 
-def test_looks_for_non_existant_should_give_none(create_dept, create_logos):
+def test_looks_for_non_existant_should_give_none(create_logos):
     # search for a local non-existant logo returns None
-    dept1, dept2, dept3 = create_dept
+    dept1, dept2, dept3 = create_logos
     no_logo = app.scodoc.sco_logos.find_logo(logoname="Z", dept_id=dept1.id)
     assert no_logo is None
 
 
-def test_looks_localy_for_a_global_should_give_none(create_dept, create_logos):
+def test_looks_localy_for_a_global_should_give_none(create_logos):
     # search for a local non-existant logo returns None
-    dept1, dept2, dept3 = create_dept
+    dept1, dept2, dept3 = create_logos
     no_logo = app.scodoc.sco_logos.find_logo(
         logoname="C", dept_id=dept1.id, strict=True
     )
     assert no_logo is None
 
 
-def test_get_jpg_data(create_dept, create_logos):
+def test_get_jpg_data(create_logos):
+    dept1, dept2, dept3 = create_logos
     logo = find_logo("A", dept_id=None)
     assert logo is not None
     logo.select()
@@ -137,7 +75,8 @@ def test_get_jpg_data(create_dept, create_logos):
     assert logo.mm == approx((9.38, 5.49), 0.1)
 
 
-def test_get_png_without_data(create_dept, create_logos):
+def test_get_png_without_data(create_logos):
+    dept1, dept2, dept3 = create_logos
     logo = find_logo("D", dept_id=None)
     assert logo is not None
     logo.select()
@@ -149,7 +88,8 @@ def test_get_png_without_data(create_dept, create_logos):
     assert logo.mm is None
 
 
-def test_delete_unique_global_jpg_logo(create_dept, create_logos):
+def test_delete_unique_global_jpg_logo(create_logos):
+    dept1, dept2, dept3 = create_logos
     from_path = Path(RESOURCES_DIR).joinpath("logo_A.jpg")
     to_path = Path(scu.SCODOC_LOGOS_DIR).joinpath("logo_W.jpg")
     copy(from_path.absolute(), to_path.absolute())
@@ -158,8 +98,8 @@ def test_delete_unique_global_jpg_logo(create_dept, create_logos):
     assert not to_path.exists()
 
 
-def test_delete_unique_local_jpg_logo(create_dept, create_logos):
-    dept1, dept2, dept3 = create_dept
+def test_delete_unique_local_jpg_logo(create_logos):
+    dept1, dept2, dept3 = create_logos
     from_path = Path(RESOURCES_DIR).joinpath("logo_A.jpg")
     to_path = Path(scu.SCODOC_LOGOS_DIR).joinpath(f"logos_{dept1.id}", "logo_W.jpg")
     copy(from_path.absolute(), to_path.absolute())
@@ -168,8 +108,8 @@ def test_delete_unique_local_jpg_logo(create_dept, create_logos):
     assert not to_path.exists()
 
 
-def test_delete_multiple_local_jpg_logo(create_dept, create_logos):
-    dept1, dept2, dept3 = create_dept
+def test_delete_multiple_local_jpg_logo(create_logos):
+    dept1, dept2, dept3 = create_logos
     from_path_A = Path(RESOURCES_DIR).joinpath("logo_A.jpg")
     to_path_A = Path(scu.SCODOC_LOGOS_DIR).joinpath(f"logos_{dept1.id}", "logo_V.jpg")
     from_path_B = Path(RESOURCES_DIR).joinpath("logo_D.png")
@@ -183,7 +123,8 @@ def test_delete_multiple_local_jpg_logo(create_dept, create_logos):
     assert not to_path_B.exists()
 
 
-def test_create_global_jpg_logo(create_dept, create_logos):
+def test_create_global_jpg_logo(create_logos):
+    dept1, dept2, dept3 = create_logos
     path = Path(f"{RESOURCES_DIR}/logo_C.jpg")
     stream = path.open("rb")
     logo_path = Path(scu.SCODOC_LOGOS_DIR).joinpath("logo_X.jpg")
@@ -193,8 +134,8 @@ def test_create_global_jpg_logo(create_dept, create_logos):
     logo_path.unlink(missing_ok=True)
 
 
-def test_create_locale_jpg_logo(create_dept, create_logos):
-    dept1, dept2, dept3 = create_dept
+def test_create_locale_jpg_logo(create_logos):
+    dept1, dept2, dept3 = create_logos
     path = Path(f"{RESOURCES_DIR}/logo_C.jpg")
     stream = path.open("rb")
     logo_path = Path(scu.SCODOC_LOGOS_DIR).joinpath(f"logos_{dept1.id}", "logo_Y.jpg")
@@ -204,7 +145,8 @@ def test_create_locale_jpg_logo(create_dept, create_logos):
     logo_path.unlink(missing_ok=True)
 
 
-def test_create_jpg_instead_of_png_logo(create_dept, create_logos):
+def test_create_jpg_instead_of_png_logo(create_logos):
+    dept1, dept2, dept3 = create_logos
     # action
     logo = Logo("D")  # create global logo (replace logo_D.png)
     path = Path(f"{RESOURCES_DIR}/logo_C.jpg")
@@ -226,9 +168,9 @@ def test_create_jpg_instead_of_png_logo(create_dept, create_logos):
     created.unlink(missing_ok=True)
 
 
-def test_list_logo(create_dept, create_logos):
+def test_list_logo(create_logos):
     # test only existence of copied logos. We assumes that they are OK
-    dept1, dept2, dept3 = create_dept
+    dept1, dept2, dept3 = create_logos
     logos = list_logos()
     assert set(logos.keys()) == {dept1.id, dept2.id, None}
     assert {"A", "C", "D", "E", "F", "header", "footer"}.issubset(

From 8bd9cf8956fb0c8e4d6964761867b3d5e828c387 Mon Sep 17 00:00:00 2001
From: Emmanuel Viennet <emmanuel.viennet@gmail.com>
Date: Sat, 1 Jan 2022 13:05:17 +0100
Subject: [PATCH 07/10] upgrade python components

---
 requirements-3.9.txt | 84 +++++++++++++++++++++++---------------------
 1 file changed, 43 insertions(+), 41 deletions(-)

diff --git a/requirements-3.9.txt b/requirements-3.9.txt
index 5a00e2824..b4a10ac16 100755
--- a/requirements-3.9.txt
+++ b/requirements-3.9.txt
@@ -1,70 +1,72 @@
-alembic==1.6.5
-astroid==2.6.6
-attrs==21.2.0
+alembic==1.7.5
+astroid==2.9.1
+attrs==21.4.0
 Babel==2.9.1
 blinker==1.4
-certifi==2021.5.30
-cffi==1.14.6
+certifi==2021.10.8
+cffi==1.15.0
 chardet==4.0.0
-charset-normalizer==2.0.4
-click==8.0.1
+charset-normalizer==2.0.9
+click==8.0.3
 cracklib==2.9.3
-cryptography==3.4.7
+cryptography==36.0.1
+Deprecated==1.2.13
 dnspython==2.1.0
 dominate==2.6.0
 email-validator==1.1.3
 et-xmlfile==1.1.0
-Flask==2.0.1
+Flask==2.0.2
 Flask-Babel==2.0.0
 Flask-Bootstrap==3.3.7.1
 Flask-Caching==1.10.1
-Flask-HTTPAuth==4.4.0
+Flask-HTTPAuth==4.5.0
 Flask-Login==0.5.0
 Flask-Mail==0.9.1
 Flask-Migrate==3.1.0
 Flask-Moment==1.0.2
 Flask-SQLAlchemy==2.5.1
-Flask-WTF==0.15.1
-greenlet==1.1.1
+Flask-WTF==1.0.0
+greenlet==1.1.2
 gunicorn==20.1.0
-icalendar==4.0.7
-idna==3.2
+icalendar==4.0.9
+idna==3.3
 iniconfig==1.1.1
-isort==5.9.3
+isort==5.10.1
 itsdangerous==2.0.1
-Jinja2==3.0.1
-lazy-object-proxy==1.6.0
-Mako==1.1.4
+Jinja2==3.0.3
+lazy-object-proxy==1.7.1
+Mako==1.1.6
 MarkupSafe==2.0.1
 mccabe==0.6.1
-numpy==1.21.4
-openpyxl==3.0.7
-packaging==21.0
-pandas==1.3.4
-Pillow==8.3.1
-pluggy==0.13.1
-psycopg2==2.9.1
-py==1.10.0
-pycparser==2.20
+numpy==1.22.0
+openpyxl==3.0.9
+packaging==21.3
+pandas==1.3.5
+Pillow==8.4.0
+pluggy==1.0.0
+psycopg2==2.9.3
+py==1.11.0
+pycparser==2.21
 pydot==1.4.2
-PyJWT==2.1.0
-pyOpenSSL==20.0.1
-pyparsing==2.4.7
-pytest==6.2.4
+PyJWT==2.3.0
+pyOpenSSL==21.0.0
+pyparsing==3.0.6
+pytest==6.2.5
 python-dateutil==2.8.2
-python-dotenv==0.19.0
+python-dotenv==0.19.2
 python-editor==1.0.4
-pytz==2021.1
-redis==3.5.3
-reportlab==3.6.1
+pytz==2021.3
+redis==4.1.0
+reportlab==3.6.5
 requests==2.26.0
-rq==1.9.0
+rq==1.10.1
 six==1.16.0
-SQLAlchemy==1.4.22
+SQLAlchemy==1.4.29
 toml==0.10.2
 tornado==6.1
-urllib3==1.26.6
+typing-extensions==4.0.1
+urllib3==1.26.7
 visitor==0.1.3
-Werkzeug==2.0.1
-wrapt==1.12.1
-WTForms==2.3.3
+Werkzeug==2.0.2
+wrapt==1.13.3
+WTForms==3.0.1

From dc004de8ef672c28bf4456b6d280bc0b432c66d3 Mon Sep 17 00:00:00 2001
From: Emmanuel Viennet <emmanuel.viennet@gmail.com>
Date: Sat, 1 Jan 2022 14:49:42 +0100
Subject: [PATCH 08/10] update copyright

---
 README.md                                   | 2 +-
 app/api/logos.py                            | 2 +-
 app/api/sco_api.py                          | 2 +-
 app/but/bulletin_but.py                     | 2 +-
 app/but/bulletin_but_xml_compat.py          | 2 +-
 app/but/forms/refcomp_forms.py              | 2 +-
 app/but/import_refcomp.py                   | 2 +-
 app/comp/df_cache.py                        | 2 +-
 app/comp/moy_mod.py                         | 2 +-
 app/comp/moy_sem.py                         | 2 +-
 app/comp/moy_ue.py                          | 2 +-
 app/forms/main/config_forms.py              | 2 +-
 app/forms/main/create_dept.py               | 2 +-
 app/models/but_refcomp.py                   | 2 +-
 app/pe/pe_avislatex.py                      | 2 +-
 app/pe/pe_jurype.py                         | 2 +-
 app/pe/pe_semestretag.py                    | 2 +-
 app/pe/pe_settag.py                         | 2 +-
 app/pe/pe_tagtable.py                       | 2 +-
 app/pe/pe_tools.py                          | 2 +-
 app/pe/pe_view.py                           | 2 +-
 app/scodoc/__init__.py                      | 2 +-
 app/scodoc/bonus_sport.py                   | 2 +-
 app/scodoc/gen_tables.py                    | 2 +-
 app/scodoc/html_sco_header.py               | 2 +-
 app/scodoc/html_sidebar.py                  | 2 +-
 app/scodoc/htmlutils.py                     | 2 +-
 app/scodoc/notes_table.py                   | 2 +-
 app/scodoc/notes_users.py                   | 2 +-
 app/scodoc/safehtml.py                      | 2 +-
 app/scodoc/sco_abs.py                       | 2 +-
 app/scodoc/sco_abs_notification.py          | 2 +-
 app/scodoc/sco_abs_views.py                 | 2 +-
 app/scodoc/sco_apogee_compare.py            | 2 +-
 app/scodoc/sco_apogee_csv.py                | 2 +-
 app/scodoc/sco_archives.py                  | 2 +-
 app/scodoc/sco_archives_etud.py             | 2 +-
 app/scodoc/sco_bac.py                       | 2 +-
 app/scodoc/sco_bulletins.py                 | 2 +-
 app/scodoc/sco_bulletins_example.py         | 2 +-
 app/scodoc/sco_bulletins_generator.py       | 2 +-
 app/scodoc/sco_bulletins_json.py            | 2 +-
 app/scodoc/sco_bulletins_legacy.py          | 2 +-
 app/scodoc/sco_bulletins_pdf.py             | 2 +-
 app/scodoc/sco_bulletins_signature.py       | 2 +-
 app/scodoc/sco_bulletins_standard.py        | 2 +-
 app/scodoc/sco_bulletins_ucac.py            | 2 +-
 app/scodoc/sco_bulletins_xml.py             | 2 +-
 app/scodoc/sco_cache.py                     | 2 +-
 app/scodoc/sco_codes_parcours.py            | 2 +-
 app/scodoc/sco_compute_moy.py               | 2 +-
 app/scodoc/sco_config_actions.py            | 2 +-
 app/scodoc/sco_cost_formation.py            | 2 +-
 app/scodoc/sco_debouche.py                  | 2 +-
 app/scodoc/sco_dept.py                      | 2 +-
 app/scodoc/sco_dump_db.py                   | 2 +-
 app/scodoc/sco_edit_apc.py                  | 2 +-
 app/scodoc/sco_edit_formation.py            | 2 +-
 app/scodoc/sco_edit_matiere.py              | 2 +-
 app/scodoc/sco_edit_module.py               | 2 +-
 app/scodoc/sco_edit_ue.py                   | 2 +-
 app/scodoc/sco_edt_cal.py                   | 2 +-
 app/scodoc/sco_entreprises.py               | 2 +-
 app/scodoc/sco_etape_apogee.py              | 2 +-
 app/scodoc/sco_etape_apogee_view.py         | 2 +-
 app/scodoc/sco_etape_bilan.py               | 2 +-
 app/scodoc/sco_etud.py                      | 2 +-
 app/scodoc/sco_evaluation_check_abs.py      | 2 +-
 app/scodoc/sco_evaluation_db.py             | 2 +-
 app/scodoc/sco_evaluation_edit.py           | 2 +-
 app/scodoc/sco_evaluations.py               | 2 +-
 app/scodoc/sco_excel.py                     | 2 +-
 app/scodoc/sco_exceptions.py                | 2 +-
 app/scodoc/sco_export_results.py            | 2 +-
 app/scodoc/sco_find_etud.py                 | 2 +-
 app/scodoc/sco_formations.py                | 2 +-
 app/scodoc/sco_formsemestre.py              | 2 +-
 app/scodoc/sco_formsemestre_custommenu.py   | 2 +-
 app/scodoc/sco_formsemestre_edit.py         | 2 +-
 app/scodoc/sco_formsemestre_exterieurs.py   | 2 +-
 app/scodoc/sco_formsemestre_inscriptions.py | 2 +-
 app/scodoc/sco_formsemestre_status.py       | 2 +-
 app/scodoc/sco_formsemestre_validation.py   | 2 +-
 app/scodoc/sco_formulas.py                  | 2 +-
 app/scodoc/sco_groups.py                    | 2 +-
 app/scodoc/sco_groups_edit.py               | 2 +-
 app/scodoc/sco_groups_view.py               | 2 +-
 app/scodoc/sco_import_etuds.py              | 2 +-
 app/scodoc/sco_import_users.py              | 2 +-
 app/scodoc/sco_inscr_passage.py             | 2 +-
 app/scodoc/sco_liste_notes.py               | 2 +-
 app/scodoc/sco_logos.py                     | 2 +-
 app/scodoc/sco_lycee.py                     | 2 +-
 app/scodoc/sco_modalites.py                 | 2 +-
 app/scodoc/sco_moduleimpl.py                | 2 +-
 app/scodoc/sco_moduleimpl_inscriptions.py   | 2 +-
 app/scodoc/sco_moduleimpl_status.py         | 2 +-
 app/scodoc/sco_news.py                      | 2 +-
 app/scodoc/sco_page_etud.py                 | 2 +-
 app/scodoc/sco_parcours_dut.py              | 2 +-
 app/scodoc/sco_pdf.py                       | 2 +-
 app/scodoc/sco_photos.py                    | 2 +-
 app/scodoc/sco_placement.py                 | 2 +-
 app/scodoc/sco_portal_apogee.py             | 2 +-
 app/scodoc/sco_poursuite_dut.py             | 2 +-
 app/scodoc/sco_preferences.py               | 2 +-
 app/scodoc/sco_prepajury.py                 | 2 +-
 app/scodoc/sco_pvjury.py                    | 2 +-
 app/scodoc/sco_pvpdf.py                     | 2 +-
 app/scodoc/sco_recapcomplet.py              | 2 +-
 app/scodoc/sco_report.py                    | 2 +-
 app/scodoc/sco_saisie_notes.py              | 2 +-
 app/scodoc/sco_semset.py                    | 2 +-
 app/scodoc/sco_synchro_etuds.py             | 2 +-
 app/scodoc/sco_tag_module.py                | 2 +-
 app/scodoc/sco_trombino.py                  | 2 +-
 app/scodoc/sco_trombino_tours.py            | 2 +-
 app/scodoc/sco_ue_external.py               | 2 +-
 app/scodoc/sco_undo_notes.py                | 2 +-
 app/scodoc/sco_up_to_date.py                | 2 +-
 app/scodoc/sco_users.py                     | 2 +-
 app/scodoc/sco_utils.py                     | 2 +-
 app/scodoc/sco_vdi.py                       | 2 +-
 app/scodoc/sco_xml.py                       | 2 +-
 app/scodoc/scolog.py                        | 2 +-
 app/views/absences.py                       | 2 +-
 app/views/entreprises.py                    | 2 +-
 app/views/notes.py                          | 2 +-
 app/views/pn_modules.py                     | 2 +-
 app/views/scodoc.py                         | 2 +-
 app/views/scolar.py                         | 2 +-
 app/views/users.py                          | 2 +-
 misc/csv2rules.py                           | 2 +-
 misc/geolocalize_lycees.py                  | 2 +-
 tools/anonymize_db.py                       | 2 +-
 135 files changed, 135 insertions(+), 135 deletions(-)

diff --git a/README.md b/README.md
index 29ac566ac..5827703c7 100644
--- a/README.md
+++ b/README.md
@@ -1,7 +1,7 @@
 
 #            ScoDoc - Gestion de la scolarité - Version ScoDoc 9
 
-(c) Emmanuel Viennet 1999 - 2021 (voir LICENCE.txt)
+(c) Emmanuel Viennet 1999 - 2022 (voir LICENCE.txt)
 
 Installation: voir instructions à jour sur <https://scodoc.org/GuideInstallDebian11>
 
diff --git a/app/api/logos.py b/app/api/logos.py
index 4fdb10992..e32f6595c 100644
--- a/app/api/logos.py
+++ b/app/api/logos.py
@@ -5,7 +5,7 @@
 #
 # Gestion scolarite IUT
 #
-# Copyright (c) 1999 - 2021 Emmanuel Viennet.  All rights reserved.
+# Copyright (c) 1999 - 2022 Emmanuel Viennet.  All rights reserved.
 #
 # This program is free software; you can redistribute it and/or modify
 # it under the terms of the GNU General Public License as published by
diff --git a/app/api/sco_api.py b/app/api/sco_api.py
index 6aa488c2f..2051ad820 100644
--- a/app/api/sco_api.py
+++ b/app/api/sco_api.py
@@ -5,7 +5,7 @@
 #
 # Gestion scolarite IUT
 #
-# Copyright (c) 1999 - 2021 Emmanuel Viennet.  All rights reserved.
+# Copyright (c) 1999 - 2022 Emmanuel Viennet.  All rights reserved.
 #
 # This program is free software; you can redistribute it and/or modify
 # it under the terms of the GNU General Public License as published by
diff --git a/app/but/bulletin_but.py b/app/but/bulletin_but.py
index 4ff2849f8..54d08400f 100644
--- a/app/but/bulletin_but.py
+++ b/app/but/bulletin_but.py
@@ -1,6 +1,6 @@
 ##############################################################################
 # ScoDoc
-# Copyright (c) 1999 - 2021 Emmanuel Viennet.  All rights reserved.
+# Copyright (c) 1999 - 2022 Emmanuel Viennet.  All rights reserved.
 # See LICENSE
 ##############################################################################
 
diff --git a/app/but/bulletin_but_xml_compat.py b/app/but/bulletin_but_xml_compat.py
index 9e234dc0b..4307788dc 100644
--- a/app/but/bulletin_but_xml_compat.py
+++ b/app/but/bulletin_but_xml_compat.py
@@ -5,7 +5,7 @@
 #
 # Gestion scolarite IUT
 #
-# Copyright (c) 1999 - 2021 Emmanuel Viennet.  All rights reserved.
+# Copyright (c) 1999 - 2022 Emmanuel Viennet.  All rights reserved.
 #
 # This program is free software; you can redistribute it and/or modify
 # it under the terms of the GNU General Public License as published by
diff --git a/app/but/forms/refcomp_forms.py b/app/but/forms/refcomp_forms.py
index a1cab459c..6fcd59500 100644
--- a/app/but/forms/refcomp_forms.py
+++ b/app/but/forms/refcomp_forms.py
@@ -1,6 +1,6 @@
 ##############################################################################
 # ScoDoc
-# Copyright (c) 1999 - 2021 Emmanuel Viennet.  All rights reserved.
+# Copyright (c) 1999 - 2022 Emmanuel Viennet.  All rights reserved.
 # See LICENSE
 ##############################################################################
 
diff --git a/app/but/import_refcomp.py b/app/but/import_refcomp.py
index e0e59ca80..04e96b50c 100644
--- a/app/but/import_refcomp.py
+++ b/app/but/import_refcomp.py
@@ -1,6 +1,6 @@
 ##############################################################################
 # ScoDoc
-# Copyright (c) 1999 - 2021 Emmanuel Viennet.  All rights reserved.
+# Copyright (c) 1999 - 2022 Emmanuel Viennet.  All rights reserved.
 # See LICENSE
 ##############################################################################
 from xml.etree import ElementTree
diff --git a/app/comp/df_cache.py b/app/comp/df_cache.py
index dec325e2a..2a85f4157 100644
--- a/app/comp/df_cache.py
+++ b/app/comp/df_cache.py
@@ -5,7 +5,7 @@
 #
 # Gestion scolarite IUT
 #
-# Copyright (c) 1999 - 2021 Emmanuel Viennet.  All rights reserved.
+# Copyright (c) 1999 - 2022 Emmanuel Viennet.  All rights reserved.
 #
 # This program is free software; you can redistribute it and/or modify
 # it under the terms of the GNU General Public License as published by
diff --git a/app/comp/moy_mod.py b/app/comp/moy_mod.py
index 40616cbab..41000fd4b 100644
--- a/app/comp/moy_mod.py
+++ b/app/comp/moy_mod.py
@@ -5,7 +5,7 @@
 #
 # Gestion scolarite IUT
 #
-# Copyright (c) 1999 - 2021 Emmanuel Viennet.  All rights reserved.
+# Copyright (c) 1999 - 2022 Emmanuel Viennet.  All rights reserved.
 #
 # This program is free software; you can redistribute it and/or modify
 # it under the terms of the GNU General Public License as published by
diff --git a/app/comp/moy_sem.py b/app/comp/moy_sem.py
index 037b4cd06..51cc5e77b 100644
--- a/app/comp/moy_sem.py
+++ b/app/comp/moy_sem.py
@@ -5,7 +5,7 @@
 #
 # Gestion scolarite IUT
 #
-# Copyright (c) 1999 - 2021 Emmanuel Viennet.  All rights reserved.
+# Copyright (c) 1999 - 2022 Emmanuel Viennet.  All rights reserved.
 #
 # This program is free software; you can redistribute it and/or modify
 # it under the terms of the GNU General Public License as published by
diff --git a/app/comp/moy_ue.py b/app/comp/moy_ue.py
index 74994f26d..a707633fd 100644
--- a/app/comp/moy_ue.py
+++ b/app/comp/moy_ue.py
@@ -5,7 +5,7 @@
 #
 # Gestion scolarite IUT
 #
-# Copyright (c) 1999 - 2021 Emmanuel Viennet.  All rights reserved.
+# Copyright (c) 1999 - 2022 Emmanuel Viennet.  All rights reserved.
 #
 # This program is free software; you can redistribute it and/or modify
 # it under the terms of the GNU General Public License as published by
diff --git a/app/forms/main/config_forms.py b/app/forms/main/config_forms.py
index 609066c51..035897950 100644
--- a/app/forms/main/config_forms.py
+++ b/app/forms/main/config_forms.py
@@ -5,7 +5,7 @@
 #
 # ScoDoc
 #
-# Copyright (c) 1999 - 2021 Emmanuel Viennet.  All rights reserved.
+# Copyright (c) 1999 - 2022 Emmanuel Viennet.  All rights reserved.
 #
 # This program is free software; you can redistribute it and/or modify
 # it under the terms of the GNU General Public License as published by
diff --git a/app/forms/main/create_dept.py b/app/forms/main/create_dept.py
index 11b361294..7bc26b42a 100644
--- a/app/forms/main/create_dept.py
+++ b/app/forms/main/create_dept.py
@@ -5,7 +5,7 @@
 #
 # ScoDoc
 #
-# Copyright (c) 1999 - 2021 Emmanuel Viennet.  All rights reserved.
+# Copyright (c) 1999 - 2022 Emmanuel Viennet.  All rights reserved.
 #
 # This program is free software; you can redistribute it and/or modify
 # it under the terms of the GNU General Public License as published by
diff --git a/app/models/but_refcomp.py b/app/models/but_refcomp.py
index b930bf9e5..bf1b4cb68 100644
--- a/app/models/but_refcomp.py
+++ b/app/models/but_refcomp.py
@@ -1,6 +1,6 @@
 ##############################################################################
 # ScoDoc
-# Copyright (c) 1999 - 2021 Emmanuel Viennet.  All rights reserved.
+# Copyright (c) 1999 - 2022 Emmanuel Viennet.  All rights reserved.
 # See LICENSE
 ##############################################################################
 """ScoDoc 9 models : Référentiel Compétence BUT 2021
diff --git a/app/pe/pe_avislatex.py b/app/pe/pe_avislatex.py
index b98218eea..2ff507152 100644
--- a/app/pe/pe_avislatex.py
+++ b/app/pe/pe_avislatex.py
@@ -5,7 +5,7 @@
 #
 # Gestion scolarite IUT
 #
-# Copyright (c) 1999 - 2021 Emmanuel Viennet.  All rights reserved.
+# Copyright (c) 1999 - 2022 Emmanuel Viennet.  All rights reserved.
 #
 # This program is free software; you can redistribute it and/or modify
 # it under the terms of the GNU General Public License as published by
diff --git a/app/pe/pe_jurype.py b/app/pe/pe_jurype.py
index a7d302ad8..694a410f6 100644
--- a/app/pe/pe_jurype.py
+++ b/app/pe/pe_jurype.py
@@ -5,7 +5,7 @@
 #
 # Gestion scolarite IUT
 #
-# Copyright (c) 1999 - 2021 Emmanuel Viennet.  All rights reserved.
+# Copyright (c) 1999 - 2022 Emmanuel Viennet.  All rights reserved.
 #
 # This program is free software; you can redistribute it and/or modify
 # it under the terms of the GNU General Public License as published by
diff --git a/app/pe/pe_semestretag.py b/app/pe/pe_semestretag.py
index a6729def9..9a33f57ce 100644
--- a/app/pe/pe_semestretag.py
+++ b/app/pe/pe_semestretag.py
@@ -5,7 +5,7 @@
 #
 # Gestion scolarite IUT
 #
-# Copyright (c) 1999 - 2021 Emmanuel Viennet.  All rights reserved.
+# Copyright (c) 1999 - 2022 Emmanuel Viennet.  All rights reserved.
 #
 # This program is free software; you can redistribute it and/or modify
 # it under the terms of the GNU General Public License as published by
diff --git a/app/pe/pe_settag.py b/app/pe/pe_settag.py
index 8fde8d20a..f4ada213b 100644
--- a/app/pe/pe_settag.py
+++ b/app/pe/pe_settag.py
@@ -5,7 +5,7 @@
 #
 # Gestion scolarite IUT
 #
-# Copyright (c) 1999 - 2021 Emmanuel Viennet.  All rights reserved.
+# Copyright (c) 1999 - 2022 Emmanuel Viennet.  All rights reserved.
 #
 # This program is free software; you can redistribute it and/or modify
 # it under the terms of the GNU General Public License as published by
diff --git a/app/pe/pe_tagtable.py b/app/pe/pe_tagtable.py
index e32a11735..03acc4a60 100644
--- a/app/pe/pe_tagtable.py
+++ b/app/pe/pe_tagtable.py
@@ -5,7 +5,7 @@
 #
 # Gestion scolarite IUT
 #
-# Copyright (c) 1999 - 2021 Emmanuel Viennet.  All rights reserved.
+# Copyright (c) 1999 - 2022 Emmanuel Viennet.  All rights reserved.
 #
 # This program is free software; you can redistribute it and/or modify
 # it under the terms of the GNU General Public License as published by
diff --git a/app/pe/pe_tools.py b/app/pe/pe_tools.py
index 99adbeddc..a495f9650 100644
--- a/app/pe/pe_tools.py
+++ b/app/pe/pe_tools.py
@@ -5,7 +5,7 @@
 #
 # Gestion scolarite IUT
 #
-# Copyright (c) 1999 - 2021 Emmanuel Viennet.  All rights reserved.
+# Copyright (c) 1999 - 2022 Emmanuel Viennet.  All rights reserved.
 #
 # This program is free software; you can redistribute it and/or modify
 # it under the terms of the GNU General Public License as published by
diff --git a/app/pe/pe_view.py b/app/pe/pe_view.py
index 14efdada3..43a00ebe5 100644
--- a/app/pe/pe_view.py
+++ b/app/pe/pe_view.py
@@ -5,7 +5,7 @@
 #
 # Gestion scolarite IUT
 #
-# Copyright (c) 1999 - 2021 Emmanuel Viennet.  All rights reserved.
+# Copyright (c) 1999 - 2022 Emmanuel Viennet.  All rights reserved.
 #
 # This program is free software; you can redistribute it and/or modify
 # it under the terms of the GNU General Public License as published by
diff --git a/app/scodoc/__init__.py b/app/scodoc/__init__.py
index 0481bb535..54c845c84 100644
--- a/app/scodoc/__init__.py
+++ b/app/scodoc/__init__.py
@@ -5,7 +5,7 @@
 #
 # Gestion scolarite IUT
 #
-# Copyright (c) 1999 - 2021 Emmanuel Viennet.  All rights reserved.
+# Copyright (c) 1999 - 2022 Emmanuel Viennet.  All rights reserved.
 #
 # This program is free software; you can redistribute it and/or modify
 # it under the terms of the GNU General Public License as published by
diff --git a/app/scodoc/bonus_sport.py b/app/scodoc/bonus_sport.py
index 4a3f8abae..afc05e26e 100644
--- a/app/scodoc/bonus_sport.py
+++ b/app/scodoc/bonus_sport.py
@@ -5,7 +5,7 @@
 #
 # Gestion scolarite IUT
 #
-# Copyright (c) 1999 - 2021 Emmanuel Viennet.  All rights reserved.
+# Copyright (c) 1999 - 2022 Emmanuel Viennet.  All rights reserved.
 #
 # This program is free software; you can redistribute it and/or modify
 # it under the terms of the GNU General Public License as published by
diff --git a/app/scodoc/gen_tables.py b/app/scodoc/gen_tables.py
index 78a0f6a28..a9ed10aaf 100644
--- a/app/scodoc/gen_tables.py
+++ b/app/scodoc/gen_tables.py
@@ -5,7 +5,7 @@
 #
 # Gestion scolarite IUT
 #
-# Copyright (c) 1999 - 2021 Emmanuel Viennet.  All rights reserved.
+# Copyright (c) 1999 - 2022 Emmanuel Viennet.  All rights reserved.
 #
 # This program is free software; you can redistribute it and/or modify
 # it under the terms of the GNU General Public License as published by
diff --git a/app/scodoc/html_sco_header.py b/app/scodoc/html_sco_header.py
index faf1fcf35..e2b4d0bd6 100644
--- a/app/scodoc/html_sco_header.py
+++ b/app/scodoc/html_sco_header.py
@@ -5,7 +5,7 @@
 #
 # Gestion scolarite IUT
 #
-# Copyright (c) 1999 - 2021 Emmanuel Viennet.  All rights reserved.
+# Copyright (c) 1999 - 2022 Emmanuel Viennet.  All rights reserved.
 #
 # This program is free software; you can redistribute it and/or modify
 # it under the terms of the GNU General Public License as published by
diff --git a/app/scodoc/html_sidebar.py b/app/scodoc/html_sidebar.py
index c35f30426..b3bf18a36 100644
--- a/app/scodoc/html_sidebar.py
+++ b/app/scodoc/html_sidebar.py
@@ -5,7 +5,7 @@
 #
 # Gestion scolarite IUT
 #
-# Copyright (c) 1999 - 2021 Emmanuel Viennet.  All rights reserved.
+# Copyright (c) 1999 - 2022 Emmanuel Viennet.  All rights reserved.
 #
 # This program is free software; you can redistribute it and/or modify
 # it under the terms of the GNU General Public License as published by
diff --git a/app/scodoc/htmlutils.py b/app/scodoc/htmlutils.py
index c06e86e91..3306b80d1 100644
--- a/app/scodoc/htmlutils.py
+++ b/app/scodoc/htmlutils.py
@@ -5,7 +5,7 @@
 #
 # Gestion scolarite IUT
 #
-# Copyright (c) 1999 - 2021 Emmanuel Viennet.  All rights reserved.
+# Copyright (c) 1999 - 2022 Emmanuel Viennet.  All rights reserved.
 #
 # This program is free software; you can redistribute it and/or modify
 # it under the terms of the GNU General Public License as published by
diff --git a/app/scodoc/notes_table.py b/app/scodoc/notes_table.py
index 052b387e1..996feddab 100644
--- a/app/scodoc/notes_table.py
+++ b/app/scodoc/notes_table.py
@@ -5,7 +5,7 @@
 #
 # Gestion scolarite IUT
 #
-# Copyright (c) 1999 - 2021 Emmanuel Viennet.  All rights reserved.
+# Copyright (c) 1999 - 2022 Emmanuel Viennet.  All rights reserved.
 #
 # This program is free software; you can redistribute it and/or modify
 # it under the terms of the GNU General Public License as published by
diff --git a/app/scodoc/notes_users.py b/app/scodoc/notes_users.py
index 8afc81dff..6dd5bf40b 100644
--- a/app/scodoc/notes_users.py
+++ b/app/scodoc/notes_users.py
@@ -5,7 +5,7 @@
 #
 # Gestion scolarite IUT
 #
-# Copyright (c) 1999 - 2021 Emmanuel Viennet.  All rights reserved.
+# Copyright (c) 1999 - 2022 Emmanuel Viennet.  All rights reserved.
 #
 # This program is free software; you can redistribute it and/or modify
 # it under the terms of the GNU General Public License as published by
diff --git a/app/scodoc/safehtml.py b/app/scodoc/safehtml.py
index f9deecfef..c7f084229 100644
--- a/app/scodoc/safehtml.py
+++ b/app/scodoc/safehtml.py
@@ -5,7 +5,7 @@
 #
 # Gestion scolarite IUT
 #
-# Copyright (c) 1999 - 2021 Emmanuel Viennet.  All rights reserved.
+# Copyright (c) 1999 - 2022 Emmanuel Viennet.  All rights reserved.
 #
 # This program is free software; you can redistribute it and/or modify
 # it under the terms of the GNU General Public License as published by
diff --git a/app/scodoc/sco_abs.py b/app/scodoc/sco_abs.py
index 4ec994ab7..0b38559f7 100644
--- a/app/scodoc/sco_abs.py
+++ b/app/scodoc/sco_abs.py
@@ -5,7 +5,7 @@
 #
 # Gestion scolarite IUT
 #
-# Copyright (c) 1999 - 2021 Emmanuel Viennet.  All rights reserved.
+# Copyright (c) 1999 - 2022 Emmanuel Viennet.  All rights reserved.
 #
 # This program is free software; you can redistribute it and/or modify
 # it under the terms of the GNU General Public License as published by
diff --git a/app/scodoc/sco_abs_notification.py b/app/scodoc/sco_abs_notification.py
index bf7c5e095..f15e7d4c8 100644
--- a/app/scodoc/sco_abs_notification.py
+++ b/app/scodoc/sco_abs_notification.py
@@ -5,7 +5,7 @@
 #
 # Gestion scolarite IUT
 #
-# Copyright (c) 1999 - 2021 Emmanuel Viennet.  All rights reserved.
+# Copyright (c) 1999 - 2022 Emmanuel Viennet.  All rights reserved.
 #
 # This program is free software; you can redistribute it and/or modify
 # it under the terms of the GNU General Public License as published by
diff --git a/app/scodoc/sco_abs_views.py b/app/scodoc/sco_abs_views.py
index 4e5aaa469..00a1870d2 100644
--- a/app/scodoc/sco_abs_views.py
+++ b/app/scodoc/sco_abs_views.py
@@ -5,7 +5,7 @@
 #
 # Gestion scolarite IUT
 #
-# Copyright (c) 1999 - 2021 Emmanuel Viennet.  All rights reserved.
+# Copyright (c) 1999 - 2022 Emmanuel Viennet.  All rights reserved.
 #
 # This program is free software; you can redistribute it and/or modify
 # it under the terms of the GNU General Public License as published by
diff --git a/app/scodoc/sco_apogee_compare.py b/app/scodoc/sco_apogee_compare.py
index 0ccd94855..61647d702 100644
--- a/app/scodoc/sco_apogee_compare.py
+++ b/app/scodoc/sco_apogee_compare.py
@@ -5,7 +5,7 @@
 #
 # Gestion scolarite IUT
 #
-# Copyright (c) 1999 - 2021 Emmanuel Viennet.  All rights reserved.
+# Copyright (c) 1999 - 2022 Emmanuel Viennet.  All rights reserved.
 #
 # This program is free software; you can redistribute it and/or modify
 # it under the terms of the GNU General Public License as published by
diff --git a/app/scodoc/sco_apogee_csv.py b/app/scodoc/sco_apogee_csv.py
index 57f6f4416..e8569cdea 100644
--- a/app/scodoc/sco_apogee_csv.py
+++ b/app/scodoc/sco_apogee_csv.py
@@ -5,7 +5,7 @@
 #
 # Gestion scolarite IUT
 #
-# Copyright (c) 1999 - 2021 Emmanuel Viennet.  All rights reserved.
+# Copyright (c) 1999 - 2022 Emmanuel Viennet.  All rights reserved.
 #
 # This program is free software; you can redistribute it and/or modify
 # it under the terms of the GNU General Public License as published by
diff --git a/app/scodoc/sco_archives.py b/app/scodoc/sco_archives.py
index 5884254e1..b7cdc1f14 100644
--- a/app/scodoc/sco_archives.py
+++ b/app/scodoc/sco_archives.py
@@ -5,7 +5,7 @@
 #
 # Gestion scolarite IUT
 #
-# Copyright (c) 1999 - 2021 Emmanuel Viennet.  All rights reserved.
+# Copyright (c) 1999 - 2022 Emmanuel Viennet.  All rights reserved.
 #
 # This program is free software; you can redistribute it and/or modify
 # it under the terms of the GNU General Public License as published by
diff --git a/app/scodoc/sco_archives_etud.py b/app/scodoc/sco_archives_etud.py
index 3a47995a8..90d2900cb 100644
--- a/app/scodoc/sco_archives_etud.py
+++ b/app/scodoc/sco_archives_etud.py
@@ -5,7 +5,7 @@
 #
 # Gestion scolarite IUT
 #
-# Copyright (c) 1999 - 2021 Emmanuel Viennet.  All rights reserved.
+# Copyright (c) 1999 - 2022 Emmanuel Viennet.  All rights reserved.
 #
 # This program is free software; you can redistribute it and/or modify
 # it under the terms of the GNU General Public License as published by
diff --git a/app/scodoc/sco_bac.py b/app/scodoc/sco_bac.py
index 1bd08f1e4..2346ac2e9 100644
--- a/app/scodoc/sco_bac.py
+++ b/app/scodoc/sco_bac.py
@@ -5,7 +5,7 @@
 #
 # Gestion scolarite IUT
 #
-# Copyright (c) 1999 - 2021 Emmanuel Viennet.  All rights reserved.
+# Copyright (c) 1999 - 2022 Emmanuel Viennet.  All rights reserved.
 #
 # This program is free software; you can redistribute it and/or modify
 # it under the terms of the GNU General Public License as published by
diff --git a/app/scodoc/sco_bulletins.py b/app/scodoc/sco_bulletins.py
index 91c912c43..0ac295e38 100644
--- a/app/scodoc/sco_bulletins.py
+++ b/app/scodoc/sco_bulletins.py
@@ -5,7 +5,7 @@
 #
 # Gestion scolarite IUT
 #
-# Copyright (c) 1999 - 2021 Emmanuel Viennet.  All rights reserved.
+# Copyright (c) 1999 - 2022 Emmanuel Viennet.  All rights reserved.
 #
 # This program is free software; you can redistribute it and/or modify
 # it under the terms of the GNU General Public License as published by
diff --git a/app/scodoc/sco_bulletins_example.py b/app/scodoc/sco_bulletins_example.py
index ce24edde2..cf908a1b9 100644
--- a/app/scodoc/sco_bulletins_example.py
+++ b/app/scodoc/sco_bulletins_example.py
@@ -5,7 +5,7 @@
 #
 # Gestion scolarite IUT
 #
-# Copyright (c) 1999 - 2021 Emmanuel Viennet.  All rights reserved.
+# Copyright (c) 1999 - 2022 Emmanuel Viennet.  All rights reserved.
 #
 # This program is free software; you can redistribute it and/or modify
 # it under the terms of the GNU General Public License as published by
diff --git a/app/scodoc/sco_bulletins_generator.py b/app/scodoc/sco_bulletins_generator.py
index 2dee620a2..04a9efaee 100644
--- a/app/scodoc/sco_bulletins_generator.py
+++ b/app/scodoc/sco_bulletins_generator.py
@@ -5,7 +5,7 @@
 #
 # Gestion scolarite IUT
 #
-# Copyright (c) 1999 - 2021 Emmanuel Viennet.  All rights reserved.
+# Copyright (c) 1999 - 2022 Emmanuel Viennet.  All rights reserved.
 #
 # This program is free software; you can redistribute it and/or modify
 # it under the terms of the GNU General Public License as published by
diff --git a/app/scodoc/sco_bulletins_json.py b/app/scodoc/sco_bulletins_json.py
index 81df14d6a..c3812e745 100644
--- a/app/scodoc/sco_bulletins_json.py
+++ b/app/scodoc/sco_bulletins_json.py
@@ -5,7 +5,7 @@
 #
 # Gestion scolarite IUT
 #
-# Copyright (c) 1999 - 2021 Emmanuel Viennet.  All rights reserved.
+# Copyright (c) 1999 - 2022 Emmanuel Viennet.  All rights reserved.
 #
 # This program is free software; you can redistribute it and/or modify
 # it under the terms of the GNU General Public License as published by
diff --git a/app/scodoc/sco_bulletins_legacy.py b/app/scodoc/sco_bulletins_legacy.py
index 5198872bd..8be1d0c50 100644
--- a/app/scodoc/sco_bulletins_legacy.py
+++ b/app/scodoc/sco_bulletins_legacy.py
@@ -5,7 +5,7 @@
 #
 # Gestion scolarite IUT
 #
-# Copyright (c) 1999 - 2021 Emmanuel Viennet.  All rights reserved.
+# Copyright (c) 1999 - 2022 Emmanuel Viennet.  All rights reserved.
 #
 # This program is free software; you can redistribute it and/or modify
 # it under the terms of the GNU General Public License as published by
diff --git a/app/scodoc/sco_bulletins_pdf.py b/app/scodoc/sco_bulletins_pdf.py
index b28e9db51..4e81ce7ad 100644
--- a/app/scodoc/sco_bulletins_pdf.py
+++ b/app/scodoc/sco_bulletins_pdf.py
@@ -5,7 +5,7 @@
 #
 # Gestion scolarite IUT
 #
-# Copyright (c) 1999 - 2021 Emmanuel Viennet.  All rights reserved.
+# Copyright (c) 1999 - 2022 Emmanuel Viennet.  All rights reserved.
 #
 # This program is free software; you can redistribute it and/or modify
 # it under the terms of the GNU General Public License as published by
diff --git a/app/scodoc/sco_bulletins_signature.py b/app/scodoc/sco_bulletins_signature.py
index cb4be0303..be93e6720 100644
--- a/app/scodoc/sco_bulletins_signature.py
+++ b/app/scodoc/sco_bulletins_signature.py
@@ -5,7 +5,7 @@
 #
 # Gestion scolarite IUT
 #
-# Copyright (c) 1999 - 2021 Emmanuel Viennet.  All rights reserved.
+# Copyright (c) 1999 - 2022 Emmanuel Viennet.  All rights reserved.
 #
 # This program is free software; you can redistribute it and/or modify
 # it under the terms of the GNU General Public License as published by
diff --git a/app/scodoc/sco_bulletins_standard.py b/app/scodoc/sco_bulletins_standard.py
index 296239ead..f1e481cf1 100644
--- a/app/scodoc/sco_bulletins_standard.py
+++ b/app/scodoc/sco_bulletins_standard.py
@@ -5,7 +5,7 @@
 #
 # Gestion scolarite IUT
 #
-# Copyright (c) 1999 - 2021 Emmanuel Viennet.  All rights reserved.
+# Copyright (c) 1999 - 2022 Emmanuel Viennet.  All rights reserved.
 #
 # This program is free software; you can redistribute it and/or modify
 # it under the terms of the GNU General Public License as published by
diff --git a/app/scodoc/sco_bulletins_ucac.py b/app/scodoc/sco_bulletins_ucac.py
index 46d3e7b7a..2114c60ad 100644
--- a/app/scodoc/sco_bulletins_ucac.py
+++ b/app/scodoc/sco_bulletins_ucac.py
@@ -5,7 +5,7 @@
 #
 # Gestion scolarite IUT
 #
-# Copyright (c) 1999 - 2021 Emmanuel Viennet.  All rights reserved.
+# Copyright (c) 1999 - 2022 Emmanuel Viennet.  All rights reserved.
 #
 # This program is free software; you can redistribute it and/or modify
 # it under the terms of the GNU General Public License as published by
diff --git a/app/scodoc/sco_bulletins_xml.py b/app/scodoc/sco_bulletins_xml.py
index 39ff1040d..bf9c63e98 100644
--- a/app/scodoc/sco_bulletins_xml.py
+++ b/app/scodoc/sco_bulletins_xml.py
@@ -5,7 +5,7 @@
 #
 # Gestion scolarite IUT
 #
-# Copyright (c) 1999 - 2021 Emmanuel Viennet.  All rights reserved.
+# Copyright (c) 1999 - 2022 Emmanuel Viennet.  All rights reserved.
 #
 # This program is free software; you can redistribute it and/or modify
 # it under the terms of the GNU General Public License as published by
diff --git a/app/scodoc/sco_cache.py b/app/scodoc/sco_cache.py
index c6c2b1498..c030aa7e6 100644
--- a/app/scodoc/sco_cache.py
+++ b/app/scodoc/sco_cache.py
@@ -5,7 +5,7 @@
 #
 # Gestion scolarite IUT
 #
-# Copyright (c) 1999 - 2021 Emmanuel Viennet.  All rights reserved.
+# Copyright (c) 1999 - 2022 Emmanuel Viennet.  All rights reserved.
 #
 # This program is free software; you can redistribute it and/or modify
 # it under the terms of the GNU General Public License as published by
diff --git a/app/scodoc/sco_codes_parcours.py b/app/scodoc/sco_codes_parcours.py
index a1e18ca64..4ff29bb79 100644
--- a/app/scodoc/sco_codes_parcours.py
+++ b/app/scodoc/sco_codes_parcours.py
@@ -5,7 +5,7 @@
 #
 # Gestion scolarite IUT
 #
-# Copyright (c) 1999 - 2021 Emmanuel Viennet.  All rights reserved.
+# Copyright (c) 1999 - 2022 Emmanuel Viennet.  All rights reserved.
 #
 # This program is free software; you can redistribute it and/or modify
 # it under the terms of the GNU General Public License as published by
diff --git a/app/scodoc/sco_compute_moy.py b/app/scodoc/sco_compute_moy.py
index 898fd9adf..85b654549 100644
--- a/app/scodoc/sco_compute_moy.py
+++ b/app/scodoc/sco_compute_moy.py
@@ -5,7 +5,7 @@
 #
 # Gestion scolarite IUT
 #
-# Copyright (c) 1999 - 2021 Emmanuel Viennet.  All rights reserved.
+# Copyright (c) 1999 - 2022 Emmanuel Viennet.  All rights reserved.
 #
 # This program is free software; you can redistribute it and/or modify
 # it under the terms of the GNU General Public License as published by
diff --git a/app/scodoc/sco_config_actions.py b/app/scodoc/sco_config_actions.py
index b91574893..c3ccc9cb6 100644
--- a/app/scodoc/sco_config_actions.py
+++ b/app/scodoc/sco_config_actions.py
@@ -5,7 +5,7 @@
 #
 # ScoDoc
 #
-# Copyright (c) 1999 - 2021 Emmanuel Viennet.  All rights reserved.
+# Copyright (c) 1999 - 2022 Emmanuel Viennet.  All rights reserved.
 #
 # This program is free software; you can redistribute it and/or modify
 # it under the terms of the GNU General Public License as published by
diff --git a/app/scodoc/sco_cost_formation.py b/app/scodoc/sco_cost_formation.py
index d53d38619..b17643d27 100644
--- a/app/scodoc/sco_cost_formation.py
+++ b/app/scodoc/sco_cost_formation.py
@@ -5,7 +5,7 @@
 #
 # Gestion scolarite IUT
 #
-# Copyright (c) 1999 - 2021 Emmanuel Viennet.  All rights reserved.
+# Copyright (c) 1999 - 2022 Emmanuel Viennet.  All rights reserved.
 #
 # This program is free software; you can redistribute it and/or modify
 # it under the terms of the GNU General Public License as published by
diff --git a/app/scodoc/sco_debouche.py b/app/scodoc/sco_debouche.py
index 4c0b8916a..31d46a87a 100644
--- a/app/scodoc/sco_debouche.py
+++ b/app/scodoc/sco_debouche.py
@@ -5,7 +5,7 @@
 #
 # Gestion scolarite IUT
 #
-# Copyright (c) 1999 - 2021 Emmanuel Viennet.  All rights reserved.
+# Copyright (c) 1999 - 2022 Emmanuel Viennet.  All rights reserved.
 #
 # This program is free software; you can redistribute it and/or modify
 # it under the terms of the GNU General Public License as published by
diff --git a/app/scodoc/sco_dept.py b/app/scodoc/sco_dept.py
index a89f2184b..274b41d76 100644
--- a/app/scodoc/sco_dept.py
+++ b/app/scodoc/sco_dept.py
@@ -5,7 +5,7 @@
 #
 # Gestion scolarite IUT
 #
-# Copyright (c) 1999 - 2021 Emmanuel Viennet.  All rights reserved.
+# Copyright (c) 1999 - 2022 Emmanuel Viennet.  All rights reserved.
 #
 # This program is free software; you can redistribute it and/or modify
 # it under the terms of the GNU General Public License as published by
diff --git a/app/scodoc/sco_dump_db.py b/app/scodoc/sco_dump_db.py
index 8fa2e209e..b11f63ca8 100644
--- a/app/scodoc/sco_dump_db.py
+++ b/app/scodoc/sco_dump_db.py
@@ -5,7 +5,7 @@
 #
 # Gestion scolarite IUT
 #
-# Copyright (c) 1999 - 2021 Emmanuel Viennet.  All rights reserved.
+# Copyright (c) 1999 - 2022 Emmanuel Viennet.  All rights reserved.
 #
 # This program is free software; you can redistribute it and/or modify
 # it under the terms of the GNU General Public License as published by
diff --git a/app/scodoc/sco_edit_apc.py b/app/scodoc/sco_edit_apc.py
index 0d129d813..773cf81d1 100644
--- a/app/scodoc/sco_edit_apc.py
+++ b/app/scodoc/sco_edit_apc.py
@@ -2,7 +2,7 @@
 #
 # ScoDoc
 #
-# Copyright (c) 1999 - 2021 Emmanuel Viennet.  All rights reserved.
+# Copyright (c) 1999 - 2022 Emmanuel Viennet.  All rights reserved.
 #
 # This program is free software; you can redistribute it and/or modify
 # it under the terms of the GNU General Public License as published by
diff --git a/app/scodoc/sco_edit_formation.py b/app/scodoc/sco_edit_formation.py
index 4901f494d..33390c1a1 100644
--- a/app/scodoc/sco_edit_formation.py
+++ b/app/scodoc/sco_edit_formation.py
@@ -5,7 +5,7 @@
 #
 # Gestion scolarite IUT
 #
-# Copyright (c) 1999 - 2021 Emmanuel Viennet.  All rights reserved.
+# Copyright (c) 1999 - 2022 Emmanuel Viennet.  All rights reserved.
 #
 # This program is free software; you can redistribute it and/or modify
 # it under the terms of the GNU General Public License as published by
diff --git a/app/scodoc/sco_edit_matiere.py b/app/scodoc/sco_edit_matiere.py
index 8e957ab8b..62a7e1d20 100644
--- a/app/scodoc/sco_edit_matiere.py
+++ b/app/scodoc/sco_edit_matiere.py
@@ -5,7 +5,7 @@
 #
 # Gestion scolarite IUT
 #
-# Copyright (c) 1999 - 2021 Emmanuel Viennet.  All rights reserved.
+# Copyright (c) 1999 - 2022 Emmanuel Viennet.  All rights reserved.
 #
 # This program is free software; you can redistribute it and/or modify
 # it under the terms of the GNU General Public License as published by
diff --git a/app/scodoc/sco_edit_module.py b/app/scodoc/sco_edit_module.py
index ee87f7e72..1c3481b06 100644
--- a/app/scodoc/sco_edit_module.py
+++ b/app/scodoc/sco_edit_module.py
@@ -5,7 +5,7 @@
 #
 # Gestion scolarite IUT
 #
-# Copyright (c) 1999 - 2021 Emmanuel Viennet.  All rights reserved.
+# Copyright (c) 1999 - 2022 Emmanuel Viennet.  All rights reserved.
 #
 # This program is free software; you can redistribute it and/or modify
 # it under the terms of the GNU General Public License as published by
diff --git a/app/scodoc/sco_edit_ue.py b/app/scodoc/sco_edit_ue.py
index 192ed8d3d..bdf37375b 100644
--- a/app/scodoc/sco_edit_ue.py
+++ b/app/scodoc/sco_edit_ue.py
@@ -5,7 +5,7 @@
 #
 # Gestion scolarite IUT
 #
-# Copyright (c) 1999 - 2021 Emmanuel Viennet.  All rights reserved.
+# Copyright (c) 1999 - 2022 Emmanuel Viennet.  All rights reserved.
 #
 # This program is free software; you can redistribute it and/or modify
 # it under the terms of the GNU General Public License as published by
diff --git a/app/scodoc/sco_edt_cal.py b/app/scodoc/sco_edt_cal.py
index f526c092f..61f223825 100644
--- a/app/scodoc/sco_edt_cal.py
+++ b/app/scodoc/sco_edt_cal.py
@@ -5,7 +5,7 @@
 #
 # Gestion scolarite IUT
 #
-# Copyright (c) 1999 - 2021 Emmanuel Viennet.  All rights reserved.
+# Copyright (c) 1999 - 2022 Emmanuel Viennet.  All rights reserved.
 #
 # This program is free software; you can redistribute it and/or modify
 # it under the terms of the GNU General Public License as published by
diff --git a/app/scodoc/sco_entreprises.py b/app/scodoc/sco_entreprises.py
index 7a7762f21..6c9b887f5 100644
--- a/app/scodoc/sco_entreprises.py
+++ b/app/scodoc/sco_entreprises.py
@@ -5,7 +5,7 @@
 #
 # Gestion scolarite IUT
 #
-# Copyright (c) 1999 - 2021 Emmanuel Viennet.  All rights reserved.
+# Copyright (c) 1999 - 2022 Emmanuel Viennet.  All rights reserved.
 #
 # This program is free software; you can redistribute it and/or modify
 # it under the terms of the GNU General Public License as published by
diff --git a/app/scodoc/sco_etape_apogee.py b/app/scodoc/sco_etape_apogee.py
index 582497e95..e997ea668 100644
--- a/app/scodoc/sco_etape_apogee.py
+++ b/app/scodoc/sco_etape_apogee.py
@@ -5,7 +5,7 @@
 #
 # Gestion scolarite IUT
 #
-# Copyright (c) 1999 - 2021 Emmanuel Viennet.  All rights reserved.
+# Copyright (c) 1999 - 2022 Emmanuel Viennet.  All rights reserved.
 #
 # This program is free software; you can redistribute it and/or modify
 # it under the terms of the GNU General Public License as published by
diff --git a/app/scodoc/sco_etape_apogee_view.py b/app/scodoc/sco_etape_apogee_view.py
index 5f2c1ed82..7660191c2 100644
--- a/app/scodoc/sco_etape_apogee_view.py
+++ b/app/scodoc/sco_etape_apogee_view.py
@@ -5,7 +5,7 @@
 #
 # Gestion scolarite IUT
 #
-# Copyright (c) 1999 - 2021 Emmanuel Viennet.  All rights reserved.
+# Copyright (c) 1999 - 2022 Emmanuel Viennet.  All rights reserved.
 #
 # This program is free software; you can redistribute it and/or modify
 # it under the terms of the GNU General Public License as published by
diff --git a/app/scodoc/sco_etape_bilan.py b/app/scodoc/sco_etape_bilan.py
index dbb6e8776..b3575a34e 100644
--- a/app/scodoc/sco_etape_bilan.py
+++ b/app/scodoc/sco_etape_bilan.py
@@ -5,7 +5,7 @@
 #
 # Gestion scolarite IUT
 #
-# Copyright (c) 1999 - 2021 Emmanuel Viennet.  All rights reserved.
+# Copyright (c) 1999 - 2022 Emmanuel Viennet.  All rights reserved.
 #
 # This program is free software; you can redistribute it and/or modify
 # it under the terms of the GNU General Public License as published by
diff --git a/app/scodoc/sco_etud.py b/app/scodoc/sco_etud.py
index 7dc30c829..cfc41d1ee 100644
--- a/app/scodoc/sco_etud.py
+++ b/app/scodoc/sco_etud.py
@@ -5,7 +5,7 @@
 #
 # Gestion scolarite IUT
 #
-# Copyright (c) 1999 - 2021 Emmanuel Viennet.  All rights reserved.
+# Copyright (c) 1999 - 2022 Emmanuel Viennet.  All rights reserved.
 #
 # This program is free software; you can redistribute it and/or modify
 # it under the terms of the GNU General Public License as published by
diff --git a/app/scodoc/sco_evaluation_check_abs.py b/app/scodoc/sco_evaluation_check_abs.py
index 943f65323..78c18045b 100644
--- a/app/scodoc/sco_evaluation_check_abs.py
+++ b/app/scodoc/sco_evaluation_check_abs.py
@@ -5,7 +5,7 @@
 #
 # Gestion scolarite IUT
 #
-# Copyright (c) 1999 - 2021 Emmanuel Viennet.  All rights reserved.
+# Copyright (c) 1999 - 2022 Emmanuel Viennet.  All rights reserved.
 #
 # This program is free software; you can redistribute it and/or modify
 # it under the terms of the GNU General Public License as published by
diff --git a/app/scodoc/sco_evaluation_db.py b/app/scodoc/sco_evaluation_db.py
index 55f9e6851..36fbb35a6 100644
--- a/app/scodoc/sco_evaluation_db.py
+++ b/app/scodoc/sco_evaluation_db.py
@@ -5,7 +5,7 @@
 #
 # Gestion scolarite IUT
 #
-# Copyright (c) 1999 - 2021 Emmanuel Viennet.  All rights reserved.
+# Copyright (c) 1999 - 2022 Emmanuel Viennet.  All rights reserved.
 #
 # This program is free software; you can redistribute it and/or modify
 # it under the terms of the GNU General Public License as published by
diff --git a/app/scodoc/sco_evaluation_edit.py b/app/scodoc/sco_evaluation_edit.py
index e6bc7d983..583ac5c44 100644
--- a/app/scodoc/sco_evaluation_edit.py
+++ b/app/scodoc/sco_evaluation_edit.py
@@ -5,7 +5,7 @@
 #
 # Gestion scolarite IUT
 #
-# Copyright (c) 1999 - 2021 Emmanuel Viennet.  All rights reserved.
+# Copyright (c) 1999 - 2022 Emmanuel Viennet.  All rights reserved.
 #
 # This program is free software; you can redistribute it and/or modify
 # it under the terms of the GNU General Public License as published by
diff --git a/app/scodoc/sco_evaluations.py b/app/scodoc/sco_evaluations.py
index e06e6b542..82f5d13aa 100644
--- a/app/scodoc/sco_evaluations.py
+++ b/app/scodoc/sco_evaluations.py
@@ -5,7 +5,7 @@
 #
 # Gestion scolarite IUT
 #
-# Copyright (c) 1999 - 2021 Emmanuel Viennet.  All rights reserved.
+# Copyright (c) 1999 - 2022 Emmanuel Viennet.  All rights reserved.
 #
 # This program is free software; you can redistribute it and/or modify
 # it under the terms of the GNU General Public License as published by
diff --git a/app/scodoc/sco_excel.py b/app/scodoc/sco_excel.py
index 77fe375db..978247800 100644
--- a/app/scodoc/sco_excel.py
+++ b/app/scodoc/sco_excel.py
@@ -5,7 +5,7 @@
 #
 # Gestion scolarite IUT
 #
-# Copyright (c) 1999 - 2021 Emmanuel Viennet.  All rights reserved.
+# Copyright (c) 1999 - 2022 Emmanuel Viennet.  All rights reserved.
 #
 # This program is free software; you can redistribute it and/or modify
 # it under the terms of the GNU General Public License as published by
diff --git a/app/scodoc/sco_exceptions.py b/app/scodoc/sco_exceptions.py
index ddb7f6747..635a724b5 100644
--- a/app/scodoc/sco_exceptions.py
+++ b/app/scodoc/sco_exceptions.py
@@ -5,7 +5,7 @@
 #
 # Gestion scolarite IUT
 #
-# Copyright (c) 1999 - 2021 Emmanuel Viennet.  All rights reserved.
+# Copyright (c) 1999 - 2022 Emmanuel Viennet.  All rights reserved.
 #
 # This program is free software; you can redistribute it and/or modify
 # it under the terms of the GNU General Public License as published by
diff --git a/app/scodoc/sco_export_results.py b/app/scodoc/sco_export_results.py
index 257bb66d6..4d6b788c6 100644
--- a/app/scodoc/sco_export_results.py
+++ b/app/scodoc/sco_export_results.py
@@ -5,7 +5,7 @@
 #
 # Gestion scolarite IUT
 #
-# Copyright (c) 1999 - 2021 Emmanuel Viennet.  All rights reserved.
+# Copyright (c) 1999 - 2022 Emmanuel Viennet.  All rights reserved.
 #
 # This program is free software; you can redistribute it and/or modify
 # it under the terms of the GNU General Public License as published by
diff --git a/app/scodoc/sco_find_etud.py b/app/scodoc/sco_find_etud.py
index 8ad96b1be..157cb6e59 100644
--- a/app/scodoc/sco_find_etud.py
+++ b/app/scodoc/sco_find_etud.py
@@ -5,7 +5,7 @@
 #
 # Gestion scolarite IUT
 #
-# Copyright (c) 1999 - 2021 Emmanuel Viennet.  All rights reserved.
+# Copyright (c) 1999 - 2022 Emmanuel Viennet.  All rights reserved.
 #
 # This program is free software; you can redistribute it and/or modify
 # it under the terms of the GNU General Public License as published by
diff --git a/app/scodoc/sco_formations.py b/app/scodoc/sco_formations.py
index 6bff40c51..caeeb707b 100644
--- a/app/scodoc/sco_formations.py
+++ b/app/scodoc/sco_formations.py
@@ -5,7 +5,7 @@
 #
 # Gestion scolarite IUT
 #
-# Copyright (c) 1999 - 2021 Emmanuel Viennet.  All rights reserved.
+# Copyright (c) 1999 - 2022 Emmanuel Viennet.  All rights reserved.
 #
 # This program is free software; you can redistribute it and/or modify
 # it under the terms of the GNU General Public License as published by
diff --git a/app/scodoc/sco_formsemestre.py b/app/scodoc/sco_formsemestre.py
index 0e1a1a81b..272c5c383 100644
--- a/app/scodoc/sco_formsemestre.py
+++ b/app/scodoc/sco_formsemestre.py
@@ -5,7 +5,7 @@
 #
 # Gestion scolarite IUT
 #
-# Copyright (c) 1999 - 2021 Emmanuel Viennet.  All rights reserved.
+# Copyright (c) 1999 - 2022 Emmanuel Viennet.  All rights reserved.
 #
 # This program is free software; you can redistribute it and/or modify
 # it under the terms of the GNU General Public License as published by
diff --git a/app/scodoc/sco_formsemestre_custommenu.py b/app/scodoc/sco_formsemestre_custommenu.py
index 9a8192ded..ee18a8ec0 100644
--- a/app/scodoc/sco_formsemestre_custommenu.py
+++ b/app/scodoc/sco_formsemestre_custommenu.py
@@ -5,7 +5,7 @@
 #
 # Gestion scolarite IUT
 #
-# Copyright (c) 1999 - 2021 Emmanuel Viennet.  All rights reserved.
+# Copyright (c) 1999 - 2022 Emmanuel Viennet.  All rights reserved.
 #
 # This program is free software; you can redistribute it and/or modify
 # it under the terms of the GNU General Public License as published by
diff --git a/app/scodoc/sco_formsemestre_edit.py b/app/scodoc/sco_formsemestre_edit.py
index bf90fe26a..6c889c54a 100644
--- a/app/scodoc/sco_formsemestre_edit.py
+++ b/app/scodoc/sco_formsemestre_edit.py
@@ -5,7 +5,7 @@
 #
 # Gestion scolarite IUT
 #
-# Copyright (c) 1999 - 2021 Emmanuel Viennet.  All rights reserved.
+# Copyright (c) 1999 - 2022 Emmanuel Viennet.  All rights reserved.
 #
 # This program is free software; you can redistribute it and/or modify
 # it under the terms of the GNU General Public License as published by
diff --git a/app/scodoc/sco_formsemestre_exterieurs.py b/app/scodoc/sco_formsemestre_exterieurs.py
index a4c782d49..b3d601de7 100644
--- a/app/scodoc/sco_formsemestre_exterieurs.py
+++ b/app/scodoc/sco_formsemestre_exterieurs.py
@@ -5,7 +5,7 @@
 #
 # Gestion scolarite IUT
 #
-# Copyright (c) 1999 - 2021 Emmanuel Viennet.  All rights reserved.
+# Copyright (c) 1999 - 2022 Emmanuel Viennet.  All rights reserved.
 #
 # This program is free software; you can redistribute it and/or modify
 # it under the terms of the GNU General Public License as published by
diff --git a/app/scodoc/sco_formsemestre_inscriptions.py b/app/scodoc/sco_formsemestre_inscriptions.py
index 30cbec83d..94d7539ce 100644
--- a/app/scodoc/sco_formsemestre_inscriptions.py
+++ b/app/scodoc/sco_formsemestre_inscriptions.py
@@ -5,7 +5,7 @@
 #
 # Gestion scolarite IUT
 #
-# Copyright (c) 1999 - 2021 Emmanuel Viennet.  All rights reserved.
+# Copyright (c) 1999 - 2022 Emmanuel Viennet.  All rights reserved.
 #
 # This program is free software; you can redistribute it and/or modify
 # it under the terms of the GNU General Public License as published by
diff --git a/app/scodoc/sco_formsemestre_status.py b/app/scodoc/sco_formsemestre_status.py
index 290b03403..5c3189898 100644
--- a/app/scodoc/sco_formsemestre_status.py
+++ b/app/scodoc/sco_formsemestre_status.py
@@ -5,7 +5,7 @@
 #
 # Gestion scolarite IUT
 #
-# Copyright (c) 1999 - 2021 Emmanuel Viennet.  All rights reserved.
+# Copyright (c) 1999 - 2022 Emmanuel Viennet.  All rights reserved.
 #
 # This program is free software; you can redistribute it and/or modify
 # it under the terms of the GNU General Public License as published by
diff --git a/app/scodoc/sco_formsemestre_validation.py b/app/scodoc/sco_formsemestre_validation.py
index 91bbdec3f..86525c5c8 100644
--- a/app/scodoc/sco_formsemestre_validation.py
+++ b/app/scodoc/sco_formsemestre_validation.py
@@ -5,7 +5,7 @@
 #
 # Gestion scolarite IUT
 #
-# Copyright (c) 1999 - 2021 Emmanuel Viennet.  All rights reserved.
+# Copyright (c) 1999 - 2022 Emmanuel Viennet.  All rights reserved.
 #
 # This program is free software; you can redistribute it and/or modify
 # it under the terms of the GNU General Public License as published by
diff --git a/app/scodoc/sco_formulas.py b/app/scodoc/sco_formulas.py
index 7dda7b908..a9f5d9b74 100644
--- a/app/scodoc/sco_formulas.py
+++ b/app/scodoc/sco_formulas.py
@@ -5,7 +5,7 @@
 #
 # Gestion scolarite IUT
 #
-# Copyright (c) 1999 - 2021 Emmanuel Viennet.  All rights reserved.
+# Copyright (c) 1999 - 2022 Emmanuel Viennet.  All rights reserved.
 #
 # This program is free software; you can redistribute it and/or modify
 # it under the terms of the GNU General Public License as published by
diff --git a/app/scodoc/sco_groups.py b/app/scodoc/sco_groups.py
index 44aa77971..0ecc1a2af 100644
--- a/app/scodoc/sco_groups.py
+++ b/app/scodoc/sco_groups.py
@@ -5,7 +5,7 @@
 #
 # Gestion scolarite IUT
 #
-# Copyright (c) 1999 - 2021 Emmanuel Viennet.  All rights reserved.
+# Copyright (c) 1999 - 2022 Emmanuel Viennet.  All rights reserved.
 #
 # This program is free software; you can redistribute it and/or modify
 # it under the terms of the GNU General Public License as published by
diff --git a/app/scodoc/sco_groups_edit.py b/app/scodoc/sco_groups_edit.py
index d5e09b76d..482904678 100644
--- a/app/scodoc/sco_groups_edit.py
+++ b/app/scodoc/sco_groups_edit.py
@@ -5,7 +5,7 @@
 #
 # Gestion scolarite IUT
 #
-# Copyright (c) 1999 - 2021 Emmanuel Viennet.  All rights reserved.
+# Copyright (c) 1999 - 2022 Emmanuel Viennet.  All rights reserved.
 #
 # This program is free software; you can redistribute it and/or modify
 # it under the terms of the GNU General Public License as published by
diff --git a/app/scodoc/sco_groups_view.py b/app/scodoc/sco_groups_view.py
index 9a28d8d79..603627d14 100644
--- a/app/scodoc/sco_groups_view.py
+++ b/app/scodoc/sco_groups_view.py
@@ -5,7 +5,7 @@
 #
 # Gestion scolarite IUT
 #
-# Copyright (c) 1999 - 2021 Emmanuel Viennet.  All rights reserved.
+# Copyright (c) 1999 - 2022 Emmanuel Viennet.  All rights reserved.
 #
 # This program is free software; you can redistribute it and/or modify
 # it under the terms of the GNU General Public License as published by
diff --git a/app/scodoc/sco_import_etuds.py b/app/scodoc/sco_import_etuds.py
index 786d8c44e..9f3ed6472 100644
--- a/app/scodoc/sco_import_etuds.py
+++ b/app/scodoc/sco_import_etuds.py
@@ -5,7 +5,7 @@
 #
 # Gestion scolarite IUT
 #
-# Copyright (c) 1999 - 2021 Emmanuel Viennet.  All rights reserved.
+# Copyright (c) 1999 - 2022 Emmanuel Viennet.  All rights reserved.
 #
 # This program is free software; you can redistribute it and/or modify
 # it under the terms of the GNU General Public License as published by
diff --git a/app/scodoc/sco_import_users.py b/app/scodoc/sco_import_users.py
index d7c360a4e..62967e3d9 100644
--- a/app/scodoc/sco_import_users.py
+++ b/app/scodoc/sco_import_users.py
@@ -5,7 +5,7 @@
 #
 # Gestion scolarite IUT
 #
-# Copyright (c) 1999 - 2021 Emmanuel Viennet.  All rights reserved.
+# Copyright (c) 1999 - 2022 Emmanuel Viennet.  All rights reserved.
 #
 # This program is free software; you can redistribute it and/or modify
 # it under the terms of the GNU General Public License as published by
diff --git a/app/scodoc/sco_inscr_passage.py b/app/scodoc/sco_inscr_passage.py
index 2f952cb8f..d486b2427 100644
--- a/app/scodoc/sco_inscr_passage.py
+++ b/app/scodoc/sco_inscr_passage.py
@@ -5,7 +5,7 @@
 #
 # Gestion scolarite IUT
 #
-# Copyright (c) 1999 - 2021 Emmanuel Viennet.  All rights reserved.
+# Copyright (c) 1999 - 2022 Emmanuel Viennet.  All rights reserved.
 #
 # This program is free software; you can redistribute it and/or modify
 # it under the terms of the GNU General Public License as published by
diff --git a/app/scodoc/sco_liste_notes.py b/app/scodoc/sco_liste_notes.py
index 6da2e3f8c..f19c95680 100644
--- a/app/scodoc/sco_liste_notes.py
+++ b/app/scodoc/sco_liste_notes.py
@@ -5,7 +5,7 @@
 #
 # Gestion scolarite IUT
 #
-# Copyright (c) 1999 - 2021 Emmanuel Viennet.  All rights reserved.
+# Copyright (c) 1999 - 2022 Emmanuel Viennet.  All rights reserved.
 #
 # This program is free software; you can redistribute it and/or modify
 # it under the terms of the GNU General Public License as published by
diff --git a/app/scodoc/sco_logos.py b/app/scodoc/sco_logos.py
index d66646d4f..c489510b5 100644
--- a/app/scodoc/sco_logos.py
+++ b/app/scodoc/sco_logos.py
@@ -5,7 +5,7 @@
 #
 # Gestion scolarite IUT
 #
-# Copyright (c) 1999 - 2021 Emmanuel Viennet.  All rights reserved.
+# Copyright (c) 1999 - 2022 Emmanuel Viennet.  All rights reserved.
 #
 # This program is free software; you can redistribute it and/or modify
 # it under the terms of the GNU General Public License as published by
diff --git a/app/scodoc/sco_lycee.py b/app/scodoc/sco_lycee.py
index 3b18e35ba..483eaa3ae 100644
--- a/app/scodoc/sco_lycee.py
+++ b/app/scodoc/sco_lycee.py
@@ -5,7 +5,7 @@
 #
 # Gestion scolarite IUT
 #
-# Copyright (c) 1999 - 2021 Emmanuel Viennet.  All rights reserved.
+# Copyright (c) 1999 - 2022 Emmanuel Viennet.  All rights reserved.
 #
 # This program is free software; you can redistribute it and/or modify
 # it under the terms of the GNU General Public License as published by
diff --git a/app/scodoc/sco_modalites.py b/app/scodoc/sco_modalites.py
index bc1cf4517..65b9269b1 100644
--- a/app/scodoc/sco_modalites.py
+++ b/app/scodoc/sco_modalites.py
@@ -5,7 +5,7 @@
 #
 # Gestion scolarite IUT
 #
-# Copyright (c) 1999 - 2021 Emmanuel Viennet.  All rights reserved.
+# Copyright (c) 1999 - 2022 Emmanuel Viennet.  All rights reserved.
 #
 # This program is free software; you can redistribute it and/or modify
 # it under the terms of the GNU General Public License as published by
diff --git a/app/scodoc/sco_moduleimpl.py b/app/scodoc/sco_moduleimpl.py
index ac490bd23..38db492d5 100644
--- a/app/scodoc/sco_moduleimpl.py
+++ b/app/scodoc/sco_moduleimpl.py
@@ -5,7 +5,7 @@
 #
 # Gestion scolarite IUT
 #
-# Copyright (c) 1999 - 2021 Emmanuel Viennet.  All rights reserved.
+# Copyright (c) 1999 - 2022 Emmanuel Viennet.  All rights reserved.
 #
 # This program is free software; you can redistribute it and/or modify
 # it under the terms of the GNU General Public License as published by
diff --git a/app/scodoc/sco_moduleimpl_inscriptions.py b/app/scodoc/sco_moduleimpl_inscriptions.py
index 69cbb7ef0..baf5de70b 100644
--- a/app/scodoc/sco_moduleimpl_inscriptions.py
+++ b/app/scodoc/sco_moduleimpl_inscriptions.py
@@ -5,7 +5,7 @@
 #
 # Gestion scolarite IUT
 #
-# Copyright (c) 1999 - 2021 Emmanuel Viennet.  All rights reserved.
+# Copyright (c) 1999 - 2022 Emmanuel Viennet.  All rights reserved.
 #
 # This program is free software; you can redistribute it and/or modify
 # it under the terms of the GNU General Public License as published by
diff --git a/app/scodoc/sco_moduleimpl_status.py b/app/scodoc/sco_moduleimpl_status.py
index c9f5aaa28..33f51da14 100644
--- a/app/scodoc/sco_moduleimpl_status.py
+++ b/app/scodoc/sco_moduleimpl_status.py
@@ -5,7 +5,7 @@
 #
 # Gestion scolarite IUT
 #
-# Copyright (c) 1999 - 2021 Emmanuel Viennet.  All rights reserved.
+# Copyright (c) 1999 - 2022 Emmanuel Viennet.  All rights reserved.
 #
 # This program is free software; you can redistribute it and/or modify
 # it under the terms of the GNU General Public License as published by
diff --git a/app/scodoc/sco_news.py b/app/scodoc/sco_news.py
index 5c08313d6..e0977a951 100644
--- a/app/scodoc/sco_news.py
+++ b/app/scodoc/sco_news.py
@@ -5,7 +5,7 @@
 #
 # Gestion scolarite IUT
 #
-# Copyright (c) 1999 - 2021 Emmanuel Viennet.  All rights reserved.
+# Copyright (c) 1999 - 2022 Emmanuel Viennet.  All rights reserved.
 #
 # This program is free software; you can redistribute it and/or modify
 # it under the terms of the GNU General Public License as published by
diff --git a/app/scodoc/sco_page_etud.py b/app/scodoc/sco_page_etud.py
index 573d79455..ac171e4e3 100644
--- a/app/scodoc/sco_page_etud.py
+++ b/app/scodoc/sco_page_etud.py
@@ -5,7 +5,7 @@
 #
 # Gestion scolarite IUT
 #
-# Copyright (c) 1999 - 2021 Emmanuel Viennet.  All rights reserved.
+# Copyright (c) 1999 - 2022 Emmanuel Viennet.  All rights reserved.
 #
 # This program is free software; you can redistribute it and/or modify
 # it under the terms of the GNU General Public License as published by
diff --git a/app/scodoc/sco_parcours_dut.py b/app/scodoc/sco_parcours_dut.py
index acd87110c..9bdc5ce7a 100644
--- a/app/scodoc/sco_parcours_dut.py
+++ b/app/scodoc/sco_parcours_dut.py
@@ -5,7 +5,7 @@
 #
 # Gestion scolarite IUT
 #
-# Copyright (c) 1999 - 2021 Emmanuel Viennet.  All rights reserved.
+# Copyright (c) 1999 - 2022 Emmanuel Viennet.  All rights reserved.
 #
 # This program is free software; you can redistribute it and/or modify
 # it under the terms of the GNU General Public License as published by
diff --git a/app/scodoc/sco_pdf.py b/app/scodoc/sco_pdf.py
index 85ead1674..0e0996800 100755
--- a/app/scodoc/sco_pdf.py
+++ b/app/scodoc/sco_pdf.py
@@ -5,7 +5,7 @@
 #
 # Gestion scolarite IUT
 #
-# Copyright (c) 1999 - 2021 Emmanuel Viennet.  All rights reserved.
+# Copyright (c) 1999 - 2022 Emmanuel Viennet.  All rights reserved.
 #
 # This program is free software; you can redistribute it and/or modify
 # it under the terms of the GNU General Public License as published by
diff --git a/app/scodoc/sco_photos.py b/app/scodoc/sco_photos.py
index 5d70168b6..80f3553e5 100644
--- a/app/scodoc/sco_photos.py
+++ b/app/scodoc/sco_photos.py
@@ -5,7 +5,7 @@
 #
 # Gestion scolarite IUT
 #
-# Copyright (c) 1999 - 2021 Emmanuel Viennet.  All rights reserved.
+# Copyright (c) 1999 - 2022 Emmanuel Viennet.  All rights reserved.
 #
 # This program is free software; you can redistribute it and/or modify
 # it under the terms of the GNU General Public License as published by
diff --git a/app/scodoc/sco_placement.py b/app/scodoc/sco_placement.py
index b3e29db9c..fb8a35ead 100644
--- a/app/scodoc/sco_placement.py
+++ b/app/scodoc/sco_placement.py
@@ -5,7 +5,7 @@
 #
 # Gestion scolarite IUT
 #
-# Copyright (c) 1999 - 2021 Emmanuel Viennet.  All rights reserved.
+# Copyright (c) 1999 - 2022 Emmanuel Viennet.  All rights reserved.
 #
 # This program is free software; you can redistribute it and/or modify
 # it under the terms of the GNU General Public License as published by
diff --git a/app/scodoc/sco_portal_apogee.py b/app/scodoc/sco_portal_apogee.py
index 07006affd..74015be14 100644
--- a/app/scodoc/sco_portal_apogee.py
+++ b/app/scodoc/sco_portal_apogee.py
@@ -5,7 +5,7 @@
 #
 # Gestion scolarite IUT
 #
-# Copyright (c) 1999 - 2021 Emmanuel Viennet.  All rights reserved.
+# Copyright (c) 1999 - 2022 Emmanuel Viennet.  All rights reserved.
 #
 # This program is free software; you can redistribute it and/or modify
 # it under the terms of the GNU General Public License as published by
diff --git a/app/scodoc/sco_poursuite_dut.py b/app/scodoc/sco_poursuite_dut.py
index 4dbd70138..c6c0ac6f9 100644
--- a/app/scodoc/sco_poursuite_dut.py
+++ b/app/scodoc/sco_poursuite_dut.py
@@ -5,7 +5,7 @@
 #
 # Gestion scolarite IUT
 #
-# Copyright (c) 1999 - 2021 Emmanuel Viennet.  All rights reserved.
+# Copyright (c) 1999 - 2022 Emmanuel Viennet.  All rights reserved.
 #
 # This program is free software; you can redistribute it and/or modify
 # it under the terms of the GNU General Public License as published by
diff --git a/app/scodoc/sco_preferences.py b/app/scodoc/sco_preferences.py
index 7e08d3558..cc99be082 100644
--- a/app/scodoc/sco_preferences.py
+++ b/app/scodoc/sco_preferences.py
@@ -5,7 +5,7 @@
 #
 # Gestion scolarite IUT
 #
-# Copyright (c) 1999 - 2021 Emmanuel Viennet.  All rights reserved.
+# Copyright (c) 1999 - 2022 Emmanuel Viennet.  All rights reserved.
 #
 # This program is free software; you can redistribute it and/or modify
 # it under the terms of the GNU General Public License as published by
diff --git a/app/scodoc/sco_prepajury.py b/app/scodoc/sco_prepajury.py
index a9e061e0d..e418074d9 100644
--- a/app/scodoc/sco_prepajury.py
+++ b/app/scodoc/sco_prepajury.py
@@ -5,7 +5,7 @@
 #
 # Gestion scolarite IUT
 #
-# Copyright (c) 1999 - 2021 Emmanuel Viennet.  All rights reserved.
+# Copyright (c) 1999 - 2022 Emmanuel Viennet.  All rights reserved.
 #
 # This program is free software; you can redistribute it and/or modify
 # it under the terms of the GNU General Public License as published by
diff --git a/app/scodoc/sco_pvjury.py b/app/scodoc/sco_pvjury.py
index 322486d3f..d193b3733 100644
--- a/app/scodoc/sco_pvjury.py
+++ b/app/scodoc/sco_pvjury.py
@@ -5,7 +5,7 @@
 #
 # Gestion scolarite IUT
 #
-# Copyright (c) 1999 - 2021 Emmanuel Viennet.  All rights reserved.
+# Copyright (c) 1999 - 2022 Emmanuel Viennet.  All rights reserved.
 #
 # This program is free software; you can redistribute it and/or modify
 # it under the terms of the GNU General Public License as published by
diff --git a/app/scodoc/sco_pvpdf.py b/app/scodoc/sco_pvpdf.py
index b8664c51a..1fb98e3d3 100644
--- a/app/scodoc/sco_pvpdf.py
+++ b/app/scodoc/sco_pvpdf.py
@@ -5,7 +5,7 @@
 #
 # Gestion scolarite IUT
 #
-# Copyright (c) 1999 - 2021 Emmanuel Viennet.  All rights reserved.
+# Copyright (c) 1999 - 2022 Emmanuel Viennet.  All rights reserved.
 #
 # This program is free software; you can redistribute it and/or modify
 # it under the terms of the GNU General Public License as published by
diff --git a/app/scodoc/sco_recapcomplet.py b/app/scodoc/sco_recapcomplet.py
index d3f7f6f4a..a309f4448 100644
--- a/app/scodoc/sco_recapcomplet.py
+++ b/app/scodoc/sco_recapcomplet.py
@@ -5,7 +5,7 @@
 #
 # Gestion scolarite IUT
 #
-# Copyright (c) 1999 - 2021 Emmanuel Viennet.  All rights reserved.
+# Copyright (c) 1999 - 2022 Emmanuel Viennet.  All rights reserved.
 #
 # This program is free software; you can redistribute it and/or modify
 # it under the terms of the GNU General Public License as published by
diff --git a/app/scodoc/sco_report.py b/app/scodoc/sco_report.py
index 9ab42ec08..d480679b7 100644
--- a/app/scodoc/sco_report.py
+++ b/app/scodoc/sco_report.py
@@ -5,7 +5,7 @@
 #
 # Gestion scolarite IUT
 #
-# Copyright (c) 1999 - 2021 Emmanuel Viennet.  All rights reserved.
+# Copyright (c) 1999 - 2022 Emmanuel Viennet.  All rights reserved.
 #
 # This program is free software; you can redistribute it and/or modify
 # it under the terms of the GNU General Public License as published by
diff --git a/app/scodoc/sco_saisie_notes.py b/app/scodoc/sco_saisie_notes.py
index 0b5cb3ce7..7f7012db9 100644
--- a/app/scodoc/sco_saisie_notes.py
+++ b/app/scodoc/sco_saisie_notes.py
@@ -5,7 +5,7 @@
 #
 # Gestion scolarite IUT
 #
-# Copyright (c) 1999 - 2021 Emmanuel Viennet.  All rights reserved.
+# Copyright (c) 1999 - 2022 Emmanuel Viennet.  All rights reserved.
 #
 # This program is free software; you can redistribute it and/or modify
 # it under the terms of the GNU General Public License as published by
diff --git a/app/scodoc/sco_semset.py b/app/scodoc/sco_semset.py
index 7b71d7c2f..a913c6480 100644
--- a/app/scodoc/sco_semset.py
+++ b/app/scodoc/sco_semset.py
@@ -5,7 +5,7 @@
 #
 # Gestion scolarite IUT
 #
-# Copyright (c) 1999 - 2021 Emmanuel Viennet.  All rights reserved.
+# Copyright (c) 1999 - 2022 Emmanuel Viennet.  All rights reserved.
 #
 # This program is free software; you can redistribute it and/or modify
 # it under the terms of the GNU General Public License as published by
diff --git a/app/scodoc/sco_synchro_etuds.py b/app/scodoc/sco_synchro_etuds.py
index 9e11097f7..bbcf4a083 100644
--- a/app/scodoc/sco_synchro_etuds.py
+++ b/app/scodoc/sco_synchro_etuds.py
@@ -5,7 +5,7 @@
 #
 # Gestion scolarite IUT
 #
-# Copyright (c) 1999 - 2021 Emmanuel Viennet.  All rights reserved.
+# Copyright (c) 1999 - 2022 Emmanuel Viennet.  All rights reserved.
 #
 # This program is free software; you can redistribute it and/or modify
 # it under the terms of the GNU General Public License as published by
diff --git a/app/scodoc/sco_tag_module.py b/app/scodoc/sco_tag_module.py
index 50ec8f01c..4c76c57d4 100644
--- a/app/scodoc/sco_tag_module.py
+++ b/app/scodoc/sco_tag_module.py
@@ -5,7 +5,7 @@
 #
 # Gestion scolarite IUT
 #
-# Copyright (c) 1999 - 2021 Emmanuel Viennet.  All rights reserved.
+# Copyright (c) 1999 - 2022 Emmanuel Viennet.  All rights reserved.
 #
 # This program is free software; you can redistribute it and/or modify
 # it under the terms of the GNU General Public License as published by
diff --git a/app/scodoc/sco_trombino.py b/app/scodoc/sco_trombino.py
index 0849b0374..9132336ea 100644
--- a/app/scodoc/sco_trombino.py
+++ b/app/scodoc/sco_trombino.py
@@ -5,7 +5,7 @@
 #
 # Gestion scolarite IUT
 #
-# Copyright (c) 1999 - 2021 Emmanuel Viennet.  All rights reserved.
+# Copyright (c) 1999 - 2022 Emmanuel Viennet.  All rights reserved.
 #
 # This program is free software; you can redistribute it and/or modify
 # it under the terms of the GNU General Public License as published by
diff --git a/app/scodoc/sco_trombino_tours.py b/app/scodoc/sco_trombino_tours.py
index 997b114be..e7f2266fb 100644
--- a/app/scodoc/sco_trombino_tours.py
+++ b/app/scodoc/sco_trombino_tours.py
@@ -5,7 +5,7 @@
 #
 # Gestion scolarite IUT
 #
-# Copyright (c) 1999 - 2021 Emmanuel Viennet.  All rights reserved.
+# Copyright (c) 1999 - 2022 Emmanuel Viennet.  All rights reserved.
 #
 # This program is free software; you can redistribute it and/or modify
 # it under the terms of the GNU General Public License as published by
diff --git a/app/scodoc/sco_ue_external.py b/app/scodoc/sco_ue_external.py
index 6e7fff307..cd9d7635e 100644
--- a/app/scodoc/sco_ue_external.py
+++ b/app/scodoc/sco_ue_external.py
@@ -5,7 +5,7 @@
 #
 # Gestion scolarite IUT
 #
-# Copyright (c) 1999 - 2021 Emmanuel Viennet.  All rights reserved.
+# Copyright (c) 1999 - 2022 Emmanuel Viennet.  All rights reserved.
 #
 # This program is free software; you can redistribute it and/or modify
 # it under the terms of the GNU General Public License as published by
diff --git a/app/scodoc/sco_undo_notes.py b/app/scodoc/sco_undo_notes.py
index b8b93879c..56684e399 100644
--- a/app/scodoc/sco_undo_notes.py
+++ b/app/scodoc/sco_undo_notes.py
@@ -5,7 +5,7 @@
 #
 # Gestion scolarite IUT
 #
-# Copyright (c) 1999 - 2021 Emmanuel Viennet.  All rights reserved.
+# Copyright (c) 1999 - 2022 Emmanuel Viennet.  All rights reserved.
 #
 # This program is free software; you can redistribute it and/or modify
 # it under the terms of the GNU General Public License as published by
diff --git a/app/scodoc/sco_up_to_date.py b/app/scodoc/sco_up_to_date.py
index cd473f97d..02c35c77d 100644
--- a/app/scodoc/sco_up_to_date.py
+++ b/app/scodoc/sco_up_to_date.py
@@ -5,7 +5,7 @@
 #
 # Gestion scolarite IUT
 #
-# Copyright (c) 1999 - 2021 Emmanuel Viennet.  All rights reserved.
+# Copyright (c) 1999 - 2022 Emmanuel Viennet.  All rights reserved.
 #
 # This program is free software; you can redistribute it and/or modify
 # it under the terms of the GNU General Public License as published by
diff --git a/app/scodoc/sco_users.py b/app/scodoc/sco_users.py
index de1548571..19fdf9793 100644
--- a/app/scodoc/sco_users.py
+++ b/app/scodoc/sco_users.py
@@ -5,7 +5,7 @@
 #
 # Gestion scolarite IUT
 #
-# Copyright (c) 1999 - 2021 Emmanuel Viennet.  All rights reserved.
+# Copyright (c) 1999 - 2022 Emmanuel Viennet.  All rights reserved.
 #
 # This program is free software; you can redistribute it and/or modify
 # it under the terms of the GNU General Public License as published by
diff --git a/app/scodoc/sco_utils.py b/app/scodoc/sco_utils.py
index 3b6b065ce..8cf8c9bec 100644
--- a/app/scodoc/sco_utils.py
+++ b/app/scodoc/sco_utils.py
@@ -5,7 +5,7 @@
 #
 # Gestion scolarite IUT
 #
-# Copyright (c) 1999 - 2021 Emmanuel Viennet.  All rights reserved.
+# Copyright (c) 1999 - 2022 Emmanuel Viennet.  All rights reserved.
 #
 # This program is free software; you can redistribute it and/or modify
 # it under the terms of the GNU General Public License as published by
diff --git a/app/scodoc/sco_vdi.py b/app/scodoc/sco_vdi.py
index c9e3ff5bf..f058b6507 100644
--- a/app/scodoc/sco_vdi.py
+++ b/app/scodoc/sco_vdi.py
@@ -5,7 +5,7 @@
 #
 # Gestion scolarite IUT
 #
-# Copyright (c) 1999 - 2021 Emmanuel Viennet.  All rights reserved.
+# Copyright (c) 1999 - 2022 Emmanuel Viennet.  All rights reserved.
 #
 # This program is free software; you can redistribute it and/or modify
 # it under the terms of the GNU General Public License as published by
diff --git a/app/scodoc/sco_xml.py b/app/scodoc/sco_xml.py
index 222ef84b1..4e9e6f214 100644
--- a/app/scodoc/sco_xml.py
+++ b/app/scodoc/sco_xml.py
@@ -5,7 +5,7 @@
 #
 # Gestion scolarite IUT
 #
-# Copyright (c) 1999 - 2021 Emmanuel Viennet.  All rights reserved.
+# Copyright (c) 1999 - 2022 Emmanuel Viennet.  All rights reserved.
 #
 # This program is free software; you can redistribute it and/or modify
 # it under the terms of the GNU General Public License as published by
diff --git a/app/scodoc/scolog.py b/app/scodoc/scolog.py
index 3b659b66f..0854ec945 100644
--- a/app/scodoc/scolog.py
+++ b/app/scodoc/scolog.py
@@ -5,7 +5,7 @@
 #
 # Gestion scolarite IUT
 #
-# Copyright (c) 1999 - 2021 Emmanuel Viennet.  All rights reserved.
+# Copyright (c) 1999 - 2022 Emmanuel Viennet.  All rights reserved.
 #
 # This program is free software; you can redistribute it and/or modify
 # it under the terms of the GNU General Public License as published by
diff --git a/app/views/absences.py b/app/views/absences.py
index a3f893518..dcbac37fc 100644
--- a/app/views/absences.py
+++ b/app/views/absences.py
@@ -3,7 +3,7 @@
 #
 # Gestion scolarite IUT
 #
-# Copyright (c) 1999 - 2021 Emmanuel Viennet.  All rights reserved.
+# Copyright (c) 1999 - 2022 Emmanuel Viennet.  All rights reserved.
 #
 # This program is free software; you can redistribute it and/or modify
 # it under the terms of the GNU General Public License as published by
diff --git a/app/views/entreprises.py b/app/views/entreprises.py
index 5b8cec66a..8b09e05dd 100644
--- a/app/views/entreprises.py
+++ b/app/views/entreprises.py
@@ -5,7 +5,7 @@
 #
 # Gestion scolarite IUT
 #
-# Copyright (c) 1999 - 2021 Emmanuel Viennet.  All rights reserved.
+# Copyright (c) 1999 - 2022 Emmanuel Viennet.  All rights reserved.
 #
 # This program is free software; you can redistribute it and/or modify
 # it under the terms of the GNU General Public License as published by
diff --git a/app/views/notes.py b/app/views/notes.py
index 5523a10e6..4ca10dff6 100644
--- a/app/views/notes.py
+++ b/app/views/notes.py
@@ -5,7 +5,7 @@
 #
 # ScoDoc
 #
-# Copyright (c) 1999 - 2021 Emmanuel Viennet.  All rights reserved.
+# Copyright (c) 1999 - 2022 Emmanuel Viennet.  All rights reserved.
 #
 # This program is free software; you can redistribute it and/or modify
 # it under the terms of the GNU General Public License as published by
diff --git a/app/views/pn_modules.py b/app/views/pn_modules.py
index c3b18f355..565bc210f 100644
--- a/app/views/pn_modules.py
+++ b/app/views/pn_modules.py
@@ -5,7 +5,7 @@
 #
 # ScoDoc
 #
-# Copyright (c) 1999 - 2021 Emmanuel Viennet.  All rights reserved.
+# Copyright (c) 1999 - 2022 Emmanuel Viennet.  All rights reserved.
 #
 # This program is free software; you can redistribute it and/or modify
 # it under the terms of the GNU General Public License as published by
diff --git a/app/views/scodoc.py b/app/views/scodoc.py
index 815de175d..9377dc564 100644
--- a/app/views/scodoc.py
+++ b/app/views/scodoc.py
@@ -5,7 +5,7 @@
 #
 # ScoDoc
 #
-# Copyright (c) 1999 - 2021 Emmanuel Viennet.  All rights reserved.
+# Copyright (c) 1999 - 2022 Emmanuel Viennet.  All rights reserved.
 #
 # This program is free software; you can redistribute it and/or modify
 # it under the terms of the GNU General Public License as published by
diff --git a/app/views/scolar.py b/app/views/scolar.py
index b83dbcace..e41183671 100644
--- a/app/views/scolar.py
+++ b/app/views/scolar.py
@@ -3,7 +3,7 @@
 #
 # ScoDoc
 #
-# Copyright (c) 1999 - 2021 Emmanuel Viennet.  All rights reserved.
+# Copyright (c) 1999 - 2022 Emmanuel Viennet.  All rights reserved.
 #
 # This program is free software; you can redistribute it and/or modify
 # it under the terms of the GNU General Public License as published by
diff --git a/app/views/users.py b/app/views/users.py
index f14ecf2a5..fee36edf2 100644
--- a/app/views/users.py
+++ b/app/views/users.py
@@ -5,7 +5,7 @@
 #
 # ScoDoc
 #
-# Copyright (c) 1999 - 2021 Emmanuel Viennet.  All rights reserved.
+# Copyright (c) 1999 - 2022 Emmanuel Viennet.  All rights reserved.
 #
 # This program is free software; you can redistribute it and/or modify
 # it under the terms of the GNU General Public License as published by
diff --git a/misc/csv2rules.py b/misc/csv2rules.py
index 63fd62529..4eb01c9d1 100755
--- a/misc/csv2rules.py
+++ b/misc/csv2rules.py
@@ -6,7 +6,7 @@
 #
 # Gestion scolarite IUT
 #
-# Copyright (c) 1999 - 2021 Emmanuel Viennet.  All rights reserved.
+# Copyright (c) 1999 - 2022 Emmanuel Viennet.  All rights reserved.
 #
 # This program is free software; you can redistribute it and/or modify
 # it under the terms of the GNU General Public License as published by
diff --git a/misc/geolocalize_lycees.py b/misc/geolocalize_lycees.py
index 818ec8c36..fc4e63dd3 100644
--- a/misc/geolocalize_lycees.py
+++ b/misc/geolocalize_lycees.py
@@ -5,7 +5,7 @@
 #
 # Gestion scolarite IUT
 #
-# Copyright (c) 2001 - 2012 Emmanuel Viennet.  All rights reserved.
+# Copyright (c) 1999 - 2022 Emmanuel Viennet.  All rights reserved.
 #
 # This program is free software; you can redistribute it and/or modify
 # it under the terms of the GNU General Public License as published by
diff --git a/tools/anonymize_db.py b/tools/anonymize_db.py
index 6f7338018..d76edb3e4 100755
--- a/tools/anonymize_db.py
+++ b/tools/anonymize_db.py
@@ -6,7 +6,7 @@
 #
 # Gestion scolarite IUT
 #
-# Copyright (c) 1999 - 2019 Emmanuel Viennet.  All rights reserved.
+# Copyright (c) 1999 - 2022 Emmanuel Viennet.  All rights reserved.
 #
 # This program is free software; you can redistribute it and/or modify
 # it under the terms of the GNU General Public License as published by

From b76f44d9f0831c056773583106b39a7f1632125d Mon Sep 17 00:00:00 2001
From: Emmanuel Viennet <emmanuel.viennet@gmail.com>
Date: Sat, 1 Jan 2022 14:51:28 +0100
Subject: [PATCH 09/10] update

---
 app/comp/aux.py         | 2 +-
 app/comp/res_but.py     | 2 +-
 app/comp/res_classic.py | 2 +-
 app/comp/res_sem.py     | 2 +-
 4 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/app/comp/aux.py b/app/comp/aux.py
index 46285a4b1..92ee22c1b 100644
--- a/app/comp/aux.py
+++ b/app/comp/aux.py
@@ -1,6 +1,6 @@
 ##############################################################################
 # ScoDoc
-# Copyright (c) 1999 - 2021 Emmanuel Viennet.  All rights reserved.
+# Copyright (c) 1999 - 2022 Emmanuel Viennet.  All rights reserved.
 # See LICENSE
 ##############################################################################
 
diff --git a/app/comp/res_but.py b/app/comp/res_but.py
index c3c548ac2..cc0b88079 100644
--- a/app/comp/res_but.py
+++ b/app/comp/res_but.py
@@ -1,6 +1,6 @@
 ##############################################################################
 # ScoDoc
-# Copyright (c) 1999 - 2021 Emmanuel Viennet.  All rights reserved.
+# Copyright (c) 1999 - 2022 Emmanuel Viennet.  All rights reserved.
 # See LICENSE
 ##############################################################################
 
diff --git a/app/comp/res_classic.py b/app/comp/res_classic.py
index c11912673..b203ec589 100644
--- a/app/comp/res_classic.py
+++ b/app/comp/res_classic.py
@@ -1,6 +1,6 @@
 ##############################################################################
 # ScoDoc
-# Copyright (c) 1999 - 2021 Emmanuel Viennet.  All rights reserved.
+# Copyright (c) 1999 - 2022 Emmanuel Viennet.  All rights reserved.
 # See LICENSE
 ##############################################################################
 
diff --git a/app/comp/res_sem.py b/app/comp/res_sem.py
index a73c46b09..4f3a5dda2 100644
--- a/app/comp/res_sem.py
+++ b/app/comp/res_sem.py
@@ -1,6 +1,6 @@
 ##############################################################################
 # ScoDoc
-# Copyright (c) 1999 - 2021 Emmanuel Viennet.  All rights reserved.
+# Copyright (c) 1999 - 2022 Emmanuel Viennet.  All rights reserved.
 # See LICENSE
 ##############################################################################
 

From e0be0f8feef8cfb7f5da4fe516b33529ec1712c9 Mon Sep 17 00:00:00 2001
From: Emmanuel Viennet <emmanuel.viennet@gmail.com>
Date: Sat, 1 Jan 2022 18:02:23 +0100
Subject: [PATCH 10/10] Modification imports pour WTForms 3.0

---
 app/entreprises/forms.py | 41 +++++++++++++++++++++++++++++++++-------
 1 file changed, 34 insertions(+), 7 deletions(-)

diff --git a/app/entreprises/forms.py b/app/entreprises/forms.py
index 0e145f43d..1f76732dc 100644
--- a/app/entreprises/forms.py
+++ b/app/entreprises/forms.py
@@ -1,16 +1,43 @@
-from flask import flash
+# -*- mode: python -*-
+# -*- coding: utf-8 -*-
+
+##############################################################################
+#
+# Gestion scolarite IUT
+#
+# Copyright (c) 1999 - 2022 Emmanuel Viennet.  All rights reserved.
+#
+# This program is free software; you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation; either version 2 of the License, or
+# (at your option) any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program; if not, write to the Free Software
+# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+#
+#
+##############################################################################
+
+import re
+import requests
+
 from flask_wtf import FlaskForm
-from markupsafe import Markup
-import requests, re
-from wtforms import StringField, SubmitField, TextAreaField, SelectField, HiddenField
-from wtforms.fields.html5 import EmailField, DateField
 from flask_wtf.file import FileField, FileAllowed, FileRequired
+from markupsafe import Markup
+from sqlalchemy import text
+from wtforms import StringField, SubmitField, TextAreaField, SelectField, HiddenField
+from wtforms.fields import EmailField, DateField
 from wtforms.validators import ValidationError, DataRequired, Email
+
 from app.entreprises.models import Entreprise, EntrepriseContact
 from app.models import Identite
 from app.auth.models import User
-from app.scodoc import sco_etud
-from sqlalchemy import text
 
 CHAMP_REQUIS = "Ce champ est requis"