diff --git a/app/api/jury.py b/app/api/jury.py index 66324ab34..4aa31ce0f 100644 --- a/app/api/jury.py +++ b/app/api/jury.py @@ -86,6 +86,12 @@ def _news_delete_jury_etud(etud: Identite, detail: str = ""): text=f"""Suppression décision jury {detail} pour {etud.nomprenom}""", url=url, ) + Scolog.logdb( + "jury_delete_manual", + etudid=etud.id, + msg=f"Validation {detail} effacée", + commit=True, + ) @bp.route( diff --git a/app/but/jury_but.py b/app/but/jury_but.py index a12877d92..a7a37ab6b 100644 --- a/app/but/jury_but.py +++ b/app/but/jury_but.py @@ -501,7 +501,7 @@ class DecisionsProposeesAnnee(DecisionsProposees): scodoc_dept=g.scodoc_dept, semestre_idx=formsemestre.semestre_id, formation_id=formsemestre.formation.id)}"> - {formsemestre.formation.html()} ({ + {formsemestre.formation.html()|safe} ({ formsemestre.formation.id}) diff --git a/app/models/formations.py b/app/models/formations.py index 65538fda4..1384873f1 100644 --- a/app/models/formations.py +++ b/app/models/formations.py @@ -64,7 +64,7 @@ class Formation(ScoDocModel): def html(self) -> str: "titre complet pour affichage" - return f"""Formation {self.titre} ({self.acronyme}) [version {self.version}] code {self.formation_code}""" + return f"""Formation {self.titre} ({self.acronyme}) version {self.version} code {self.formation_code}""" @classmethod def get_formation(cls, formation_id: int | str, dept_id: int = None) -> "Formation": diff --git a/app/models/validations.py b/app/models/validations.py index a9a3ad2b4..150bb94a2 100644 --- a/app/models/validations.py +++ b/app/models/validations.py @@ -91,7 +91,7 @@ class ScolarFormSemestreValidation(db.Model): d.pop("_sa_instance_state", None) return d - def html(self, detail=False) -> str: + def html(self, detail=True) -> str: "Affichage html" if self.ue_id is not None: moyenne = ( @@ -114,11 +114,12 @@ class ScolarFormSemestreValidation(db.Model): + ", ".join([p.code for p in self.ue.parcours])) + "" if self.ue.parcours else ""} - {("émise par " + link)} : {self.code}{moyenne} {(self.ue.ects or 0):g} ECTS - le {self.event_date.strftime(scu.DATEATIME_FMT)} - """ + {("émise par " + link)} + """ + ( + f"le {self.event_date.strftime(scu.DATEATIME_FMT)}" if detail else "" + ) else: return f"""Validation du semestre S{ self.formsemestre.semestre_id if self.formsemestre else "?"} diff --git a/app/scodoc/sco_edit_ue.py b/app/scodoc/sco_edit_ue.py index 40989539e..89af78ec8 100644 --- a/app/scodoc/sco_edit_ue.py +++ b/app/scodoc/sco_edit_ue.py @@ -765,7 +765,7 @@ def ue_table(formation_id=None, semestre_idx=1, msg=""): # was ue_list "delete_small_dis_img", title="Suppression impossible (module utilisé)" ) H = [ - f"""
Le symbole TC désigne un niveau du tronc commun diff --git a/app/templates/jury/etud_bilan_ects.j2 b/app/templates/jury/etud_bilan_ects.j2 index 0908dc7e2..553864b65 100644 --- a/app/templates/jury/etud_bilan_ects.j2 +++ b/app/templates/jury/etud_bilan_ects.j2 @@ -1,4 +1,4 @@ -{% extends "sco_page.j2" %} +{% extends "sco_page_dept.j2" %} {% block styles %} {{super()}} @@ -10,8 +10,13 @@
+ Cette page donne toutes les UEs acquises par l'étudiant (codes ADM, ADJ, ADJR, ADSUP, CMP...). +
++ La somme des crédits ECTS en bas de page peut compter des UEs + suivies plusieurs fois (redoublements) n'a pas de signification pour l'octroit des diplômes. +