diff --git a/ReferenceDataApp/funcs.py b/ReferenceDataApp/funcs.py index 8543ad9..c138af7 100644 --- a/ReferenceDataApp/funcs.py +++ b/ReferenceDataApp/funcs.py @@ -18,7 +18,7 @@ def search_cities_in_db(search_str): for item in objs_wo_tz: item.get_n_save_timezone() res_data = City.objects.filter(id__in=ids).values( - 'id', 'name', 'country__name', 'timezone' + 'id', 'name', 'country__name', 'timezone', 'country__flag' ) return list(res_data) diff --git a/ReferenceDataApp/js_views.py b/ReferenceDataApp/js_views.py index 3afc0d8..b8e9f50 100644 --- a/ReferenceDataApp/js_views.py +++ b/ReferenceDataApp/js_views.py @@ -29,7 +29,7 @@ def get_address_point_ajax(request): data = json.loads(request.body) - if not 'search_str' in data or not 'type_transport' in data or not 'ctrl_name' in data: + if not 'search_str' in data:# or not 'type_transport' in data or not 'ctrl_name' in data: errors_Dict = { 'errors': { 'all__': f'ошибка в запросе = недостаточно данных' @@ -40,30 +40,33 @@ def get_address_point_ajax(request): if len(data['search_str'].strip()) < 3: res_data = [] else: - if data['type_transport'] == 'avia': - res_data = search_airports_in_db(data['search_str']) - else: - res_data = search_cities_in_db(data['search_str']) + # if data['type_transport'] == 'avia': + # res_data = search_airports_in_db(data['search_str']) + # else: + res_data = search_cities_in_db(data['search_str']) - res_data_str_list = [] - i = 0 - html = '' - for item in res_data: - item['index'] = i - item['ctrl_name'] = data['ctrl_name'] - if 'iata_code' in item: - item['airport_fullname'] = f'{item["iata_code"]} - {item["name"]}' - 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 + widgets_list = [render_to_string('widgets/w_ac_input_address_point.html', item, request) for item in res_data] + html = ''.join(widgets_list) + + # res_data_str_list = [] + # i = 0 + # html = '' + # for item in res_data: + # item['index'] = i + # item['ctrl_name'] = data['ctrl_name'] + # if 'iata_code' in item: + # item['airport_fullname'] = f'{item["iata_code"]} - {item["name"]}' + # 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 res_Dict = { diff --git a/RoutesApp/funcs.py b/RoutesApp/funcs.py index 548c500..13f0bd1 100644 --- a/RoutesApp/funcs.py +++ b/RoutesApp/funcs.py @@ -27,15 +27,15 @@ def get_profile_new_route_page_html(request, data): errors_off = True - if 'from_address_point' in data: - del data['from_address_point'] - if 'from_address_point_txt' in data: - del data['from_address_point_txt'] - - if 'to_address_point' in data: - del data['to_address_point'] - if 'to_address_point_txt' in data: - del data['to_address_point_txt'] + # if 'from_address_point' in data: + # del data['from_address_point'] + # if 'from_address_point_txt' in data: + # del data['from_address_point_txt'] + # + # if 'to_address_point' in data: + # del data['to_address_point'] + # if 'to_address_point_txt' in data: + # del data['to_address_point_txt'] # if data['type_transport'] == 'avia': diff --git a/templates/widgets/w_ac_input_address_point.html b/templates/widgets/w_ac_input_address_point.html index 859cd04..8f491fc 100644 --- a/templates/widgets/w_ac_input_address_point.html +++ b/templates/widgets/w_ac_input_address_point.html @@ -1,4 +1,5 @@ -
- {% if airport_fullname %}
{{ airport_fullname|safe }}
{% endif %} -
{{ city_name }} / {{ country_name }}
+
+{# {% if airport_fullname %}
{{ airport_fullname|safe }}
{% endif %}#} +
{{ name }} / {{ country__name }}
+ {{ country__name }}
\ No newline at end of file