Merge branch 'bug/249_duplicated_exceeded_visists' into 'master'

Bug/249 duplicated exceeded visists

See merge request NCER-PD/scheduling-system!170

smash/web/models/study_visit_list.py

@@ -13,11 +13,11 @@ VISIT_LIST_APPROACHING_FOR_MAIL_CONTACT = "APPROACHING_FOR_MAIL_CONTACT"
 
 VISIT_LIST_CHOICES = {
     VISIT_LIST_GENERIC: 'Generic visit list',
-    VISIT_LIST_EXCEEDED_TIME: 'exceeded visit time',
-    VISIT_LIST_UNFINISHED: 'unfinished visits',
-    VISIT_LIST_MISSING_APPOINTMENTS: 'visits with missing appointments',
-    VISIT_LIST_APPROACHING_WITHOUT_APPOINTMENTS: 'approaching visits',
-    VISIT_LIST_APPROACHING_FOR_MAIL_CONTACT: 'post mail for approaching visits',
+    VISIT_LIST_EXCEEDED_TIME: 'Exceeded visit time',
+    VISIT_LIST_UNFINISHED: 'Unfinished visits',
+    VISIT_LIST_MISSING_APPOINTMENTS: 'Visits with missing appointments',
+    VISIT_LIST_APPROACHING_WITHOUT_APPOINTMENTS: 'Approaching visits',
+    VISIT_LIST_APPROACHING_FOR_MAIL_CONTACT: 'Post mail for approaching visits',
 }
 
 

smash/web/views/notifications.py

@@ -247,7 +247,7 @@ def get_exceeded_visits(user):
         Q(visit_number__gt=1) | Q(appointment__status=Appointment.APPOINTMENT_STATUS_FINISHED)).filter(
         # visits that have scheduled appointments should be excluded
         ~Q(appointment__status=Appointment.APPOINTMENT_STATUS_SCHEDULED)).order_by(
-        'datetime_begin')
+        'datetime_begin').distinct()
 
 
 def get_missing_redcap_subjects(user, include_ignored=True):