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

Merge remote-tracking branch 'origin/main'

Browse Source
This commit is contained in:
borissedw
2023-08-08 13:54:19 +03:00
parent b477c6f35d 6d121c8879
commit b3d6c3e2e5
2 changed files with 6 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
AuthApp/admin.py
View File

@@ -125,7 +125,7 @@ class Admin_UserProfile(Admin_BaseIconModel):
('1С', { ('1С', {
'classes': ['wide'], 'classes': ['wide'],
'fields': ( 'fields': (
('id_1s', 'name',), ('name',),
) )
}), }),
) )

7
ReferenceDataApp/funcs.py
View File

@@ -58,7 +58,7 @@ def create_airports_by_airportsList(airportsList, city=None):
kwargs.update({'iata_code': airport_Dict['iata']}) kwargs.update({'iata_code': airport_Dict['iata']})
airport = Airport.objects.get(**kwargs) airport = Airport.objects.get(**kwargs)
except Airport.DoesNotExist: except Airport.DoesNotExist:
print(f'{airport_Dict["int_name"]} не найден в БД > добавляем') print(f' - - {airport_Dict["int_name"]} не найден в БД > добавляем')
except Exception as e: except Exception as e:
print(f'error = {str(e)}') print(f'error = {str(e)}')
@@ -181,10 +181,13 @@ def parse_data():
if 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']})
if country:
kwargs.update({'country': country})
try: try:
city = City.objects.get(**kwargs) city = City.objects.get(**kwargs)
except City.DoesNotExist: except City.DoesNotExist:
print(f'{city_Dict["name:en"]} не найдена в БД > добавляем') print(f' - {city_Dict["name:en"]} не найдена в БД > добавляем')
except Exception as e: except Exception as e:
print(f'error = {str(e)}') print(f'error = {str(e)}')