From fb07005e9a790ae8c4e915780c5a89a888a41179 Mon Sep 17 00:00:00 2001
From: SDE <strigevitch@syncsystems.net>
Date: Mon, 17 Feb 2025 15:51:52 +0300
Subject: [PATCH] 2.1.36 route is_highlighted_now

---
 RoutesApp/funcs.py     | 24 ++++++------------------
 RoutesApp/models.py    |  8 ++++++++
 SubscribesApp/admin.py |  1 +
 3 files changed, 15 insertions(+), 18 deletions(-)

diff --git a/RoutesApp/funcs.py b/RoutesApp/funcs.py
index 69b79e2..38b7190 100644
--- a/RoutesApp/funcs.py
+++ b/RoutesApp/funcs.py
@@ -201,29 +201,17 @@ def get_routes_Dict(user=None, data=None):
                     })
 
                 if key not in (
-                    'from_address_point_txt', 'to_address_point_txt', 'csrfmiddlewaretoken', 'sort', 'weight',
-                    'from_el', 'to_el', 'from_address_point', 'to_address_point', 'type_transport',
+                    'from_city', 'to_city', 'csrfmiddlewaretoken', 'sort', 'weight',
+                    'from_el', 'to_el', 'type_transport',
                     'departure_DT', 'arrival_DT'
                 ):
                     kwargs.update({key: val})
 
-                if key == 'from_address_point': # в from_address_point всегда город
-                    # city = get_city_by_type_transport_and_address_point(type_transport, val)
-                    city = get_city_by_address_point(val)
-                    kwargs.update({f'from_city': city})
+                if key == 'from_city':
+                    kwargs.update({f'from_city_id': val})
 
-
-                    res_Dict.update({
-                        'from_address_point_txt': city.get_country_n_city_str()
-                    })
-
-                if key == 'to_address_point': # в to_address_point всегда город
-                    # city = get_city_by_type_transport_and_address_point(type_transport, val)
-                    city = get_city_by_address_point(val)
-                    kwargs.update({f'to_city': city})
-                    res_Dict.update({
-                        'to_address_point_txt': city.get_country_n_city_str()
-                    })
+                if key == 'to_city':
+                    kwargs.update({f'to_city_id': val})
 
                 if key == 'from_el':
                     from_el = int(val)
diff --git a/RoutesApp/models.py b/RoutesApp/models.py
index 431b2b2..0b3014e 100644
--- a/RoutesApp/models.py
+++ b/RoutesApp/models.py
@@ -2,6 +2,7 @@ from django.db import models
 from django.utils.translation import gettext_lazy as _
 from BaseModels.base_models import BaseModel
 from colorfield.fields import ColorField
+from datetime import datetime
 
 
 type_transport_choices = [
@@ -116,6 +117,13 @@ class Route(BaseModel):
         verbose_name_plural = _(u'Маршруты')
         ordering = ('name',)
 
+
+    def is_highlighted_now(self):
+        if self.highlight_end_DT and datetime.now() < self.highlight_end_DT:
+            return True
+        return False
+
+
     def get_permission_for_raise(self):
         from SubscribesApp.funcs import get_cur_user_subscribe
         user_subscribe = get_cur_user_subscribe(self.owner)
diff --git a/SubscribesApp/admin.py b/SubscribesApp/admin.py
index b47fea9..7d717cd 100644
--- a/SubscribesApp/admin.py
+++ b/SubscribesApp/admin.py
@@ -95,6 +95,7 @@ class Admin_SubscribeForUser(Admin_Trans_BaseModel):
     list_display_links = ['id']
 
     list_filter = [
+        'enable',
         'subscribe', 'last_paid_DT', 'paid_period_from_DT', 'paid_period_to_DT',
         'auto_continue', 'receive_finish_subscribe_msg',
         'modifiedDT', 'createDT'