2022-05-29 17:34:03 +02:00
|
|
|
# -*- coding: UTF-8 -*
|
|
|
|
|
2022-06-09 07:39:58 +02:00
|
|
|
"""Décisions de jury (validations) des RCUE et années du BUT
|
2022-05-29 17:34:03 +02:00
|
|
|
"""
|
2024-07-04 14:51:46 +02:00
|
|
|
from collections import defaultdict
|
2022-05-29 17:34:03 +02:00
|
|
|
|
2022-06-09 07:39:58 +02:00
|
|
|
from app import db
|
2022-05-29 17:34:03 +02:00
|
|
|
from app.models import CODE_STR_LEN
|
2022-06-09 07:39:58 +02:00
|
|
|
from app.models.but_refcomp import ApcNiveau
|
2022-06-20 17:56:27 +02:00
|
|
|
from app.models.etudiants import Identite
|
2022-06-09 07:39:58 +02:00
|
|
|
from app.models.formsemestre import FormSemestre
|
2022-12-24 22:06:22 +01:00
|
|
|
from app.models.ues import UniteEns
|
2024-01-26 16:14:08 +01:00
|
|
|
from app.scodoc import sco_preferences
|
2024-04-02 23:37:23 +02:00
|
|
|
from app.scodoc import sco_utils as scu
|
2022-05-29 17:34:03 +02:00
|
|
|
|
|
|
|
|
|
|
|
class ApcValidationRCUE(db.Model):
|
|
|
|
"""Validation des niveaux de compétences
|
|
|
|
|
|
|
|
aka "regroupements cohérents d'UE" dans le jargon BUT.
|
|
|
|
|
2023-06-28 21:25:38 +02:00
|
|
|
Le formsemestre est l'origine, utilisé pour effacer
|
2022-05-29 17:34:03 +02:00
|
|
|
"""
|
|
|
|
|
|
|
|
__tablename__ = "apc_validation_rcue"
|
|
|
|
# Assure unicité de la décision:
|
|
|
|
__table_args__ = (
|
|
|
|
db.UniqueConstraint("etudid", "formsemestre_id", "ue1_id", "ue2_id"),
|
|
|
|
)
|
|
|
|
|
|
|
|
id = db.Column(db.Integer, primary_key=True)
|
|
|
|
etudid = db.Column(
|
|
|
|
db.Integer,
|
|
|
|
db.ForeignKey("identite.id", ondelete="CASCADE"),
|
|
|
|
index=True,
|
|
|
|
nullable=False,
|
|
|
|
)
|
|
|
|
formsemestre_id = db.Column(
|
|
|
|
db.Integer, db.ForeignKey("notes_formsemestre.id"), index=True, nullable=True
|
|
|
|
)
|
2023-07-02 12:09:17 +02:00
|
|
|
"formsemestre origine du RCUE (celui d'où a été émis la validation)"
|
2022-05-29 17:34:03 +02:00
|
|
|
# Les deux UE associées à ce niveau:
|
2023-10-25 23:07:34 +02:00
|
|
|
ue1_id = db.Column(
|
|
|
|
db.Integer, db.ForeignKey("notes_ue.id", ondelete="CASCADE"), nullable=False
|
|
|
|
)
|
|
|
|
ue2_id = db.Column(
|
|
|
|
db.Integer, db.ForeignKey("notes_ue.id", ondelete="CASCADE"), nullable=False
|
|
|
|
)
|
2022-05-29 17:34:03 +02:00
|
|
|
# optionnel, le parcours dans lequel se trouve la compétence:
|
2023-02-09 11:56:20 +01:00
|
|
|
parcours_id = db.Column(
|
|
|
|
db.Integer, db.ForeignKey("apc_parcours.id", ondelete="set null"), nullable=True
|
|
|
|
)
|
2022-05-29 17:34:03 +02:00
|
|
|
date = db.Column(db.DateTime(timezone=True), server_default=db.func.now())
|
|
|
|
code = db.Column(db.String(CODE_STR_LEN), nullable=False, index=True)
|
|
|
|
|
|
|
|
etud = db.relationship("Identite", backref="apc_validations_rcues")
|
|
|
|
formsemestre = db.relationship("FormSemestre", backref="apc_validations_rcues")
|
|
|
|
ue1 = db.relationship("UniteEns", foreign_keys=ue1_id)
|
|
|
|
ue2 = db.relationship("UniteEns", foreign_keys=ue2_id)
|
|
|
|
parcour = db.relationship("ApcParcours")
|
|
|
|
|
|
|
|
def __repr__(self):
|
2022-10-01 10:39:46 +02:00
|
|
|
return f"""<{self.__class__.__name__} {self.id} {self.etud} {
|
|
|
|
self.ue1}/{self.ue2}:{self.code!r}>"""
|
|
|
|
|
|
|
|
def __str__(self):
|
2022-12-24 22:06:22 +01:00
|
|
|
return f"""Décision sur RCUE {self.ue1.acronyme}/{self.ue2.acronyme}: {
|
2024-04-02 23:37:23 +02:00
|
|
|
self.code} enregistrée le {self.date.strftime(scu.DATE_FMT)}"""
|
2022-12-24 22:06:22 +01:00
|
|
|
|
2023-06-18 09:37:13 +02:00
|
|
|
def html(self) -> str:
|
2022-12-24 22:06:22 +01:00
|
|
|
"description en HTML"
|
|
|
|
return f"""Décision sur RCUE {self.ue1.acronyme}/{self.ue2.acronyme}:
|
|
|
|
<b>{self.code}</b>
|
2024-04-02 23:37:23 +02:00
|
|
|
<em>enregistrée le {self.date.strftime(scu.DATEATIME_FMT)}</em>"""
|
2022-05-29 17:34:03 +02:00
|
|
|
|
2023-01-23 19:08:00 +01:00
|
|
|
def annee(self) -> str:
|
|
|
|
"""l'année BUT concernée: "BUT1", "BUT2" ou "BUT3" """
|
|
|
|
niveau = self.niveau()
|
|
|
|
return niveau.annee if niveau else None
|
|
|
|
|
2024-02-09 13:47:48 +01:00
|
|
|
def niveau(self) -> ApcNiveau | None:
|
2022-06-09 07:39:58 +02:00
|
|
|
"""Le niveau de compétence associé à cet RCUE."""
|
|
|
|
# Par convention, il est donné par la seconde UE
|
2024-02-09 13:47:48 +01:00
|
|
|
# à défaut (si l'UE a été désacciée entre temps), la première
|
|
|
|
# et à défaut, renvoie None
|
|
|
|
return self.ue2.niveau_competence or self.ue1.niveau_competence
|
2022-06-09 07:39:58 +02:00
|
|
|
|
2023-01-17 01:05:48 +01:00
|
|
|
def to_dict(self):
|
|
|
|
"as a dict"
|
|
|
|
d = dict(self.__dict__)
|
|
|
|
d.pop("_sa_instance_state", None)
|
2023-07-18 16:41:02 +02:00
|
|
|
d["etud"] = self.etud.to_dict_short()
|
|
|
|
d["ue1"] = self.ue1.to_dict()
|
|
|
|
d["ue2"] = self.ue2.to_dict()
|
|
|
|
|
2023-01-17 01:05:48 +01:00
|
|
|
return d
|
|
|
|
|
2022-06-29 19:25:08 +02:00
|
|
|
def to_dict_bul(self) -> dict:
|
2022-07-08 18:09:45 +02:00
|
|
|
"Export dict pour bulletins: le code et le niveau de compétence"
|
2022-09-08 01:22:22 +02:00
|
|
|
niveau = self.niveau()
|
|
|
|
return {
|
|
|
|
"code": self.code,
|
|
|
|
"niveau": None if niveau is None else niveau.to_dict_bul(),
|
|
|
|
}
|
2022-06-29 19:25:08 +02:00
|
|
|
|
2023-02-12 23:03:12 +01:00
|
|
|
def to_dict_codes(self) -> dict:
|
|
|
|
"Dict avec seulement les ids et la date - pour cache table jury"
|
|
|
|
return {
|
|
|
|
"id": self.id,
|
|
|
|
"code": self.code,
|
|
|
|
"date": self.date,
|
|
|
|
"etudid": self.etudid,
|
|
|
|
"niveau_id": self.niveau().id,
|
|
|
|
"formsemestre_id": self.formsemestre_id,
|
|
|
|
}
|
|
|
|
|
2024-06-09 15:18:03 +02:00
|
|
|
def get_codes_apogee(self) -> set[str]:
|
|
|
|
"""Les codes Apogée associés à cette validation RCUE.
|
|
|
|
Prend les codes des deux UEs
|
|
|
|
"""
|
|
|
|
return self.ue1.get_codes_apogee_rcue() | self.ue2.get_codes_apogee_rcue()
|
|
|
|
|
2022-06-09 07:39:58 +02:00
|
|
|
|
2022-05-29 17:34:03 +02:00
|
|
|
class ApcValidationAnnee(db.Model):
|
|
|
|
"""Validation des années du BUT"""
|
|
|
|
|
|
|
|
__tablename__ = "apc_validation_annee"
|
|
|
|
# Assure unicité de la décision:
|
2023-06-28 10:09:56 +02:00
|
|
|
__table_args__ = (
|
2023-06-30 09:34:29 +02:00
|
|
|
db.UniqueConstraint("etudid", "ordre", "referentiel_competence_id"),
|
|
|
|
)
|
2022-05-29 17:34:03 +02:00
|
|
|
id = db.Column(db.Integer, primary_key=True)
|
|
|
|
etudid = db.Column(
|
|
|
|
db.Integer,
|
|
|
|
db.ForeignKey("identite.id", ondelete="CASCADE"),
|
|
|
|
index=True,
|
|
|
|
nullable=False,
|
|
|
|
)
|
|
|
|
ordre = db.Column(db.Integer, nullable=False)
|
|
|
|
"numéro de l'année: 1, 2, 3"
|
|
|
|
formsemestre_id = db.Column(
|
|
|
|
db.Integer, db.ForeignKey("notes_formsemestre.id"), nullable=True
|
|
|
|
)
|
2023-06-28 21:25:38 +02:00
|
|
|
"le semestre origine, normalement l'IMPAIR (le 1er) de l'année"
|
2023-06-30 09:34:29 +02:00
|
|
|
referentiel_competence_id = db.Column(
|
|
|
|
db.Integer, db.ForeignKey("apc_referentiel_competences.id"), nullable=False
|
2023-06-15 08:49:05 +02:00
|
|
|
)
|
|
|
|
annee_scolaire = db.Column(db.Integer, nullable=False) # eg 2021
|
2022-05-29 17:34:03 +02:00
|
|
|
date = db.Column(db.DateTime(timezone=True), server_default=db.func.now())
|
|
|
|
code = db.Column(db.String(CODE_STR_LEN), nullable=False, index=True)
|
|
|
|
|
|
|
|
etud = db.relationship("Identite", backref="apc_validations_annees")
|
|
|
|
formsemestre = db.relationship("FormSemestre", backref="apc_validations_annees")
|
|
|
|
|
|
|
|
def __repr__(self):
|
2022-12-24 22:06:22 +01:00
|
|
|
return f"""<{self.__class__.__name__} {self.id} {self.etud
|
|
|
|
} BUT{self.ordre}/{self.annee_scolaire}:{self.code!r}>"""
|
2022-06-29 19:25:08 +02:00
|
|
|
|
2022-10-01 10:39:46 +02:00
|
|
|
def __str__(self):
|
|
|
|
return f"""décision sur année BUT{self.ordre} {self.annee_scolaire} : {self.code}"""
|
|
|
|
|
2022-06-29 19:25:08 +02:00
|
|
|
def to_dict_bul(self) -> dict:
|
|
|
|
"dict pour bulletins"
|
|
|
|
return {
|
|
|
|
"annee_scolaire": self.annee_scolaire,
|
2023-06-30 09:34:29 +02:00
|
|
|
"date": self.date.isoformat() if self.date else "",
|
2022-06-29 19:25:08 +02:00
|
|
|
"code": self.code,
|
|
|
|
"ordre": self.ordre,
|
|
|
|
}
|
|
|
|
|
2023-06-18 09:37:13 +02:00
|
|
|
def html(self) -> str:
|
|
|
|
"Affichage html"
|
2023-06-30 09:34:29 +02:00
|
|
|
date_str = (
|
2024-04-02 23:37:23 +02:00
|
|
|
f"""le {self.date.strftime(scu.DATEATIME_FMT)}"""
|
2023-06-30 09:34:29 +02:00
|
|
|
if self.date
|
|
|
|
else "(sans date)"
|
|
|
|
)
|
2023-06-30 17:26:41 +02:00
|
|
|
link = (
|
|
|
|
self.formsemestre.html_link_status(
|
|
|
|
label=f"{self.formsemestre.titre_formation(with_sem_idx=1)}",
|
|
|
|
title=self.formsemestre.titre_annee(),
|
|
|
|
)
|
|
|
|
if self.formsemestre
|
|
|
|
else "externe/antérieure"
|
|
|
|
)
|
2023-06-18 09:37:13 +02:00
|
|
|
return f"""Validation <b>année BUT{self.ordre}</b> émise par
|
2023-06-30 17:26:41 +02:00
|
|
|
{link}
|
2023-06-21 16:47:24 +02:00
|
|
|
: <b>{self.code}</b>
|
2023-06-30 09:34:29 +02:00
|
|
|
{date_str}
|
2023-06-18 09:37:13 +02:00
|
|
|
"""
|
|
|
|
|
2022-06-29 19:25:08 +02:00
|
|
|
|
|
|
|
def dict_decision_jury(etud: Identite, formsemestre: FormSemestre) -> dict:
|
|
|
|
"""
|
2022-07-08 18:09:45 +02:00
|
|
|
Un dict avec les décisions de jury BUT enregistrées:
|
|
|
|
- decision_rcue : list[dict]
|
2023-06-15 08:49:05 +02:00
|
|
|
- decision_annee : dict (décision issue de ce semestre seulement (à confirmer ?))
|
2022-06-29 19:25:08 +02:00
|
|
|
Ne reprend pas les décisions d'UE, non spécifiques au BUT.
|
|
|
|
"""
|
|
|
|
decisions = {}
|
|
|
|
# --- RCUEs: seulement sur semestres pairs XXX à améliorer
|
|
|
|
if formsemestre.semestre_id % 2 == 0:
|
|
|
|
# validations émises depuis ce formsemestre:
|
2023-06-17 14:56:04 +02:00
|
|
|
validations_rcues = (
|
|
|
|
ApcValidationRCUE.query.filter_by(
|
|
|
|
etudid=etud.id, formsemestre_id=formsemestre.id
|
|
|
|
)
|
|
|
|
.join(UniteEns, UniteEns.id == ApcValidationRCUE.ue1_id)
|
|
|
|
.order_by(UniteEns.numero, UniteEns.acronyme)
|
2022-06-29 19:25:08 +02:00
|
|
|
)
|
|
|
|
decisions["decision_rcue"] = [v.to_dict_bul() for v in validations_rcues]
|
2024-07-04 14:51:46 +02:00
|
|
|
titres_rcues = _build_decisions_rcue_list(decisions["decision_rcue"])
|
2022-09-11 07:52:18 +02:00
|
|
|
decisions["descr_decisions_rcue"] = ", ".join(titres_rcues)
|
2024-06-19 18:28:23 +02:00
|
|
|
decisions["descr_decisions_rcue_list"] = titres_rcues
|
2022-07-08 23:58:27 +02:00
|
|
|
decisions["descr_decisions_niveaux"] = (
|
|
|
|
"Niveaux de compétences: " + decisions["descr_decisions_rcue"]
|
|
|
|
)
|
2022-06-29 19:25:08 +02:00
|
|
|
else:
|
|
|
|
decisions["decision_rcue"] = []
|
2022-07-08 23:58:27 +02:00
|
|
|
decisions["descr_decisions_rcue"] = ""
|
|
|
|
decisions["descr_decisions_niveaux"] = ""
|
2023-09-05 22:50:01 +02:00
|
|
|
# --- Année: prend la validation pour l'année scolaire et l'ordre de ce semestre
|
2024-01-26 16:14:08 +01:00
|
|
|
if sco_preferences.get_preference("bul_but_code_annuel", formsemestre.id):
|
|
|
|
annee_but = (formsemestre.semestre_id + 1) // 2
|
|
|
|
validation = ApcValidationAnnee.query.filter_by(
|
|
|
|
etudid=etud.id,
|
|
|
|
annee_scolaire=formsemestre.annee_scolaire(),
|
|
|
|
ordre=annee_but,
|
|
|
|
referentiel_competence_id=formsemestre.formation.referentiel_competence_id,
|
|
|
|
).first()
|
|
|
|
if validation:
|
|
|
|
decisions["decision_annee"] = validation.to_dict_bul()
|
|
|
|
else:
|
|
|
|
decisions["decision_annee"] = None
|
2022-06-29 19:25:08 +02:00
|
|
|
else:
|
|
|
|
decisions["decision_annee"] = None
|
|
|
|
return decisions
|
2024-07-04 14:51:46 +02:00
|
|
|
|
|
|
|
|
|
|
|
def _build_decisions_rcue_list(decisions_rcue: dict) -> list[str]:
|
|
|
|
"""Formatte liste des décisions niveaux de compétences / RCUE pour
|
|
|
|
lettres individuelles.
|
|
|
|
Le résulat est trié par compétence et donne pour chaque niveau avec validation:
|
|
|
|
[ 'Administrer: niveau 1 ADM, niveau 2 ADJ', ... ]
|
|
|
|
"""
|
|
|
|
# Construit { id_competence : validation }
|
|
|
|
# où validation est {'code': 'CMP', 'niveau': {'annee': 'BUT3', 'competence': {}, ... }
|
|
|
|
validation_by_competence = defaultdict(list)
|
|
|
|
for validation in decisions_rcue:
|
2024-07-05 14:12:00 +02:00
|
|
|
if validation:
|
|
|
|
competence_id = (
|
|
|
|
validation.get("niveau", {}).get("competence", {}).get("id_orebut")
|
|
|
|
)
|
|
|
|
validation_by_competence[competence_id].append(validation)
|
2024-07-04 14:51:46 +02:00
|
|
|
# Tri des listes de validation par numéro de compétence
|
|
|
|
validations_niveaux = sorted(
|
|
|
|
validation_by_competence.values(),
|
|
|
|
key=lambda v: (
|
|
|
|
v[0].get("niveau", {}).get("competence", {}).get("numero", 0) if v else -1
|
|
|
|
),
|
|
|
|
)
|
|
|
|
titres_rcues = []
|
|
|
|
empty = {} # pour syntaxe f-string
|
|
|
|
for validations in validations_niveaux:
|
|
|
|
if validations:
|
|
|
|
v = validations[0]
|
|
|
|
titre_competence = (
|
|
|
|
v.get("niveau", {}).get("competence", {}).get("titre", "sans titre")
|
|
|
|
)
|
|
|
|
titres_rcues.append(
|
|
|
|
f"""{titre_competence} : """
|
|
|
|
+ ", ".join(
|
|
|
|
[
|
|
|
|
f"niveau {v.get('niveau',empty).get('ordre','?')} {v.get('code', '?')}"
|
|
|
|
for v in validations
|
|
|
|
]
|
|
|
|
)
|
|
|
|
)
|
|
|
|
return titres_rcues
|