diff --git a/RoutesApp/funcs.py b/RoutesApp/funcs.py index e2e6525..904807b 100644 --- a/RoutesApp/funcs.py +++ b/RoutesApp/funcs.py @@ -236,6 +236,14 @@ def get_routes_Dict(user=None, data=None): # ).order_by( # '-rising_DT', '-departure_DT', '-arrival_DT', '-modifiedDT' # ) + routes = Route.objects.exclude( + rising_DT=None + ).filter( + arrival_DT__lt=datetime.now() + ) + routes.update( + rising_DT=None + ) routes = Route.objects.filter( **kwargs