Merge branch '141-mouse-over-in-appointment-calendar' into 'master'

info about location available from on hover

Closes #141

See merge request !70

smash/web/api_views/appointment.py

@@ -105,6 +105,11 @@ def serialize_appointment(appointment):
     if appointment.datetime_when is not None:
         until = appointment.datetime_until().strftime('%Y-%m-%d %H:%M')
 
+    if appointment.flying_team is None:
+        location = unicode(appointment.location)
+    else:
+        location = unicode(appointment.location) + " (" + unicode(appointment.flying_team) + ")"
+
     result = {
         "subject": subject_string,
         "title": title,
@@ -118,6 +123,7 @@ def serialize_appointment(appointment):
         "comment": appointment.comment,
         "color": appointment.color(),
         "id": appointment.id,
+        "location": location,
         "url": reverse('web.views.appointment_edit', kwargs={'id': str(appointment.id)})
     }
     return result

smash/web/static/js/appointment.js

@@ -232,6 +232,7 @@ function get_calendar_events_function(source, allow_url_redirection) {
                         id: entry.id,
                         color: entry.color,
                         nd_number: entry.nd_number,
+                        location: entry.location,
                         screening_number: entry.screening_number,
                         phone_number: entry.phone_number,
                         appointment_types: entry.appointment_types

smash/web/templates/appointments/index.html

@@ -129,6 +129,9 @@
                     if (event.appointment_types) {
                         content += '<li>Appointment types: ' + event.appointment_types + '</li>'
                     }
+                    if (event.location) {
+                        content += '<li>Location: ' + event.location + '</li>'
+                    }
                     content += "</ul>";
                     $(element).popover({
                         title: event.title,