diff --git a/smash/web/api_views/appointment.py b/smash/web/api_views/appointment.py index 8fef1935e93586c35c7b24b43541cfe7da27eaeb..28a521b378a99371025414b1cdbdba1f56de573c 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 6d77e0bda86a59eb337733d10ec678eb93e890d2..6e14a48c9ef9ff4c68afcb9ac3275b5f4628e36b 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); },