From 76257f1794e635dc6bc4d2a4fa5fbd662a799210 Mon Sep 17 00:00:00 2001 From: Emmanuel Viennet Date: Tue, 21 Feb 2023 00:45:27 +0100 Subject: [PATCH] Cache table recap aussi en mode jury --- app/scodoc/sco_recapcomplet.py | 14 ++++++-------- app/static/css/scodoc.css | 11 +++++++++++ 2 files changed, 17 insertions(+), 8 deletions(-) diff --git a/app/scodoc/sco_recapcomplet.py b/app/scodoc/sco_recapcomplet.py index 58f01f6b..e91f3681 100644 --- a/app/scodoc/sco_recapcomplet.py +++ b/app/scodoc/sco_recapcomplet.py @@ -449,13 +449,12 @@ def gen_formsemestre_recapcomplet_html_table( """ table = None table_html = None - if not (mode_jury or selected_etudid): + if not selected_etudid: if include_evaluations: table_html = sco_cache.TableRecapWithEvalsCache.get(formsemestre.id) else: table_html = sco_cache.TableRecapCache.get(formsemestre.id) - # en mode jury ne cache pas la table html - if mode_jury or (table_html is None): + if table_html is None: table = _gen_formsemestre_recapcomplet_table( formsemestre, res, @@ -465,11 +464,10 @@ def gen_formsemestre_recapcomplet_html_table( selected_etudid=selected_etudid, ) table_html = table.html() - if not mode_jury: - if include_evaluations: - sco_cache.TableRecapWithEvalsCache.set(formsemestre.id, table_html) - else: - sco_cache.TableRecapCache.set(formsemestre.id, table_html) + if include_evaluations: + sco_cache.TableRecapWithEvalsCache.set(formsemestre.id, table_html) + else: + sco_cache.TableRecapCache.set(formsemestre.id, table_html) return table_html, table diff --git a/app/static/css/scodoc.css b/app/static/css/scodoc.css index e7b5e5fd..e45b9fd2 100644 --- a/app/static/css/scodoc.css +++ b/app/static/css/scodoc.css @@ -2066,6 +2066,17 @@ table#formation_list_table tr.gt_hl { 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 { width: 16px; height: 16px;