From b3f4eec2e9d200bb02ffbd386bd24f676d4ac629 Mon Sep 17 00:00:00 2001 From: SBD Date: Fri, 17 Jan 2025 19:43:35 +0300 Subject: [PATCH] 0.0.44 w route card --- static/v2/css/widgets/w_route_card.css | 23 ++++++++++++++++++- static/v2/js/widgets/w_route_card.js | 2 +- .../v2/widgets/w_customer_route_card.html | 10 ++++++-- 3 files changed, 31 insertions(+), 4 deletions(-) diff --git a/static/v2/css/widgets/w_route_card.css b/static/v2/css/widgets/w_route_card.css index e314f60..decb59a 100644 --- a/static/v2/css/widgets/w_route_card.css +++ b/static/v2/css/widgets/w_route_card.css @@ -34,6 +34,9 @@ --route-btn-title-color: #272424; --route-btn-text-data-color: #27242499; + --route-date-data-justify: center; + --route-date-data-margin: 4px 0 0 0; + background: var(--route-card-bg); margin: var(--route-card-margin); box-shadow: var(--route-card-box_shadow); @@ -64,6 +67,7 @@ padding: var(--route-text-container-padding); margin: var(--route-text-container-margin); border-radius: var(--route-text-container-border-radius); + font-size: var(--big-font-size); } .route_card_owner_info{ height: 47px; @@ -134,7 +138,7 @@ gap: 5px; img{ - width: 24px; + width: 16px; height: 12px; display: block; object-fit: contain; @@ -172,6 +176,7 @@ .way_progress_line_container{ position: relative; width: 100%; + height: 15px; .way_progress_round{ height: 20px; width: 20px; @@ -278,5 +283,21 @@ font-size: var(--small-font-size); color: var(--route-btn-text-data-color); } + img{ + min-width: 16px; + display: block; + } + } + .route_date_data{ + display: flex; + align-items: center; + gap: 5px; + justify-content: var(--route-date-data-justify); + margin: var(--route-date-data-margin); + font-size: var(--medium-font-size); + width: 100%; + .date_data_value{ + font-weight: 600; + } } } \ No newline at end of file diff --git a/static/v2/js/widgets/w_route_card.js b/static/v2/js/widgets/w_route_card.js index 97a4f72..43bbd27 100644 --- a/static/v2/js/widgets/w_route_card.js +++ b/static/v2/js/widgets/w_route_card.js @@ -8,7 +8,7 @@ function changeRoute(el) { 'owner_type': $parent.dataset.owner_type, } let request = new api({ - url: '/routes/create_or_change_route/', + url: '/routes/edit_route/', data: data, data_type: 'json', success: (res) => { diff --git a/templates/v2/widgets/w_customer_route_card.html b/templates/v2/widgets/w_customer_route_card.html index c888b53..e93459d 100644 --- a/templates/v2/widgets/w_customer_route_card.html +++ b/templates/v2/widgets/w_customer_route_card.html @@ -4,7 +4,7 @@
- +
{{ route.owner }}
@@ -12,7 +12,7 @@
{% if route.owner_type == 'customer' %}{% trans "Нужен перевозчик" %}{% else %}{% trans "Могу перевезти" %}{% endif %}
{% trans "Тип посылки:" %}
{{ route.get_cargo_type_display }}
-
+
{{ route.phone }}
@@ -56,6 +56,12 @@
+ {% if route.owner_type == 'customer' %} +
+ {% trans "Дата доставки:" %} +
{{ route.arrival_DT|date:'d F Y' }}
+
+ {% endif %}
{% trans "Доставить в:" %}