From a8932acb712f6dd3a63b66b5a1730545a9a96101 Mon Sep 17 00:00:00 2001
From: iziram <matthias.hartmann@iziram.fr>
Date: Fri, 1 Sep 2023 15:24:44 +0200
Subject: [PATCH 01/18] Assiduites : issue 694 + bug fixe saisie journalier
 (moduleimpl)

---
 app/scodoc/sco_formsemestre_status.py | 15 ++++++-------
 app/scodoc/sco_groups_view.py         | 16 +++++++-------
 app/scodoc/sco_moduleimpl_status.py   | 18 +++++++--------
 app/views/assiduites.py               |  7 ++++--
 tests/unit/test_assiduites.py         | 32 ++++++++++++++-------------
 5 files changed, 46 insertions(+), 42 deletions(-)

diff --git a/app/scodoc/sco_formsemestre_status.py b/app/scodoc/sco_formsemestre_status.py
index 45c8b4e73c..61053f7476 100755
--- a/app/scodoc/sco_formsemestre_status.py
+++ b/app/scodoc/sco_formsemestre_status.py
@@ -888,14 +888,13 @@ def _make_listes_sem(formsemestre: FormSemestre, with_absences=True):
                 if n_members == 0:
                     continue  # skip empty groups
                 partition_is_empty = False
-                # XXX TODO-ASSIDUITE
-                group["url_etat"] = "non disponible"  # url_for(
-                #     "absences.EtatAbsencesGr",
-                #     group_ids=group["group_id"],
-                #     debut=formsemestre.date_debut.strftime("%d/%m/%Y"),
-                #     fin=formsemestre.date_fin.strftime("%d/%m/%Y"),
-                #     scodoc_dept=g.scodoc_dept,
-                # )
+                group["url_etat"] = url_for(
+                    "assiduites.visu_assi_group",
+                    scodoc_dept=g.scodoc_dept,
+                    group_ids=group["id"],
+                    date_debut=formsemestre.date_debut.isoformat(),
+                    date_fin=formsemestre.date_fin.isoformat(),
+                )
                 if group["group_name"]:
                     group["label"] = "groupe %(group_name)s" % group
                 else:
diff --git a/app/scodoc/sco_groups_view.py b/app/scodoc/sco_groups_view.py
index 5f12735db4..b27098ef26 100644
--- a/app/scodoc/sco_groups_view.py
+++ b/app/scodoc/sco_groups_view.py
@@ -819,9 +819,13 @@ def tab_absences_html(groups_infos, etat=None):
     H = ['<div class="tab-content">']
     if not groups_infos.members:
         return "".join(H) + "<h3>Aucun étudiant !</h3></div>"
+
+    group_ids: str = ",".join(map(str, groups_infos.group_ids))
+    formsemestre: FormSemestre = groups_infos.get_formsemestre()
+
     H.extend(
         [
-            "<h3>Absences</h3>",
+            "<h3>Assiduités</h3>",
             '<ul class="ul_abs">',
             "<li>",
             form_choix_saisie_semaine(groups_infos),  # Ajout Le Havre
@@ -829,13 +833,9 @@ def tab_absences_html(groups_infos, etat=None):
             "<li>",
             form_choix_jour_saisie_hebdo(groups_infos),
             "</li>",
-            # XXX TODO-ASSIDUITE
-            """<li><a class="stdlink" href="Absences/EtatAbsencesGr?%s&debut=%s&fin=%s">XXX État des absences du groupe</a></li>"""
-            % (
-                groups_infos.groups_query_args,
-                groups_infos.formsemestre["date_debut"],
-                groups_infos.formsemestre["date_fin"],
-            ),
+            f"""<li><a href="{
+                    url_for("assiduites.visu_assi_group", scodoc_dept=g.scodoc_dept, group_ids=group_ids, date_debut=formsemestre.date_debut.isoformat(), date_fin=formsemestre.date_fin.isoformat()) 
+                }">État des assiduités du groupe</a></li>""",
             "</ul>",
             "<h3>Feuilles</h3>",
             '<ul class="ul_feuilles">',
diff --git a/app/scodoc/sco_moduleimpl_status.py b/app/scodoc/sco_moduleimpl_status.py
index 1bcfd9702c..93ce5237ff 100644
--- a/app/scodoc/sco_moduleimpl_status.py
+++ b/app/scodoc/sco_moduleimpl_status.py
@@ -29,6 +29,7 @@
 """
 import math
 import time
+import datetime
 
 from flask import g, url_for
 from flask_login import current_user
@@ -328,20 +329,19 @@ def moduleimpl_status(moduleimpl_id=None, partition_id=None):
         current_user.has_permission(Permission.ScoAbsChange)
         and formsemestre.est_courant()
     ):
-        datelundi = sco_cal.ddmmyyyy(time.strftime("%d/%m/%Y")).prev_monday()
         group_id = sco_groups.get_default_group(formsemestre_id)
         H.append(
             f"""
-        <span class="moduleimpl_abs_link"><a class="stdlink" href="XXX"
-        >Saisie Absences hebdo. (INDISPONIBLE)</a></span>
+                <span class="moduleimpl_abs_link"><a class="stdlink" href="{
+                    url_for("assiduites.signal_assiduites_group", scodoc_dept=g.scodoc_dept)
+                }?group_ids={group_id}&jour={
+                    datetime.date.today().isoformat()
+                }&formsemestre_id={formsemestre.id}
+                &moduleimpl_id={moduleimpl_id}
+                "
+        >Saisie Absences hebdo</a></span>
         """
         )
-        #  TODO-ASSIDUITE
-        # href="{
-        #     url_for("absences.SignaleAbsenceGrHebdo",
-        #     scodoc_dept=g.scodoc_dept,formsemestre_id=formsemestre_id,
-        #     moduleimpl_id=moduleimpl_id, datelundi=datelundi, group_ids=group_id)
-        # }"
 
     H.append("</td></tr></table>")
     #
diff --git a/app/views/assiduites.py b/app/views/assiduites.py
index ec81393988..488a7842ac 100644
--- a/app/views/assiduites.py
+++ b/app/views/assiduites.py
@@ -1022,7 +1022,7 @@ def _module_selector(
     for ue in ues:
         modimpls_list += ntc.get_modimpls_dict(ue_id=ue["ue_id"])
 
-    selected = moduleimpl_id is not None
+    selected = "" if moduleimpl_id is not None else "selected"
 
     modules = []
 
@@ -1035,7 +1035,10 @@ def _module_selector(
         modules.append({"moduleimpl_id": modimpl["moduleimpl_id"], "name": modname})
 
     return render_template(
-        "assiduites/widgets/moduleimpl_selector.j2", selected=selected, modules=modules
+        "assiduites/widgets/moduleimpl_selector.j2",
+        selected=selected,
+        modules=modules,
+        moduleimpl_id=moduleimpl_id,
     )
 
 
diff --git a/tests/unit/test_assiduites.py b/tests/unit/test_assiduites.py
index fdd98f1361..725be9491e 100644
--- a/tests/unit/test_assiduites.py
+++ b/tests/unit/test_assiduites.py
@@ -137,7 +137,7 @@ def test_general(test_client):
     etud_faux_dict = g_fake.create_etud(code_nip=None, prenom="etudfaux")
     etud_faux = Identite.query.filter_by(id=etud_faux_dict["id"]).first()
 
-    verif_migration_abs_assiduites()
+    # verif_migration_abs_assiduites() // Test à revoir TODO-ASSIDUITE
 
     ajouter_assiduites(etuds, moduleimpls, etud_faux)
     justificatifs: list[Justificatif] = ajouter_justificatifs(etuds[0])
@@ -308,13 +308,14 @@ def verif_migration_abs_assiduites():
             False,
         ),  # 3 assi 22-23-24/02/2023 08h > 13h (3dj) JUSTI(ext)
     ]:
-        sco_abs_views.doSignaleAbsence(  # TODO-ASSIDUITE
-            datedebut=debut,
-            datefin=fin,
-            demijournee=demijournee,
-            etudid=etudid,
-            estjust=justifiee,
-        )
+        continue
+        # sco_abs_views.doSignaleAbsence(  # TODO-ASSIDUITE
+        #     datedebut=debut,
+        #     datefin=fin,
+        #     demijournee=demijournee,
+        #     etudid=etudid,
+        #     estjust=justifiee,
+        # )
 
     # --- Justification de certaines absences
 
@@ -330,12 +331,13 @@ def verif_migration_abs_assiduites():
             2,
         ),
     ]:
-        sco_abs_views.doJustifAbsence(
-            datedebut=debut,
-            datefin=fin,
-            demijournee=demijournee,
-            etudid=etudid,
-        )
+        continue
+        # sco_abs_views.doJustifAbsence(
+        #     datedebut=debut,
+        #     datefin=fin,
+        #     demijournee=demijournee,
+        #     etudid=etudid,
+        # )
 
     migrate_abs_to_assiduites()
 
@@ -475,7 +477,7 @@ def _get_justi(
 
 
 def essais_cache(etudid):
-    """Vérification des fonctionnalités du cache TODO:WIP"""
+    """Vérification des fonctionnalités du cache"""
 
     date_deb: str = "2023-01-01T07:00"
     date_fin: str = "2023-03-31T19:00"

From 1692857b0e68de8437723e63ec013fd286326194 Mon Sep 17 00:00:00 2001
From: Emmanuel Viennet <emmanuel.viennet@gmail.com>
Date: Fri, 1 Sep 2023 18:14:22 +0200
Subject: [PATCH 02/18] =?UTF-8?q?Bulleins=20BUT=20court:=20html=20et=20pdf?=
 =?UTF-8?q?=20raccord=C3=A9s?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/but/bulletin_but_court.py            |   8 +-
 app/but/bulletin_but_court_pdf.py        | 139 ++++++++++++++++++-----
 app/scodoc/sco_bulletins_generator.py    |   8 +-
 app/scodoc/sco_bulletins_legacy.py       |   8 +-
 app/scodoc/sco_bulletins_pdf.py          |  10 +-
 app/scodoc/sco_bulletins_standard.py     |  54 +++++----
 app/scodoc/sco_config.py                 |   2 +-
 app/scodoc/sco_pdf.py                    |  15 ++-
 app/scodoc/sco_preferences.py            |  36 +++++-
 app/templates/bul_head.j2                |   7 ++
 app/templates/but/bulletin_court_page.j2 |   5 +
 sco_version.py                           |   1 +
 tools/scodoc_config.py                   |   2 +-
 13 files changed, 230 insertions(+), 65 deletions(-)

diff --git a/app/but/bulletin_but_court.py b/app/but/bulletin_but_court.py
index 4ba1aee9a0..684b168232 100644
--- a/app/but/bulletin_but_court.py
+++ b/app/but/bulletin_but_court.py
@@ -44,9 +44,13 @@ from app.views import notes_bp as bp
 from app.views import ScoData
 
 
-@bp.route("/bulletin_but/<int:formsemestre_id>/<int:etudid>")
 @bp.route(
-    "/bulletin_but/<int:formsemestre_id>/<int:etudid>/pdf", defaults={"fmt": "pdf"}
+    "/bulletin_but/<int:formsemestre_id>/<int:etudid>", endpoint="bulletin_but_html"
+)
+@bp.route(
+    "/bulletin_but/<int:formsemestre_id>/<int:etudid>/pdf",
+    defaults={"fmt": "pdf"},
+    endpoint="bulletin_but_pdf",
 )
 @scodoc
 @permission_required(Permission.ScoView)
diff --git a/app/but/bulletin_but_court_pdf.py b/app/but/bulletin_but_court_pdf.py
index 3f0a1fb651..40914b09cb 100644
--- a/app/but/bulletin_but_court_pdf.py
+++ b/app/but/bulletin_but_court_pdf.py
@@ -20,12 +20,15 @@ from reportlab.lib.units import cm, mm
 from reportlab.platypus import Paragraph, Spacer, Table
 
 from app.but import cursus_but
-from app.models import FormSemestre, Identite, ScolarFormSemestreValidation
+from app.models import (
+    BulAppreciations,
+    FormSemestre,
+    Identite,
+    ScolarFormSemestreValidation,
+)
 
 from app.scodoc.sco_bulletins_standard import BulletinGeneratorStandard
-from app.scodoc import sco_bulletins
 from app.scodoc.sco_logos import Logo
-from app.scodoc import sco_pdf, sco_preferences
 from app.scodoc.sco_pdf import PDFLOCK, SU
 
 
@@ -41,6 +44,7 @@ def make_bulletin_but_court_pdf(
     ue_validation_by_niveau: dict[tuple[int, str], ScolarFormSemestreValidation] = None,
     ues_acronyms: list[str] = None,
 ) -> bytes:
+    "génère le bulletin court BUT en pdf"
     # A priori ce verrou n'est plus nécessaire avec Flask (multi-process)
     # mais...
     try:
@@ -64,6 +68,7 @@ class BulletinGeneratorBUTCourt(BulletinGeneratorStandard):
     multi_pages = False  # une page par bulletin
     small_fontsize = "8"
     color_blue_bg = Color(0, 153 / 255, 204 / 255)
+    color_gray_bg = Color(0.86, 0.86, 0.86)
 
     def __init__(
         self,
@@ -94,13 +99,23 @@ class BulletinGeneratorBUTCourt(BulletinGeneratorStandard):
 
         self.nb_ues = len(self.ues_acronyms)
         # Styles PDF
-        self.style_cell = styles.ParagraphStyle("style_cell")
-        self.style_cell.fontName = "Helvetica"
+        self.style_base = styles.ParagraphStyle("style_base")
+        self.style_base.fontName = "Helvetica"
+        self.style_base.fontSize = 9
+
+        self.style_nom = styles.ParagraphStyle("style_nom", self.style_base)
+        self.style_nom.fontSize = 11
+        self.style_nom.fontName = "Helvetica-Bold"
+
+        self.style_field = self.style_base  # écrase style defaut buleltins
+
+        self.style_cell = styles.ParagraphStyle("style_cell", self.style_base)
         self.style_cell.fontSize = 7
         self.style_cell.leading = 7
-        self.style_bold = styles.ParagraphStyle("style_bold", self.style_cell)
-        self.style_bold.fontName = "Helvetica-Bold"
-        self.style_head = styles.ParagraphStyle("style_head", self.style_bold)
+        self.style_cell_bold = styles.ParagraphStyle("style_cell_bold", self.style_cell)
+        self.style_cell_bold.fontName = "Helvetica-Bold"
+
+        self.style_head = styles.ParagraphStyle("style_head", self.style_cell_bold)
         self.style_head.fontSize = 9
 
         self.style_niveaux = styles.ParagraphStyle("style_niveaux", self.style_cell)
@@ -128,6 +143,25 @@ class BulletinGeneratorBUTCourt(BulletinGeneratorStandard):
             "style_niveaux_code", self.style_niveaux
         )
         self.style_niveaux_code.borderColor = black
+        #
+        self.style_jury = styles.ParagraphStyle("style_jury", self.style_base)
+        self.style_jury.fontSize = 9
+        self.style_jury.leading = self.style_jury.fontSize * 1.4  # espace les lignes
+        self.style_jury.backColor = self.color_gray_bg
+        self.style_jury.borderColor = black
+        self.style_jury.borderWidth = 1
+        self.style_jury.borderPadding = 2
+        self.style_jury.borderRadius = 2
+
+        self.style_appreciations = styles.ParagraphStyle(
+            "style_appreciations", self.style_base
+        )
+        self.style_appreciations.fontSize = 9
+        self.style_appreciations.leading = (
+            self.style_jury.fontSize * 1.4
+        )  # espace les lignes
+
+        self.style_assiduite = self.style_cell
 
         # Géométrie page
         self.width_page_avail = 185 * mm  # largeur utilisable
@@ -138,7 +172,27 @@ class BulletinGeneratorBUTCourt(BulletinGeneratorStandard):
         self.width_col_code = self.width_col_ue
         # Niveaux
         self.width_col_niveaux_titre = 24 * mm
-        self.width_col_niveaux_code = 12 * mm
+        self.width_col_niveaux_code = 14 * mm
+
+    def bul_title_pdf(self, preference_field="bul_but_pdf_title") -> list:
+        """Génère la partie "titre" du bulletin de notes.
+        Renvoie une liste d'objets platypus
+        """
+        # comme les bulletins standard, mais avec notre préférence
+        return super().bul_title_pdf(preference_field=preference_field)
+
+    def bul_part_below(self, fmt="pdf") -> list:
+        """Génère les informations placées sous la table
+        Dans le cas du bul. court BUT pdf, seulement les appréciations.
+        fmt est ignoré ici.
+        """
+        appreciations = BulAppreciations.get_appreciations_list(
+            self.formsemestre.id, self.etud.id
+        )
+        return [
+            Spacer(1, 3 * mm),
+            self.bul_appreciations_pdf(appreciations, style=self.style_appreciations),
+        ]
 
     def bul_table(self, fmt=None) -> list:
         """Génère la table centrale du bulletin de notes
@@ -148,7 +202,7 @@ class BulletinGeneratorBUTCourt(BulletinGeneratorStandard):
         style_table_2cols = [
             ("ALIGN", (0, -1), (0, -1), "LEFT"),
             ("ALIGN", (-1, -1), (-1, -1), "RIGHT"),
-            ("VALIGN", (0, 0), (-1, 1), "TOP"),
+            ("VALIGN", (0, 0), (-1, -1), "TOP"),
             ("LEFTPADDING", (0, 0), (-1, -1), 0),
             ("TOPPADDING", (0, 0), (-1, -1), 0),
             ("RIGHTPADDING", (0, 0), (-1, -1), 0),
@@ -156,15 +210,24 @@ class BulletinGeneratorBUTCourt(BulletinGeneratorStandard):
         ]
         # Ligne avec boite assiduité et table UEs
         table_abs_ues = Table(
-            [[self.box_assiduite(), self.table_ues()]],
-            colWidths=(3 * cm, self.width_page_avail - 3 * cm),
+            [
+                [
+                    self.boite_identite() + [Spacer(1, 3 * mm), self.boite_assiduite()],
+                    self.table_ues(),
+                ],
+            ],
             style=style_table_2cols,
         )
         table_abs_ues.hAlign = "RIGHT"
         # Ligne (en bas) avec table cursus et boite jury
         table_cursus_jury = Table(
-            [[self.table_cursus_but(), self.boite_decisions_jury()]],
-            colWidths=(self.width_page_avail - 45 * mm, 45 * mm),
+            [
+                [
+                    self.table_cursus_but(),
+                    [Spacer(1, 8 * mm), self.boite_decisions_jury()],
+                ]
+            ],
+            colWidths=(self.width_page_avail - 84 * mm, 84 * mm),
             style=style_table_2cols,
         )
         return [
@@ -223,13 +286,15 @@ class BulletinGeneratorBUTCourt(BulletinGeneratorStandard):
         col_widths = [self.width_col_ue_titres] + [self.width_col_ue] * self.nb_ues
 
         rows_styled = [[Paragraph(SU(str(cell)), self.style_head) for cell in rows[0]]]
-        rows_styled += [[Paragraph(SU(str(cell)), self.style_bold) for cell in rows[1]]]
+        rows_styled += [
+            [Paragraph(SU(str(cell)), self.style_cell_bold) for cell in rows[1]]
+        ]
         rows_styled += [
             [Paragraph(SU(str(cell)), self.style_cell) for cell in row]
             for row in rows[2:-1]
         ]
         rows_styled += [
-            [Paragraph(SU(str(cell)), self.style_bold) for cell in rows[-1]]
+            [Paragraph(SU(str(cell)), self.style_cell_bold) for cell in rows[-1]]
         ]
         table = Table(
             rows_styled,
@@ -285,7 +350,7 @@ class BulletinGeneratorBUTCourt(BulletinGeneratorStandard):
         ] * self.nb_ues
 
         rows_styled = [
-            [Paragraph(SU(str(cell)), self.style_bold) for cell in row]
+            [Paragraph(SU(str(cell)), self.style_cell_bold) for cell in row]
             for row in rows[:2]
         ]
         rows_styled += [
@@ -310,7 +375,26 @@ class BulletinGeneratorBUTCourt(BulletinGeneratorStandard):
             "saes", "Situations d'Apprentissage et d'Évaluation (SAÉ)"
         )
 
-    def box_assiduite(self) -> Table:
+    def boite_identite(self) -> list:
+        "Les informations sur l'identité et l'inscription de l'étudiant"
+        return [
+            Paragraph(
+                SU(f"""{self.etud.nomprenom}"""),
+                style=self.style_nom,
+            ),
+            Paragraph(
+                SU(
+                    f"""
+            <b>{self.bul["demission"]}</b><br/>
+            Formation: {self.formsemestre.titre_num()}<br/>
+            Année scolaire: {self.formsemestre.annee_scolaire_str()}<br/>
+            """
+                ),
+                style=self.style_base,
+            ),
+        ]
+
+    def boite_assiduite(self) -> Table:
         "Les informations sur l'assiduité"
         if not self.bul["options"]["show_abs"]:
             return Paragraph("")  # empty
@@ -326,7 +410,7 @@ class BulletinGeneratorBUTCourt(BulletinGeneratorStandard):
             for row in rows[:1]
         ]
         rows_styled += [
-            [Paragraph(SU(str(cell)), self.style_cell) for cell in row]
+            [Paragraph(SU(str(cell)), self.style_assiduite) for cell in row]
             for row in rows[1:]
         ]
         table = Table(
@@ -339,6 +423,7 @@ class BulletinGeneratorBUTCourt(BulletinGeneratorStandard):
                 ("SPAN", (0, 1), (1, 1)),
                 ("VALIGN", (0, 0), (-1, -1), "TOP"),
             ],
+            colWidths=(25 * mm, 10 * mm),
         )
         table.hAlign = "LEFT"
         return table
@@ -387,12 +472,14 @@ class BulletinGeneratorBUTCourt(BulletinGeneratorStandard):
             style=[
                 ("ALIGN", (0, 0), (-1, -1), "CENTER"),
                 ("VALIGN", (0, 0), (-1, -1), "MIDDLE"),
-                ("LEFTPADDING", (0, 0), (-1, -1), 2),
+                ("LEFTPADDING", (0, 0), (-1, -1), 5),
                 ("TOPPADDING", (0, 0), (-1, -1), 4),
-                ("RIGHTPADDING", (0, 0), (-1, -1), 2),
+                ("RIGHTPADDING", (0, 0), (-1, -1), 5),
                 ("BOTTOMPADDING", (0, 0), (-1, -1), 4),
                 # sert de séparateur entre les lignes:
                 ("LINEABOVE", (0, 1), (-1, -1), 3, white),
+                # séparateur colonne
+                ("LINEBEFORE", (1, 1), (-1, -1), 5, white),
             ],
         )
         table.hAlign = "LEFT"
@@ -400,24 +487,24 @@ class BulletinGeneratorBUTCourt(BulletinGeneratorStandard):
 
     def boite_decisions_jury(self):
         """La boite en bas à droite avec jury"""
-        txt = f"""ECTS acquis : {self.ects_total}<br/>"""
+        txt = f"""ECTS acquis : {self.ects_total:g}<br/>"""
         if self.bul["semestre"]["decision_annee"]:
             txt += f"""
             Jury tenu le {
                 datetime.datetime.fromisoformat(self.bul["semestre"]["decision_annee"]["date"]).strftime("%d/%m/%Y à %H:%M")
-            }, année BUT {self.bul["semestre"]["decision_annee"]["code"]}.
+            }, année BUT <b>{self.bul["semestre"]["decision_annee"]["code"]}</b>.
             <br/>
             """
         if self.bul["semestre"]["autorisation_inscription"]:
             txt += (
-                "Autorisé à s'inscrire en "
+                "Autorisé à s'inscrire en <b>"
                 + ", ".join(
                     [
                         f"S{aut['semestre_id']}"
                         for aut in self.bul["semestre"]["autorisation_inscription"]
                     ]
                 )
-                + "."
+                + "</b>."
             )
 
-        return Paragraph(txt)
+        return Paragraph(txt, style=self.style_jury)
diff --git a/app/scodoc/sco_bulletins_generator.py b/app/scodoc/sco_bulletins_generator.py
index 499833e198..f0c66db67e 100644
--- a/app/scodoc/sco_bulletins_generator.py
+++ b/app/scodoc/sco_bulletins_generator.py
@@ -113,10 +113,10 @@ class BulletinGenerator:
         self.diagnostic = None  # error message if any problem
         # Common PDF styles:
         #  - Pour tous les champs du bulletin sauf les cellules de table:
-        self.FieldStyle = reportlab.lib.styles.ParagraphStyle({})
-        self.FieldStyle.fontName = self.preferences["SCOLAR_FONT_BUL_FIELDS"]
-        self.FieldStyle.fontSize = self.preferences["SCOLAR_FONT_SIZE"]
-        self.FieldStyle.firstLineIndent = 0
+        self.style_field = reportlab.lib.styles.ParagraphStyle({})
+        self.style_field.fontName = self.preferences["SCOLAR_FONT_BUL_FIELDS"]
+        self.style_field.fontSize = self.preferences["SCOLAR_FONT_SIZE"]
+        self.style_field.firstLineIndent = 0
         #  - Pour les cellules de table:
         self.CellStyle = reportlab.lib.styles.ParagraphStyle({})
         self.CellStyle.fontSize = self.preferences["SCOLAR_FONT_SIZE"]
diff --git a/app/scodoc/sco_bulletins_legacy.py b/app/scodoc/sco_bulletins_legacy.py
index 419a243776..95e3846af4 100644
--- a/app/scodoc/sco_bulletins_legacy.py
+++ b/app/scodoc/sco_bulletins_legacy.py
@@ -62,7 +62,7 @@ class BulletinGeneratorLegacy(sco_bulletins_generator.BulletinGenerator):
         Renvoie une liste d'objets platypus
         """
         objects = sco_bulletins_pdf.process_field(
-            self.preferences["bul_pdf_title"], self.infos, self.FieldStyle
+            self.preferences["bul_pdf_title"], self.infos, self.style_field
         )
         objects.append(
             Spacer(1, 5 * mm)
@@ -301,7 +301,7 @@ class BulletinGeneratorLegacy(sco_bulletins_generator.BulletinGenerator):
             objects += sco_bulletins_pdf.process_field(
                 self.preferences["bul_pdf_caption"],
                 self.infos,
-                self.FieldStyle,
+                self.style_field,
             )
 
         return objects
@@ -387,7 +387,7 @@ class BulletinGeneratorLegacy(sco_bulletins_generator.BulletinGenerator):
                         sco_bulletins_pdf.process_field(
                             self.preferences["bul_pdf_sig_left"],
                             self.infos,
-                            self.FieldStyle,
+                            self.style_field,
                         )
                     ]
                 ]
@@ -398,7 +398,7 @@ class BulletinGeneratorLegacy(sco_bulletins_generator.BulletinGenerator):
                     sco_bulletins_pdf.process_field(
                         self.preferences["bul_pdf_sig_right"],
                         self.infos,
-                        self.FieldStyle,
+                        self.style_field,
                     )
                 )
             else:
diff --git a/app/scodoc/sco_bulletins_pdf.py b/app/scodoc/sco_bulletins_pdf.py
index 4413741d43..01c39aefad 100644
--- a/app/scodoc/sco_bulletins_pdf.py
+++ b/app/scodoc/sco_bulletins_pdf.py
@@ -142,7 +142,9 @@ class WrapDict(object):
         return value
 
 
-def process_field(field, cdict, style, suppress_empty_pars=False, fmt="pdf"):
+def process_field(
+    field, cdict, style, suppress_empty_pars=False, fmt="pdf", field_name=None
+):
     """Process a field given in preferences, returns
     - if format = 'pdf': a list of Platypus objects
     - if format = 'html' : a string
@@ -178,7 +180,7 @@ def process_field(field, cdict, style, suppress_empty_pars=False, fmt="pdf"):
         # ne sera pas visible si lien vers pdf:
         scu.flash_once(f"Attention: format PDF invalide (champs {field})")
         text = (
-            "<para><i>format invalide !</i></para><para>"
+            "<para><i>format invalide ! (1)</i></para><para>"
             + traceback.format_exc()
             + "</para>"
         )
@@ -204,7 +206,9 @@ def process_field(field, cdict, style, suppress_empty_pars=False, fmt="pdf"):
     #        secure_filename dans la classe Logo
 
     # log('field: %s' % (text))
-    return sco_pdf.make_paras(text, style, suppress_empty=suppress_empty_pars)
+    return sco_pdf.make_paras(
+        text, style, suppress_empty=suppress_empty_pars, field_name=field_name
+    )
 
 
 def get_formsemestre_bulletins_pdf(formsemestre_id, version="selectedevals"):
diff --git a/app/scodoc/sco_bulletins_standard.py b/app/scodoc/sco_bulletins_standard.py
index dd3e8d7d67..8bff41a4c4 100644
--- a/app/scodoc/sco_bulletins_standard.py
+++ b/app/scodoc/sco_bulletins_standard.py
@@ -81,12 +81,15 @@ class BulletinGeneratorStandard(sco_bulletins_generator.BulletinGenerator):
     description = "standard ScoDoc (version 2011)"
     supported_formats = ["html", "pdf"]
 
-    def bul_title_pdf(self) -> list:
+    def bul_title_pdf(self, preference_field="bul_pdf_title") -> list:
         """Génère la partie "titre" du bulletin de notes.
         Renvoie une liste d'objets platypus
         """
         objects = sco_bulletins_pdf.process_field(
-            self.preferences["bul_pdf_title"], self.infos, self.FieldStyle
+            self.preferences[preference_field],
+            self.infos,
+            self.style_field,
+            field_name=preference_field,
         )
         objects.append(
             Spacer(1, 5 * mm)
@@ -195,37 +198,26 @@ class BulletinGeneratorStandard(sco_bulletins_generator.BulletinGenerator):
                 % self.infos
             )
         H.append("</div>")
-        # Appréciations sur PDF:
+        # ------ Appréciations sur PDF
         if appreciations:
             story.append(Spacer(1, 3 * mm))
-            try:
-                story.append(
-                    Paragraph(
-                        SU(
-                            "Appréciation : "
-                            + "\n".join(BulAppreciations.summarize(appreciations))
-                        ),
-                        self.CellStyle,
-                    )
-                )
-            except AttributeError as exc:
-                raise ScoPDFFormatError(
-                    "Appréciation invalide bloquant la génération du pdf"
-                ) from exc
+            story.append(self.bul_appreciations_pdf(appreciations))
 
         # ----- DECISION JURY
         if self.preferences["bul_show_decision"]:
             story += sco_bulletins_pdf.process_field(
                 self.preferences["bul_pdf_caption"],
                 self.infos,
-                self.FieldStyle,
+                self.style_field,
                 fmt="pdf",
+                field_name="bul_pdf_caption",
             )
             field = sco_bulletins_pdf.process_field(
                 self.preferences["bul_pdf_caption"],
                 self.infos,
-                self.FieldStyle,
+                self.style_field,
                 fmt="html",
+                field_name="bul_pdf_caption",
             )
             H.append('<div class="bul_decision">' + field + "</div>")
 
@@ -240,6 +232,24 @@ class BulletinGeneratorStandard(sco_bulletins_generator.BulletinGenerator):
         elif fmt == "html":
             return "\n".join(H)
 
+    def bul_appreciations_pdf(
+        self, appreciations: list[BulAppreciations], style=None
+    ) -> Paragraph:
+        "Liste d'objets platypus pour les appréciations sous le bulletin"
+        style = style or self.CellStyle
+        try:
+            return Paragraph(
+                SU(
+                    "Appréciation du "
+                    + "\n".join(BulAppreciations.summarize(appreciations))
+                ),
+                style,
+            )
+        except AttributeError as exc:
+            raise ScoPDFFormatError(
+                "Appréciation invalide bloquant la génération du pdf"
+            ) from exc
+
     def bul_signatures_pdf(self):
         """Génère les signatures placées en bas du bulletin PDF
         Renvoie une liste d'objets platypus
@@ -253,7 +263,8 @@ class BulletinGeneratorStandard(sco_bulletins_generator.BulletinGenerator):
                         sco_bulletins_pdf.process_field(
                             self.preferences["bul_pdf_sig_left"],
                             self.infos,
-                            self.FieldStyle,
+                            self.style_field,
+                            field_name="bul_pdf_sig_left",
                         )
                     ]
                 ]
@@ -264,7 +275,8 @@ class BulletinGeneratorStandard(sco_bulletins_generator.BulletinGenerator):
                     sco_bulletins_pdf.process_field(
                         self.preferences["bul_pdf_sig_right"],
                         self.infos,
-                        self.FieldStyle,
+                        self.style_field,
+                        field_name="bul_pdf_sig_right",
                     )
                 )
             else:
diff --git a/app/scodoc/sco_config.py b/app/scodoc/sco_config.py
index a7f389237e..4c8a559f93 100644
--- a/app/scodoc/sco_config.py
+++ b/app/scodoc/sco_config.py
@@ -45,7 +45,7 @@ CONFIG.LOGO_HEADER_HEIGHT = 28
 #   server_url: URL du serveur ScoDoc
 #   scodoc_name: le nom du logiciel (ScoDoc actuellement, voir sco_version.py)
 CONFIG.DEFAULT_PDF_FOOTER_TEMPLATE = (
-    "Edité par %(scodoc_name)s le %(day)s/%(month)s/%(year)s à %(hour)sh%(minute)s"
+    "Édité par %(scodoc_name)s le %(day)s/%(month)s/%(year)s à %(hour)sh%(minute)s"
 )
 
 
diff --git a/app/scodoc/sco_pdf.py b/app/scodoc/sco_pdf.py
index 72e1f8df27..b21f626709 100755
--- a/app/scodoc/sco_pdf.py
+++ b/app/scodoc/sco_pdf.py
@@ -57,6 +57,7 @@ from flask import g
 
 from app import log
 from app.scodoc.sco_exceptions import ScoGenError, ScoPDFFormatError, ScoValueError
+from app.scodoc import sco_preferences
 from app.scodoc import sco_utils as scu
 from app.scodoc.sco_utils import CONFIG
 import sco_version
@@ -119,7 +120,9 @@ def _splitPara(txt):
     return L
 
 
-def make_paras(txt: str, style, suppress_empty=False) -> list[Paragraph]:
+def make_paras(
+    txt: str, style, suppress_empty=False, field_name=None
+) -> list[Paragraph]:
     """Returns a list of Paragraph instances from a text
     with one or more <para> ... </para>
     """
@@ -157,9 +160,17 @@ def make_paras(txt: str, style, suppress_empty=False) -> list[Paragraph]:
         log(traceback.format_exc())
         log(f"Invalid pdf para format: {txt}")
         try:
+            # récupère le nom de la préférence
+            if field_name:
+                p = sco_preferences.BasePreferences(g.scodoc_dept_id)
+                pref = p.prefs_dict.get(field_name)
+                if pref:
+                    field_name = pref["title"]
             result = [
                 Paragraph(
-                    SU('<font color="red"><i>Erreur: format invalide</i></font>'),
+                    SU(
+                        f"""<font color="red"><i>Erreur: format invalide (voir préférence {field_name or ""})</i></font>"""
+                    ),
                     style,
                 )
             ]
diff --git a/app/scodoc/sco_preferences.py b/app/scodoc/sco_preferences.py
index 5a37845356..1acfc5dab0 100644
--- a/app/scodoc/sco_preferences.py
+++ b/app/scodoc/sco_preferences.py
@@ -229,6 +229,16 @@ PREF_CATEGORIES = (
             "related": ("abs", "bul_margins", "bul_mail"),
         },
     ),
+    (
+        "bul_but_pdf",
+        {
+            "title": "Réglages des bulletins BUT (pdf)",
+            "related": (
+                "bul",
+                "bul_margins",
+            ),
+        },
+    ),
     # sur page "Mise en page des bulletins"
     (
         "bul_margins",
@@ -257,7 +267,7 @@ PREF_CATEGORIES = (
 )
 
 
-class BasePreferences(object):
+class BasePreferences:
     """Global preferences"""
 
     _editor = ndb.EditableTable(
@@ -1681,6 +1691,30 @@ class BasePreferences(object):
                     "category": "bul",
                 },
             ),
+            # Bulletin court BUT
+            # avec peu de réglages afin conserver la mise en page compacte...
+            (
+                "bul_but_pdf_title",
+                {
+                    "initvalue": """
+<para fontSize="14" align="center">
+<b>%(UnivName)s</b>
+</para>
+<para fontSize="14" align="center" spaceBefore="2mm">
+<b>%(InstituteName)s</b>
+</para>
+<para fontSize="14" align="center" spaceBefore="4mm">
+<b>Bachelor Universitaire de Technologie</b>
+</para>
+""",
+                    "title": "Bulletins PDF BUT: paragraphe de titre",
+                    "explanation": "(balises interprétées, voir documentation)",
+                    "input_type": "textarea",
+                    "rows": 10,
+                    "cols": 64,
+                    "category": "bul_but_pdf",
+                },
+            ),
             # XXX A COMPLETER, voir sco_formsemestre_edit.py XXX
             # bul_mail
             (
diff --git a/app/templates/bul_head.j2 b/app/templates/bul_head.j2
index 691cb4fb32..9a59ccd52b 100644
--- a/app/templates/bul_head.j2
+++ b/app/templates/bul_head.j2
@@ -42,6 +42,13 @@
                 format='pdf',
                 version=version,
             )}}">{{scu.ICON_PDF|safe}}</a>
+            <a style="margin-left: 20px;"
+            href="{{url_for(
+                'notes.bulletin_but_html',
+                scodoc_dept=g.scodoc_dept,
+                formsemestre_id=formsemestre.id,
+                etudid=etud.id
+            )}}">version courte spéciale BUT</a>
         </span>
         </div>
     </form>
diff --git a/app/templates/but/bulletin_court_page.j2 b/app/templates/but/bulletin_court_page.j2
index 66da8bc398..f7249c1655 100644
--- a/app/templates/but/bulletin_court_page.j2
+++ b/app/templates/but/bulletin_court_page.j2
@@ -39,6 +39,11 @@
 {%- endmacro %}
 
 {% block app_content %}
+<p><a href="{{url_for(
+        'notes.bulletin_but_pdf', scodoc_dept=g.scodoc_dept, etudid=etud.id, 
+        formsemestre_id=formsemestre.id
+    )}}" class="stdlink">version pdf {{scu.ICON_PDF|safe}}</a>
+</p>
 
 <div class="but_bul_court">
     <div id="infos_etudiant">
diff --git a/sco_version.py b/sco_version.py
index c72a265843..5cc41fa0f7 100644
--- a/sco_version.py
+++ b/sco_version.py
@@ -11,6 +11,7 @@ SCONEWS = """
 
 <li>ScoDoc 9.6 (juillet 2023)</li>
 <ul>
+      <li>Nouveaux bulletins BUT compacts</li>
       <li>Nouvelle gestion des absences et assiduité</li>
       <li>Mise à jour logiciels: Debian 12, Python 3.11, ...</li>
 </ul>
diff --git a/tools/scodoc_config.py b/tools/scodoc_config.py
index 75a47e3efa..205b4773aa 100644
--- a/tools/scodoc_config.py
+++ b/tools/scodoc_config.py
@@ -64,7 +64,7 @@ CONFIG.LOGO_HEADER_HEIGHT = 28  # taille verticale dans le document en millimetr
 #   scodoc_name: le nom du logiciel (ScoDoc actuellement, voir sco_version.py)
 
 CONFIG.DEFAULT_PDF_FOOTER_TEMPLATE = (
-    "Edité par %(scodoc_name)s le %(day)s/%(month)s/%(year)s à %(hour)sh%(minute)s"
+    "Édité par %(scodoc_name)s le %(day)s/%(month)s/%(year)s à %(hour)sh%(minute)s"
 )
 
 

From 1fd54ade84e1b68b0e116795325f220e694bd905 Mon Sep 17 00:00:00 2001
From: Emmanuel Viennet <emmanuel.viennet@gmail.com>
Date: Sat, 2 Sep 2023 15:53:30 +0200
Subject: [PATCH 03/18] Fix some bugs: bul. but, modimpl_status

---
 app/but/bulletin_but_court.py            | 17 ++++++++++++----
 app/but/bulletin_but_court_pdf.py        | 25 ++++++++++++++++--------
 app/scodoc/sco_bulletins_generator.py    |  2 ++
 app/scodoc/sco_bulletins_standard.py     |  4 ++--
 app/scodoc/sco_moduleimpl_status.py      |  8 ++++++--
 app/templates/bul_head.j2                | 18 +++++++++--------
 app/templates/but/bulletin_court_page.j2 | 15 ++++++++++----
 sco_version.py                           |  2 +-
 8 files changed, 62 insertions(+), 29 deletions(-)

diff --git a/app/but/bulletin_but_court.py b/app/but/bulletin_but_court.py
index 684b168232..3997d091af 100644
--- a/app/but/bulletin_but_court.py
+++ b/app/but/bulletin_but_court.py
@@ -36,7 +36,7 @@ from app.decorators import (
 )
 from app.models import FormSemestre, FormSemestreInscription, Identite
 from app.scodoc.codes_cursus import UE_STANDARD
-from app.scodoc.sco_exceptions import ScoNoReferentielCompetences
+from app.scodoc.sco_exceptions import ScoNoReferentielCompetences, ScoValueError
 from app.scodoc.sco_logos import find_logo
 from app.scodoc.sco_permissions import Permission
 import app.scodoc.sco_utils as scu
@@ -63,12 +63,18 @@ def bulletin_but(formsemestre_id: int, etudid: int = None, fmt="html"):
         .filter_by(etudid=etudid)
         .first_or_404()
     )
+    if not formsemestre.formation.is_apc():
+        raise ScoValueError("formation non BUT")
     bulletins_sem = BulletinBUT(formsemestre)
     if fmt == "pdf":
         bul: dict = bulletins_sem.bulletin_etud_complet(etud)
     else:  # la même chose avec un peu moins d'infos
         bul: dict = bulletins_sem.bulletin_etud(etud)
-    decision_ues = {x["acronyme"]: x for x in bul["semestre"]["decision_ue"]}
+    decision_ues = (
+        {x["acronyme"]: x for x in bul["semestre"]["decision_ue"]}
+        if "semestre" in bul
+        else {}
+    )
     cursus = cursus_but.EtudCursusBUT(etud, formsemestre.formation)
     refcomp = formsemestre.formation.referentiel_competence
     if refcomp is None:
@@ -80,6 +86,7 @@ def bulletin_but(formsemestre_id: int, etudid: int = None, fmt="html"):
 
     logo = find_logo(logoname="header", dept_id=g.scodoc_dept_id)
 
+    ue_acronyms = bul["ues"].keys()
     args = {
         "bul": bul,
         "cursus": cursus,
@@ -91,13 +98,15 @@ def bulletin_but(formsemestre_id: int, etudid: int = None, fmt="html"):
         "title": f"Bul. {etud.nom_disp()} BUT (court)",
         "ue_validation_by_niveau": ue_validation_by_niveau,
         "ues_acronyms": [
-            ue.acronyme for ue in bulletins_sem.res.ues if ue.type == UE_STANDARD
+            ue.acronyme
+            for ue in bulletins_sem.res.ues
+            if ue.type == UE_STANDARD and ue.acronyme in ue_acronyms
         ],
     }
     if fmt == "pdf":
         filename = scu.bul_filename(formsemestre, etud, prefix="bul-but")
         bul_pdf = bulletin_but_court_pdf.make_bulletin_but_court_pdf(**args)
-        return scu.sendPDFFile(bul_pdf, filename)
+        return scu.sendPDFFile(bul_pdf, filename + ".pdf")
 
     return render_template(
         "but/bulletin_court_page.j2",
diff --git a/app/but/bulletin_but_court_pdf.py b/app/but/bulletin_but_court_pdf.py
index 40914b09cb..1887efd248 100644
--- a/app/but/bulletin_but_court_pdf.py
+++ b/app/but/bulletin_but_court_pdf.py
@@ -16,7 +16,7 @@ from flask_login import current_user
 from reportlab.lib import styles
 from reportlab.lib.colors import black, white, Color
 from reportlab.lib.enums import TA_CENTER
-from reportlab.lib.units import cm, mm
+from reportlab.lib.units import mm
 from reportlab.platypus import Paragraph, Spacer, Table
 
 from app.but import cursus_but
@@ -102,13 +102,15 @@ class BulletinGeneratorBUTCourt(BulletinGeneratorStandard):
         self.style_base = styles.ParagraphStyle("style_base")
         self.style_base.fontName = "Helvetica"
         self.style_base.fontSize = 9
+        self.style_base.firstLineIndent = 0
+        # écrase style defaut des bulletins
+        self.style_field = self.style_base
 
+        # Le nom/prénom de l'étudiant:
         self.style_nom = styles.ParagraphStyle("style_nom", self.style_base)
         self.style_nom.fontSize = 11
         self.style_nom.fontName = "Helvetica-Bold"
 
-        self.style_field = self.style_base  # écrase style defaut buleltins
-
         self.style_cell = styles.ParagraphStyle("style_cell", self.style_base)
         self.style_cell.fontSize = 7
         self.style_cell.leading = 7
@@ -124,7 +126,7 @@ class BulletinGeneratorBUTCourt(BulletinGeneratorStandard):
         self.style_niveaux.firstLineIndent = 0
         self.style_niveaux.leftIndent = 1
         self.style_niveaux.rightIndent = 1
-        self.style_niveaux.borderWidth = 1
+        self.style_niveaux.borderWidth = 0.5
         self.style_niveaux.borderPadding = 2
         self.style_niveaux.borderRadius = 2
         self.style_niveaux_top = styles.ParagraphStyle(
@@ -162,6 +164,7 @@ class BulletinGeneratorBUTCourt(BulletinGeneratorStandard):
         )  # espace les lignes
 
         self.style_assiduite = self.style_cell
+        self.style_signature = self.style_appreciations
 
         # Géométrie page
         self.width_page_avail = 185 * mm  # largeur utilisable
@@ -189,10 +192,16 @@ class BulletinGeneratorBUTCourt(BulletinGeneratorStandard):
         appreciations = BulAppreciations.get_appreciations_list(
             self.formsemestre.id, self.etud.id
         )
-        return [
-            Spacer(1, 3 * mm),
-            self.bul_appreciations_pdf(appreciations, style=self.style_appreciations),
-        ]
+        return (
+            [
+                Spacer(1, 3 * mm),
+                self.bul_appreciations_pdf(
+                    appreciations, style=self.style_appreciations
+                ),
+            ]
+            if appreciations
+            else []
+        )
 
     def bul_table(self, fmt=None) -> list:
         """Génère la table centrale du bulletin de notes
diff --git a/app/scodoc/sco_bulletins_generator.py b/app/scodoc/sco_bulletins_generator.py
index f0c66db67e..bf6660d8fd 100644
--- a/app/scodoc/sco_bulletins_generator.py
+++ b/app/scodoc/sco_bulletins_generator.py
@@ -117,6 +117,8 @@ class BulletinGenerator:
         self.style_field.fontName = self.preferences["SCOLAR_FONT_BUL_FIELDS"]
         self.style_field.fontSize = self.preferences["SCOLAR_FONT_SIZE"]
         self.style_field.firstLineIndent = 0
+        # Champ signatures
+        self.style_signature = self.style_field
         #  - Pour les cellules de table:
         self.CellStyle = reportlab.lib.styles.ParagraphStyle({})
         self.CellStyle.fontSize = self.preferences["SCOLAR_FONT_SIZE"]
diff --git a/app/scodoc/sco_bulletins_standard.py b/app/scodoc/sco_bulletins_standard.py
index 8bff41a4c4..c84f1a1713 100644
--- a/app/scodoc/sco_bulletins_standard.py
+++ b/app/scodoc/sco_bulletins_standard.py
@@ -263,7 +263,7 @@ class BulletinGeneratorStandard(sco_bulletins_generator.BulletinGenerator):
                         sco_bulletins_pdf.process_field(
                             self.preferences["bul_pdf_sig_left"],
                             self.infos,
-                            self.style_field,
+                            self.style_signature,
                             field_name="bul_pdf_sig_left",
                         )
                     ]
@@ -275,7 +275,7 @@ class BulletinGeneratorStandard(sco_bulletins_generator.BulletinGenerator):
                     sco_bulletins_pdf.process_field(
                         self.preferences["bul_pdf_sig_right"],
                         self.infos,
-                        self.style_field,
+                        self.style_signature,
                         field_name="bul_pdf_sig_right",
                     )
                 )
diff --git a/app/scodoc/sco_moduleimpl_status.py b/app/scodoc/sco_moduleimpl_status.py
index 93ce5237ff..43b66230b3 100644
--- a/app/scodoc/sco_moduleimpl_status.py
+++ b/app/scodoc/sco_moduleimpl_status.py
@@ -127,8 +127,12 @@ def moduleimpl_evaluation_menu(evaluation: Evaluation, nbnotes: int = 0) -> str:
             "args": {
                 "group_ids": group_id,
                 "desc": evaluation.description or "",
-                "date_debut": evaluation.date_debut.isoformat(),
-                "date_fin": evaluation.date_fin.isoformat(),
+                "date_debut": evaluation.date_debut.isoformat()
+                if evaluation.date_debut
+                else "",
+                "date_fin": evaluation.date_fin.isoformat()
+                if evaluation.date_fin
+                else "",
             },
             "enabled": evaluation.date_debut is not None,
         },
diff --git a/app/templates/bul_head.j2 b/app/templates/bul_head.j2
index 9a59ccd52b..89fa768998 100644
--- a/app/templates/bul_head.j2
+++ b/app/templates/bul_head.j2
@@ -42,20 +42,22 @@
                 format='pdf',
                 version=version,
             )}}">{{scu.ICON_PDF|safe}}</a>
-            <a style="margin-left: 20px;"
-            href="{{url_for(
-                'notes.bulletin_but_html',
-                scodoc_dept=g.scodoc_dept,
-                formsemestre_id=formsemestre.id,
-                etudid=etud.id
-            )}}">version courte spéciale BUT</a>
+            {% if formsemestre.formation.is_apc() %}
+                <a style="margin-left: 20px;" class="stdlink"
+                href="{{url_for(
+                    'notes.bulletin_but_html',
+                    scodoc_dept=g.scodoc_dept,
+                    formsemestre_id=formsemestre.id,
+                    etudid=etud.id
+                )}}">version courte spéciale BUT</a>
+            {% endif %}
         </span>
         </div>
     </form>
     </div>
 {% if not is_apc  %}
     <div class="bull_photo"><a href="{{
-        url_for("scolar.ficheEtud", scodoc_dept=g.scodoc_dept, etudid=etud.id)
+        url_for('scolar.ficheEtud', scodoc_dept=g.scodoc_dept, etudid=etud.id)
         }}">{{etud.photo_html(title="fiche de " + etud["nom"])|safe}}</a>
     </div>
 {% endif %}
diff --git a/app/templates/but/bulletin_court_page.j2 b/app/templates/but/bulletin_court_page.j2
index f7249c1655..f1962d02c7 100644
--- a/app/templates/but/bulletin_court_page.j2
+++ b/app/templates/but/bulletin_court_page.j2
@@ -39,10 +39,17 @@
 {%- endmacro %}
 
 {% block app_content %}
-<p><a href="{{url_for(
+<p>
+<a href="{{url_for(
         'notes.bulletin_but_pdf', scodoc_dept=g.scodoc_dept, etudid=etud.id, 
         formsemestre_id=formsemestre.id
     )}}" class="stdlink">version pdf {{scu.ICON_PDF|safe}}</a>
+<a style="margin-left: 32px;"
+    href="{{url_for(
+        'notes.formsemestre_bulletinetud', 
+        scodoc_dept=g.scodoc_dept, etudid=etud.id, 
+        formsemestre_id=formsemestre.id
+)}}" class="stdlink">version complète</a>
 </p>
 
 <div class="but_bul_court">
@@ -57,9 +64,9 @@
     </div>
 
     <div id="logo">
-        {% if logo %}
-            {{logo.html()|safe}}
-        {% endif %}
+        <a href="{{
+            url_for('scolar.ficheEtud', scodoc_dept=g.scodoc_dept, etudid=etud.id)
+        }}">{{etud.photo_html()|safe}}</a>
     </div>
 
     {% if bul.options.show_abs %}
diff --git a/sco_version.py b/sco_version.py
index 5cc41fa0f7..dc28f1bd7a 100644
--- a/sco_version.py
+++ b/sco_version.py
@@ -1,7 +1,7 @@
 # -*- mode: python -*-
 # -*- coding: utf-8 -*-
 
-SCOVERSION = "9.6.16"
+SCOVERSION = "9.6.17"
 
 SCONAME = "ScoDoc"
 

From 4e6220b39f71679cf59b1581fd0958b665e5e466 Mon Sep 17 00:00:00 2001
From: Emmanuel Viennet <emmanuel.viennet@gmail.com>
Date: Sat, 2 Sep 2023 21:40:54 +0200
Subject: [PATCH 04/18] Fix formsemestre_jury_but_erase (cas sans formsemestre)

---
 app/but/jury_but.py | 1 +
 1 file changed, 1 insertion(+)

diff --git a/app/but/jury_but.py b/app/but/jury_but.py
index fc4faf20e1..4eb7525f15 100644
--- a/app/but/jury_but.py
+++ b/app/but/jury_but.py
@@ -867,6 +867,7 @@ class DecisionsProposeesAnnee(DecisionsProposees):
             for dec_ue in self.decisions_ues.values():
                 if (
                     dec_ue
+                    and dec_ue.formsemestre
                     and self.formsemestre
                     and dec_ue.formsemestre.id == self.formsemestre.id
                 ):

From aa38ac0664985ff654882942d6b99f8ec50de63a Mon Sep 17 00:00:00 2001
From: Emmanuel Viennet <emmanuel.viennet@gmail.com>
Date: Sat, 2 Sep 2023 22:19:35 +0200
Subject: [PATCH 05/18] Remplace partout
 sco_permissions_check.can_change_groups() par
 FormSemestre.can_change_groups()

---
 app/scodoc/sco_formsemestre_status.py | 19 ++----
 app/scodoc/sco_groups.py              | 85 +++++++++++++--------------
 app/scodoc/sco_groups_edit.py         |  9 ++-
 app/views/scolar.py                   |  8 +--
 4 files changed, 54 insertions(+), 67 deletions(-)

diff --git a/app/scodoc/sco_formsemestre_status.py b/app/scodoc/sco_formsemestre_status.py
index 61053f7476..286bcf113c 100755
--- a/app/scodoc/sco_formsemestre_status.py
+++ b/app/scodoc/sco_formsemestre_status.py
@@ -73,7 +73,6 @@ from app.scodoc import sco_formsemestre
 from app.scodoc import sco_formsemestre_inscriptions
 from app.scodoc import sco_groups
 from app.scodoc import sco_moduleimpl
-from app.scodoc import sco_permissions_check
 from app.scodoc import sco_preferences
 from app.scodoc import sco_users
 from app.scodoc.gen_tables import GenTable
@@ -340,6 +339,7 @@ def formsemestre_status_menubar(formsemestre: FormSemestre) -> str:
         },
     ]
 
+    can_change_groups = formsemestre.can_change_groups()
     menu_groupes = [
         {
             "title": "Listes, photos, feuilles...",
@@ -352,27 +352,20 @@ def formsemestre_status_menubar(formsemestre: FormSemestre) -> str:
             "title": "Modifier groupes et partitions",
             "endpoint": "scolar.partition_editor",
             "args": {"formsemestre_id": formsemestre_id},
-            "enabled": sco_groups.sco_permissions_check.can_change_groups(
-                formsemestre_id
-            ),
+            "enabled": can_change_groups,
             "helpmsg": "Editeur de partitions",
         },
         {
             "title": "Ancienne page édition partitions",
             "endpoint": "scolar.edit_partition_form",
             "args": {"formsemestre_id": formsemestre_id},
-            "enabled": sco_groups.sco_permissions_check.can_change_groups(
-                formsemestre_id
-            ),
+            "enabled": can_change_groups,
         },
     ]
     # 1 item / partition:
     partitions = sco_groups.get_partitions_list(formsemestre_id, with_default=False)
     submenu = []
-    enabled = (
-        sco_groups.sco_permissions_check.can_change_groups(formsemestre_id)
-        and partitions
-    )
+    enabled = can_change_groups and partitions
     for partition in partitions:
         submenu.append(
             {
@@ -921,7 +914,7 @@ def _make_listes_sem(formsemestre: FormSemestre, with_absences=True):
             H.append("</table>")
         if partition_is_empty:
             H.append('<p class="help indent">Aucun groupe peuplé dans cette partition')
-            if sco_groups.sco_permissions_check.can_change_groups(formsemestre.id):
+            if formsemestre.can_change_groups():
                 H.append(
                     f""" (<a href="{url_for("scolar.partition_editor",
                         scodoc_dept=g.scodoc_dept, 
@@ -930,7 +923,7 @@ def _make_listes_sem(formsemestre: FormSemestre, with_absences=True):
                     }" class="stdlink">créer</a>)"""
                 )
             H.append("</p>")
-    if sco_groups.sco_permissions_check.can_change_groups(formsemestre.id):
+    if formsemestre.can_change_groups():
         H.append(
             f"""<h4><a class="stdlink"
             href="{url_for("scolar.partition_editor",
diff --git a/app/scodoc/sco_groups.py b/app/scodoc/sco_groups.py
index ecdf9b9d82..e54100d861 100644
--- a/app/scodoc/sco_groups.py
+++ b/app/scodoc/sco_groups.py
@@ -26,12 +26,6 @@
 ##############################################################################
 
 """Gestion des groupes, nouvelle mouture (juin/nov 2009)
-
-TODO:
-Optimisation possible:
- revoir do_evaluation_listeetuds_groups() pour extraire aussi les groupes (de chaque etudiant)
- et éviter ainsi l'appel ulterieur à get_etud_groups() dans _make_table_notes
-
 """
 import collections
 import time
@@ -49,7 +43,7 @@ from app.comp import res_sem
 from app.comp.res_compat import NotesTableCompat
 from app.models import FormSemestre, Identite, Scolog
 from app.models import GROUPNAME_STR_LEN, SHORT_STR_LEN
-from app.models.groups import GroupDescr, Partition, group_membership
+from app.models.groups import GroupDescr, Partition
 import app.scodoc.sco_utils as scu
 import app.scodoc.notesdb as ndb
 from app.scodoc.scolog import logdb
@@ -59,7 +53,6 @@ from app.scodoc import codes_cursus
 from app.scodoc import sco_cursus
 from app.scodoc import sco_etud
 from app.scodoc.sco_etud import etud_sort_key
-from app.scodoc import sco_permissions_check
 from app.scodoc import sco_xml
 from app.scodoc.sco_exceptions import ScoException, AccessDenied, ScoValueError
 from app.scodoc.TrivialFormulator import TrivialFormulator
@@ -720,18 +713,19 @@ def setGroups(
         log(msg)
         return xml_error(msg, code=403)
 
-    if not sco_permissions_check.can_change_groups(partition.formsemestre.id):
-        raise AccessDenied("Vous n'avez pas le droit d'effectuer cette opération !")
-    log("***setGroups: partition_id=%s" % partition_id)
-    log("groupsLists=%s" % groupsLists)
-    log("groupsToCreate=%s" % groupsToCreate)
-    log("groupsToDelete=%s" % groupsToDelete)
-
     if not partition.formsemestre.etat:
         raise AccessDenied("Modification impossible: semestre verrouillé")
+    if not partition.formsemestre.can_change_groups():
+        raise AccessDenied("Vous n'avez pas le droit d'effectuer cette opération !")
+    log(
+        f"""***setGroups: partition={partition}
+groupsLists={groupsLists}
+groupsToCreate={groupsToCreate}
+groupsToDelete={groupsToDelete}
+"""
+    )
 
     groupsToDelete = [g for g in groupsToDelete.split(";") if g]
-
     etud_groups = formsemestre_get_etud_groupnames(
         partition.formsemestre.id, attr="group_id"
     )
@@ -811,7 +805,7 @@ def create_group(partition_id, group_name="", default=False) -> GroupDescr:
     Obsolete: utiliser Partition.create_group
     """
     partition = Partition.query.get_or_404(partition_id)
-    if not sco_permissions_check.can_change_groups(partition.formsemestre_id):
+    if not partition.formsemestre.can_change_groups():
         raise AccessDenied("Vous n'avez pas le droit d'effectuer cette opération !")
     #
     if group_name:
@@ -847,7 +841,7 @@ def delete_group(group_id, partition_id=None):
     if partition_id:
         if partition_id != group.partition_id:
             raise ValueError("inconsistent partition/group")
-    if not sco_permissions_check.can_change_groups(group.partition.formsemestre_id):
+    if not group.partition.formsemestre.can_change_groups():
         raise AccessDenied("Vous n'avez pas le droit d'effectuer cette opération !")
     log(f"delete_group: group={group} partition={group.partition}")
     formsemestre = group.partition.formsemestre
@@ -863,7 +857,8 @@ def partition_create(
     redirect=True,
 ):
     """Create a new partition"""
-    if not sco_permissions_check.can_change_groups(formsemestre_id):
+    formsemestre = FormSemestre.get_formsemestre(formsemestre_id)
+    if not formsemestre.can_change_groups():
         raise AccessDenied("Vous n'avez pas le droit d'effectuer cette opération !")
     if partition_name:
         partition_name = str(partition_name).strip()
@@ -924,9 +919,10 @@ def get_arrow_icons_tags():
 def edit_partition_form(formsemestre_id=None):
     """Form to create/suppress partitions"""
     # ad-hoc form
-    if not sco_permissions_check.can_change_groups(formsemestre_id):
-        raise AccessDenied("Vous n'avez pas le droit d'effectuer cette opération !")
     formsemestre = FormSemestre.get_formsemestre(formsemestre_id)
+    if not formsemestre.can_change_groups():
+        raise AccessDenied("Vous n'avez pas le droit d'effectuer cette opération !")
+
     partitions = get_partitions_list(formsemestre_id)
     arrow_up, arrow_down, arrow_none = get_arrow_icons_tags()
     suppricon = scu.icontag(
@@ -1093,21 +1089,22 @@ def edit_partition_form(formsemestre_id=None):
 def partition_set_attr(partition_id, attr, value):
     """Set partition attribute: bul_show_rank or show_in_lists"""
     if attr not in {"bul_show_rank", "show_in_lists"}:
-        raise ValueError("invalid partition attribute: %s" % attr)
+        raise ValueError(f"invalid partition attribute: {attr}")
 
-    partition = get_partition(partition_id)
-    formsemestre_id = partition["formsemestre_id"]
-    if not sco_permissions_check.can_change_groups(formsemestre_id):
+    partition = Partition.query.get_or_404(partition_id)
+    if not partition.formsemestre.can_change_groups():
         raise AccessDenied("Vous n'avez pas le droit d'effectuer cette opération !")
 
-    log("partition_set_attr(%s, %s, %s)" % (partition_id, attr, value))
+    log(f"partition_set_attr({partition_id}, {attr}, {value})")
     value = int(value)
-
-    cnx = ndb.GetDBConnexion()
-    partition[attr] = value
-    partitionEditor.edit(cnx, partition)
-    # invalid bulletin cache
-    sco_cache.invalidate_formsemestre(formsemestre_id=partition["formsemestre_id"])
+    if getattr(partition, attr, None) != value:
+        setattr(partition, attr, value)
+        db.session.add(partition)
+        db.session.commit()
+        # invalid bulletin cache
+        sco_cache.invalidate_formsemestre(
+            formsemestre_id=partition.formsemestre.id["formsemestre_id"]
+        )
     return "enregistré"
 
 
@@ -1118,9 +1115,9 @@ def partition_delete(partition_id, force=False, redirect=1, dialog_confirmed=Fal
     """
     partition = get_partition(partition_id)
     formsemestre_id = partition["formsemestre_id"]
-    if not sco_permissions_check.can_change_groups(formsemestre_id):
-        raise AccessDenied("Vous n'avez pas le droit d'effectuer cette opération !")
     formsemestre = FormSemestre.get_formsemestre(formsemestre_id)
+    if not formsemestre.can_change_groups():
+        raise AccessDenied("Vous n'avez pas le droit d'effectuer cette opération !")
 
     if not partition["partition_name"] and not force:
         raise ValueError("cannot suppress this partition")
@@ -1163,7 +1160,8 @@ def partition_move(partition_id, after=0, redirect=1):
     """Move before/after previous one (decrement/increment numero)"""
     partition = get_partition(partition_id)
     formsemestre_id = partition["formsemestre_id"]
-    if not sco_permissions_check.can_change_groups(formsemestre_id):
+    formsemestre = FormSemestre.get_formsemestre(formsemestre_id)
+    if not formsemestre.can_change_groups():
         raise AccessDenied("Vous n'avez pas le droit d'effectuer cette opération !")
     #
     redirect = int(redirect)
@@ -1221,7 +1219,8 @@ def partition_rename(partition_id):
     """Form to rename a partition"""
     partition = get_partition(partition_id)
     formsemestre_id = partition["formsemestre_id"]
-    if not sco_permissions_check.can_change_groups(formsemestre_id):
+    formsemestre = FormSemestre.get_formsemestre(formsemestre_id)
+    if not formsemestre.can_change_groups():
         raise AccessDenied("Vous n'avez pas le droit d'effectuer cette opération !")
     H = ["<h2>Renommer une partition</h2>"]
     tf = TrivialFormulator(
@@ -1272,7 +1271,9 @@ def partition_set_name(partition_id, partition_name, redirect=1):
     if partition_name == scu.PARTITION_PARCOURS:
         raise ScoValueError(f"nom de partition {scu.PARTITION_PARCOURS} réservé.")
     formsemestre_id = partition["formsemestre_id"]
-
+    formsemestre = FormSemestre.get_formsemestre(formsemestre_id)
+    if not formsemestre.can_change_groups():
+        raise AccessDenied("Vous n'avez pas le droit d'effectuer cette opération !")
     # check unicity
     r = ndb.SimpleDictFetch(
         """SELECT p.* FROM partition p
@@ -1285,9 +1286,6 @@ def partition_set_name(partition_id, partition_name, redirect=1):
         raise ScoValueError(
             f"Partition {partition_name} déjà existante dans ce semestre !"
         )
-
-    if not sco_permissions_check.can_change_groups(formsemestre_id):
-        raise AccessDenied("Vous n'avez pas le droit d'effectuer cette opération !")
     redirect = int(redirect)
     cnx = ndb.GetDBConnexion()
     partitionEditor.edit(
@@ -1304,7 +1302,7 @@ def partition_set_name(partition_id, partition_name, redirect=1):
 
 def group_set_name(group: GroupDescr, group_name: str, redirect=True):
     """Set group name"""
-    if not sco_permissions_check.can_change_groups(group.partition.formsemestre.id):
+    if not group.partition.formsemestre.can_change_groups():
         raise AccessDenied("Vous n'avez pas le droit d'effectuer cette opération !")
     if group.group_name is None:
         raise ValueError("can't set a name to default group")
@@ -1337,7 +1335,8 @@ def group_rename(group_id):
     """Form to rename a group"""
     group = GroupDescr.query.get_or_404(group_id)
     formsemestre_id = group.partition.formsemestre_id
-    if not sco_permissions_check.can_change_groups(formsemestre_id):
+    formsemestre = FormSemestre.get_formsemestre(formsemestre_id)
+    if not formsemestre.can_change_groups():
         raise AccessDenied("Vous n'avez pas le droit d'effectuer cette opération !")
     H = [f"<h2>Renommer un groupe de {group.partition.partition_name or '-'}</h2>"]
     tf = TrivialFormulator(
@@ -1395,7 +1394,7 @@ def groups_auto_repartition(partition_id=None):
         scodoc_dept=g.scodoc_dept,
         formsemestre_id=formsemestre_id,
     )
-    if not sco_permissions_check.can_change_groups(formsemestre_id):
+    if not formsemestre.can_change_groups():
         raise AccessDenied("Vous n'avez pas le droit d'effectuer cette opération !")
 
     descr = [
diff --git a/app/scodoc/sco_groups_edit.py b/app/scodoc/sco_groups_edit.py
index 5caba3beb3..4fd1e103cb 100644
--- a/app/scodoc/sco_groups_edit.py
+++ b/app/scodoc/sco_groups_edit.py
@@ -31,7 +31,6 @@ from flask import render_template
 
 from app.models import Partition
 from app.scodoc import html_sco_header
-from app.scodoc import sco_groups
 from app.scodoc.sco_exceptions import AccessDenied
 
 
@@ -41,10 +40,10 @@ def affect_groups(partition_id):
     """
     # réécrit pour 9.0.47 avec un template
     partition = Partition.query.get_or_404(partition_id)
-    formsemestre_id = partition.formsemestre_id
-    if not sco_groups.sco_permissions_check.can_change_groups(formsemestre_id):
+    formsemestre = partition.formsemestre
+    if not formsemestre.can_change_groups():
         raise AccessDenied("vous n'avez pas la permission de modifier les groupes")
-    partition.formsemestre.setup_parcours_groups()
+    formsemestre.setup_parcours_groups()
     return render_template(
         "scolar/affect_groups.j2",
         sco_header=html_sco_header.sco_header(
@@ -58,5 +57,5 @@ def affect_groups(partition_id):
         partitions_list=partition.formsemestre.partitions.filter(
             Partition.partition_name != None
         ),
-        formsemestre_id=formsemestre_id,
+        formsemestre_id=formsemestre.id,
     )
diff --git a/app/views/scolar.py b/app/views/scolar.py
index e63522bc2b..b8a4466e71 100644
--- a/app/views/scolar.py
+++ b/app/views/scolar.py
@@ -923,15 +923,11 @@ def partition_editor(formsemestre_id: int, edit_partition=False):
             page_title=f"Partitions de {formsemestre.titre_annee()}",
             init_datatables=True,
         ),
-        f"""<h2>
-        </h2>
-        """,
+        """<h2></h2>""",
         render_template(
             "scolar/partition_editor.j2",
             formsemestre=formsemestre,
-            read_only=not sco_groups.sco_permissions_check.can_change_groups(
-                formsemestre_id
-            ),
+            read_only=not formsemestre.can_change_groups(),
             edit_partition=edit_partition,
         ),
         html_sco_header.sco_footer(),

From 62eea7fc47d2b5e04212d87071703297452d644b Mon Sep 17 00:00:00 2001
From: Emmanuel Viennet <emmanuel.viennet@gmail.com>
Date: Sat, 2 Sep 2023 22:21:31 +0200
Subject: [PATCH 06/18] =?UTF-8?q?Oubli=20dans=20le=20commit=20pr=C3=A9c?=
 =?UTF-8?q?=C3=A9dent:=20supprime=20sco=5Fpermissions=5Fcheck.can=5Fchange?=
 =?UTF-8?q?=5Fgroups()?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/scodoc/sco_permissions_check.py | 12 ------------
 1 file changed, 12 deletions(-)

diff --git a/app/scodoc/sco_permissions_check.py b/app/scodoc/sco_permissions_check.py
index 495a1eb4b3..1b6b368182 100644
--- a/app/scodoc/sco_permissions_check.py
+++ b/app/scodoc/sco_permissions_check.py
@@ -117,18 +117,6 @@ def check_access_diretud(formsemestre_id, required_permission=Permission.ScoImpl
         return True, ""
 
 
-def can_change_groups(formsemestre_id: int) -> bool:
-    """Vrai si l'utilisateur peut changer les groupes dans ce semestre
-    Obsolete: utiliser FormSemestre.can_change_groups
-    """
-    formsemestre: FormSemestre = FormSemestre.query.get_or_404(formsemestre_id)
-    if not formsemestre.etat:
-        return False  # semestre verrouillé
-    if current_user.has_permission(Permission.ScoEtudChangeGroups):
-        return True  # typiquement admin, chef dept
-    return formsemestre.est_responsable(current_user)
-
-
 def can_handle_passwd(user: User, allow_admindepts=False) -> bool:
     """True if the current user can see or change passwd info of user.
     If allow_admindepts, allow Admin from all depts (so they can view users from other depts

From da9818dddef128a650ca3ff56a2d28c48d9701b6 Mon Sep 17 00:00:00 2001
From: Emmanuel Viennet <emmanuel.viennet@gmail.com>
Date: Sat, 2 Sep 2023 22:49:21 +0200
Subject: [PATCH 07/18] Option pour autoriser le CAS aux nouveaux utilisateurs:
 implements #701

---
 app/forms/main/config_cas.py |  3 +++
 app/templates/config_cas.j2  |  1 +
 app/views/scodoc.py          | 10 ++++++++++
 app/views/users.py           |  7 +++++++
 4 files changed, 21 insertions(+)

diff --git a/app/forms/main/config_cas.py b/app/forms/main/config_cas.py
index 9ebf2d8718..f68aa3ccb9 100644
--- a/app/forms/main/config_cas.py
+++ b/app/forms/main/config_cas.py
@@ -40,6 +40,9 @@ class ConfigCASForm(FlaskForm):
     cas_force = BooleanField(
         "Forcer l'utilisation de CAS (tous les utilisateurs seront redirigés vers le CAS)"
     )
+    cas_allow_for_new_users = BooleanField(
+        "Par défaut, autoriser le CAS aux nouveaux utilisateurs"
+    )
 
     cas_server = StringField(
         label="URL du serveur CAS",
diff --git a/app/templates/config_cas.j2 b/app/templates/config_cas.j2
index 6ca3020ba8..ce45cfa67e 100644
--- a/app/templates/config_cas.j2
+++ b/app/templates/config_cas.j2
@@ -17,6 +17,7 @@
 
         {{ wtf.form_field(form.cas_enable) }}
         {{ wtf.form_field(form.cas_force) }}
+        {{ wtf.form_field(form.cas_allow_for_new_users) }}
         {{ wtf.form_field(form.cas_server) }}
         {{ wtf.form_field(form.cas_login_route) }}
         {{ wtf.form_field(form.cas_logout_route) }}
diff --git a/app/views/scodoc.py b/app/views/scodoc.py
index 41af54d6de..214ea42611 100644
--- a/app/views/scodoc.py
+++ b/app/views/scodoc.py
@@ -156,6 +156,13 @@ def config_cas():
             flash("CAS " + ("activé" if form.data["cas_enable"] else "désactivé"))
         if ScoDocSiteConfig.set("cas_force", form.data["cas_force"]):
             flash("CAS " + ("forcé" if form.data["cas_force"] else "non forcé"))
+        if ScoDocSiteConfig.set(
+            "cas_allow_for_new_users", form.data["cas_allow_for_new_users"]
+        ):
+            flash(
+                f"""CAS {'' if form.data['cas_allow_for_new_users'] else 'non'
+                       } autorisé par défaut aux nouveaux"""
+            )
         if ScoDocSiteConfig.set("cas_server", form.data["cas_server"]):
             flash("URL du serveur CAS enregistrée")
         if ScoDocSiteConfig.set("cas_login_route", form.data["cas_login_route"]):
@@ -182,6 +189,9 @@ def config_cas():
     elif request.method == "GET":
         form.cas_enable.data = ScoDocSiteConfig.get("cas_enable")
         form.cas_force.data = ScoDocSiteConfig.get("cas_force")
+        form.cas_allow_for_new_users.data = ScoDocSiteConfig.get(
+            "cas_allow_for_new_users"
+        )
         form.cas_server.data = ScoDocSiteConfig.get("cas_server")
         form.cas_login_route.data = ScoDocSiteConfig.get("cas_login_route")
         form.cas_logout_route.data = ScoDocSiteConfig.get("cas_logout_route")
diff --git a/app/views/users.py b/app/views/users.py
index 31c6bf45df..6b179532bc 100644
--- a/app/views/users.py
+++ b/app/views/users.py
@@ -371,6 +371,12 @@ def create_user_form(user_name=None, edit=0, all_roles=True):
             )
         ]
     cas_enabled = ScoDocSiteConfig.is_cas_enabled()
+    if edit:
+        cas_allow_login_default = the_user.cas_allow_login
+    else:
+        cas_allow_login_default = int(
+            bool(ScoDocSiteConfig.get("cas_allow_for_new_users"))
+        )
     descr += [
         (
             "email",
@@ -408,6 +414,7 @@ def create_user_form(user_name=None, edit=0, all_roles=True):
                 "explanation": """ si CAS est activé.
                     Seul le super-administrateur peut changer ce réglage.""",
                 "enabled": current_user.is_administrator(),
+                "default": cas_allow_login_default,
             },
         ),
         (

From ec274f0ad6e739a588edd512aa28b09ae83cff1b Mon Sep 17 00:00:00 2001
From: Emmanuel Viennet <emmanuel.viennet@gmail.com>
Date: Sat, 2 Sep 2023 22:54:48 +0200
Subject: [PATCH 08/18] =?UTF-8?q?Modifie=20gestion=20erreur=20pour=20suivi?=
 =?UTF-8?q?=20d=C3=A9bouch=C3=A9s?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/scodoc/sco_debouche.py | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/app/scodoc/sco_debouche.py b/app/scodoc/sco_debouche.py
index 3f83ba75c7..09ae1f5a5b 100644
--- a/app/scodoc/sco_debouche.py
+++ b/app/scodoc/sco_debouche.py
@@ -37,7 +37,7 @@ from app.comp.res_compat import NotesTableCompat
 from app.models import FormSemestre
 import app.scodoc.sco_utils as scu
 import app.scodoc.notesdb as ndb
-from app.scodoc.sco_exceptions import AccessDenied
+from app.scodoc.sco_exceptions import AccessDenied, ScoValueError
 from app.scodoc.scolog import logdb
 from app.scodoc.gen_tables import GenTable
 from app.scodoc import safehtml
@@ -259,7 +259,7 @@ def itemsuivi_get(cnx, itemsuivi_id, ignore_errors=False):
     if items:
         return items[0]
     elif not ignore_errors:
-        raise ValueError("invalid itemsuivi_id")
+        raise ScoValueError(f"Débouché: item inexistant ({itemsuivi_id})")
     return None
 
 

From b13d4df370f28af927a4881e5204efc6c415806d Mon Sep 17 00:00:00 2001
From: Emmanuel Viennet <emmanuel.viennet@gmail.com>
Date: Sat, 2 Sep 2023 23:12:41 +0200
Subject: [PATCH 09/18] Corrige permissions API partition/groupes. Fixes #704

---
 app/api/partitions.py | 45 +++++++++++++++++++++++++++++++------------
 1 file changed, 33 insertions(+), 12 deletions(-)

diff --git a/app/api/partitions.py b/app/api/partitions.py
index 207fa9ec45..64ed136cc7 100644
--- a/app/api/partitions.py
+++ b/app/api/partitions.py
@@ -176,7 +176,7 @@ def etud_in_group_query(group_id: int):
 @api_web_bp.route("/group/<int:group_id>/set_etudiant/<int:etudid>", methods=["POST"])
 @login_required
 @scodoc
-@permission_required(Permission.ScoEtudChangeGroups)
+@permission_required(Permission.ScoView)
 @as_json
 def set_etud_group(etudid: int, group_id: int):
     """Affecte l'étudiant au groupe indiqué"""
@@ -189,6 +189,8 @@ def set_etud_group(etudid: int, group_id: int):
     group = query.first_or_404()
     if not group.partition.formsemestre.etat:
         return json_error(403, "formsemestre verrouillé")
+    if not group.partition.formsemestre.can_change_groups():
+        return json_error(401, "opération non autorisée")
     if etud.id not in {e.id for e in group.partition.formsemestre.etuds}:
         return json_error(404, "etud non inscrit au formsemestre du groupe")
 
@@ -207,7 +209,7 @@ def set_etud_group(etudid: int, group_id: int):
 )
 @login_required
 @scodoc
-@permission_required(Permission.ScoEtudChangeGroups)
+@permission_required(Permission.ScoView)
 @as_json
 def group_remove_etud(group_id: int, etudid: int):
     """Retire l'étudiant de ce groupe. S'il n'y est pas, ne fait rien."""
@@ -220,6 +222,8 @@ def group_remove_etud(group_id: int, etudid: int):
     group = query.first_or_404()
     if not group.partition.formsemestre.etat:
         return json_error(403, "formsemestre verrouillé")
+    if not group.partition.formsemestre.can_change_groups():
+        return json_error(401, "opération non autorisée")
 
     group.remove_etud(etud)
 
@@ -234,7 +238,7 @@ def group_remove_etud(group_id: int, etudid: int):
 )
 @login_required
 @scodoc
-@permission_required(Permission.ScoEtudChangeGroups)
+@permission_required(Permission.ScoView)
 @as_json
 def partition_remove_etud(partition_id: int, etudid: int):
     """Enlève l'étudiant de tous les groupes de cette partition
@@ -247,7 +251,8 @@ def partition_remove_etud(partition_id: int, etudid: int):
     partition = query.first_or_404()
     if not partition.formsemestre.etat:
         return json_error(403, "formsemestre verrouillé")
-
+    if not partition.formsemestre.can_change_groups():
+        return json_error(401, "opération non autorisée")
     db.session.execute(
         sa.text(
             """DELETE FROM group_membership
@@ -278,7 +283,7 @@ def partition_remove_etud(partition_id: int, etudid: int):
 @api_web_bp.route("/partition/<int:partition_id>/group/create", methods=["POST"])
 @login_required
 @scodoc
-@permission_required(Permission.ScoEtudChangeGroups)
+@permission_required(Permission.ScoView)
 @as_json
 def group_create(partition_id: int):  # partition-group-create
     """Création d'un groupe dans une partition
@@ -296,6 +301,8 @@ def group_create(partition_id: int):  # partition-group-create
         return json_error(403, "formsemestre verrouillé")
     if not partition.groups_editable:
         return json_error(403, "partition non editable")
+    if not partition.formsemestre.can_change_groups():
+        return json_error(401, "opération non autorisée")
     data = request.get_json(force=True)  # may raise 400 Bad Request
     group_name = data.get("group_name")
     if group_name is None:
@@ -317,7 +324,7 @@ def group_create(partition_id: int):  # partition-group-create
 @api_web_bp.route("/group/<int:group_id>/delete", methods=["POST"])
 @login_required
 @scodoc
-@permission_required(Permission.ScoEtudChangeGroups)
+@permission_required(Permission.ScoView)
 @as_json
 def group_delete(group_id: int):
     """Suppression d'un groupe"""
@@ -331,6 +338,8 @@ def group_delete(group_id: int):
         return json_error(403, "formsemestre verrouillé")
     if not group.partition.groups_editable:
         return json_error(403, "partition non editable")
+    if not group.partition.formsemestre.can_change_groups():
+        return json_error(401, "opération non autorisée")
     formsemestre_id = group.partition.formsemestre_id
     log(f"deleting {group}")
     db.session.delete(group)
@@ -344,7 +353,7 @@ def group_delete(group_id: int):
 @api_web_bp.route("/group/<int:group_id>/edit", methods=["POST"])
 @login_required
 @scodoc
-@permission_required(Permission.ScoEtudChangeGroups)
+@permission_required(Permission.ScoView)
 @as_json
 def group_edit(group_id: int):
     """Edit a group"""
@@ -358,6 +367,8 @@ def group_edit(group_id: int):
         return json_error(403, "formsemestre verrouillé")
     if not group.partition.groups_editable:
         return json_error(403, "partition non editable")
+    if not group.partition.formsemestre.can_change_groups():
+        return json_error(401, "opération non autorisée")
     data = request.get_json(force=True)  # may raise 400 Bad Request
     group_name = data.get("group_name")
     if group_name is not None:
@@ -379,7 +390,7 @@ def group_edit(group_id: int):
 )
 @login_required
 @scodoc
-@permission_required(Permission.ScoEtudChangeGroups)
+@permission_required(Permission.ScoView)
 @as_json
 def partition_create(formsemestre_id: int):
     """Création d'une partition dans un semestre
@@ -399,6 +410,8 @@ def partition_create(formsemestre_id: int):
     formsemestre: FormSemestre = query.first_or_404(formsemestre_id)
     if not formsemestre.etat:
         return json_error(403, "formsemestre verrouillé")
+    if not formsemestre.can_change_groups():
+        return json_error(401, "opération non autorisée")
     data = request.get_json(force=True)  # may raise 400 Bad Request
     partition_name = data.get("partition_name")
     if partition_name is None:
@@ -442,7 +455,7 @@ def partition_create(formsemestre_id: int):
 )
 @login_required
 @scodoc
-@permission_required(Permission.ScoEtudChangeGroups)
+@permission_required(Permission.ScoView)
 @as_json
 def formsemestre_order_partitions(formsemestre_id: int):
     """Modifie l'ordre des partitions du formsemestre
@@ -454,6 +467,8 @@ def formsemestre_order_partitions(formsemestre_id: int):
     formsemestre: FormSemestre = query.first_or_404(formsemestre_id)
     if not formsemestre.etat:
         return json_error(403, "formsemestre verrouillé")
+    if not formsemestre.can_change_groups():
+        return json_error(401, "opération non autorisée")
     partition_ids = request.get_json(force=True)  # may raise 400 Bad Request
     if not isinstance(partition_ids, int) and not all(
         isinstance(x, int) for x in partition_ids
@@ -480,7 +495,7 @@ def formsemestre_order_partitions(formsemestre_id: int):
 @api_web_bp.route("/partition/<int:partition_id>/groups/order", methods=["POST"])
 @login_required
 @scodoc
-@permission_required(Permission.ScoEtudChangeGroups)
+@permission_required(Permission.ScoView)
 @as_json
 def partition_order_groups(partition_id: int):
     """Modifie l'ordre des groupes de la partition
@@ -492,6 +507,8 @@ def partition_order_groups(partition_id: int):
     partition: Partition = query.first_or_404()
     if not partition.formsemestre.etat:
         return json_error(403, "formsemestre verrouillé")
+    if not partition.formsemestre.can_change_groups():
+        return json_error(401, "opération non autorisée")
     group_ids = request.get_json(force=True)  # may raise 400 Bad Request
     if not isinstance(group_ids, int) and not all(
         isinstance(x, int) for x in group_ids
@@ -515,7 +532,7 @@ def partition_order_groups(partition_id: int):
 @api_web_bp.route("/partition/<int:partition_id>/edit", methods=["POST"])
 @login_required
 @scodoc
-@permission_required(Permission.ScoEtudChangeGroups)
+@permission_required(Permission.ScoView)
 @as_json
 def partition_edit(partition_id: int):
     """Modification d'une partition dans un semestre
@@ -536,6 +553,8 @@ def partition_edit(partition_id: int):
     partition: Partition = query.first_or_404()
     if not partition.formsemestre.etat:
         return json_error(403, "formsemestre verrouillé")
+    if not partition.formsemestre.can_change_groups():
+        return json_error(401, "opération non autorisée")
     data = request.get_json(force=True)  # may raise 400 Bad Request
     modified = False
     partition_name = data.get("partition_name")
@@ -585,7 +604,7 @@ def partition_edit(partition_id: int):
 @api_web_bp.route("/partition/<int:partition_id>/delete", methods=["POST"])
 @login_required
 @scodoc
-@permission_required(Permission.ScoEtudChangeGroups)
+@permission_required(Permission.ScoView)
 @as_json
 def partition_delete(partition_id: int):
     """Suppression d'une partition (et de tous ses groupes).
@@ -601,6 +620,8 @@ def partition_delete(partition_id: int):
     partition: Partition = query.first_or_404()
     if not partition.formsemestre.etat:
         return json_error(403, "formsemestre verrouillé")
+    if not partition.formsemestre.can_change_groups():
+        return json_error(401, "opération non autorisée")
     if not partition.partition_name:
         return json_error(
             API_CLIENT_ERROR, "ne peut pas supprimer la partition par défaut"

From 9d2148ae69f49545c70a87647c23d6d12676d578 Mon Sep 17 00:00:00 2001
From: Emmanuel Viennet <emmanuel.viennet@gmail.com>
Date: Sun, 3 Sep 2023 19:23:00 +0200
Subject: [PATCH 10/18] Fix 2 typos

---
 app/api/users.py                 | 4 ++--
 app/scodoc/sco_bulletins_json.py | 2 +-
 app/scodoc/sco_groups.py         | 4 +---
 3 files changed, 4 insertions(+), 6 deletions(-)

diff --git a/app/api/users.py b/app/api/users.py
index 32abccf259..cf017ee6df 100644
--- a/app/api/users.py
+++ b/app/api/users.py
@@ -218,7 +218,7 @@ def user_password(uid: int):
 @permission_required(Permission.ScoSuperAdmin)
 @as_json
 def user_role_add(uid: int, role_name: str, dept: str = None):
-    """Add a role to the user"""
+    """Add a role in the given dept to the user"""
     user: User = User.query.get_or_404(uid)
     role: Role = Role.query.filter_by(name=role_name).first_or_404()
     if dept is not None:  # check
@@ -247,7 +247,7 @@ def user_role_add(uid: int, role_name: str, dept: str = None):
 @permission_required(Permission.ScoSuperAdmin)
 @as_json
 def user_role_remove(uid: int, role_name: str, dept: str = None):
-    """Remove the role from the user"""
+    """Remove the role (in the given dept) from the user"""
     user: User = User.query.get_or_404(uid)
     role: Role = Role.query.filter_by(name=role_name).first_or_404()
     if dept is not None:  # check
diff --git a/app/scodoc/sco_bulletins_json.py b/app/scodoc/sco_bulletins_json.py
index a4ee2ed3ec..e5e7693d55 100644
--- a/app/scodoc/sco_bulletins_json.py
+++ b/app/scodoc/sco_bulletins_json.py
@@ -306,7 +306,7 @@ def formsemestre_bulletinetud_published_dict(
     appreciations = BulAppreciations.get_appreciations_list(formsemestre.id, etudid)
     d["appreciation"] = [
         {
-            "comment": quote_xml_attr(appreciation["comment"]),
+            "comment": quote_xml_attr(appreciation.comment),
             "date": appreciation.date.isoformat() if appreciation.date else "",
         }
         for appreciation in appreciations
diff --git a/app/scodoc/sco_groups.py b/app/scodoc/sco_groups.py
index e54100d861..6a7b686d85 100644
--- a/app/scodoc/sco_groups.py
+++ b/app/scodoc/sco_groups.py
@@ -1102,9 +1102,7 @@ def partition_set_attr(partition_id, attr, value):
         db.session.add(partition)
         db.session.commit()
         # invalid bulletin cache
-        sco_cache.invalidate_formsemestre(
-            formsemestre_id=partition.formsemestre.id["formsemestre_id"]
-        )
+        sco_cache.invalidate_formsemestre(formsemestre_id=partition.formsemestre.id)
     return "enregistré"
 
 

From 16e4290ff7ae39d60e1e9e7b133e1208d184add8 Mon Sep 17 00:00:00 2001
From: lehmann <sebastien.lehmann@uha.fr>
Date: Sun, 3 Sep 2023 00:02:23 +0200
Subject: [PATCH 11/18] Message erreur partition editor

---
 app/templates/scolar/partition_editor.j2 | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/app/templates/scolar/partition_editor.j2 b/app/templates/scolar/partition_editor.j2
index c9375a9e72..97744f4314 100644
--- a/app/templates/scolar/partition_editor.j2
+++ b/app/templates/scolar/partition_editor.j2
@@ -524,10 +524,10 @@
 					}
 					return;
 				}
-				throw 'Les données retournées ne sont pas valides';
+				throw ('Les données retournées ne sont pas valides : ' + r.status + ' ' + r.message);
 			})
 			.catch(error => {
-				document.querySelector("main").innerHTML = "<h2>Une erreur s'est produite lors de la sauvegarde des données.</h2>";
+				document.querySelector("main").innerHTML = "<h2>" + error + "</h2>";
 			})
 	}
 

From 08b8fef91ced535dacbacd8b01e10c8e905a22a8 Mon Sep 17 00:00:00 2001
From: Emmanuel Viennet <emmanuel.viennet@gmail.com>
Date: Sun, 3 Sep 2023 19:39:40 +0200
Subject: [PATCH 12/18] 9.6.18

---
 sco_version.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/sco_version.py b/sco_version.py
index dc28f1bd7a..97786e2fdf 100644
--- a/sco_version.py
+++ b/sco_version.py
@@ -1,7 +1,7 @@
 # -*- mode: python -*-
 # -*- coding: utf-8 -*-
 
-SCOVERSION = "9.6.17"
+SCOVERSION = "9.6.18"
 
 SCONAME = "ScoDoc"
 

From 3fe5595cae80c5fc7d1cd5b89c9caa6fa7656005 Mon Sep 17 00:00:00 2001
From: Emmanuel Viennet <emmanuel.viennet@gmail.com>
Date: Sun, 3 Sep 2023 21:00:20 +0200
Subject: [PATCH 13/18] =?UTF-8?q?Petites=20am=C3=A9liorations=20du=20bul?=
 =?UTF-8?q?=20BUT=20court=20(suggestions=20de=20LGS)?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/but/bulletin_but_court_pdf.py        | 20 +++++++++++---------
 app/templates/but/bulletin_court_page.j2 | 20 +++++++-------------
 sco_version.py                           |  2 +-
 3 files changed, 19 insertions(+), 23 deletions(-)

diff --git a/app/but/bulletin_but_court_pdf.py b/app/but/bulletin_but_court_pdf.py
index 1887efd248..9642de833f 100644
--- a/app/but/bulletin_but_court_pdf.py
+++ b/app/but/bulletin_but_court_pdf.py
@@ -170,7 +170,7 @@ class BulletinGeneratorBUTCourt(BulletinGeneratorStandard):
         self.width_page_avail = 185 * mm  # largeur utilisable
         # Géométrie tableaux
         self.width_col_ue = 18 * mm
-        self.width_col_ue_titres = 15 * mm
+        self.width_col_ue_titres = 16.5 * mm
         # Modules
         self.width_col_code = self.width_col_ue
         # Niveaux
@@ -259,19 +259,21 @@ class BulletinGeneratorBUTCourt(BulletinGeneratorStandard):
             [""] + self.ues_acronyms,
             ["Moyenne"]
             + [bul["ues"][ue]["moyenne"]["value"] for ue in self.ues_acronyms],
-            ["Bonus"]
+            ["dont bonus"]
             + [
                 bul["ues"][ue]["bonus"] if bul["ues"][ue]["bonus"] != "00.00" else ""
                 for ue in self.ues_acronyms
             ],
-            ["Malus"]
+            ["et malus"]
             + [
                 bul["ues"][ue]["malus"] if bul["ues"][ue]["malus"] != "00.00" else ""
                 for ue in self.ues_acronyms
             ],
-            ["Rang"] + [bul["ues"][ue]["moyenne"]["rang"] for ue in self.ues_acronyms],
-            ["Effectif"]
-            + [bul["ues"][ue]["moyenne"]["total"] for ue in self.ues_acronyms],
+            ["Rang"]
+            + [
+                f'{bul["ues"][ue]["moyenne"]["rang"]} / {bul["ues"][ue]["moyenne"]["total"]}'
+                for ue in self.ues_acronyms
+            ],
             ["ECTS"]
             + [
                 f'{self.decision_ues[ue]["ects"]:g}' if ue in self.decision_ues else ""
@@ -496,17 +498,17 @@ class BulletinGeneratorBUTCourt(BulletinGeneratorStandard):
 
     def boite_decisions_jury(self):
         """La boite en bas à droite avec jury"""
-        txt = f"""ECTS acquis : {self.ects_total:g}<br/>"""
+        txt = f"""ECTS acquis en BUT : <b>{self.ects_total:g}</b><br/>"""
         if self.bul["semestre"]["decision_annee"]:
             txt += f"""
             Jury tenu le {
-                datetime.datetime.fromisoformat(self.bul["semestre"]["decision_annee"]["date"]).strftime("%d/%m/%Y à %H:%M")
+                datetime.datetime.fromisoformat(self.bul["semestre"]["decision_annee"]["date"]).strftime("%d/%m/%Y")
             }, année BUT <b>{self.bul["semestre"]["decision_annee"]["code"]}</b>.
             <br/>
             """
         if self.bul["semestre"]["autorisation_inscription"]:
             txt += (
-                "Autorisé à s'inscrire en <b>"
+                "<br/>Autorisé à s'inscrire en <b>"
                 + ", ".join(
                     [
                         f"S{aut['semestre_id']}"
diff --git a/app/templates/but/bulletin_court_page.j2 b/app/templates/but/bulletin_court_page.j2
index f1962d02c7..1068e01671 100644
--- a/app/templates/but/bulletin_court_page.j2
+++ b/app/templates/but/bulletin_court_page.j2
@@ -100,13 +100,13 @@
                 {% endfor %}
             </tr>
             <tr>
-                <td>Bonus</td>
+                <td>dont bonus</td>
                 {% for ue in ues_acronyms %}
                     <td class="col_ue">{{bul.ues[ue].bonus if bul.ues[ue].bonus != "00.00" else ""}}</td>
                 {% endfor %}
             </tr>
             <tr>
-                <td>Malus</td>
+                <td>et malus</td>
                 {% for ue in ues_acronyms %}
                     <td class="col_ue">{{bul.ues[ue].malus if bul.ues[ue].malus != "00.00" else ""}}</td>
                 {% endfor %}
@@ -114,13 +114,7 @@
             <tr>
                 <td>Rang</td>
                 {% for ue in ues_acronyms %}
-                    <td class="col_ue">{{bul.ues[ue].moyenne.rang}}</td>
-                {% endfor %}
-            </tr>
-            <tr>
-                <td>Effectif</td>
-                {% for ue in ues_acronyms %}
-                    <td class="col_ue">{{bul.ues[ue].moyenne.total}}</td>
+                    <td class="col_ue">{{bul.ues[ue].moyenne.rang}} / {{bul.ues[ue].moyenne.total}}</td>
                 {% endfor %}
             </tr>
             <tr>
@@ -157,18 +151,18 @@
         </div>
 
         <div id="situation">
-            <div>ECTS acquis : {{ects_total}}</div>
+            <div>ECTS acquis en BUT&nbsp;: <b>{{"%g"|format(ects_total)}}</b></div>
             <div class="descr_jury">
                 {% if bul.semestre.decision_annee %}
                     Jury tenu le {{
-                        datetime.datetime.fromisoformat(bul.semestre.decision_annee.date).strftime("%d/%m/%Y à %H:%M")
+                        datetime.datetime.fromisoformat(bul.semestre.decision_annee.date).strftime("%d/%m/%Y")
                     }},
-                    année BUT {{bul.semestre.decision_annee.code}}.
+                    année BUT <b>{{bul.semestre.decision_annee.code}}</b>.
                 {% endif %}
                 {% set virg = joiner(", ") %}
                 {% for aut in bul.semestre.autorisation_inscription -%}
                     {% if loop.first %}
-                        Autorisé à s'inscrire en
+                        <br>Autorisé à s'inscrire en
                     {% endif %}
                     {{- virg() }}S{{aut.semestre_id -}}
                     {%- if loop.last -%}
diff --git a/sco_version.py b/sco_version.py
index 97786e2fdf..4610d0b5aa 100644
--- a/sco_version.py
+++ b/sco_version.py
@@ -1,7 +1,7 @@
 # -*- mode: python -*-
 # -*- coding: utf-8 -*-
 
-SCOVERSION = "9.6.18"
+SCOVERSION = "9.6.19"
 
 SCONAME = "ScoDoc"
 

From 48d7ef3d726a395030f5c7148659284363d996d0 Mon Sep 17 00:00:00 2001
From: iziram <matthias.hartmann@iziram.fr>
Date: Mon, 4 Sep 2023 09:08:40 +0200
Subject: [PATCH 14/18] =?UTF-8?q?Assiduites=20:=20fix=20D=C3=A9compte=20ab?=
 =?UTF-8?q?sences=20#693?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/api/assiduites.py        | 14 ++++--
 app/scodoc/sco_assiduites.py | 92 ++++++++++++++++++++++++++----------
 2 files changed, 76 insertions(+), 30 deletions(-)

diff --git a/app/api/assiduites.py b/app/api/assiduites.py
index d3f216c041..1ffaeb4150 100644
--- a/app/api/assiduites.py
+++ b/app/api/assiduites.py
@@ -946,8 +946,8 @@ def _count_manager(requested) -> tuple[str, dict]:
 
     est_just: str = requested.args.get("est_just")
     if est_just is not None:
-        trues: tuple[str] = ("v", "t", "vrai", "true")
-        falses: tuple[str] = ("f", "faux", "false")
+        trues: tuple[str] = ("v", "t", "vrai", "true", "1")
+        falses: tuple[str] = ("f", "faux", "false", "0")
 
         if est_just.lower() in trues:
             filtered["est_just"] = True
@@ -960,6 +960,12 @@ def _count_manager(requested) -> tuple[str, dict]:
     if user_id is not False:
         filtered["user_id"] = user_id
 
+    # cas 9 : split
+
+    split = requested.args.get("split", False)
+    if split is not False:
+        filtered["split"] = True
+
     return (metric, filtered)
 
 
@@ -1015,8 +1021,8 @@ def _filter_manager(requested, assiduites_query: Query) -> Query:
 
     est_just: str = requested.args.get("est_just")
     if est_just is not None:
-        trues: tuple[str] = ("v", "t", "vrai", "true")
-        falses: tuple[str] = ("f", "faux", "false")
+        trues: tuple[str] = ("v", "t", "vrai", "true", "1")
+        falses: tuple[str] = ("f", "faux", "false", "0")
 
         if est_just.lower() in trues:
             assiduites_query: Query = scass.filter_assiduites_by_est_just(
diff --git a/app/scodoc/sco_assiduites.py b/app/scodoc/sco_assiduites.py
index bd683033f4..2a478843b6 100644
--- a/app/scodoc/sco_assiduites.py
+++ b/app/scodoc/sco_assiduites.py
@@ -152,7 +152,6 @@ class CountCalculator:
             delta: timedelta = assi.date_fin - assi.date_debut
 
             if delta.days > 0:
-                # raise Exception(self.hours)
                 self.compute_long_assiduite(assi)
 
                 continue
@@ -186,37 +185,78 @@ def get_assiduites_stats(
     if filtered is not None:
         deb, fin = None, None
         for key in filtered:
-            if key == "etat":
-                assiduites = filter_assiduites_by_etat(assiduites, filtered[key])
-            elif key == "date_fin":
-                fin = filtered[key]
-            elif key == "date_debut":
-                deb = filtered[key]
-            elif key == "moduleimpl_id":
-                assiduites = filter_by_module_impl(assiduites, filtered[key])
-            elif key == "formsemestre":
-                assiduites = filter_by_formsemestre(
-                    assiduites, Assiduite, filtered[key]
-                )
-            elif key == "est_just":
-                assiduites = filter_assiduites_by_est_just(assiduites, filtered[key])
-            elif key == "user_id":
-                assiduites = filter_by_user_id(assiduites, filtered[key])
+            match key:
+                case "etat":
+                    assiduites = filter_assiduites_by_etat(assiduites, filtered[key])
+                case "date_fin":
+                    fin = filtered[key]
+                case "date_debut":
+                    deb = filtered[key]
+                case "moduleimpl_id":
+                    assiduites = filter_by_module_impl(assiduites, filtered[key])
+                case "formsemestre":
+                    assiduites = filter_by_formsemestre(
+                        assiduites, Assiduite, filtered[key]
+                    )
+                case "est_just":
+                    assiduites = filter_assiduites_by_est_just(
+                        assiduites, filtered[key]
+                    )
+                case "user_id":
+                    assiduites = filter_by_user_id(assiduites, filtered[key])
+
         if (deb, fin) != (None, None):
             assiduites = filter_by_date(assiduites, Assiduite, deb, fin)
 
-    calculator: CountCalculator = CountCalculator()
-    calculator.compute_assiduites(assiduites)
-    count: dict = calculator.to_dict()
-
     metrics: list[str] = metric.split(",")
-
     output: dict = {}
+    calculator: CountCalculator = CountCalculator()
 
-    for key, val in count.items():
+    if "split" not in filtered:
+        calculator.compute_assiduites(assiduites)
+        count: dict = calculator.to_dict()
+
+        for key, val in count.items():
+            if key in metrics:
+                output[key] = val
+        return output if output else count
+
+    etats: list[str] = (
+        filtered["etat"].split(",")
+        if "etat" in filtered
+        else ["absent", "present", "retard"]
+    )
+
+    for etat in etats:
+        output[etat] = _count_assiduites_etat(etat, assiduites, calculator, metrics)
+        if "est_just" not in filtered:
+            output[etat]["justifie"] = _count_assiduites_etat(
+                etat, assiduites, calculator, metrics, justifie=True
+            )
+
+    return output
+
+
+def _count_assiduites_etat(
+    etat: str,
+    assiduites: Query,
+    calculator: CountCalculator,
+    metrics: list[str],
+    justifie: bool = False,
+):
+    calculator.reset()
+    etat_num: int = scu.EtatAssiduite.get(etat, -1)
+    assiduites_etat: Query = assiduites.filter(Assiduite.etat == etat_num)
+    if justifie:
+        assiduites_etat = assiduites_etat.filter(Assiduite.est_just == True)
+
+    calculator.compute_assiduites(assiduites_etat)
+    count_etat: dict = calculator.to_dict()
+    output_etat: dict = {}
+    for key, val in count_etat.items():
         if key in metrics:
-            output[key] = val
-    return output if output else count
+            output_etat[key] = val
+    return output_etat if output_etat else count_etat
 
 
 def filter_assiduites_by_etat(assiduites: Assiduite, etat: str) -> Query:
@@ -232,7 +272,7 @@ def filter_assiduites_by_est_just(assiduites: Assiduite, est_just: bool) -> Quer
     """
     Filtrage d'une collection d'assiduites en fonction de s'ils sont justifiés
     """
-    return assiduites.filter_by(est_just=est_just)
+    return assiduites.filter(Assiduite.est_just == est_just)
 
 
 def filter_by_user_id(

From 2e7e00eb0a71e45c3e8c6f7baeffcabdf3fa10aa Mon Sep 17 00:00:00 2001
From: iziram <matthias.hartmann@iziram.fr>
Date: Mon, 4 Sep 2023 09:24:08 +0200
Subject: [PATCH 15/18] Assiduites: lien CalAbs #695

---
 app/scodoc/sco_bulletins_legacy.py   |  9 +++------
 app/scodoc/sco_bulletins_standard.py | 10 +++-------
 2 files changed, 6 insertions(+), 13 deletions(-)

diff --git a/app/scodoc/sco_bulletins_legacy.py b/app/scodoc/sco_bulletins_legacy.py
index 95e3846af4..5ba649f9a2 100644
--- a/app/scodoc/sco_bulletins_legacy.py
+++ b/app/scodoc/sco_bulletins_legacy.py
@@ -314,16 +314,13 @@ class BulletinGeneratorLegacy(sco_bulletins_generator.BulletinGenerator):
         authuser = self.authuser
         H = []
         # --- Absences
-        # XXX TODO-ASSIDUITE
-        # au passage, utiliser url_for...
         H.append(
-            """<p>
-        XXX <a href="../Absences/CalAbs?etudid=%(etudid)s" class="bull_link">
-        <b>Absences :</b> %(nbabs)s demi-journées, dont %(nbabsjust)s justifiées
+            f"""<p>
+        <a href="{ url_for('assiduites.calendrier_etud', scodoc_dept=g.scodoc_dept, etudid=I["etudid"]) }" class="bull_link">
+        <b>Absences :</b>{I['nbabs']} demi-journées, dont {I['nbabsjust']} justifiées
         (pendant ce semestre).
         </a></p>
             """
-            % I
         )
         # --- Decision Jury
         if I["situation"]:
diff --git a/app/scodoc/sco_bulletins_standard.py b/app/scodoc/sco_bulletins_standard.py
index c84f1a1713..e8dda75f08 100644
--- a/app/scodoc/sco_bulletins_standard.py
+++ b/app/scodoc/sco_bulletins_standard.py
@@ -132,17 +132,13 @@ class BulletinGeneratorStandard(sco_bulletins_generator.BulletinGenerator):
             nbabs = self.infos["nbabs"]
             story.append(Spacer(1, 2 * mm))
             if nbabs:
-                # XXX TODO-ASSIDUITE
-                # et utiliser url_for...
                 H.append(
-                    """<p class="bul_abs">
-                <a href="../Absences/CalAbs?etudid=%(etudid)s" class="bull_link">
-                XXX
-                <b>Absences :</b> %(nbabs)s demi-journées, dont %(nbabsjust)s justifiées
+                    f"""<p class="bul_abs">
+                <a href="{ url_for('assiduites.calendrier_etud', scodoc_dept=g.scodoc_dept, etudid=self.infos["etudid"]) }"  class="bull_link">
+                <b>Absences :</b> {self.infos['nbabs']} demi-journées, dont {self.infos['nbabsjust']} justifiées
                 (pendant ce semestre).
                 </a></p>
                 """
-                    % self.infos
                 )
                 story.append(
                     Paragraph(

From cd0b8b7ca9f3b14cb4d05b8896358e40ce40664a Mon Sep 17 00:00:00 2001
From: iziram <matthias.hartmann@iziram.fr>
Date: Mon, 4 Sep 2023 09:58:55 +0200
Subject: [PATCH 16/18] Assiduite: fix ajout justificatif #705

---
 .../assiduites/pages/ajout_justificatif.j2    | 27 ++++++++++++-------
 1 file changed, 17 insertions(+), 10 deletions(-)

diff --git a/app/templates/assiduites/pages/ajout_justificatif.j2 b/app/templates/assiduites/pages/ajout_justificatif.j2
index 9aaf83e281..4cbc8f590a 100644
--- a/app/templates/assiduites/pages/ajout_justificatif.j2
+++ b/app/templates/assiduites/pages/ajout_justificatif.j2
@@ -1,5 +1,5 @@
+{% include "assiduites/widgets/toast.j2" %}
 {% block pageContent %}
-
 <div class="pageContent">
     <h3>Justifier des assiduités</h3>
     {% include "assiduites/widgets/tableau_base.j2" %}
@@ -12,7 +12,7 @@
 
         <fieldset>
             <div class="justi-row">
-                <button onclick="validerFormulaire()">Créer le justificatif</button>
+                <button onclick="validerFormulaire(this)">Créer le justificatif</button>
                 <button onclick="effacerFormulaire()">Remettre à zero</button>
             </div>
             <div class="justi-row">
@@ -153,6 +153,7 @@
 
         const requests = []
         Array.from(in_files.files).forEach((f) => {
+            pushToast(generateToast(document.createTextNode(`Importation du fichier : ${f.name} commencée`), color = "#f0c865"));
             const fd = new FormData();
             fd.append('file', f);
             requests.push(
@@ -164,22 +165,22 @@
                         dateType: 'json',
                         contentType: false,
                         processData: false,
-                        success: () => { console.log("done") },
+                        success: () => {
+                            pushToast(generateToast(document.createTextNode(`Importation du fichier : ${f.name} finie`)));
+                            loadAll();
+                        },
                     }
                 )
             )
 
+
         });
-
-        $.when(
-            requests
-        ).done(() => {
+        if (in_files.files.length == 0) {
             loadAll();
-        })
-
+        }
     }
 
-    function validerFormulaire() {
+    function validerFormulaire(btn) {
         if (!validateFields()) return
 
         const justificatif = fieldsToJustificatif();
@@ -198,6 +199,12 @@
                 return;
             }
         })
+
+        btn.disabled = true;
+        setTimeout(() => {
+            btn.disabled = false;
+        }, 1000)
+
     }
 
     function effacerFormulaire() {

From 69eda90eeace4da2247ad3cbd827f7f557412d9c Mon Sep 17 00:00:00 2001
From: iziram <matthias.hartmann@iziram.fr>
Date: Mon, 4 Sep 2023 14:27:48 +0200
Subject: [PATCH 17/18] =?UTF-8?q?Assiduites=20:=20fix=20SignalAssiduiteDif?=
 =?UTF-8?q?feree:=20pr=C3=A9sentation=20#687?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../pages/signal_assiduites_diff.j2           | 35 +++++++++++++++-
 .../pages/signal_assiduites_etud.j2           |  2 +
 app/templates/assiduites/widgets/differee.j2  | 38 ++++++++++-------
 app/views/assiduites.py                       | 41 +++++++++++++++++++
 4 files changed, 101 insertions(+), 15 deletions(-)

diff --git a/app/templates/assiduites/pages/signal_assiduites_diff.j2 b/app/templates/assiduites/pages/signal_assiduites_diff.j2
index ea11796e62..700b84f7f0 100644
--- a/app/templates/assiduites/pages/signal_assiduites_diff.j2
+++ b/app/templates/assiduites/pages/signal_assiduites_diff.j2
@@ -20,6 +20,14 @@
 <script>
     const etudsDefDem = {{ defdem  | safe }}
 
+    const timeMorning = "{{ timeMorning | safe}}";
+    const timeNoon = "{{ timeNoon | safe}}";
+    const timeEvening = "{{ timeEvening | safe}}";
+
+    const defaultDates = {{ defaultDates | safe }}
+    const nonWorkDays = [{{ nonworkdays| safe }}];
+
+
     window.addEventListener('load', () => {
         [...document.querySelectorAll('.tr[etudid]')].forEach((a) => {
             try {
@@ -28,8 +36,33 @@
                     a.classList.add(defdem);
                 }
             } catch (_) { }
-        })
+        });
+
+        if (defaultDates != null) {
+            defaultDates.forEach((dateString) => {
+
+                d = moment(dateString).weekday();
+
+                if (verifyNonWorkDays(d, nonWorkDays)) return;
+
+                matin = `${dateString}T${timeMorning}`;
+                midi = `${dateString}T${timeNoon}`;
+                soir = `${dateString}T${timeEvening}`;
+
+                console.log(matin, midi, soir)
+
+                createColumn(matin, midi);
+                createColumn(midi, soir);
+            });
+
+            updateAllCol();
+        } else {
+            createColumn();
+        }
     })
+
+
+
 </script>
 
 
diff --git a/app/templates/assiduites/pages/signal_assiduites_etud.j2 b/app/templates/assiduites/pages/signal_assiduites_etud.j2
index 44a37f2471..2222cbe425 100644
--- a/app/templates/assiduites/pages/signal_assiduites_etud.j2
+++ b/app/templates/assiduites/pages/signal_assiduites_etud.j2
@@ -118,6 +118,8 @@
         window.forceModule = "{{ forcer_module }}"
         window.forceModule = window.forceModule == "True" ? true : false
 
+        createColumn();
+
     </script>
 
 
diff --git a/app/templates/assiduites/widgets/differee.j2 b/app/templates/assiduites/widgets/differee.j2
index 0b267b8c10..aa42a3e5ac 100644
--- a/app/templates/assiduites/widgets/differee.j2
+++ b/app/templates/assiduites/widgets/differee.j2
@@ -9,9 +9,8 @@
 
         {% for etud in etudiants %}
         <div class="tr" etudid="{{etud.etudid}}">
-            <div class="td sticky">
+            <div class="td sticky etudinfo" id="row-{{etud.etudid}}">
                 <span>{{etud.nomprenom}}</span>
-                <img class="pdp-hover" src="" alt="No Img" etudid="{{etud.etudid}}">
             </div>
         </div>
         {% endfor %}
@@ -40,6 +39,10 @@
         gap: 15px;
     }
 
+    .tr[etudid] {
+        height: 50px;
+    }
+
     .table-container {
         overflow: auto;
         position: relative;
@@ -72,13 +75,13 @@
 
     .th,
     .td {
-        padding: 20px;
         text-align: center;
         width: 225px;
         border: 1px solid #ddd;
         display: flex;
         justify-content: center;
         align-content: center;
+        min-height: 40px;
     }
 
     .tr {
@@ -88,11 +91,17 @@
         width: max-content;
     }
 
+    .td span {
+        align-items: center;
+        display: flex;
+    }
+
     .sticky {
         position: sticky;
         left: 0;
         background-color: #fafafa;
         border-right: 1px solid #ddd;
+        z-index: 100;
     }
 
     .mini-form {
@@ -120,7 +129,7 @@
         border-radius: 50%;
         right: -60px;
         top: calc(50% - 50px /2);
-        background-color: #007BFF;
+        background-color: #09c;
         color: white;
         border: none;
         outline: none;
@@ -133,13 +142,13 @@
     }
 
     .th {
-        background-color: #007BFF;
+        background-color: #09c;
         color: white;
         position: relative;
     }
 
     .th.error {
-        background-color: crimson;
+        background-color: #d71111;
     }
 
     .tbody .tr:nth-child(even) {
@@ -219,7 +228,7 @@
     .th.error:hover .col-error {
         display: block;
         z-index: 2000;
-        background-color: crimson;
+        background-color: #d71111;
         width: 100%;
         min-height: 25%;
         bottom: -25%;
@@ -269,7 +278,7 @@
         currentDate = moment(currentDate).tz(TIMEZONE).format("YYYY-MM-DDTHH:mm");
     }
 
-    function createColumn() {
+    function createColumn(dateStart = "", dateEnd = "") {
         let table = document.getElementById("studentTable");
         let th = document.createElement("div");
         th.classList.add("th", "error");
@@ -282,8 +291,8 @@
           <div class="btngroup" style="justify-content: flex-end;">
                 <button class="closeCol" onclick="removeColumn(this)">x</button>
           </div>
-          <input type="datetime-local" id="dateStart">
-          <input type="datetime-local" id="dateEnd">
+          <input type="datetime-local" id="dateStart" value="${dateStart}">
+          <input type="datetime-local" id="dateEnd" value="${dateEnd}">
           {{moduleimpl_select|safe}}
           <div id="mass_action_${col_id}" class="mass">
           <input disabled="" type="radio" class="rbtn present" name="mass_action_${col_id}" value="present" onclick="massCol(this)">
@@ -300,8 +309,10 @@
 
 
 
-        const last = [...document.querySelectorAll("#dateStart")].pop();
-        defaultDate(last);
+        if (dateStart == "") {
+            const last = [...document.querySelectorAll("#dateStart")].pop();
+            defaultDate(last);
+        }
 
         try {
             const sl = th.querySelector('.dynaSelect');
@@ -614,7 +625,7 @@
     function updateAllCol() {
         const colIds = [...document.querySelectorAll("[col]")].map((col) => { return col.getAttribute('col') });
         colIds.forEach((colid) => {
-            updateAssiduitesCol(colid);
+            getAndUpdateCol(colid)
         })
     }
 
@@ -1009,7 +1020,6 @@
             createColumn();
         });
 
-        createColumn();
         setEtuds();
 
         document.querySelectorAll('.pdp-hover').forEach((el) => {
diff --git a/app/views/assiduites.py b/app/views/assiduites.py
index 488a7842ac..cd267a9549 100644
--- a/app/views/assiduites.py
+++ b/app/views/assiduites.py
@@ -210,6 +210,7 @@ def signal_assiduites_etud():
             "js/assiduites.js",
             "libjs/moment.new.min.js",
             "libjs/moment-timezone.js",
+            "js/etud_info.js",
         ],
         cssstyles=[
             "css/assiduites.css",
@@ -880,6 +881,21 @@ def signal_assiduites_diff():
     group_ids: list[int] = request.args.get("group_ids", None)
     formsemestre_id: int = request.args.get("formsemestre_id", -1)
     date: str = request.args.get("jour", datetime.date.today().isoformat())
+
+    date_deb: str = request.args.get("date_deb")
+    date_fin: str = request.args.get("date_fin")
+
+    semaine: str = request.args.get("semaine")
+
+    if semaine is not None:
+        semaine = (
+            f"{scu.annee_scolaire()}-W{semaine}" if "W" not in semaine else semaine
+        )
+        date_deb: datetime.date = datetime.datetime.strptime(
+            semaine + "-1", "%Y-W%W-%w"
+        )
+        date_fin: datetime.date = date_deb + datetime.timedelta(days=6)
+
     etudiants: list[dict] = []
 
     titre = None
@@ -936,6 +952,7 @@ def signal_assiduites_diff():
             "js/assiduites.js",
             "libjs/moment.new.min.js",
             "libjs/moment-timezone.js",
+            "js/etud_info.js",
         ],
     )
 
@@ -968,11 +985,35 @@ def signal_assiduites_diff():
             gr=gr_tit,
             sem=sem["titre_num"],
             defdem=_get_etuds_dem_def(formsemestre),
+            timeMorning=ScoDocSiteConfig.get("assi_morning_time", "08:00:00"),
+            timeNoon=ScoDocSiteConfig.get("assi_lunch_time", "13:00:00"),
+            timeEvening=ScoDocSiteConfig.get("assi_evening_time", "18:00:00"),
+            defaultDates=_get_days_between_dates(date_deb, date_fin),
+            nonworkdays=_non_work_days(),
         ),
         html_sco_header.sco_footer(),
     ).build()
 
 
+def _get_days_between_dates(deb: str, fin: str):
+    if deb is None or fin is None:
+        return "null"
+    try:
+        if isinstance(deb, str) and isinstance(fin, str):
+            date_deb: datetime.date = datetime.date.fromisoformat(deb)
+            date_fin: datetime.date = datetime.date.fromisoformat(fin)
+        else:
+            date_deb, date_fin = deb.date(), fin.date()
+    except ValueError:
+        return "null"
+    dates: list[str] = []
+    while date_deb <= date_fin:
+        dates.append(f'"{date_deb.isoformat()}"')
+        date_deb = date_deb + datetime.timedelta(days=1)
+
+    return f"[{','.join(dates)}]"
+
+
 def _differee(
     etudiants, moduleimpl_select, date=None, periode=None, formsemestre_id=None
 ):

From f9970a16ada9baae30c56fb23e2160fffec15893 Mon Sep 17 00:00:00 2001
From: iziram <matthias.hartmann@iziram.fr>
Date: Mon, 4 Sep 2023 15:05:17 +0200
Subject: [PATCH 18/18] =?UTF-8?q?Assiduit=C3=A9s=20:=20fix=20Bug=20module?=
 =?UTF-8?q?=20autre=20#710?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/api/assiduites.py | 114 +++++++++++++++++-------------------------
 1 file changed, 45 insertions(+), 69 deletions(-)

diff --git a/app/api/assiduites.py b/app/api/assiduites.py
index 1ffaeb4150..ec47f518a2 100644
--- a/app/api/assiduites.py
+++ b/app/api/assiduites.py
@@ -587,16 +587,6 @@ def _create_singular(
     if fin is None:
         errors.append("param 'date_fin': format invalide")
 
-    # cas 4 : moduleimpl_id
-
-    moduleimpl_id = data.get("moduleimpl_id", False)
-    moduleimpl: ModuleImpl = None
-
-    if moduleimpl_id not in [False, None]:
-        moduleimpl = ModuleImpl.query.filter_by(id=int(moduleimpl_id)).first()
-        if moduleimpl is None:
-            errors.append("param 'moduleimpl_id': invalide")
-
     # cas 5 : desc
 
     desc: str = data.get("desc", None)
@@ -606,6 +596,21 @@ def _create_singular(
         if not isinstance(external_data, dict):
             errors.append("param 'external_data' : n'est pas un objet JSON")
 
+    # cas 4 : moduleimpl_id
+
+    moduleimpl_id = data.get("moduleimpl_id", False)
+    moduleimpl: ModuleImpl = None
+
+    if moduleimpl_id not in [False, None]:
+        if moduleimpl_id != "autre":
+            moduleimpl = ModuleImpl.query.filter_by(id=int(moduleimpl_id)).first()
+            if moduleimpl is None:
+                errors.append("param 'moduleimpl_id': invalide")
+        else:
+            moduleimpl_id = None
+            external_data = external_data if external_data is not None else {}
+            external_data["module"] = "Autre"
+
     if errors:
         err: str = ", ".join(errors)
         return (404, err)
@@ -709,58 +714,10 @@ def assiduite_edit(assiduite_id: int):
     errors: list[str] = []
     data = request.get_json(force=True)
 
-    # Vérifications de data
+    code, obj = _edit_singular(assiduite_unique, data)
 
-    # Cas 1 : Etat
-    if data.get("etat") is not None:
-        etat = scu.EtatAssiduite.get(data.get("etat"))
-        if etat is None:
-            errors.append("param 'etat': invalide")
-        else:
-            assiduite_unique.etat = etat
-
-    # Cas 2 : Moduleimpl_id
-    moduleimpl_id = data.get("moduleimpl_id", False)
-    moduleimpl: ModuleImpl = None
-
-    if moduleimpl_id is not False:
-        if moduleimpl_id is not None and moduleimpl_id != "":
-            moduleimpl = ModuleImpl.query.filter_by(id=int(moduleimpl_id)).first()
-            if moduleimpl is None:
-                errors.append("param 'moduleimpl_id': invalide")
-            else:
-                if not moduleimpl.est_inscrit(
-                    Identite.query.filter_by(id=assiduite_unique.etudid).first()
-                ):
-                    errors.append("param 'moduleimpl_id': etud non inscrit")
-                else:
-                    assiduite_unique.moduleimpl_id = moduleimpl_id
-        else:
-            assiduite_unique.moduleimpl_id = None
-
-    # Cas 3 : desc
-    desc = data.get("desc", False)
-    if desc is not False:
-        assiduite_unique.description = desc
-
-    # Cas 4 : est_just
-    est_just = data.get("est_just")
-    if est_just is not None:
-        if not isinstance(est_just, bool):
-            errors.append("param 'est_just' : booléen non reconnu")
-        else:
-            assiduite_unique.est_just = est_just
-
-    external_data = data.get("external_data")
-    if external_data is not None:
-        if not isinstance(external_data, dict):
-            errors.append("param 'external_data' : n'est pas un objet JSON")
-        else:
-            assiduite_unique.external_data = external_data
-
-    if errors:
-        err: str = ", ".join(errors)
-        return json_error(404, err)
+    if code == 404:
+        return json_error(404, obj)
 
     log(f"assiduite_edit: {assiduite_unique.etudiant.id} {assiduite_unique}")
     Scolog.logdb(
@@ -841,22 +798,41 @@ def _edit_singular(assiduite_unique, data):
         else:
             assiduite_unique.etat = etat
 
+    external_data = data.get("external_data")
+    if external_data is not None:
+        if not isinstance(external_data, dict):
+            errors.append("param 'external_data' : n'est pas un objet JSON")
+        else:
+            assiduite_unique.external_data = external_data
+
     # Cas 2 : Moduleimpl_id
     moduleimpl_id = data.get("moduleimpl_id", False)
     moduleimpl: ModuleImpl = None
 
     if moduleimpl_id is not False:
         if moduleimpl_id is not None:
-            moduleimpl = ModuleImpl.query.filter_by(id=int(moduleimpl_id)).first()
-            if moduleimpl is None:
-                errors.append("param 'moduleimpl_id': invalide")
+            if moduleimpl_id == "autre":
+                assiduite_unique.moduleimpl_id = None
+                external_data = (
+                    external_data
+                    if external_data is not None and isinstance(external_data, dict)
+                    else assiduite_unique.external_data
+                )
+                external_data = external_data if external_data is not None else {}
+                external_data["module"] = "Autre"
+                assiduite_unique.external_data = external_data
+
             else:
-                if not moduleimpl.est_inscrit(
-                    Identite.query.filter_by(id=assiduite_unique.etudid).first()
-                ):
-                    errors.append("param 'moduleimpl_id': etud non inscrit")
+                moduleimpl = ModuleImpl.query.filter_by(id=int(moduleimpl_id)).first()
+                if moduleimpl is None:
+                    errors.append("param 'moduleimpl_id': invalide")
                 else:
-                    assiduite_unique.moduleimpl_id = moduleimpl_id
+                    if not moduleimpl.est_inscrit(
+                        Identite.query.filter_by(id=assiduite_unique.etudid).first()
+                    ):
+                        errors.append("param 'moduleimpl_id': etud non inscrit")
+                    else:
+                        assiduite_unique.moduleimpl_id = moduleimpl_id
         else:
             assiduite_unique.moduleimpl_id = moduleimpl_id