diff --git a/app/but/jury_but.py b/app/but/jury_but.py index 1ec6eeea..02f18dff 100644 --- a/app/but/jury_but.py +++ b/app/but/jury_but.py @@ -355,7 +355,7 @@ class DecisionsProposeesAnnee(DecisionsProposees): # Reste à attribuer ADM, ADJ, PASD, PAS1NCI, RED, NAR plural = self.nb_validables > 1 explanation += f"""{self.nb_validables} niveau{"x" if plural else ""} validable{ - "s" if plural else ""} sur {self.nb_competences}""" + "s" if plural else ""} de droit sur {self.nb_competences}""" if self.admis: self.codes = [sco_codes.ADM] + self.codes # elif not self.jury_annuel: diff --git a/app/scodoc/sco_formsemestre_validation.py b/app/scodoc/sco_formsemestre_validation.py index f8ce9847..6460fb4f 100644 --- a/app/scodoc/sco_formsemestre_validation.py +++ b/app/scodoc/sco_formsemestre_validation.py @@ -31,6 +31,7 @@ import time import flask from flask import url_for, flash, g, request +from flask_login import current_user import sqlalchemy as sa from app.models.etudiants import Identite @@ -66,7 +67,7 @@ from app.scodoc.sco_cursus_dut import etud_est_inscrit_ue from app.scodoc import sco_photos from app.scodoc import sco_preferences from app.scodoc import sco_pv_dict - +from app.scodoc.sco_permissions import Permission # ------------------------------------------------------------------------------------ def formsemestre_validation_etud_form( @@ -1288,7 +1289,9 @@ def _get_etud_ue_cap_html(etud: Identite, formsemestre: FormSemestre) -> str: if validation.semestre_id is not None: origine += f" (S{validation.semestre_id})" H.append(f"""