From 61facdb5fb3e1f5ad78dae4e2d4d5c13edb8385d Mon Sep 17 00:00:00 2001
From: ArtemB <mil.basalyga@gmail.com>
Date: Wed, 17 Jul 2024 13:10:15 +0300
Subject: [PATCH] 1.1.35 refactor date comparison logic in Django template

---
 templates/widgets/w_carrier_card.html | 24 +++++++++++++-----------
 1 file changed, 13 insertions(+), 11 deletions(-)

diff --git a/templates/widgets/w_carrier_card.html b/templates/widgets/w_carrier_card.html
index 51d024c..3b38553 100644
--- a/templates/widgets/w_carrier_card.html
+++ b/templates/widgets/w_carrier_card.html
@@ -2,19 +2,21 @@
 {% load i18n %}
 {% load subscribes_tags_extra %}
 
-{{ route.from_city.get_current_datetime }}
-{% if route.departure_DT %}
-{#    {% now 'Y-m-d H:i:s' as current_date %}#}
-    {% now 'Y-m-d H:i:s' as current_date %}
-   {% with departure_date_string=route.departure_DT|date:"Y-m-d H:i:s" %}
-        {% if departure_date_string < current_date %}
-            <div class="carrier-card out_of_date" data-number-of-route="{{ route.id }}">
-        {% else %}
-            <div class="carrier-card {% if route.highlight_color %} highlight-color {% endif %}" data-number-of-route="{{ route.id }}">
-        {% endif %}
-   {% endwith %}
+{#Current Datetime: {{ route.from_city.get_current_datetime }}<br>#}
+{#Departure DT:{{ route.departure_DT }}<br>#}
 
+{% if route.departure_DT %}
+    {% with current_datetime=route.from_city.get_current_datetime %}
+            {% with departure_datetime=route.departure_DT %}
+                {% if current_datetime|date:"Y-m-d H:i:s" > departure_datetime|date:"Y-m-d H:i:s" %}
+                    <div class="carrier-card out_of_date" data-number-of-route="{{ route.id }}">
+                {% else %}
+                    <div class="carrier-card {% if route.highlight_color %} highlight-color {% endif %}" data-number-of-route="{{ route.id }}">
+                {% endif %}
+            {% endwith %}
+    {% endwith %}
 {% endif %}
+
     <div class="left-part-carrier-card">
         {% if route.owner_type == 'mover'  %}
             <div class="first-line-card-carrier">