Merge remote-tracking branch 'origin/dev' into dev

ReferenceDataApp/funcs.py

@@ -9,11 +9,9 @@ tzf = TimezoneFinder()
 
 def search_cities_in_db(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)
-    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)
 
 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__country__name_en__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)
 
 

ReferenceDataApp/js_views.py

@@ -56,10 +56,12 @@ def get_address_point_ajax(request):
                 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