0.0.227

static/js/dynamic_loading_routes.js

@@ -1,5 +1,5 @@
-let page_iterator = 2
+page_iterator = 2
-let separator_iterator = 1
+separator_iterator = 1
 
 function load_routes (el) {
     let number_last_route = el.id
@@ -118,7 +118,7 @@ function forloop_func_form (data,get,str) {
         }
     }
     if (!data["type_transport"]){
-        data["type_transport"] =
+        data["type_transport"] = "=&"
         str = `${str}type_transport=&`
     }
     if (get !== null){

templates/forms/f_find_route_filters_form.html

@@ -14,7 +14,7 @@
 {#                            <text></text>#}
 {#                        </label>#}
 {#                    </div>#}
-        {% for item in form.fields.type_transport.choices %}
+        {% for item in route_form.fields.type_transport.choices %}
             {% if forloop.counter0 > 0 %}
                 <div>
                     <input
@@ -50,8 +50,8 @@
         <div class="title_el_methods_transportation">Откуда забрать посылку</div>
         <select onchange="filters_func_find_route_main(this)" class="select_form_filters_find_route el_form_find_route" name="from_place">
             <option value="" selected="selected">--не имеет значения--</option>
-            {% for item in form.fields.from_place.choices %}
+            {% for item in route_form.fields.from_place.choices %}
-                <option value="{{ item.0 }}" {% if form.initial.from_place == item.0  %} selected{% endif %}>{{ item.1 }}</option>
+                <option value="{{ item.0 }}" {% if route_form.initial.from_place == item.0  %} selected{% endif %}>{{ item.1 }}</option>
             {% endfor %}
 
 
@@ -62,15 +62,15 @@
         <div class="title_el_methods_transportation">Куда доставить посылку</div>
         <select onchange="filters_func_find_route_main(this)" class="select_form_filters_find_route el_form_find_route" name="to_place">
             <option value="" selected="selected">--не имеет значения--</option>
-            {% for item in form.fields.to_place.choices %}
+            {% for item in route_form.fields.to_place.choices %}
-                <option value="{{ item.0 }}" {% if form.initial.to_place == item.0  %} selected{% endif %}>{{ item.1 }}</option>
+                <option value="{{ item.0 }}" {% if route_form.initial.to_place == item.0  %} selected{% endif %}>{{ item.1 }}</option>
             {% endfor %}
         </select>
     </div>
     <div class="methods_transportation_form_filters">
         <label for="weight">Вес посылки (кг)</label>
         <div class="range-slider">
-            <input oninput="filters_func_find_route_main(this)" type="text" class="range_slider_form_filters el_form_find_route" name="weight" value="{{ form.fields.weight.initial }}" />
+            <input oninput="filters_func_find_route_main(this)" type="text" class="range_slider_form_filters el_form_find_route" name="weight" value="{{ route_form.fields.weight.initial }}" />
         </div>
         <div class="inputs_for_slider_cont">
             <input type="text" class="input_f_slider_start" value="100" />
@@ -82,7 +82,7 @@
     <div class="methods_transportation_form_filters">
         <div class="title_el_methods_transportation">Сортировать по:</div>
         <select onchange="filters_func_find_route_main(this)" name="sort" class="select_form_filters_find_route el_form_find_route">
-            <option value="last" {% if form.initial.sort == item.0  %} selected{% endif %}>По последним</option>
+            <option value="last" {% if route_form.initial.sort == item.0  %} selected{% endif %}>По последним</option>
         </select>
     </div>
 

templates/forms/f_find_route_form_main_find_routes.html

@@ -16,7 +16,7 @@
                 class="el_form_find_route"
                 hidden
                 class="disp-none"
-                {% if form.initial.from_address_point %}value="{{ form.initial.from_address_point }}"{% endif %}
+                {% if route_form.initial.from_address_point %}value="{{ route_form.initial.from_address_point }}"{% endif %}
             />
             <input
                 oninput="searchTown(this)"
@@ -30,7 +30,7 @@
                 class="from_address_point_txt find_route first"
 {#                            {% if form.fields.from_address_point.required %} required{% endif %}#}
                 id="id_from_address_point_txt"
-                {% if form.initial.from_address_point_txt %}value="{{ form.initial.from_address_point_txt }}"{% endif %}
+                {% if route_form.initial.from_address_point_txt %}value="{{ route_form.initial.from_address_point_txt }}"{% endif %}
             />
             <div class="abbreviation_airport_in_search"><text>MSQ</text></div>
             <div class="input_list find_route" name="from_address_point_txt_list">
@@ -55,7 +55,7 @@
                     class="el_form_find_route"
                     hidden
                     class="disp-none"
-                    {% if form.initial.to_address_point %}value="{{ form.initial.to_address_point}}"{% endif %}/>
+                    {% if route_form.initial.to_address_point %}value="{{ route_form.initial.to_address_point}}"{% endif %}/>
             <input
                 oninput="searchTown(this)"
                 onclick="showSearchList(this)"
@@ -68,7 +68,7 @@
 {#                            {% if form.fields.to_address_point.required %} required{% endif %}#}
                 id="id_to_address_point_txt"
                 class="to_address_point_txt find_route"
-                {% if form.initial.to_address_point_txt %}value="{{ form.initial.to_address_point_txt}}"{% endif %}/>
+                {% if route_form.initial.to_address_point_txt %}value="{{ route_form.initial.to_address_point_txt}}"{% endif %}/>
                 <div class="abbreviation_airport_in_search"><text>WAW</text></div>
                 <div class="input_list find_route" name="to_address_point_txt_list">
 
@@ -77,18 +77,18 @@
     </div>
     <div class="cont-el-form-search-carrier">
         <label for="id_departure_DT">Дата отправки</label>
-        <input class="el_form_find_route" name="departure_DT" id="id_departure_DT" type="date" {% if form.fields.departure_DT.required %} {% endif %} {% if form.initial.departure_DT %} value="{{ form.initial.departure_DT }}"{% endif %} >
+        <input class="el_form_find_route" name="departure_DT" id="id_departure_DT" type="date" {% if route_form.fields.departure_DT.required %} {% endif %} {% if route_form.initial.departure_DT %} value="{{ form.initial.departure_DT }}"{% endif %} >
     </div>
     <div class="cont-el-form-search-carrier">
         <label for="id_arrival_DT">Дата прибытия</label>
-        <input class="el_form_find_route" name="arrival_DT" id="id_arrival_DT" type="date" {% if form.initial.arrival_DT %} {% endif %} {% if form.initial.arrival_DT %} value="{{ form.initial.arrival_DT }}"{% endif %}>
+        <input class="el_form_find_route" name="arrival_DT" id="id_arrival_DT" type="date" {% if route_form.initial.arrival_DT %} {% endif %} {% if route_form.initial.arrival_DT %} value="{{ form.initial.arrival_DT }}"{% endif %}>
     </div>
     <div class="cont-el-form-search-carrier last">
         <label>test</label>
-        <select class="el_form_find_route" name="cargo_type" id="id_cargo_type" {% if form.fields.cargo_type.required %} {% endif %}>
+        <select class="el_form_find_route" name="cargo_type" id="id_cargo_type" {% if route_form.fields.cargo_type.required %} {% endif %}>
             <option value="" selected="selected">--не имеет значения--</option>
-            {% for item in form.fields.cargo_type.choices %}
+            {% for item in route_form.fields.cargo_type.choices %}
-                <option value="{{ item.0 }}" {% if form.initial.cargo_type == item.0  %} selected{% endif %}>{{ item.1 }}</option>
+                <option value="{{ item.0 }}" {% if route_form.initial.cargo_type == item.0  %} selected{% endif %}>{{ item.1 }}</option>
             {% endfor %}