dev #30

Merged
sysadminix merged 14 commits from dev into main 2024-11-18 15:07:51 +03:00
2 changed files with 3 additions and 2 deletions
Showing only changes of commit 384d1e8aec - Show all commits

View File

@@ -73,7 +73,7 @@ def test_code(request):
from RoutesApp.search_matches import search_matches
from RoutesApp.models import Route
search_matches(Route.objects.filter(from_city__id=57062))
search_matches(Route.objects.filter(id=16))
# from RoutesApp.funcs import get_city_by_type_transport_and_address_point
# from RoutesApp.models import Route

View File

@@ -116,10 +116,11 @@ def search_matches(for_routes=None):
kwargs.update({f"{field_name}__date": field_val.date()})
elif field_name == 'weight':
# print(field_name)
params.update({f"{field_name}": field_val})
if route.owner_type == 'mover':
params.update({f"{field_name}__lte": field_val})
kwargs.update({f"{field_name}__lte": field_val})
else:
params.update({f"{field_name}__gte": field_val})
kwargs.update({f"{field_name}__gte": field_val})
elif field_name == 'from_city':
params.update({'from_address_point': field_val.id})