diff --git a/app/but/jury_but.py b/app/but/jury_but.py
index 1d8c08fce..818809ebb 100644
--- a/app/but/jury_but.py
+++ b/app/but/jury_but.py
@@ -188,14 +188,21 @@ class DecisionsProposeesAnnee(DecisionsProposees):
"le 1er semestre de l'année scolaire considérée (S1, S3, S5)"
self.formsemestre_pair = formsemestre_pair
"le second formsemestre de la même année scolaire (S2, S4, S6)"
- self.annee_but = formsemestre_impair.semestre_id // 2 + 1
+ self.annee_but = (
+ formsemestre_impair.semestre_id // 2 + 1
+ if formsemestre_impair
+ else formsemestre_pair.semestre_id // 2
+ )
"le rang de l'année dans le BUT: 1, 2, 3"
assert self.annee_but in (1, 2, 3)
- self.validation = ApcValidationAnnee.query.filter_by(
- etudid=self.etud.id,
- formsemestre_id=formsemestre_impair.id,
- ordre=self.annee_but,
- ).first()
+ if self.formsemestre_impair is not None:
+ self.validation = ApcValidationAnnee.query.filter_by(
+ etudid=self.etud.id,
+ formsemestre_id=formsemestre_impair.id,
+ ordre=self.annee_but,
+ ).first()
+ else:
+ self.validation = None
if self.validation is not None:
self.code_valide = self.validation.code
self.parcour = None
diff --git a/app/but/jury_but_recap.py b/app/but/jury_but_recap.py
new file mode 100644
index 000000000..0fafa02b5
--- /dev/null
+++ b/app/but/jury_but_recap.py
@@ -0,0 +1,179 @@
+##############################################################################
+# ScoDoc
+# Copyright (c) 1999 - 2022 Emmanuel Viennet. All rights reserved.
+# See LICENSE
+##############################################################################
+
+"""Jury BUT: table recap annuelle et liens saisie
+"""
+
+import time
+from flask import g, url_for
+from app import db
+
+from app.but import jury_but
+from app.comp.res_but import ResultatsSemestreBUT
+from app.comp import res_sem
+from app.models.etudiants import Identite
+from app.models.formsemestre import FormSemestre
+from app.models.ues import UniteEns
+
+from app.scodoc import sco_formsemestre_status
+from app.scodoc import html_sco_header
+from app.scodoc import sco_utils as scu
+from app.scodoc.sco_exceptions import ScoException, ScoValueError
+
+
+class RowCollector:
+ def __init__(self, cells: dict = None, titles: dict = None):
+ self.titles = titles
+ self.row = cells or {} # col_id : str
+ self.idx = 0
+
+ def add_cell(
+ self,
+ col_id: str,
+ title: str,
+ content: str,
+ classes: str = "",
+ idx: int = None,
+ ):
+ "Add a row to our table. classes is a list of css class names"
+ self.idx = idx if idx is not None else self.idx
+ self.row[col_id] = content
+ if classes:
+ self.row[f"_{col_id}_class"] = classes + f" c{self.idx}"
+ if not col_id in self.titles:
+ self.titles[col_id] = title
+ self.titles[f"_{col_id}_col_order"] = self.idx
+ if classes:
+ self.titles[f"_{col_id}_class"] = classes
+ self.idx += 1
+
+ def __setitem__(self, key, value):
+ self.row[key] = value
+
+ def __getitem__(self, key):
+ return self.row[key]
+
+
+def formsemestre_saisie_jury_but(
+ formsemestre2: FormSemestre, readonly: bool = False
+) -> str:
+ """formsemestre est un semestre PAIR
+ Si readonly, ne montre pas le lien "saisir la décision"
+
+ => page html complète
+ """
+ # Quick & Dirty
+ # pour chaque etud de res2 trié
+ # S1: UE1, ..., UEn
+ # S2: UE1, ..., UEn
+ #
+ # UE1_s1, UE1_s2, moy_rcue, UE2... , Nbrcue_validables, Nbrcue<8, passage_de_droit, valide_moitie_rcue
+ #
+ # Pour chaque etud de res2 trié
+ # DecisionsProposeesAnnee(etud, formsemestre2)
+ # Pour le 1er etud, faire un check_ues_ready_jury(self) -> page d'erreur
+ # -> rcue .ue_1, .ue_2 -> stroe moy ues, rcue.moy_rcue, etc
+ if formsemestre2.semestre_id % 2 != 0:
+ raise ScoValueError("Cette page ne fonctionne que sur les semestres pairs")
+
+ rows, titles, column_ids = get_table_jury_but(formsemestre2, readonly=readonly)
+ if not rows:
+ return (
+ ''
+ )
+ filename = scu.sanitize_filename(
+ f"""jury-but-{formsemestre2.titre_num()}-{time.strftime("%Y-%m-%d")}"""
+ )
+ table_html = build_table_jury_but_html(filename, rows, titles, column_ids)
+ H = [
+ html_sco_header.sco_header(
+ page_title=f"{formsemestre2.sem_modalite()}: moyennes",
+ no_side_bar=True,
+ init_qtip=True,
+ javascripts=["js/etud_info.js", "js/table_recap.js"],
+ ),
+ sco_formsemestre_status.formsemestre_status_head(
+ formsemestre_id=formsemestre2.id
+ ),
+ ]
+ H.append(table_html)
+ H.append(html_sco_header.sco_footer())
+ return "\n".join(H)
+
+
+def build_table_jury_but_html(filename: str, rows, titles, column_ids) -> str:
+ """assemble la table html"""
+ footer_rows = [] # inutile pour l'instant, à voir XXX
+ selected_etudid = None # inutile pour l'instant, à voir XXX
+ H = [
+ f""""""
+ ]
+ # header
+ H.append(
+ f"""
+
+ {scu.gen_row(column_ids, titles, "th")}
+
+ """
+ )
+ # body
+ H.append("")
+ for row in rows:
+ H.append(f"{scu.gen_row(column_ids, row, selected_etudid=selected_etudid)}\n")
+ H.append("\n")
+ # footer
+ H.append("")
+ idx_last = len(footer_rows) - 1
+ for i, row in enumerate(footer_rows):
+ H.append(f'{scu.gen_row(column_ids, row, "th" if i == idx_last else "td")}\n')
+ H.append(
+ """
+
+
+