0.0.49 w route card

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',
                        )
         }),
     )

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);

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) => {
 
         }

templates/tb_base.html

@@ -60,6 +60,7 @@ function gtag_report_conversion(url) {
     <script type="text/javascript" src="{% static "js/datarangepicker.js" %}"></script>
     <script type="text/javascript" src="{% static "js/push/registerSw.js" %}"></script>
     <script src="{% static "js/rangecalendartech.js" %}"></script>
+    <script src="{% static "v2/js/twb.js" %}"></script>
 
     <link rel="stylesheet" href="{% static 'css/datarangepicker.css' %}" />
     <script src="{% static "js/global_js.js" %}"></script>

templates/v2/widgets/w_customer_route_card.html

@@ -37,6 +37,12 @@
                     {{ route.from_city.name }}/{{ route.from_city.country.name }}
                 </div>
             </div>
+            {% if route.owner_type == 'mover' %}
+                <div class="route_date_data" style="--route-date-data-justify: left;--route-date-data-margin: 10px 0 0 0;">
+                    {% trans "Отправка:" %}
+                    <div class="date_data_value">{{ route.departure_DT|date:'d F Y' }}</div>
+                </div>
+            {% endif %}
         </div>
         <div class="route_way_data">
             <div class="route_transport">
@@ -74,6 +80,12 @@
                     {{ route.to_city.name }}/{{ route.to_city.country.name }}
                 </div>
             </div>
+            {% if route.owner_type == 'mover' %}
+                <div class="route_date_data" style="--route-date-data-justify: right;--route-date-data-margin: 10px 0 0 0;">
+                    {% trans "Прибытие:" %}
+                    <div class="date_data_value">{{ route.arrival_DT|date:'d F Y' }}</div>
+                </div>
+            {% endif %}
         </div>
     </div>
     <div class="route_card_route_data mobile">
@@ -95,6 +107,12 @@
                         {{ route.from_city.name }}/{{ route.from_city.country.name }}
                     </div>
                 </div>
+                {% if route.owner_type == 'mover' %}
+                    <div class="route_date_data">
+                        {% trans "Отправка:" %}
+                        <div class="date_data_value">{{ route.departure_DT|date:'d F Y' }}</div>
+                    </div>
+                {% endif %}
             </div>
             <div class="route_way_data">
                 <div class="route_transport">
@@ -127,19 +145,25 @@
                         {{ route.to_city.name }}/{{ route.to_city.country.name }}
                     </div>
                 </div>
+                {% if route.owner_type == 'mover' %}
+                    <div class="route_date_data">
+                        {% trans "Прибытие:" %}
+                        <div class="date_data_value">{{ route.arrival_DT|date:'d F Y' }}</div>
+                    </div>
+                {% endif %}
             </div>
         </div>
     </div>
     <div class="route_card_actions_container">
         <div class="delete_route" onclick="deleteRoute(this)">{% trans "Удалить" %}</div>
         <div class="right_part_action_btns">
-            <div class="route_btn" data-action="raise" onclick="raiseRoute(this)">
+            <div class="route_btn" data-actions_count="{{ remains_route_rising_count }}" data-action="raise" onclick="raiseRoute(this)">
                 <div class="route_btn_title">{% trans "Поднять" %}</div>
-                <div class="route_btn_data">Осталось поднятий: 2</div>
+                <div class="route_btn_data">Осталось поднятий: {{ remains_route_rising_count }}</div>
             </div>
-            <div class="route_btn" data-action="highlight" onclick="highlightRoute(this)">
+            <div class="route_btn" data-actions_count="{{ remains_route_highlight_count }}" data-action="highlight" onclick="highlightRoute(this)">
                 <div class="route_btn_title">{% trans "Выделить цветом" %}</div>
-                <div class="route_btn_data">Осталось выделений: 0</div>
+                <div class="route_btn_data">Осталось выделений: {{ remains_route_highlight_count }}</div>
             </div>
             <div class="route_btn solid" data-action="change" onclick="changeRoute(this)">
                 <div class="route_btn_title">{% trans "Редактировать" %}</div>
@@ -155,13 +179,13 @@
             <div class="route_btn_title">{% trans "Редактировать" %}</div>
         </div>
         <div class="container_actions_mobile">
-            <div class="route_btn" data-actions_count="{{ used_route_rising_count }}" style="--route-btn-height: fit-content;--route-btn-width: auto;" data-action="raise" onclick="raiseRoute(this)">
+            <div class="route_btn" data-actions_count="{{ remains_route_rising_count }}" style="--route-btn-height: fit-content;--route-btn-width: auto;" data-action="raise" onclick="raiseRoute(this)">
                 <div class="route_btn_title">{% trans "Поднять" %}</div>
-                <div class="route_btn_data">Осталось поднятий: {{ used_route_rising_count }}</div>
+                <div class="route_btn_data">Осталось поднятий: {{ remains_route_rising_count }}</div>
             </div>
-            <div class="route_btn" data-actions_count="{{ used_route_highlight_count }}" style="--route-btn-height: fit-content;--route-btn-width: auto;" data-action="highlight" onclick="highlightRoute(this)">
+            <div class="route_btn" data-actions_count="{{ remains_route_highlight_count }}" style="--route-btn-height: fit-content;--route-btn-width: auto;" data-action="highlight" onclick="highlightRoute(this)">
                 <div class="route_btn_title">{% trans "Выделить цветом" %}</div>
-                <div class="route_btn_data">Осталось выделений: {{ used_route_highlight_count }}</div>
+                <div class="route_btn_data">Осталось выделений: {{ remains_route_highlight_count }}</div>
             </div>
         </div>
         <div class="delete_route" onclick="deleteRoute(this)">{% trans "Удалить" %}</div>