diff --git a/mondumas/models/agenda.py b/mondumas/models/agenda.py index 897bf74..4341cf4 100644 --- a/mondumas/models/agenda.py +++ b/mondumas/models/agenda.py @@ -22,7 +22,7 @@ def execute_query(request, query, params): def get_users_agenda(request): """ lire la liste des users ayant un agenda""" - query = "SELECT * FROM p_users WHERE cd_uti <> 'N' and agenda <> 0 AND actif <> 0 ORDER BY nom;" + query = "SELECT * FROM p_users WHERE cd_uti != 'N' and agenda != 0 AND actif != 0 ORDER BY nom;" results = request.dbsession.execute(query).fetchall() return results @@ -66,7 +66,7 @@ def get_rendez_vous(request, itc): datedeb = d.strftime('%Y-%m-01') # lire les rdv de l'ITC - query = """SELECT CONCAT(l.societe,"-",l.no_id) as nodossier, l.rdv_debut, l.rdv_fin, e.c_nom FROM dem_lig l + query = """SELECT CONCAT(l.societe,"-",l.no_id) as nodossier, l.rdv_debut, l.rdv_fin, e.c_nom, e.c_ville FROM dem_lig l INNER JOIN dem_devis e ON l.societe=e.societe AND l.no_id=e.no_id WHERE l.datevi >= :datedeb AND l.liste=:itc ORDER BY l.datevi, l.heurevi """ diff --git a/mondumas/templates/agenda/planning.pt b/mondumas/templates/agenda/planning.pt index c7a3d9a..d86b583 100644 --- a/mondumas/templates/agenda/planning.pt +++ b/mondumas/templates/agenda/planning.pt @@ -44,6 +44,9 @@ $(document).ready(function() { resourceLabelText: 'Intervenants', resources: ${fullcalendar_ressources}, events:${fullcalendar_events}, + eventRender: function(event, element){ + element.find('.fc-title').append("
" + event.description); + } }); }); diff --git a/mondumas/views/agenda.py b/mondumas/views/agenda.py index b440776..6f58777 100644 --- a/mondumas/views/agenda.py +++ b/mondumas/views/agenda.py @@ -187,6 +187,7 @@ def planning(request): json_event = { 'resourceId': user.CD_UTI, 'title': event_title, + 'description': row.c_ville.capitalize(), 'start': row.rdv_debut.strftime('%Y-%m-%d %H:%M:%S'), 'end': row.rdv_fin.strftime('%Y-%m-%d %H:%M:%S'), 'allDay': False, diff --git a/setup.py b/setup.py index efbab64..3226b1f 100644 --- a/setup.py +++ b/setup.py @@ -21,6 +21,8 @@ requires = [ 'zope.sqlalchemy', 'waitress', 'MySQL-python', + 'python-dateutil', + 'docutils', ] tests_require = [