Merge pull request 'dev' (#7) from dev into main

Reviewed-on: #7

templates/blocks/profile/b_my_routes.html

@@ -1,3 +1,15 @@
-<div>
+{% load static %}
+{% load i18n %}
+
+<div class="page_paging_elements_1">
     {% include 'blocks/routes/b_my_routes_list.html' %}
-</div>
+</div>
+
+{% if last_block == False and next_page_els_count %}
+            <div class="text-align-center">
+                <button class="button-find-more-routes" id="{{ last_el }}" onclick="load_routes(this,null,{{ next_page_els_count }},'{{ owner_type }}')">{% trans "Показать ещё" %}<span class="col_vo_els_f_load"> {{ next_page_els_count }}</span></button>
+                <div class="width-100 text-align-center mb-10">
+                    <img class="loader_f_loading_routes" src="{% static "img/svg/loader.svg" %}">
+                </div>
+            </div>
+{% endif %}

templates/blocks/profile/b_new_route.html

@@ -74,92 +74,9 @@
 
 {% 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.initial.owner_type == 'mover' and form.initial.type_transport == 'road' or form.data.owner_type == 'mover' and form.initial.type_transport == 'road' %}
-                    {% translate "Дата и время выезда" %}
-                {% elif form.initial.owner_type == 'mover' and form.initial.type_transport == 'avia' or form.data.owner_type == 'mover' and form.initial.type_transport == 'avia' %}
-                    {% translate "Дата и время вылета" %}
-                {% elif form.initial.owner_type == 'customer' or form.data.owner_type == 'customer' %}
-                    {% translate "Дата и время отправки" %}
-                {% endif %}
-
-              </label>
-
-
-{#          <input#}
-{#                   type="datetime-local"#}
-{#                   min= {% now "Y-m-d" %}T{% now "H:i" %}#}
-{#                   name="departure_DT"#}
-{#                   onchange="checkDate()"#}
-{#                   {% if form.fields.departure_DT.required %} required{% endif %}#}
-{#                   id="id_departure_DT"#}
-{#                   class="el_form_b_new_route"#}
-{#                    placeholder="Выберите дату и время"#}
-{#                   {% if form.initial.departure_DT %}value="{{ form.initial.departure_DT.date|date:"Y-m-d" }}T{{ form.initial.departure_DT.time|date:"H:i" }}"{% endif %}#}
-{#           />#}
-          {# boris change input #}
-            <input
-                    class="el_form_b_new_route"
-{#                    onchange="checkDate()"#}
-{#                    onclick="setIcon(this)"#}
-                    onmouseup="hideErrors(this)"
-                    type="text"
-                    id="id_departure_DT"
-                    name="departure_DT"
-                    placeholder="{% translate "Выберите дату и время" %}" {% if form.initial.departure_DT %}
-                    value="{{ form.initial.departure_DT|date:"d.m.Y H:m" }}"{% endif %}/>
-            <div id="displayRegervation"></div>
-
-          {% if not errors_off and form.errors and form.errors.departure_DT %}
-              <span id="error_departure_DT">{{ form.errors.departure_DT }}</span>
-          {% endif %}
-
-        </div>
-          <div id="arrival_div">
-          <label for="id_arrival_DT">
-
-              {% if form.initial.owner_type == 'mover' or form.data.owner_type == 'mover'%}
-                    {% translate "Дата и время прибытия" %}
-                {% elif form.initial.owner_type == 'customer' or form.data.owner_type == 'customer' %}
-                    {% translate "Дата и время доставки посылки" %}
-              {% endif %}
-
-          </label>
-{#          <input#}
-{#                  type="datetime-local"#}
-{#                  min= {% now "Y-m-d" %}T{% now "H:i" %}#}
-{#                  name="arrival_DT"#}
-{#                  onchange="checkDate()"#}
-{#                  {% if form.fields.arrival_DT.required %} required{% endif %}#}
-{#                  id="id_arrival_DT"#}
-{#                  class="el_form_b_new_route"#}
-{#                  {% if form.initial.arrival_DT %}value="{{ form.initial.arrival_DT.date|date:"Y-m-d" }}T{{ form.initial.arrival_DT.time|date:"H:i" }}"{% endif %}#}
-{#          />#}
-        {# boris change input #}
-            <input
-                    class="el_form_b_new_route"
-                    onchange="checkDate()"
-                    onmouseup="hideErrors(this)"
-                    type="text"
-                    id="id_arrival_DT"
-                    name="arrival_DT"
-                    placeholder="{% translate "Выберите дату и время" %}" {% if form.initial.arrival_DT %}
-                    value="{{ form.initial.arrival_DT|date:"d.m.Y H:m" }}"{% endif %}/>
-
-            <div id="displayRegervation"></div>
-        {# end #}
-        {% if not errors_off and form.errors and form.errors.arrival_DT %}
-            <span id="error_arrival_DT">{{ form.errors.arrival_DT }}</span>
-        {% endif %}
-        </div>
-    <div class="clear_both"></div>
-    </div>
-<hr>
-  <div class="from_to_country">
+    <div class="from_to_country">
     <div class="from_country_container">
+        <div class="local_city_time" hidden="hidden">{% if route.departure_DT %}{{ route.from_city.get_current_datetime }}{% elif form.initial.departure_DT %}{{ form.initial.departure_DT }}{% endif %}</div>
         <label for="id_from_address_point_txt">
             {% if form.initial.owner_type == 'mover' and form.initial.type_transport == 'avia' or form.data.owner_type == 'mover' and form.initial.type_transport == 'avia'  %}
                     {% translate "Пункт вылета" %}
@@ -247,6 +164,92 @@
     </div>
     <div class="clear_both"></div>
   </div>
+<hr>
+    <div class="departure_arrival">
+          <div class="wrap_left">
+              <label for="id_departure_DT">
+
+                {% if form.initial.owner_type == 'mover' and form.initial.type_transport == 'road' or form.data.owner_type == 'mover' and form.initial.type_transport == 'road' %}
+                    {% translate "Дата и время выезда" %}
+                {% elif form.initial.owner_type == 'mover' and form.initial.type_transport == 'avia' or form.data.owner_type == 'mover' and form.initial.type_transport == 'avia' %}
+                    {% translate "Дата и время вылета" %}
+                {% elif form.initial.owner_type == 'customer' or form.data.owner_type == 'customer' %}
+                    {% translate "Дата и время отправки" %}
+                {% endif %}
+
+              </label>
+
+
+{#          <input#}
+{#                   type="datetime-local"#}
+{#                   min= {% now "Y-m-d" %}T{% now "H:i" %}#}
+{#                   name="departure_DT"#}
+{#                   onchange="checkDate()"#}
+{#                   {% if form.fields.departure_DT.required %} required{% endif %}#}
+{#                   id="id_departure_DT"#}
+{#                   class="el_form_b_new_route"#}
+{#                    placeholder="Выберите дату и время"#}
+{#                   {% if form.initial.departure_DT %}value="{{ form.initial.departure_DT.date|date:"Y-m-d" }}T{{ form.initial.departure_DT.time|date:"H:i" }}"{% endif %}#}
+{#           />#}
+          {# boris change input #}
+            <input
+                    class="el_form_b_new_route"
+{#                    onchange="checkDate()"#}
+{#                    onclick="setIcon(this)"#}
+                    onmouseup="hideErrors(this)"
+                    readonly
+                    type="text"
+                    id="id_departure_DT"
+                    name="departure_DT"
+                    placeholder="{% translate "Выберите дату и время" %}" {% if form.initial.departure_DT %}
+                    value="{{ form.initial.departure_DT|date:"d.m.Y H:i" }}"{% endif %}/>
+            <div id="displayRegervation"></div>
+
+          {% if not errors_off and form.errors and form.errors.departure_DT %}
+              <span id="error_departure_DT">{{ form.errors.departure_DT }}</span>
+          {% endif %}
+
+        </div>
+          <div id="arrival_div">
+          <label for="id_arrival_DT">
+
+              {% if form.initial.owner_type == 'mover' or form.data.owner_type == 'mover'%}
+                    {% translate "Дата и время прибытия" %}
+                {% elif form.initial.owner_type == 'customer' or form.data.owner_type == 'customer' %}
+                    {% translate "Дата и время доставки посылки" %}
+              {% endif %}
+
+          </label>
+{#          <input#}
+{#                  type="datetime-local"#}
+{#                  min= {% now "Y-m-d" %}T{% now "H:i" %}#}
+{#                  name="arrival_DT"#}
+{#                  onchange="checkDate()"#}
+{#                  {% if form.fields.arrival_DT.required %} required{% endif %}#}
+{#                  id="id_arrival_DT"#}
+{#                  class="el_form_b_new_route"#}
+{#                  {% if form.initial.arrival_DT %}value="{{ form.initial.arrival_DT.date|date:"Y-m-d" }}T{{ form.initial.arrival_DT.time|date:"H:i" }}"{% endif %}#}
+{#          />#}
+        {# boris change input #}
+            <input
+                    class="el_form_b_new_route"
+                    onchange="checkDate()"
+                    onmouseup="hideErrors(this)"
+                    type="text"
+                    readonly
+                    id="id_arrival_DT"
+                    name="arrival_DT"
+                    placeholder="{% translate "Выберите дату и время" %}" {% if form.initial.arrival_DT %}
+                    value="{{ form.initial.arrival_DT|date:"d.m.Y H:i" }}"{% endif %}/>
+
+            <div id="displayRegervation"></div>
+        {# end #}
+        {% if not errors_off and form.errors and form.errors.arrival_DT %}
+            <span id="error_arrival_DT">{{ form.errors.arrival_DT }}</span>
+        {% endif %}
+        </div>
+    <div class="clear_both"></div>
+    </div>
 
 {#  <div>#}
 {#    <label for="id_from_city">{{ form.fields.from_city.label }}</label>#}