From c5f5cb7daacfa9df262483671c3322a458036a56 Mon Sep 17 00:00:00 2001
From: Emmanuel Viennet <emmanuel.viennet@gmail.com>
Date: Wed, 31 May 2023 14:24:36 +0200
Subject: [PATCH] Fix regression: saisie notes tableur

---
 app/scodoc/sco_saisie_notes.py | 33 ++++++++++++++-------------------
 1 file changed, 14 insertions(+), 19 deletions(-)

diff --git a/app/scodoc/sco_saisie_notes.py b/app/scodoc/sco_saisie_notes.py
index 594ee20b..e5d7f3da 100644
--- a/app/scodoc/sco_saisie_notes.py
+++ b/app/scodoc/sco_saisie_notes.py
@@ -885,21 +885,18 @@ def feuille_saisie_notes(evaluation_id, group_ids=[]):
         indication_date = evaluation.jour.isoformat()
     else:
         indication_date = scu.sanitize_filename(evaluation.description or "")[:12]
-    eval_name = "%s-%s" % (evaluation.moduleimpl.module.code, indication_date)
+    eval_name = f"{evaluation.moduleimpl.module.code}-{indication_date}"
 
-    if evaluation.description:
-        evaltitre = "%s du %s" % (
-            evaluation.description,
-            evaluation.jour.strftime("%d/%m/%Y"),
-        )
-    else:
-        evaltitre = "évaluation du %s" % evaluation.jour.strftime("%d/%m/%Y")
-    description = "%s en %s (%s) resp. %s" % (
-        evaltitre,
-        evaluation.moduleimpl.module.abbrev or "",
-        evaluation.moduleimpl.module.code,
-        mod_responsable["prenomnom"],
+    date_str = (
+        f"""du {evaluation.jour.strftime("%d/%m/%Y")}"""
+        if evaluation.jour
+        else "(sans date)"
     )
+    eval_titre = f"""{evaluation.description if evaluation.description else "évaluation"} {date_str}"""
+
+    description = f"""{eval_titre} en {evaluation.moduleimpl.module.abbrev or ""} ({
+        evaluation.moduleimpl.module.code
+        }) resp. {mod_responsable["prenomnom"]}"""
 
     groups_infos = sco_groups_view.DisplayedGroupsInfos(
         group_ids=group_ids,
@@ -909,10 +906,8 @@ def feuille_saisie_notes(evaluation_id, group_ids=[]):
     )
     groups = sco_groups.listgroups(groups_infos.group_ids)
     gr_title_filename = sco_groups.listgroups_filename(groups)
-    # gr_title = sco_groups.listgroups_abbrev(groups)
     if None in [g["group_name"] for g in groups]:  # tous les etudiants
         getallstudents = True
-        # gr_title = "tous"
         gr_title_filename = "tous"
     else:
         getallstudents = False
@@ -924,7 +919,7 @@ def feuille_saisie_notes(evaluation_id, group_ids=[]):
     ]
 
     # une liste de liste de chaines: lignes de la feuille de calcul
-    L = []
+    rows = []
 
     etuds = _get_sorted_etuds(evaluation, etudids, formsemestre.id)
     for e in etuds:
@@ -932,7 +927,7 @@ def feuille_saisie_notes(evaluation_id, group_ids=[]):
         groups = sco_groups.get_etud_groups(etudid, formsemestre.id)
         grc = sco_groups.listgroups_abbrev(groups)
 
-        L.append(
+        rows.append(
             [
                 str(etudid),
                 e["nom"].upper(),
@@ -944,9 +939,9 @@ def feuille_saisie_notes(evaluation_id, group_ids=[]):
             ]
         )
 
-    filename = "notes_%s_%s" % (eval_name, gr_title_filename)
+    filename = f"notes_{eval_name}_{gr_title_filename}"
     xls = sco_excel.excel_feuille_saisie(
-        evaluation, formsemestre.titre_annee(), description, lines=L
+        evaluation, formsemestre.titre_annee(), description, lines=rows
     )
     return scu.send_file(xls, filename, scu.XLSX_SUFFIX, mime=scu.XLSX_MIMETYPE)