lehmann/ScoDoc-Front
1
0
Fork 0
forked from ScoDoc/ScoDoc
Code Pull Requests Activity

Fix: ordre col. tableau recap (groupe admission)

Browse Source
This commit is contained in:
Emmanuel Viennet 2023-01-18 14:25:40 -03:00 committed by iziram
parent cf63e1c038
commit 294ce1d708
3 changed files with 7 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
app/comp/res_common.py
View File

@ -905,7 +905,7 @@ class ResultatsSemestre(ResultatsCache):
} }
first = True first = True
for i, cid in enumerate(fields): for i, cid in enumerate(fields):
titles[f"_{cid}_col_order"] = 10000 + i # tout à droite titles[f"_{cid}_col_order"] = 100000 + i # tout à droite
if first: if first:
titles[f"_{cid}_class"] = "admission admission_first" titles[f"_{cid}_class"] = "admission admission_first"
first = False first = False

3
app/scodoc/sco_recapcomplet.py
View File

@ -37,6 +37,7 @@ from flask import abort, url_for
from app import log from app import log
from app.but import bulletin_but from app.but import bulletin_but
from app.comp import res_sem from app.comp import res_sem
from app.comp.res_common import ResultatsSemestre
from app.comp.res_compat import NotesTableCompat from app.comp.res_compat import NotesTableCompat
from app.models import FormSemestre from app.models import FormSemestre
from app.models.etudiants import Identite from app.models.etudiants import Identite
@ -407,7 +408,7 @@ def gen_formsemestre_recapcomplet_html(
def _gen_formsemestre_recapcomplet_html( def _gen_formsemestre_recapcomplet_html(
formsemestre: FormSemestre, formsemestre: FormSemestre,
res: NotesTableCompat, res: ResultatsSemestre,
include_evaluations=False, include_evaluations=False,
mode_jury=False, mode_jury=False,
filename: str = "", filename: str = "",

5
app/scodoc/sco_utils.py
View File

@ -1289,7 +1289,10 @@ def gen_row(
tr_id = ( tr_id = (
f"""id="row_selected" """ if (row.get("etudid", "") == selected_etudid) else "" f"""id="row_selected" """ if (row.get("etudid", "") == selected_etudid) else ""
) )
return f"""<tr {tr_id} {tr_class}>{"".join([gen_cell(key, row, elt, with_col_class=with_col_classes) for key in keys if not key.startswith('_')])}</tr>""" return f"""<tr {tr_id} {tr_class}>{
"".join([gen_cell(key, row, elt, with_col_class=with_col_classes)
for key in keys if not key.startswith('_')])
}</tr>"""
# Pour accès depuis les templates jinja # Pour accès depuis les templates jinja