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

1.6.11 fix next package for my_routes

Browse Source
This commit is contained in:
SDE
2024-08-13 12:58:41 +03:00
parent 40a2412b9b
commit a99ffcc9d2
3 changed files with 34 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
GeneralApp/views.py
View File

@@ -22,8 +22,8 @@ def test_code(request):
res = None res = None
from ReferenceDataApp.funcs import parse_data # from ReferenceDataApp.funcs import parse_data
parse_data() # parse_data()
# from SubscribesApp.reports import send_mail_for_user_subscribes_that_is_going_to_finish # from SubscribesApp.reports import send_mail_for_user_subscribes_that_is_going_to_finish
# send_mail_for_user_subscribes_that_is_going_to_finish() # send_mail_for_user_subscribes_that_is_going_to_finish()

41
RoutesApp/funcs.py
View File

@@ -118,15 +118,25 @@ def get_city_by_type_transport_and_address_point(type_transport, address_point):
from ReferenceDataApp.models import Airport, City from ReferenceDataApp.models import Airport, City
try: try:
if type_transport == 'avia': # if type_transport == 'avia':
return Airport.objects.get(id=address_point).city # return Airport.objects.get(id=address_point).city
else: # else:
return City.objects.get(id=address_point) return City.objects.get(id=address_point)
except Exception as e: except Exception as e:
msg = f'get_city_by_type_transport_and_address_point Error = {str(e)}, type_transport = {type_transport}, address_point = {address_point}' msg = f'get_city_by_type_transport_and_address_point Error = {str(e)}, type_transport = {type_transport}, address_point = {address_point}'
print(msg) print(msg)
return None return None
def get_city_by_address_point(address_point):
from ReferenceDataApp.models import Airport, City
try:
return City.objects.get(id=address_point)
except Exception as e:
msg = f'get_city_by_address_point Error = {str(e)}, address_point = {address_point}'
print(msg)
return None
def get_profile_my_routes_page_content_html(request): def get_profile_my_routes_page_content_html(request):
routes_Dict = get_routes_Dict(request.user) routes_Dict = get_routes_Dict(request.user)
@@ -210,15 +220,18 @@ def get_routes_Dict(user=None, data=None):
kwargs.update({key: val}) kwargs.update({key: val})
if key == 'from_address_point': if key == 'from_address_point':
city = get_city_by_type_transport_and_address_point(type_transport, val) # city = get_city_by_type_transport_and_address_point(type_transport, val)
city = get_city_by_address_point(val)
kwargs.update({f'from_city': city}) kwargs.update({f'from_city': city})
res_Dict.update({ res_Dict.update({
'from_address_point_txt': city.get_country_n_city_str() 'from_address_point_txt': city.get_country_n_city_str()
}) })
if key == 'to_address_point': if key == 'to_address_point':
city = get_city_by_type_transport_and_address_point(type_transport, val) # city = get_city_by_type_transport_and_address_point(type_transport, val)
city = get_city_by_address_point(val)
kwargs.update({f'to_city': city}) kwargs.update({f'to_city': city})
res_Dict.update({ res_Dict.update({
'to_address_point_txt': city.get_country_n_city_str() 'to_address_point_txt': city.get_country_n_city_str()
@@ -236,14 +249,14 @@ def get_routes_Dict(user=None, data=None):
# ).order_by( # ).order_by(
# '-rising_DT', '-departure_DT', '-arrival_DT', '-modifiedDT' # '-rising_DT', '-departure_DT', '-arrival_DT', '-modifiedDT'
# ) # )
routes = Route.objects.exclude( # routes = Route.objects.exclude(
rising_DT=None # rising_DT=None
).filter( # ).filter(
departure_DT__lt=datetime.now() # departure_DT__lt=datetime.now()
) # )
routes.update( # routes.update(
rising_DT=None # rising_DT=None
) # )
routes = Route.objects.filter( routes = Route.objects.filter(
**kwargs **kwargs

6
RoutesApp/js_views.py
View File

@@ -293,8 +293,12 @@ def get_my_routes_ajax(request):
lang = get_and_set_lang(request) lang = get_and_set_lang(request)
data = request.POST.dict()
if not data and request.body:
data = json.loads(request.body)
try: try:
routes_Dict = get_routes_Dict(request.user) routes_Dict = get_routes_Dict(request.user, data)
if 'errors' in routes_Dict: if 'errors' in routes_Dict:
return JsonResponse(routes_Dict, status=400) return JsonResponse(routes_Dict, status=400)