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

1.6.5 parsing timezones

Browse Source
This commit is contained in:
SDE
2024-07-16 15:34:35 +03:00
parent 6e5e82401b
commit 0b5e37281b
2 changed files with 38 additions and 36 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
ReferenceDataApp/models.py
View File

@@ -62,7 +62,7 @@ class City(BaseModel):
def get_n_save_timezone(self): def get_n_save_timezone(self):
from ReferenceDataApp.funcs import tzf from ReferenceDataApp.funcs import tzf
self.timezone = tzf.timezone_at(lng=self.geo_lon, lat=self.geo_lat) self.timezone = tzf.timezone_at(lng=float(self.geo_lon), lat=float(self.geo_lat))
self.save(update_fields=['timezone']) self.save(update_fields=['timezone'])
return self.timezone return self.timezone

72
RoutesApp/views.py
View File

@@ -21,44 +21,46 @@ def route_search_results_View(request):
Dict = {} Dict = {}
data = {} data = {}
try: # try:
if request.GET: if request.GET:
data = request.GET.dict() data = request.GET.dict()
routes_Dict = get_routes_Dict(data=data) routes_Dict = get_routes_Dict(data=data)
if routes_Dict: if routes_Dict:
Dict = { Dict = {
'routes': routes_Dict['routes'], 'routes': routes_Dict['routes'],
'last_block': routes_Dict['last_block'], 'last_block': routes_Dict['last_block'],
'show_filter_and_results': True, 'show_filter_and_results': True,
'owner_type': data['owner_type'], 'owner_type': data['owner_type'],
'last_el': routes_Dict['last_el'], 'last_el': routes_Dict['last_el'],
'page_type': 'routes', 'page_type': 'routes',
'next_page_els_count': routes_Dict['next_page_els_count'], 'next_page_els_count': routes_Dict['next_page_els_count'],
} }
if 'from_address_point_txt' in routes_Dict: if 'from_address_point_txt' in routes_Dict:
data.update({'from_address_point_txt': routes_Dict['from_address_point_txt']}) data.update({'from_address_point_txt': routes_Dict['from_address_point_txt']})
if 'to_address_point_txt' in routes_Dict: if 'to_address_point_txt' in routes_Dict:
data.update({'to_address_point_txt': routes_Dict['to_address_point_txt']}) data.update({'to_address_point_txt': routes_Dict['to_address_point_txt']})
Dict.update({'route_form': RouteForm(initial=data)}) Dict.update({'route_form': RouteForm(initial=data)})
title = _('Результат поиска маршрутов') title = _('Результат поиска маршрутов')
if 'from_address_point_txt' in data: if 'from_address_point_txt' in data:
title = f'{title} из {data["from_address_point_txt"]}' title = f'{title} из {data["from_address_point_txt"]}'
if 'to_address_point_txt' in data: if 'to_address_point_txt' in data:
title = f'{title} в {data["to_address_point_txt"]}' title = f'{title} в {data["to_address_point_txt"]}'
Dict.update({ Dict.update({
'page': { 'page': {
'title': title, 'title': title,
'description': title, 'description': title,
'keywords': title, 'keywords': title,
} }
}) })
t = loader.get_template('pages/p_results_find_route.html') t = loader.get_template('pages/p_results_find_route.html')
return get_inter_http_response(t, Dict, request) return get_inter_http_response(t, Dict, request)
# return HttpResponse(t.render(Dict, request)) # return HttpResponse(t.render(Dict, request))
except Exception as e: # except Exception as e:
raise Http404 # msg = f'!!! --- route_search_results_View Exception {str(e)}'
# print(msg)
# raise Http404