1.1.50 add pagination for b_my_routes.html && upd conditional rendering for carrier card based on departure date

static/js/range_calendar.js

@@ -143,108 +143,69 @@ function init_arrival_DT (date=null,single=true,hour=true){
 
 }
 
+function init_departure_DT() {
+    let place_1 = document.querySelector("#id_departure_DT");
+    if (!place_1) return;
 
-function init_departure_DT (){
+    let hiddenTime = document.querySelector('.local_city_time').innerText;
+    let startDate;
 
-    let place_1 = document.querySelector("#id_departure_DT")
-    let onl_param = ""
-    if (window.location.href === "http://localhost:8016/ru/profile/page/create_route_for_mover/" || window.location.href === "http://localhost:8016/ru/profile/page/create_route_for_customer/"){
-        onl_param = "singleDatePicker"
-    }
-    if (place_1) {
 
-        $(place_1).daterangepicker({
+    if (window.location.href.includes("/ru/")) {
-            "autoapply": true,
-            "linkedCalendars": false,
-            "singleDatePicker":true,
-            "timePicker":true,
-            "timePicker24Hour":true,
-            "locale": changeLangForDateTimePicker(),
-        },
-        function(start, end, label) {
-            // $('#displayRegervation').text('Registration date is: ' + start.format('YYYY-MM-DD') + ' to ' + end.format('YYYY-MM-DD'));
-            // $('#regervation')[0].dataset['departure_DT'] = start.format('YYYY-MM-DD');
-            // $('#regervation')[0].dataset['arrival_DT'] = end.format('YYYY-MM-DD');
-            $('#id_departure_DT').val(start.format('DD.MM.YYYY HH:mm'))
 
-        });
+        startDate = moment(hiddenTime, "D MMMM YYYY г. HH:mm", 'ru');
+    } else {
 
-        $(`${place_1.id} .drp-calendar.right`).hide();
+        startDate = moment(hiddenTime, "MMMM D, YYYY, h:mm a", 'en');
-        $(`${place_1.id} .drp-calendar.left`).addClass('single');
-
-        $(`${place_1.id} .calendar-table`).on('DOMSubtreeModified', function() {
-            var el = $(`${place_1.id} .prev.available`).parent().children().last();
-            if (el.hasClass('next available')) {
-                return;
-            }
-            el.addClass('next available');
-            el.append('<span></span>');
-        });
     }
 
+
+    $(place_1).daterangepicker({
+        "autoapply": true,
+        "linkedCalendars": false,
+        "singleDatePicker": true,
+        "timePicker": true,
+        "timePicker24Hour": true,
+        "minDate": startDate,
+        "locale": changeLangForDateTimePicker(),
+    }, function (start, end, label) {
+        $('#id_departure_DT').val(start.format('DD.MM.YYYY HH:mm'));
+    });
+
+    $(`${place_1.id} .drp-calendar.right`).hide();
+    $(`${place_1.id} .drp-calendar.left`).addClass('single');
+
+    $(`${place_1.id} .calendar-table`).on('DOMSubtreeModified', function () {
+        var el = $(`${place_1.id} .prev.available`).parent().children().last();
+        if (el.hasClass('next available')) {
+            return;
+        }
+        el.addClass('next available');
+        el.append('<span></span>');
+    });
 }
 
 $(function () {
-        let onl_param = ""
+    let onl_param = {};
-        if (window.location.href === "http://localhost:8016/ru/profile/page/create_route_for_mover/" || window.location.href === "http://localhost:8016/ru/profile/page/create_route_for_customer/"){
+    if (window.location.href.includes("/ru/profile/page/create_route_for_mover/") || window.location.href.includes("/ru/profile/page/create_route_for_customer/")) {
-            onl_param = "singleDatePicker: true"
+        onl_param = { singleDatePicker: true };
-        }
-        let place_1 = document.querySelector("#id_arrival_DT")
-        if (place_1) {
-            $(place_1).daterangepicker({
-                    "autoapply": true,
-                    "linkedCalendars": false,
-                    "locale": changeLangForDateTimePicker(),
-
-                },
-                function (start, end, label) {
-
-                    // $('#displayRegervation').text('Registration date is: ' + start.format('YYYY-MM-DD') + ' to ' + end.format('YYYY-MM-DD'));
-                    $('#id_arrival_DT').val(start.format('DD.MM.YYYY') + " - " + end.format('DD.MM.YYYY'))
-                });
-
-            $(`${place_1.id} .drp-calendar.right`).hide();
-            $(`${place_1.id} .drp-calendar.left`).addClass('single');
-
-            $(`${place_1.id} .calendar-table`).on('DOMSubtreeModified', function () {
-                var el = $(`${place_1.id} .prev.available`).parent().children().last();
-                if (el.hasClass('next available')) {
-                    return;
-                }
-                el.addClass('next available');
-                el.append('<span></span>');
-            });
-        }
-    });
-
-$(function() {
-    let place_1 = document.querySelector("#id_departure_DT")
-    let onl_param = ""
-    if (window.location.href === "http://localhost:8016/ru/profile/page/create_route_for_mover/" || window.location.href === "http://localhost:8016/ru/profile/page/create_route_for_customer/"){
-        onl_param = "singleDatePicker: true"
     }
+
+    let place_1 = document.querySelector("#id_arrival_DT");
     if (place_1) {
         $(place_1).daterangepicker({
             "autoapply": true,
             "linkedCalendars": false,
             "locale": changeLangForDateTimePicker(),
-            onl_param
+            ...onl_param
-        },
+        }, function (start, end, label) {
-        function(start, end, label) {
+            $('#id_arrival_DT').val(start.format('DD.MM.YYYY') + " - " + end.format('DD.MM.YYYY'));
-            // $('#displayRegervation').text('Registration date is: ' + start.format('YYYY-MM-DD') + ' to ' + end.format('YYYY-MM-DD'));
-            // $('#regervation')[0].dataset['departure_DT'] = start.format('YYYY-MM-DD');
-            // $('#regervation')[0].dataset['arrival_DT'] = end.format('YYYY-MM-DD');
-            $('#id_departure_DT').val(start.format('DD.MM.YYYY') + " - " + end.format('DD.MM.YYYY'))
-            // init_arrival_DT(start.format('DD.MM.YYYY'),false,false)
-            $('#id_arrival_DT').val('')
-            init_arrival_DT(start.format('DD.MM.YYYY'),false,false)
-
         });
 
         $(`${place_1.id} .drp-calendar.right`).hide();
         $(`${place_1.id} .drp-calendar.left`).addClass('single');
 
-        $(`${place_1.id} .calendar-table`).on('DOMSubtreeModified', function() {
+        $(`${place_1.id} .calendar-table`).on('DOMSubtreeModified', function () {
             var el = $(`${place_1.id} .prev.available`).parent().children().last();
             if (el.hasClass('next available')) {
                 return;
@@ -253,4 +214,37 @@ $(function() {
             el.append('<span></span>');
         });
     }
-});
+});
+
+$(function() {
+    let place_1 = document.querySelector("#id_departure_DT");
+    let onl_param = {};
+    if (window.location.href.includes("/ru/profile/page/create_route_for_mover/") || window.location.href.includes("/ru/profile/page/create_route_for_customer/")) {
+        onl_param = { singleDatePicker: true };
+    }
+
+    if (place_1) {
+        $(place_1).daterangepicker({
+            "autoapply": true,
+            "linkedCalendars": false,
+            "locale": changeLangForDateTimePicker(),
+            ...onl_param
+        }, function (start, end, label) {
+            $('#id_departure_DT').val(start.format('DD.MM.YYYY') + " - " + end.format('DD.MM.YYYY'));
+            $('#id_arrival_DT').val('');
+            init_arrival_DT(start.format('DD.MM.YYYY'), false, false);
+        });
+
+        $(`${place_1.id} .drp-calendar.right`).hide();
+        $(`${place_1.id} .drp-calendar.left`).addClass('single');
+
+        $(`${place_1.id} .calendar-table`).on('DOMSubtreeModified', function () {
+            var el = $(`${place_1.id} .prev.available`).parent().children().last();
+            if (el.hasClass('next available')) {
+                return;
+            }
+            el.addClass('next available');
+            el.append('<span></span>');
+        });
+    }
+});

static/js/user_profile.js

@@ -346,13 +346,18 @@ function searchTown(el){
 
 
 
-function selectItemAddrPoint(id, name, ctrl_name,){
+function selectItemAddrPoint(id, name, ctrl_name, city_DT){
             let input_list = document.getElementsByName(ctrl_name + '_list')[0];
             let tap_txt_cont = document.querySelector("#id_" + ctrl_name);
+            let local_city_time = document.querySelector(".local_city_time");
+            local_city_time.innerHTML = city_DT;
             tap_txt_cont.value = name;
             tap_txt_cont.setAttribute('title',name)
             let tap_cont = document.querySelector("#id_" + ctrl_name.slice(0, -4));
             tap_cont.value = id;
+
+            init_departure_DT()
+
             if (tap_txt_cont.classList.contains('red_text')){
                  tap_txt_cont.classList.remove('red_text')
             }

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="from_to_country">
-          <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: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"
-                    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>
-<hr>
-  <div class="from_to_country">
     <div class="from_country_container">
+        <div class="local_city_time" hidden="hidden"></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,90 @@
     </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)"
+                    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"
+                    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>#}

templates/widgets/w_ac_input_address_point.html

@@ -1,4 +1,4 @@
- <div onmousedown='selectItemAddrPoint({{ id }}, "{{ fullname }}", "{{ ctrl_name }}")' class="autocomplete-result" data-index="{{ index }}">
+ <div onmousedown='selectItemAddrPoint({{ id }}, "{{ fullname }}", "{{ ctrl_name }}", "{{ city_DT }}")' class="autocomplete-result" data-index="{{ index }}">
         {% if airport_fullname %}<div>{{ airport_fullname|safe }}</div>{% endif %}
         <div class="autocomplete-location">{{ city_name }} / {{ country_name }}</div>
  </div>