diff --git a/mondumas/models/agenda.py b/mondumas/models/agenda.py index 80332f9..d6be209 100644 --- a/mondumas/models/agenda.py +++ b/mondumas/models/agenda.py @@ -20,13 +20,10 @@ def execute_query(request, query, params): mark_changed(request.dbsession) transaction.commit() -def get_users_actifs(request,cd_uti): - if cd_uti =='': - query = "SELECT * FROM p_users WHERE agenda <> 0 ORDER BY NOM" - results = request.dbsession.execute(query).fetchall() - else: - query = "SELECT * FROM p_users WHERE cd_uti = :cd_uti;" - results = request.dbsession.execute(query, {'cd_uti': cd_uti}).first() +def get_agendas(request): + """ lire la liste des personnes ayant un agenda""" + query = "CALL spGET_AGENDAS('T')" + results = request.dbsession.execute(query).fetchall() return results def get_table(code): diff --git a/mondumas/templates/agenda/planning.pt b/mondumas/templates/agenda/planning.pt index 9d74f87..17d72aa 100644 --- a/mondumas/templates/agenda/planning.pt +++ b/mondumas/templates/agenda/planning.pt @@ -12,7 +12,7 @@
diff --git a/mondumas/templates/user_edit.pt b/mondumas/templates/user_edit.pt index a8d1aa8..2bebe89 100644 --- a/mondumas/templates/user_edit.pt +++ b/mondumas/templates/user_edit.pt @@ -56,7 +56,7 @@
@@ -68,7 +68,7 @@
- +

${individu.modif_le.strftime('%d/%m/%Y - %H:%M')}

diff --git a/mondumas/views/agenda.py b/mondumas/views/agenda.py index 97b3849..8695613 100644 --- a/mondumas/views/agenda.py +++ b/mondumas/views/agenda.py @@ -150,16 +150,16 @@ def planning(request): request.session.flash(u"Identifiant %s introuvable" % (logged_in), 'danger') return HTTPFound(location=request.route_url("/home")) - agenda = 'JMD' # determiner le rôle du user access = member.access - agendas = get_users_actifs(request,'') + agendas = get_agendas(request) + agenda = 'JMD' # prendre en compte les paramètres de saisie if 'agenda' in request.params: agenda = request.params["agenda"] - personne = get_users_actifs(request,agenda) + personne = get_member_by_id(request,agenda) rows = get_rendez_vous(request, agenda) # construire la liste des events