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

0.0.40

Browse Source 
search by cities
This commit is contained in:
SDE
2023-07-21 18:51:12 +03:00
parent 86bef4df2d
commit 1ff6875e58
4 changed files with 16 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
ReferenceDataApp/admin.py
View File

@@ -9,6 +9,7 @@ class Admin_Country(Admin_Trans_BaseModel):
'short_code', 'code', 'short_code', 'code',
'enable', 'area_id', 'parsing_finished_DT', 'enable', 'area_id', 'parsing_finished_DT',
'order', 'modifiedDT', 'createDT'] 'order', 'modifiedDT', 'createDT']
search_fields = ['id', 'name_en', 'name_ru', 'short_code', 'code']
admin.site.register(Country, Admin_Country) admin.site.register(Country, Admin_Country)
class Admin_City(Admin_Trans_BaseModel): class Admin_City(Admin_Trans_BaseModel):
@@ -17,6 +18,7 @@ class Admin_City(Admin_Trans_BaseModel):
'country', 'country',
'enable', 'area_id', 'parsing_finished_DT', 'enable', 'area_id', 'parsing_finished_DT',
'order', 'modifiedDT', 'createDT'] 'order', 'modifiedDT', 'createDT']
search_fields = ['id', 'name_en', 'name_ru', 'country__name']
admin.site.register(City, Admin_City) admin.site.register(City, Admin_City)
class Admin_Airport(Admin_Trans_BaseModel): class Admin_Airport(Admin_Trans_BaseModel):
@@ -26,4 +28,5 @@ class Admin_Airport(Admin_Trans_BaseModel):
'international_name', 'international_name',
'enable', 'area_id', 'parsing_finished_DT', 'enable', 'area_id', 'parsing_finished_DT',
'order', 'modifiedDT', 'createDT'] 'order', 'modifiedDT', 'createDT']
search_fields = ['id', 'name_en', 'name_ru', 'city', 'iata_code', 'icao_code', 'international_name']
admin.site.register(Airport, Admin_Airport) admin.site.register(Airport, Admin_Airport)

2
ReferenceDataApp/funcs.py
View File

@@ -173,7 +173,7 @@ def parse_data():
kwargs = {} kwargs = {}
if city_Dict['name:en']: if city_Dict['name:en']:
kwargs.update({'name_en': city_Dict['name:en']}) kwargs.update({'name_en': city_Dict['name:en']})
elif city_Dict['name:ru']: if city_Dict['name:ru']:
kwargs.update({'name_ru': city_Dict['name:ru']}) kwargs.update({'name_ru': city_Dict['name:ru']})
try: try:

11
ReferenceDataApp/js_views.py
View File

@@ -46,8 +46,15 @@ def get_address_point_ajax(request):
for item in res_data: for item in res_data:
item['index'] = i item['index'] = i
item['ctrl_name'] = data['ctrl_name'] item['ctrl_name'] = data['ctrl_name']
item['airport_fullname_html'] = f'<b>{item["iata_code"]}</b> - {item["name"]}' if 'iata_code' in item:
item['airport_fullname'] = f'{item["iata_code"]} - {item["name"]}' item['airport_fullname'] = f'<b>{item["iata_code"]}</b> - {item["name"]}'
item['fullname'] = f'{item["iata_code"]} - {item["name"]}'
item['city_name'] = item['city__name']
item['country_name'] = item['city__country__name']
else:
item['city_name'] = item['name']
item['country_name'] = item['country__name']
item['fullname'] = f'{item["country_name"]} / {item["city_name"]}'
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

6
templates/widgets/w_ac_input_address_point.html
View File

@@ -1,4 +1,4 @@
<div onclick='selectItemAddrPoint({{ id }}, "{{ airport_fullname }}", "{{ ctrl_name }}")' class="autocomplete-result" data-index="{{ index }}"> <div onclick='selectItemAddrPoint({{ id }}, "{{ fullname }}", "{{ ctrl_name }}")' class="autocomplete-result" data-index="{{ index }}">
<div>{{ airport_fullname_html|safe }}</div> {% if airport_fullname %}<div>{{ airport_fullname|safe }}</div>{% endif %}
<div class="autocomplete-location">{{ city__name }}, {{ city__country__name }}</div> <div class="autocomplete-location">{{ country_name }} / {{ city_name }}</div>
</div> </div>