From 72d8ae6616bcb6a68c5d234559a30f09f195c9d7 Mon Sep 17 00:00:00 2001 From: SDE Date: Wed, 31 Jul 2024 12:02:13 +0300 Subject: [PATCH] 1.6.7 get_address_point_ajax add cur time for city --- ReferenceDataApp/funcs.py | 9 +++++---- ReferenceDataApp/js_views.py | 2 ++ 2 files changed, 7 insertions(+), 4 deletions(-) diff --git a/ReferenceDataApp/funcs.py b/ReferenceDataApp/funcs.py index a565786..9d8c85c 100644 --- a/ReferenceDataApp/funcs.py +++ b/ReferenceDataApp/funcs.py @@ -9,11 +9,9 @@ tzf = TimezoneFinder() def search_cities_in_db(search_str): - - Q_obj = Q(name_en__icontains=search_str) | Q(name_ru__icontains=search_str) | \ Q(country__name_en__icontains=search_str) | Q(country__name_ru__icontains=search_str) - res_data = City.objects.filter(Q_obj).values('id', 'name', 'country__name') + res_data = City.objects.filter(Q_obj).values('id', 'name', 'country__name', 'timezone') return list(res_data) def search_airports_in_db(search_str): @@ -22,7 +20,10 @@ def search_airports_in_db(search_str): Q(city__name_en__icontains=search_str) | Q(city__name_ru__icontains=search_str) | \ Q(city__country__name_en__icontains=search_str) | \ Q(city__country__name_ru__icontains=search_str) - res_data = Airport.objects.filter(Q_obj).values('id', 'name', 'iata_code', 'city__name', 'city__country__name') + res_data = Airport.objects.filter(Q_obj).values( + 'id', 'name', 'iata_code', + 'city__name', 'city__country__name', 'city__timezone' + ) return list(res_data) diff --git a/ReferenceDataApp/js_views.py b/ReferenceDataApp/js_views.py index 21880f4..3afc0d8 100644 --- a/ReferenceDataApp/js_views.py +++ b/ReferenceDataApp/js_views.py @@ -56,10 +56,12 @@ def get_address_point_ajax(request): item['fullname'] = f'{item["iata_code"]} - {item["name"]}' item['city_name'] = item['city__name'] item['country_name'] = item['city__country__name'] + item['city_DT'] = datetime.now(tz=pytz.timezone(item['city__timezone'])) else: item['city_name'] = item['name'] item['country_name'] = item['country__name'] item['fullname'] = f'{item["city_name"]} / {item["country_name"]}' + item['city_DT'] = datetime.now(tz=pytz.timezone(item['timezone'])) html = f"{html}{render_to_string('widgets/w_ac_input_address_point.html', item)}" i += 1