diff --git a/RoutesApp/funcs.py b/RoutesApp/funcs.py index ed9b94b..44281b4 100644 --- a/RoutesApp/funcs.py +++ b/RoutesApp/funcs.py @@ -228,7 +228,11 @@ def get_routes_Dict(user=None, data=None): if key == 'to_el': to_el = int(val) - routes = Route.objects.filter(**kwargs).order_by('-departure_DT', '-arrival_DT', '-modifiedDT') + routes = Route.objects.filter( + **kwargs + ).order_by( + '-rising_DT', '-departure_DT', '-arrival_DT', '-modifiedDT' + ) routes_count = routes.count() if from_el and to_el: diff --git a/RoutesApp/js_views.py b/RoutesApp/js_views.py index bc80d27..57f8034 100644 --- a/RoutesApp/js_views.py +++ b/RoutesApp/js_views.py @@ -44,6 +44,11 @@ def highlight_route_ajax(request): route.highlight_color = '#FF0000' route.save(update_fields=['highlight_color']) + from SubscribesApp.funcs import get_cur_user_subscribe + user_subscribe = get_cur_user_subscribe(request.user) + user_subscribe.used_route_highlight_count += 1 + user_subscribe.save(update_fields=['used_route_highlight_count']) + Dict = { 'route': route, } @@ -82,6 +87,11 @@ def raise_route_ajax(request): route.rising_DT = datetime.now() route.save(update_fields=['rising_DT']) + from SubscribesApp.funcs import get_cur_user_subscribe + user_subscribe = get_cur_user_subscribe(request.user) + user_subscribe.used_route_rising_count += 1 + user_subscribe.save(update_fields=['used_route_rising_count']) + return JsonResponse({'status': 'ok'}) diff --git a/templates/widgets/routes/w_my_route.html b/templates/widgets/routes/w_my_route.html index 831c6ef..5e01245 100644 --- a/templates/widgets/routes/w_my_route.html +++ b/templates/widgets/routes/w_my_route.html @@ -2,7 +2,7 @@ {% load i18n %} -
+
{#
#} {#
#}