Refactor leave filtering in get_calendar() function to exclude rejected

Tubo · Feb 23, 2024 · 3ceb302 · 3ceb302
1 parent 5ad3e81
commit 3ceb302
Showing 1 changed file with 5 additions and 2 deletions.
diff --git a/radscheduler/core/views/calendar.py b/radscheduler/core/views/calendar.py
@@ -22,8 +22,11 @@ def get_calendar(request):
             shifts = Shift.objects.filter(date__gte=start, date__lte=end, registrar__isnull=False).select_related(
                 "registrar", "registrar__user"
             )
-            leaves = Leave.objects.filter(date__gte=start, date__lte=end, cancelled=False).select_related(
-                "registrar", "registrar__user"
+            leaves = (
+                Leave.objects.filter(date__gte=start, date__lte=end, cancelled=False)
+                .exclude(reg_approved=False)
+                .exclude(dot_approved=False)
+                .select_related("registrar", "registrar__user")
             )
             events = shifts_to_events(shifts) + leaves_to_events(leaves) + holidays_to_events(start.year)
             return JsonResponse(events, safe=False)