diff --git a/SubscribesApp/admin.py b/SubscribesApp/admin.py index 00ca283..b47fea9 100644 --- a/SubscribesApp/admin.py +++ b/SubscribesApp/admin.py @@ -77,7 +77,8 @@ class Admin_SubscribeForUser(Admin_Trans_BaseModel): 'last_paid_DT', 'paid_period_from_DT', 'paid_period_to_DT', 'auto_continue', 'receive_finish_subscribe_msg', - 'order' + 'order', + 'used_route_rising_count', 'used_route_highlight_count', ) }), ) diff --git a/static/v2/css/widgets/w_route_card.css b/static/v2/css/widgets/w_route_card.css index 9f69b4b..0fb2b60 100644 --- a/static/v2/css/widgets/w_route_card.css +++ b/static/v2/css/widgets/w_route_card.css @@ -168,6 +168,11 @@ } } .from_to_place_data{ + &:has(.arrival_to){ + .place{justify-content: right} + } &:has(.departure_from){ + .place{justify-content: left} + } .label{ color: #27242499; font-size: var(--big-font-size); diff --git a/static/v2/js/twb.js b/static/v2/js/twb.js new file mode 100644 index 0000000..e69de29 diff --git a/static/v2/js/widgets/w_route_card.js b/static/v2/js/widgets/w_route_card.js index b96dd5f..4b2d421 100644 --- a/static/v2/js/widgets/w_route_card.js +++ b/static/v2/js/widgets/w_route_card.js @@ -60,6 +60,26 @@ function raiseRoute(el) { data_type: 'json', success: (res) => { + window.scrollTo(0, 0); + let $parent_list = $parent.closest('.b_my_routes').children + + $($parent).insertBefore($($parent_list[0])) + + if ($parent.dataset.owner_type === 'mover'){ + $($parent).css('--route-card-box_shadow', '0 -1px 10px rgb(62 205 5 / 36%), -1px 4px 10px rgba(198, 199, 203, 0.2)') + } else { + $($parent).css('--route-card-box_shadow', '0 -1px 10px rgb(5 74 205 / 36%), -1px 4px 10px rgba(198, 199, 203, 0.2)') + } + let timeout = setTimeout(() =>{ + $($parent).css('--route-card-box_shadow', '0 -1px 10px rgba(198, 199, 203, 0.2), -1px 4px 10px rgba(198, 199, 203, 0.2)'); + clearTimeout(timeout); + }, 1000) + + + $('.route_btn[data-action="raise"]').each((i, el) => { + el.dataset.actions_count = res.remains_route_rising_count; + el.querySelector('.route_btn_data').innerHTML = el.querySelector('.route_btn_data').innerHTML.split(':')[0] + `: ${res.remains_route_rising_count}`; + }) }, error: (res) => { } diff --git a/templates/tb_base.html b/templates/tb_base.html index 6ca788f..2aecbe2 100644 --- a/templates/tb_base.html +++ b/templates/tb_base.html @@ -60,6 +60,7 @@ function gtag_report_conversion(url) { + diff --git a/templates/v2/widgets/w_customer_route_card.html b/templates/v2/widgets/w_customer_route_card.html index 508bc18..1b32dfa 100644 --- a/templates/v2/widgets/w_customer_route_card.html +++ b/templates/v2/widgets/w_customer_route_card.html @@ -37,6 +37,12 @@ {{ route.from_city.name }}/{{ route.from_city.country.name }} + {% if route.owner_type == 'mover' %} +
+ {% trans "Отправка:" %} +
{{ route.departure_DT|date:'d F Y' }}
+
+ {% endif %}
@@ -74,6 +80,12 @@ {{ route.to_city.name }}/{{ route.to_city.country.name }}
+ {% if route.owner_type == 'mover' %} +
+ {% trans "Прибытие:" %} +
{{ route.arrival_DT|date:'d F Y' }}
+
+ {% endif %}
@@ -95,6 +107,12 @@ {{ route.from_city.name }}/{{ route.from_city.country.name }}
+ {% if route.owner_type == 'mover' %} +
+ {% trans "Отправка:" %} +
{{ route.departure_DT|date:'d F Y' }}
+
+ {% endif %}
@@ -127,19 +145,25 @@ {{ route.to_city.name }}/{{ route.to_city.country.name }}
+ {% if route.owner_type == 'mover' %} +
+ {% trans "Прибытие:" %} +
{{ route.arrival_DT|date:'d F Y' }}
+
+ {% endif %}
{% trans "Удалить" %}
-
+
{% trans "Поднять" %}
-
Осталось поднятий: 2
+
Осталось поднятий: {{ remains_route_rising_count }}
-
+
{% trans "Выделить цветом" %}
-
Осталось выделений: 0
+
Осталось выделений: {{ remains_route_highlight_count }}
{% trans "Редактировать" %}
@@ -155,13 +179,13 @@
{% trans "Редактировать" %}
-
+
{% trans "Поднять" %}
-
Осталось поднятий: {{ used_route_rising_count }}
+
Осталось поднятий: {{ remains_route_rising_count }}
-
+
{% trans "Выделить цветом" %}
-
Осталось выделений: {{ used_route_highlight_count }}
+
Осталось выделений: {{ remains_route_highlight_count }}
{% trans "Удалить" %}