From de0446c7996463bcc7a27c3a2f2ee233309a1d23 Mon Sep 17 00:00:00 2001
From: borissedw <strigevitch.boris@gmail.com>
Date: Tue, 29 Aug 2023 12:47:38 +0300
Subject: [PATCH 1/3] 0.0.188

---
 templates/blocks/profile/b_new_route.html | 2 +-
 templates/widgets/w_carrier_card.html     | 1 +
 2 files changed, 2 insertions(+), 1 deletion(-)

diff --git a/templates/blocks/profile/b_new_route.html b/templates/blocks/profile/b_new_route.html
index b244e21..f9dd8a8 100644
--- a/templates/blocks/profile/b_new_route.html
+++ b/templates/blocks/profile/b_new_route.html
@@ -61,7 +61,7 @@
 
           <input
                    type="datetime-local"
-                   min= {{ now|date:"Y-m-d" }}T{{ now|date:"H:i" }}
+                   min="{{ now|date:"Y-m-d" }}T{{ now|date:"H:i" }}"
                    name="departure_DT"
                    {% if form.fields.departure_DT.required %} required{% endif %}
                    id="id_departure_DT"
diff --git a/templates/widgets/w_carrier_card.html b/templates/widgets/w_carrier_card.html
index d722c1e..117385e 100644
--- a/templates/widgets/w_carrier_card.html
+++ b/templates/widgets/w_carrier_card.html
@@ -45,6 +45,7 @@
                     <div>{{ route.get_cargo_type_display }}</div>
                     <div>{{ route.weight }}</div>
                     <div>{{ route.get_owner_type_display }}</div>
+                    <div>{{ forloop.counter }}</div>
                 </a>
             </div>
             {% if route.owner != user %}

From c8c0f43d4ded812c4617ef576779dd866eceeca9 Mon Sep 17 00:00:00 2001
From: SDE <strigevitch@syncsystems.net>
Date: Tue, 29 Aug 2023 13:31:00 +0300
Subject: [PATCH 2/3] 0.5.3 find route limit slice

---
 RoutesApp/admin.py |  5 ++++-
 RoutesApp/funcs.py | 17 ++++++++++++++++-
 2 files changed, 20 insertions(+), 2 deletions(-)

diff --git a/RoutesApp/admin.py b/RoutesApp/admin.py
index 715b9c6..6a8e7c6 100644
--- a/RoutesApp/admin.py
+++ b/RoutesApp/admin.py
@@ -4,7 +4,7 @@ from django.contrib import admin
 
 class Admin_Route(Admin_Trans_BaseModel):
     list_display = [
-        'id', 'type_transport', 'cargo_type',
+        'id', 'owner_type', 'type_transport', 'cargo_type',
         'departure_DT', 'from_address_point', 'from_place',
         'arrival_DT', 'to_place', 'owner',
         'order', 'modifiedDT', 'createDT'
@@ -12,4 +12,7 @@ class Admin_Route(Admin_Trans_BaseModel):
 
     list_display_links = ['id']
 
+    list_filter = ['owner_type', 'type_transport', 'cargo_type', 'from_place', 'arrival_DT', 'modifiedDT', 'createDT']
+    search_fields = ['owner__first_name', 'owner__last_name']
+
 admin.site.register(Route,Admin_Route)
diff --git a/RoutesApp/funcs.py b/RoutesApp/funcs.py
index d84bed2..17fce42 100644
--- a/RoutesApp/funcs.py
+++ b/RoutesApp/funcs.py
@@ -15,6 +15,9 @@ def get_routes_Dict(user=None, data=None):
             'owner': user
         })
 
+    from_el = None
+    to_el = None
+
     if data:
         for key, val in data.items():
             if val:
@@ -25,11 +28,23 @@ def get_routes_Dict(user=None, data=None):
                     if weight_list[1]:
                         kwargs.update({f'{key}__lte': int(weight_list[1])})
                 if key not in (
-                        'from_address_point_txt', 'to_address_point_txt', 'csrfmiddlewaretoken', 'sort', 'weight',
+                    'from_address_point_txt', 'to_address_point_txt', 'csrfmiddlewaretoken', 'sort', 'weight',
+                    'from_el', 'to_el'
                 ):
                     kwargs.update({key: val})
 
+                if key == 'from_el':
+                    from_el = int(val)
+                if key == 'to_el':
+                    to_el = int(val)
+
     routes = Route.objects.filter(**kwargs).order_by('-modifiedDT')
+    if from_el and to_el:
+        routes = routes[from_el:to_el]
+    elif from_el:
+        routes = routes[from_el:]
+    elif to_el:
+        routes = routes[:to_el]
 
     res_Dict = {}
 

From 90f880ee70832018e9228057f48809bcaa884c4e Mon Sep 17 00:00:00 2001
From: SDE <strigevitch@syncsystems.net>
Date: Tue, 29 Aug 2023 13:33:53 +0300
Subject: [PATCH 3/3] 0.5.4 find route limit slice

---
 RoutesApp/funcs.py | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/RoutesApp/funcs.py b/RoutesApp/funcs.py
index 17fce42..346847a 100644
--- a/RoutesApp/funcs.py
+++ b/RoutesApp/funcs.py
@@ -45,6 +45,8 @@ def get_routes_Dict(user=None, data=None):
         routes = routes[from_el:]
     elif to_el:
         routes = routes[:to_el]
+    else:
+        routes = routes[:25]
 
     res_Dict = {}