From dd778e3e67946155d89b9ce71d38efdf1c581a82 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Valentin=20Grou=C3=A8s?= <valentin.groues@uni.lu>
Date: Fri, 19 May 2017 11:54:51 +0200
Subject: [PATCH] improvements to calendar's popover
---
smash/web/api_views/appointment.py | 6 +++---
smash/web/templates/appointments/index.html | 3 ++-
2 files changed, 5 insertions(+), 4 deletions(-)
diff --git a/smash/web/api_views/appointment.py b/smash/web/api_views/appointment.py
index 8fef1935..28a521b3 100644
--- a/smash/web/api_views/appointment.py
+++ b/smash/web/api_views/appointment.py
@@ -78,14 +78,14 @@ def appointments(request, type):
def serialize_appointment(appointment):
subject_string = ""
- nd_number = screening_number = phone_number = appointment_types = None
+ nd_number = screening_number = phone_numbers = appointment_types = None
if appointment.visit is not None:
title = appointment.visit.follow_up_title()
subject = appointment.visit.subject
subject_string = subject.last_name + " " + subject.first_name
nd_number = subject.nd_number
screening_number = subject.screening_number
- phone_number = subject.phone_number
+ phone_numbers = ", ".join(filter(None, [subject.phone_number, subject.phone_number_2, subject.phone_number_3]))
appointment_types = ", ".join([unicode(type) for type in appointment.appointment_types.all()])
else:
title = appointment.comment
@@ -104,7 +104,7 @@ def serialize_appointment(appointment):
"title": title,
"nd_number": nd_number,
"screening_number": screening_number,
- "phone_number": phone_number,
+ "phone_number": phone_numbers,
"appointment_types": appointment_types,
"type": type,
"datetime_when": time,
diff --git a/smash/web/templates/appointments/index.html b/smash/web/templates/appointments/index.html
index 6d77e0bd..6e14a48c 100644
--- a/smash/web/templates/appointments/index.html
+++ b/smash/web/templates/appointments/index.html
@@ -135,7 +135,8 @@
content: content,
html: true,
container: 'body',
- trigger: 'hover'
+ trigger: 'hover',
+ placement: 'bottom'
});
console.log(event);
},
--
GitLab