0.0.322 upd lable for b_new_route.html

static/css/styles.css

@@ -1619,6 +1619,10 @@ div.departure_arrival>div>input{
 
 }
 
+#hide_owner_type{
+    display: none;
+}
+
 
 
 /*end create new route*/

static/js/user_profile.js

@@ -620,9 +620,22 @@ function setIcon(el) {
 //cleaning route inputs after selection changes
 function OnSelectionChange(el) {
     event.preventDefault()
-
     let form = el.form;
+
+    // if (customer.classList.contains('selected')) {
+    //      owner_type = form.dataset['customer']
+    // } else if (mover.classList.contains('selected')) {
+    //      owner_type = form.dataset['customer']
+    // }
+    let owner_type_value = document.getElementById('hide_owner_type').value
+
+
+
     let formData = new FormData(form);
+    let owner_type = owner_type_value
+    formData.set('owner_type', owner_type)
+
+    // formData.set('owner_type', owner_type)
 
     // let data = {};
     // data['csrfmiddlewaretoken'] = $('input[name="csrfmiddlewaretoken"]')[0].value;

templates/blocks/profile/b_new_route.html

@@ -32,7 +32,7 @@
 {#    </div>#}
 
 
-
+{#    <label for="id_type_transport">{% translate "Выберите способ перевозки" %}</label>#}
     <select
             onchange="OnSelectionChange(this)"
             name="type_transport"
@@ -56,21 +56,21 @@
     {% endif %}
   </div>
 
-
+    <input id="hide_owner_type" type="text" value="{{ form.initial.owner_type }}">
 
 {% if form.initial and form.initial.type_transport and form.initial.type_transport != '' %}
     <hr>
     <div class="departure_arrival">
           <div class="wrap_left">
               <label for="id_departure_DT">
-{#                  {% if form.instance.owner_type == 'mover' %}#}
-{#                        {% if form.initial.type_transport == 'road' %}{% translate "Дата и время выезда" %}{% elif form.initial.type_transport == 'avia' %}{% translate "Дата и время вылета" %}{% endif %}#}
-{#                  {% endif %}#}
-{#                  {% if form.owner_type == 'customer'  %}#}
-{#                        {% if form.instance.type_transport == 'road' %}{% translate "Дата и время отправки" %}{% elif form.initial.type_transport == 'avia' %}{% translate "Дата и время доставки посылки" %}{% endif %}#}
-{#                  {% endif %}#}
 
-                {% if form.instance.owner_type == 'mover' and form.initial.type_transport == 'road' %}{% translate "Дата и время выезда" %}{% elif form.instance.owner_type == 'mover' and form.initial.type_transport == 'avia' %}{% translate "Дата и время вылета" %}{% endif %}
+                {% if form.initial.owner_type == 'mover' and form.initial.type_transport == 'road' %}
+                    {% translate "Дата и время выезда" %}
+                {% elif form.initial.owner_type == 'mover' and form.initial.type_transport == 'avia' %}
+                    {% translate "Дата и время вылета" %}
+                {% elif form.initial.owner_type == 'customer' and form.initial.type_transport == 'road' or form.initial.type_transport == 'avia' %}
+                    {% translate "Дата и время отправки" %}
+                {% endif %}
 
               </label>
 
@@ -105,7 +105,19 @@
 
         </div>
           <div id="arrival_div">
-          <label for="id_arrival_DT">Дата и время прибытия</label>
+          <label for="id_arrival_DT">
+
+              {% if form.initial.owner_type == 'mover' and form.initial.type_transport == 'road' %}
+                    {% translate "Дата и время прибытия" %}
+                {% elif form.initial.owner_type == 'mover' and  form.initial.type_transport == 'avia' %}
+                    {% translate "Дата и время прибытия" %}
+                {% elif form.initial.owner_type == 'customer' and form.initial.type_transport == 'avia'  %}
+                    {% translate "Дата и время доставки посылки" %}
+                {% elif form.initial.owner_type == 'customer' and form.initial.type_transport == 'road'  %}
+                    {% translate "Дата и время доставки посылки" %}
+              {% endif %}
+
+          </label>
 {#          <input#}
 {#                  type="datetime-local"#}
 {#                  min= {% now "Y-m-d" %}T{% now "H:i" %}#}
@@ -138,7 +150,15 @@
 <hr>
   <div class="from_to_country">
     <div class="from_country_container">
-        <label for="id_from_address_point_txt">{% if form.initial.type_transport == 'avia' %}Пункт вылета{% elif form.initial.type_transport == 'road' %}Пункт выезда{% endif %}</label>
+        <label for="id_from_address_point_txt">
+            {% if form.initial.owner_type == 'mover' and form.initial.type_transport == 'avia' %}
+                    {% translate "Пункт вылета" %}
+                {% elif form.initial.owner_type == 'mover' and form.initial.type_transport == 'road' %}
+                    {% translate "Пункт выезда" %}
+                {% elif form.initial.owner_type == 'customer' %}
+                    {% translate "Пункт отправки" %}
+            {% endif %}
+        </label>
         <input
                 type="number"
                 name="from_address_point"
@@ -175,7 +195,15 @@
         {% endif %}
     </div>
     <div class="wrap_right">
-    <label for="id_to_address_point_txt">{% if form.initial.type_transport == 'avia' %}Пункт прилета{% elif form.initial.type_transport == 'road' %}Пункт приезда{% endif %}</label>
+    <label for="id_to_address_point_txt">
+        {% if form.initial.owner_type == 'mover' and form.initial.type_transport == 'avia' %}
+                {% translate "Пункт прилета" %}
+            {% elif form.initial.owner_type == 'mover' and form.initial.type_transport == 'road' %}
+                {% translate "Пункт приезда" %}
+            {% elif form.initial.owner_type == 'customer'%}
+                {% translate "Пункт прибытия" %}
+        {% endif %}
+    </label>
     <input
             type="number"
             name="to_address_point"
@@ -220,7 +248,13 @@
 {#  </div>#}
   <div class="from_to_place">
     <div class="wrap_left">
-        <label for="id_from_place">{{ form.fields.from_place.label }}</label>
+        <label for="id_from_place">
+             {% if form.initial.owner_type == 'mover' %}
+                    {% translate "Откуда можете забрать?" %}
+             {% elif form.initial.owner_type == 'customer' %}
+                    {% translate "Откуда нужно забрать посылку?" %}
+             {% endif %}
+        </label>
         <select
                 class="custom_select el_form_b_new_route"
                 name="from_place"
@@ -239,7 +273,13 @@
                  {% endif %}
     </div>
     <div class="wrap_right">
-    <label for="id_to_place">{{ form.fields.to_place.label }}</label>
+    <label for="id_to_place">
+        {% if form.initial.owner_type == 'mover' %}
+                    {% translate "Куда можете доставить?" %}
+        {% elif form.initial.owner_type == 'customer' %}
+                    {% translate "Куда нужно доставить посылку?" %}
+        {% endif %}
+    </label>
     <select
             name="to_place"
             id="id_to_place"
@@ -262,7 +302,12 @@
 <hr>
 
   <div>
-    <label>{{ form.fields.cargo_type.label }}</label>
+    <label>{% if form.initial.owner_type == 'mover' %}
+                    {% translate "Могу перевезти:" %}
+        {% elif form.initial.owner_type == 'customer' %}
+                    {% translate "Что нужно перевезти?" %}
+        {% endif %}
+    </label>
 
 
   </div>