manager: include current exceptions directly in settings page (#21243)

chrono/agendas/models.py

@@ -24,8 +24,8 @@ from django.conf import settings
 from django.contrib.auth.models import Group
 from django.core.exceptions import ValidationError
 from django.core.urlresolvers import reverse
-from django.db import models
-from django.db import transaction
+from django.db import models, transaction
+from django.db.models import Q
 from django.utils.dateformat import DateFormat
 from django.utils.dates import WEEKDAYS
 from django.utils.encoding import force_text
@@ -423,8 +423,8 @@ class Desk(models.Model):
 
     def get_exceptions_within_two_weeks(self):
         in_two_weeks = make_aware(datetime.datetime.today() + datetime.timedelta(days=14))
-        exceptions = self.timeperiodexception_set.filter(
-            end_datetime__gte=now(), end_datetime__lte=in_two_weeks)
+        exceptions = self.timeperiodexception_set.filter(end_datetime__gte=now()).filter(
+                Q(end_datetime__lte=in_two_weeks) | Q(start_datetime__lt=now()))
         if exceptions.exists():
             return exceptions
         # if none found within the 2 coming weeks, return the next one