diff --git a/mondumas/layout.py b/mondumas/layout.py index 3be3f94..58a87d3 100644 --- a/mondumas/layout.py +++ b/mondumas/layout.py @@ -9,7 +9,7 @@ from pyramid.security import authenticated_userid @layout_config(template='templates/layouts/global_layout.pt') class GlobalLayout(object): - page_title = u"Pagode Tinh-Do" + # page_title = u"Pagode Tinh-Do" def __init__(self, context, request): self.context = context diff --git a/mondumas/panels.py b/mondumas/panels.py index dfc90fb..f2236cc 100644 --- a/mondumas/panels.py +++ b/mondumas/panels.py @@ -14,11 +14,20 @@ def dropdown_menu_panel(context, request): member = get_member_by_id(request, logged_in) fullname = member.NOM email = member.email + if member.access == 9: + logged_in_fonction = 'Administrateur' + elif member.access == 8: + logged_in_fonction = 'Comptabilité' + elif member.access == 5: + logged_in_fonction = 'Gestion' + else: + logged_in_fonction = 'Production' return { 'logged_in': logged_in, 'logged_in_name': fullname, 'logged_in_email': email, + 'logged_in_fonction': logged_in_fonction, } diff --git a/mondumas/templates/agenda/agenda.pt b/mondumas/templates/agenda/agenda.pt index 665a6ec..0f2c2bc 100644 --- a/mondumas/templates/agenda/agenda.pt +++ b/mondumas/templates/agenda/agenda.pt @@ -5,17 +5,20 @@
-
+
+
+ +

diff --git a/mondumas/templates/agenda/dossier_view.pt b/mondumas/templates/agenda/dossier_view.pt index ca9a58c..c6eb274 100644 --- a/mondumas/templates/agenda/dossier_view.pt +++ b/mondumas/templates/agenda/dossier_view.pt @@ -96,8 +96,8 @@ ${detail.DATE.strftime('%d/%m/%Y')} - - + + ${detail.rdv_debut.strftime('%d/%m/%Y %H:%M')} diff --git a/mondumas/templates/layouts/global_layout.pt b/mondumas/templates/layouts/global_layout.pt index de7fe35..9130aec 100644 --- a/mondumas/templates/layouts/global_layout.pt +++ b/mondumas/templates/layouts/global_layout.pt @@ -73,7 +73,7 @@

${page_title}

- +
diff --git a/mondumas/templates/panels/dropdown_menu_panel.pt b/mondumas/templates/panels/dropdown_menu_panel.pt index 36723c7..1556813 100644 --- a/mondumas/templates/panels/dropdown_menu_panel.pt +++ b/mondumas/templates/panels/dropdown_menu_panel.pt @@ -4,7 +4,8 @@