iziram/ScoDoc
1
0
Fork 0
forked from ScoDoc/ScoDoc
Code Issues 12 Pull Requests Projects 1 Releases Wiki Activity

Cache table recap aussi en mode jury

Browse Source
This commit is contained in:
Emmanuel Viennet 2023-02-21 00:45:27 +01:00 committed by iziram
parent 831b6a1039
commit 6235f2346e
2 changed files with 17 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
app/scodoc/sco_recapcomplet.py
View File

@ -447,13 +447,12 @@ def gen_formsemestre_recapcomplet_html_table(
""" """
table = None table = None
table_html = None table_html = None
if not (mode_jury or selected_etudid): if not selected_etudid:
if include_evaluations: if include_evaluations:
table_html = sco_cache.TableRecapWithEvalsCache.get(formsemestre.id) table_html = sco_cache.TableRecapWithEvalsCache.get(formsemestre.id)
else: else:
table_html = sco_cache.TableRecapCache.get(formsemestre.id) table_html = sco_cache.TableRecapCache.get(formsemestre.id)
# en mode jury ne cache pas la table html if table_html is None:
if mode_jury or (table_html is None):
table = _gen_formsemestre_recapcomplet_table( table = _gen_formsemestre_recapcomplet_table(
formsemestre, formsemestre,
res, res,
@ -463,11 +462,10 @@ def gen_formsemestre_recapcomplet_html_table(
selected_etudid=selected_etudid, selected_etudid=selected_etudid,
) )
table_html = table.html() table_html = table.html()
if not mode_jury: if include_evaluations:
if include_evaluations: sco_cache.TableRecapWithEvalsCache.set(formsemestre.id, table_html)
sco_cache.TableRecapWithEvalsCache.set(formsemestre.id, table_html) else:
else: sco_cache.TableRecapCache.set(formsemestre.id, table_html)
sco_cache.TableRecapCache.set(formsemestre.id, table_html)
return table_html, table return table_html, table

11
app/static/css/scodoc.css
View File

@ -2066,6 +2066,17 @@ table#formation_list_table tr.gt_hl {
background-color: rgb(96%, 96%, 96%); background-color: rgb(96%, 96%, 96%);
} }
table.formation_list_table td.buttons {
white-space: nowrap;
}
table.formation_list_table td.buttons a {
margin-left: 8px;
}
table.formation_list_table td.buttons span.but_placeholder {
display: inline-block;
width: 15px;
}
.formation_list_table img.delete_small_img { .formation_list_table img.delete_small_img {
width: 16px; width: 16px;
height: 16px; height: 16px;