sysadminix/account_store
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

1.6.7 get_address_point_ajax add cur time for city

Browse Source
This commit is contained in:
SDE
2024-07-31 12:02:13 +03:00
parent b007c3ad23
commit 72d8ae6616
2 changed files with 7 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
ReferenceDataApp/funcs.py
View File

@@ -9,11 +9,9 @@ tzf = TimezoneFinder()
def search_cities_in_db(search_str): def search_cities_in_db(search_str):
Q_obj = Q(name_en__icontains=search_str) | Q(name_ru__icontains=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) 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) return list(res_data)
def search_airports_in_db(search_str): 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__name_en__icontains=search_str) | Q(city__name_ru__icontains=search_str) | \
Q(city__country__name_en__icontains=search_str) | \ Q(city__country__name_en__icontains=search_str) | \
Q(city__country__name_ru__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) return list(res_data)

2
ReferenceDataApp/js_views.py
View File

@@ -56,10 +56,12 @@ def get_address_point_ajax(request):
item['fullname'] = f'{item["iata_code"]} - {item["name"]}' item['fullname'] = f'{item["iata_code"]} - {item["name"]}'
item['city_name'] = item['city__name'] item['city_name'] = item['city__name']
item['country_name'] = item['city__country__name'] item['country_name'] = item['city__country__name']
item['city_DT'] = datetime.now(tz=pytz.timezone(item['city__timezone']))
else: else:
item['city_name'] = item['name'] item['city_name'] = item['name']
item['country_name'] = item['country__name'] item['country_name'] = item['country__name']
item['fullname'] = f'{item["city_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)}" html = f"{html}{render_to_string('widgets/w_ac_input_address_point.html', item)}"
i += 1 i += 1