From e44a5ee55d56782e2e44f5f578138a2858128993 Mon Sep 17 00:00:00 2001 From: Emmanuel Viennet Date: Sun, 7 Apr 2024 19:52:22 +0200 Subject: [PATCH] Corrige templates formsemestre --- app/scodoc/html_sco_header.py | 1 + app/scodoc/html_sidebar.py | 4 +++- app/scodoc/sco_edit_ue.py | 3 +-- app/scodoc/sco_formsemestre_status.py | 4 +++- app/scodoc/sco_report.py | 3 +++ app/templates/bul_head.j2 | 8 ++++---- app/templates/formsemestre_header.j2 | 19 ++++++++++++------ app/templates/sco_page.j2 | 28 +++++++++++++-------------- app/views/__init__.py | 4 ++++ 9 files changed, 46 insertions(+), 28 deletions(-) diff --git a/app/scodoc/html_sco_header.py b/app/scodoc/html_sco_header.py index 0de360d1..18d7ad9f 100644 --- a/app/scodoc/html_sco_header.py +++ b/app/scodoc/html_sco_header.py @@ -179,6 +179,7 @@ def sco_header( H = [ """ + %(page_title)s diff --git a/app/scodoc/html_sidebar.py b/app/scodoc/html_sidebar.py index 1b160713..b9bab904 100755 --- a/app/scodoc/html_sidebar.py +++ b/app/scodoc/html_sidebar.py @@ -141,7 +141,9 @@ def sidebar(etudid: int = None): params = {} H = [ - f"""
+ f""" + +
{ sidebar_common() }
Chercher étudiant:
\ No newline at end of file diff --git a/app/templates/sco_page.j2 b/app/templates/sco_page.j2 index 177c8b0f..5c881bb5 100644 --- a/app/templates/sco_page.j2 +++ b/app/templates/sco_page.j2 @@ -1,6 +1,5 @@ {%- extends 'babase.j2' -%} {# -*- Base des pages ordinaires, dans départements -*- #} - {% block styles %} {{super()}} @@ -22,24 +21,25 @@ {% endblock %} {% block content %} + {% block scodoc_sidebar %} - {% include "sidebar.j2" %} + {% include "sidebar.j2" %} {% endblock %} -
- {% include "flashed_messages.j2" %} - {% if sco.formsemestre %} - {% block formsemestre_header %} - {% include "formsemestre_header.j2" %} - {% endblock %} - {% endif %} +
+ {% include "flashed_messages.j2" %} + {% if sco.formsemestre %} + {% block formsemestre_header %} + {% include "formsemestre_header.j2" %} + {% endblock %} + {% endif %} -
- {% block app_content %} - page vide - {% endblock %} +
+ {% block app_content %} + page vide + {% endblock %} +
-
{% endblock %} {% block scripts %} diff --git a/app/views/__init__.py b/app/views/__init__.py index 0f04cd9e..df78e7cf 100644 --- a/app/views/__init__.py +++ b/app/views/__init__.py @@ -135,6 +135,10 @@ class ScoData: self.formsemestre.id if self.formsemestre else None ) + def formsemestre_status_menu_bar(self) -> str: + "Le HTML de la barre de menu semestre" + return sco_formsemestre_status.formsemestre_status_menubar(self.formsemestre) + from app.views import ( absences,