From 90aa6234bdf01527a36cf8e187eb7709aaad8e79 Mon Sep 17 00:00:00 2001 From: Emmanuel Viennet Date: Mon, 23 Jan 2023 17:30:54 -0300 Subject: [PATCH] Lien navigation sur jury BUT sem. impair --- app/but/jury_but_recap.py | 8 ++++---- app/comp/res_common.py | 4 ++++ app/static/js/table_recap.js | 4 ++-- 3 files changed, 10 insertions(+), 6 deletions(-) diff --git a/app/but/jury_but_recap.py b/app/but/jury_but_recap.py index 38657957..80929440 100644 --- a/app/but/jury_but_recap.py +++ b/app/but/jury_but_recap.py @@ -284,6 +284,10 @@ class RowCollector: self["_nom_disp_order"] = etud.sort_key self.add_cell("prenom", "Prénom", etud.prenom, "identite_detail") self.add_cell("nom_short", "Nom", etud.nom_short, "identite_court") + self["_nom_short_data"] = { + "etudid": etud.id, + "nomprenom": etud.nomprenom, + } if with_links: self["_nom_short_order"] = etud.sort_key self["_nom_short_target"] = url_for( @@ -368,10 +372,6 @@ class RowCollector: + ((" " + scu.EMO_WARNING) if deca.nb_rcues_under_8 > 0 else ""), "col_rcue col_rcues_validables" + klass, ) - self["_rcues_validables_data"] = { - "etudid": deca.etud.id, - "nomprenom": deca.etud.nomprenom, - } if len(deca.rcues_annee) > 0: # permet un tri par nb de niveaux validables + moyenne gen indicative S_pair if deca.res_pair and deca.etud.id in deca.res_pair.etud_moy_gen: diff --git a/app/comp/res_common.py b/app/comp/res_common.py index 8326b640..7632ec28 100644 --- a/app/comp/res_common.py +++ b/app/comp/res_common.py @@ -543,6 +543,10 @@ class ResultatsSemestre(ResultatsCache): formsemestre_id=self.formsemestre.id, etudid=etudid, ) + row["_nom_short_data"] = { + "etudid": etud.id, + "nomprenom": etud.nomprenom, + } row["_nom_short_target_attrs"] = f'class="etudinfo" id="{etudid}"' row["_nom_disp_target"] = row["_nom_short_target"] row["_nom_disp_target_attrs"] = row["_nom_short_target_attrs"] diff --git a/app/static/js/table_recap.js b/app/static/js/table_recap.js index 9352e25c..7242ed39 100644 --- a/app/static/js/table_recap.js +++ b/app/static/js/table_recap.js @@ -219,11 +219,11 @@ $(function () { localStorage.setItem(order_info_key, order_info); } let etudids = []; - document.querySelectorAll("td.col_rcues_validables").forEach(e => { + document.querySelectorAll("td.identite_court").forEach(e => { etudids.push(e.dataset.etudid); }); let noms = []; - document.querySelectorAll("td.col_rcues_validables").forEach(e => { + document.querySelectorAll("td.identite_court").forEach(e => { noms.push(e.dataset.nomprenom); }); const etudids_key = JSON.stringify(["etudids", url.origin, formsemestre_id]);