formatage

app/scodoc/sco_formsemestre_exterieurs.py

@@ -262,7 +262,7 @@ def formsemestre_ext_edit_ue_validations(formsemestre_id, etudid):
                 )
 
 
-def _make_page(etud, sem, tf, message=""):
+def _make_page(etud: dict, sem, tf, message="") -> list:
     formsemestre = FormSemestre.query.get_or_404(sem["formsemestre_id"])
     nt: NotesTableCompat = res_sem.load_formsemestre_results(formsemestre)
     moy_gen = nt.get_etud_moy_gen(etud["etudid"])
@@ -277,21 +277,20 @@ def _make_page(etud, sem, tf, message=""):
         </p>
         """
         % etud,
-        """<p>La moyenne de ce semestre serait: 
+        f"""<p>La moyenne de ce semestre serait: 
-        <span class="ext_sem_moy"><span class="ext_sem_moy_val">%s</span> / 20</span>
+        <span class="ext_sem_moy"><span class="ext_sem_moy_val">{moy_gen}</span> / 20</span>
         </p>
-        """
+        """,
-        % moy_gen,
         '<div id="formsemestre_ext_edit_ue_validations">',
         tf[1],
         "</div>",
-        """<div>
+        f"""<div>
-        <a class="stdlink" 
+        <a class="stdlink"
-        href="formsemestre_bulletinetud?formsemestre_id=%s&etudid=%s">
+        href="{url_for("notes.formsemestre_bulletinetud", scodoc_dept=g.scodoc_dept,
-        retour au bulletin de notes
+        formsemestre_id=formsemestre.id, etudid=etud['etudid']
-        </a></div>
+        )}">retour au bulletin de notes</a>
-        """
+        </div>
-        % (sem["formsemestre_id"], etud["etudid"]),
+        """,
         html_sco_header.sco_footer(),
     ]
     return H