From ae84ed26c3d0af94bed844e511dd993c86e8eedc Mon Sep 17 00:00:00 2001 From: Iziram Date: Tue, 13 Aug 2024 16:01:31 +0200 Subject: [PATCH] Rework : Menu formsemestre --- app/scodoc/sco_formsemestre_custommenu.py | 2 +- app/scodoc/sco_formsemestre_status.py | 24 +- app/templates/formsemestre/menu.j2 | 469 ++++++++++++++++++++++ 3 files changed, 482 insertions(+), 13 deletions(-) create mode 100644 app/templates/formsemestre/menu.j2 diff --git a/app/scodoc/sco_formsemestre_custommenu.py b/app/scodoc/sco_formsemestre_custommenu.py index 485fdcd14..3be638311 100644 --- a/app/scodoc/sco_formsemestre_custommenu.py +++ b/app/scodoc/sco_formsemestre_custommenu.py @@ -101,7 +101,7 @@ def formsemestre_custommenu_html(formsemestre_id): "args": {"formsemestre_id": formsemestre_id}, } ) - return htmlutils.make_menu("Liens", menu) + return menu def formsemestre_custommenu_edit(formsemestre_id): diff --git a/app/scodoc/sco_formsemestre_status.py b/app/scodoc/sco_formsemestre_status.py index db7143e13..e3c7fe037 100755 --- a/app/scodoc/sco_formsemestre_status.py +++ b/app/scodoc/sco_formsemestre_status.py @@ -473,18 +473,18 @@ def formsemestre_status_menubar(formsemestre: FormSemestre | None) -> str: ] menu_stats = _build_menu_stats(formsemestre) - H = [ - '", - ] - return "\n".join(H) + + menus = { + "Semestre": menu_semestre, + "Inscriptions": menu_inscriptions, + "Groupes": menu_groupes, + "Notes": menu_notes, + "Jury": menu_jury, + "Statistiques": menu_stats, + "Liens": formsemestre_custommenu_html(formsemestre_id), + } + + return render_template("formsemestre/menu.j2", menu=menus) # Element HTML decrivant un semestre (barre de menu et infos) diff --git a/app/templates/formsemestre/menu.j2 b/app/templates/formsemestre/menu.j2 new file mode 100644 index 000000000..53e38b9ae --- /dev/null +++ b/app/templates/formsemestre/menu.j2 @@ -0,0 +1,469 @@ +{# Styles du menu #} + +{# Scripts #} + + +{# Macro génération dropdown #} +{% macro dropdown(category, items) %} + +{% endmacro %} + +{# Menu HTML #} + \ No newline at end of file