From f90d87a3013383e6b1ac20196f2d76a3b5bc07f5 Mon Sep 17 00:00:00 2001
From: SDE <strigevitch@syncsystems.net>
Date: Tue, 11 Jun 2024 16:48:39 +0300
Subject: [PATCH] 1.2.5 fix get_routes_Dict rising

---
 RoutesApp/funcs.py | 17 ++++++++++++++++-
 1 file changed, 16 insertions(+), 1 deletion(-)

diff --git a/RoutesApp/funcs.py b/RoutesApp/funcs.py
index 44281b4..e2e6525 100644
--- a/RoutesApp/funcs.py
+++ b/RoutesApp/funcs.py
@@ -3,6 +3,7 @@ from .forms import *
 from django.utils.translation import gettext as _
 from django.template.loader import render_to_string
 from datetime import datetime
+from django.db.models import F
 
 elements_on_page = 25
 
@@ -228,13 +229,27 @@ def get_routes_Dict(user=None, data=None):
                 if key == 'to_el':
                     to_el = int(val)
 
+    # rising_routes = Route.objects.filter(
+    #     **kwargs,
+    # ).exclude(
+    #     rising_DT=None
+    # ).order_by(
+    #     '-rising_DT', '-departure_DT', '-arrival_DT', '-modifiedDT'
+    # )
+
     routes = Route.objects.filter(
         **kwargs
     ).order_by(
-        '-rising_DT', '-departure_DT', '-arrival_DT', '-modifiedDT'
+        F('rising_DT').desc(nulls_last=True),
+        # '-rising_DT',
+        '-departure_DT', '-arrival_DT', '-modifiedDT'
     )
+
     routes_count = routes.count()
 
+
+
+
     if from_el and to_el:
         routes = routes[from_el:to_el]
     elif from_el: