From a46bbdec847d05f47777f7080bfd9668050c8cc6 Mon Sep 17 00:00:00 2001
From: borissedw <strigevitch.boris@gmail.com>
Date: Sat, 2 Sep 2023 18:40:06 +0300
Subject: [PATCH] 0.0.220

---
 templates/blocks/b_find_route_form.html       | 107 ++--------------
 templates/blocks/b_finded_routes.html         |  21 ++++
 .../forms/f_find_route_filters_form.html      |  89 ++++++++++++++
 .../f_find_route_form_main_find_routes.html   | 101 +++++++++++++++
 templates/pages/p_results_find_route.html     | 115 +-----------------
 5 files changed, 223 insertions(+), 210 deletions(-)
 create mode 100644 templates/blocks/b_finded_routes.html
 create mode 100644 templates/forms/f_find_route_filters_form.html
 create mode 100644 templates/forms/f_find_route_form_main_find_routes.html

diff --git a/templates/blocks/b_find_route_form.html b/templates/blocks/b_find_route_form.html
index 2384b7f..6718bab 100644
--- a/templates/blocks/b_find_route_form.html
+++ b/templates/blocks/b_find_route_form.html
@@ -1,101 +1,16 @@
 {% load static %}
-<div class="container_form_search_carrier">
-    <div class="cont-el-form-search-carrier first abbreviation">
-        <label for="id_from_address_point_txt">Откуда</label>
 
-{#                        <input onfocus="focus_el_ins(this)" onclick="show_list_w_places(this)" oninput="searchTown(this)" class="inp_form_find_route_w_abbreviation first" id="inp_form_find_route_w_abbreviation_1" type="text">#}
+<form name="find_route">
+    {% csrf_token %}
 
-{#                        <div class="insert-airports-place" id="insert-airports-place_1">#}
-{#                            {% include "widgets/w_places_input.html" %}#}
-{#                        </div>#}
-        <div class="container_inp_w_abr">
-            <input
-                type="number"
-                name="from_address_point"
-                id="id_from_address_point"
-                class="el_form_find_route"
-                hidden
-                class="disp-none"
-                {% if form.initial.from_address_point %}value="{{ form.initial.from_address_point }}"{% endif %}
-            />
-            <input
-                oninput="searchTown(this)"
-                onclick="showSearchList(this)"
-                onblur="onblurInputField(event, this)"
-                onFocus="this.select()"
-                autocomplete="off"
-                type="text"
-                minlength="3"
-                name="from_address_point_txt"
-                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 %}
-            />
-            <div class="abbreviation_airport_in_search"><text>MSQ</text></div>
-            <div class="input_list find_route" name="from_address_point_txt_list">
+    {% include "forms/f_find_route_form_main_find_routes.html" %}
 
-            </div>
-        </div>
+    <div class="block-find-route">
+
+        {% include "forms/f_find_route_filters_form.html" %}
+
+        {% include "blocks/b_finded_routes.html" %}
+
+        <div class="clear_both"></div>
     </div>
-    <div class="cont-el-form-search-carrier">
-        <label for="id_to_address_point_txt">Куда</label>
-{#                    <div class="container_inp_w_abr">#}
-{#                        <input onfocus="focus_el_ins(this)" onclick="show_list_w_places(this)" oninput="searchTown(this)" class="inp_form_find_route_w_abbreviation" id="inp_form_find_route_w_abbreviation_2" type="text">#}
-
-{#                        <div class="insert-airports-place" id="insert-airports-place_2">#}
-{#                            {% include "widgets/w_ac_input_address_point.html" %}#}
-{#                        </div>#}
-{#                    </div>#}
-        <div class="container_inp_w_abr">
-            <input
-                    type="number"
-                    name="to_address_point"
-                    id="id_to_address_point"
-                    class="el_form_find_route"
-                    hidden
-                    class="disp-none"
-                    {% if form.initial.to_address_point %}value="{{ form.initial.to_address_point}}"{% endif %}/>
-            <input
-                oninput="searchTown(this)"
-                onclick="showSearchList(this)"
-                onblur="onblurInputField(event, this)"
-
-                onFocus="this.select()"
-                autocomplete="off"
-                type="text"
-                name="to_address_point_txt"
-{#                            {% 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 %}/>
-                <div class="abbreviation_airport_in_search"><text>WAW</text></div>
-                <div class="input_list find_route" name="to_address_point_txt_list">
-
-                </div>
-        </div>
-    </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 %} >
-    </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 %}>
-    </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 %}>
-            <option value="" selected="selected">--не имеет значения--</option>
-            {% for item in form.fields.cargo_type.choices %}
-                <option value="{{ item.0 }}" {% if form.initial.cargo_type == item.0  %} selected{% endif %}>{{ item.1 }}</option>
-            {% endfor %}
-
-
-        </select>
-    </div>
-    <div class="cont-el-form-search-carrier el_form_find_route">
-        <label style="opacity: 0">test</label>
-        <button onclick="filters_func_find_route_main(this)">Найти</button>
-    </div>
-</div>
\ No newline at end of file
+</form>
\ No newline at end of file
diff --git a/templates/blocks/b_finded_routes.html b/templates/blocks/b_finded_routes.html
new file mode 100644
index 0000000..20ead58
--- /dev/null
+++ b/templates/blocks/b_finded_routes.html
@@ -0,0 +1,21 @@
+{% load static %}
+
+<div class="block-finded-routes">
+    {% if not routes %}
+        <span style='color: #ff0000;font-weight: 800;font-size: 18px;padding: 10px;'>Нечего не найдено!</span>
+    {% endif %}
+    <img class="loader_filters_routes" src="{% static "img/svg/loader.svg" %}">
+    <div class="page_routes_1">
+        {% include "blocks/b_search_routes.html" %}
+    </div>
+    <div class="page_routes_2">
+
+    </div>
+    {% if last_block_routes == false %}
+        <div class="text-align-center">
+            <button class="button-find-more-routes" id="25" onclick="load_routes(this)">Показать ещё 10</button>
+            <img class="loader_f_loading_routes" src="{% static "img/svg/loader.svg" %}">
+        </div>
+    {% endif %}
+
+</div>
\ No newline at end of file
diff --git a/templates/forms/f_find_route_filters_form.html b/templates/forms/f_find_route_filters_form.html
new file mode 100644
index 0000000..eb2bfec
--- /dev/null
+++ b/templates/forms/f_find_route_filters_form.html
@@ -0,0 +1,89 @@
+{% load static %}
+
+<div class="block-filters-find-route">
+    <div class="title_filters_find_route">Все фильтры</div>
+    <div class="methods_transportation_form_filters">
+        <div class="title_el_methods_transportation">Способ перевозки</div>
+{#                    <div>#}
+{#                        <div class="method_transport">#}
+{#                            <input class="method_transport_inp_hide" type="checkbox">#}
+{#                            <div class="method_transport_inp"></div>#}
+{#                        </div>#}
+{#                        <label>#}
+{#                            <img>#}
+{#                            <text></text>#}
+{#                        </label>#}
+{#                    </div>#}
+        {% for item in form.fields.type_transport.choices %}
+            {% if forloop.counter0 > 0 %}
+                <div>
+                    <input
+                        class="custom-checkbox el_form_find_route"
+                        type="checkbox"
+                        name="type_transport"
+                        id="id_cargo_type_car_{{ forloop.counter }}"
+                        onchange="filters_func_find_route_main(this)"
+                        value="{{ item.0 }}"
+                    />
+
+                    <label for="id_cargo_type_car_{{ forloop.counter }}" >
+                        <img style="display: inline-block;padding-top: 11px;" src="{% static "img/svg/Car.svg" %}">
+                        <span style="display: inline-block;width: 80%;">{{ item.1 }}</span>
+                    </label>
+                </div>
+            {% endif %}
+        {% endfor %}
+{#                        <div>#}
+{#                            <input#}
+{#                                class="custom-checkbox"#}
+{#                                type="checkbox"#}
+{#                                name="type_transport"#}
+{#                                id="id_cargo_type_plane"#}
+{#                            />#}
+{##}{#                                <img style="display: inline-block;padding-top: 11px;" src="{% static "img/svg/Airplane.svg" %}">#}
+{#                            <label for="id_cargo_type_plane" >#}
+{#                                <span style="display: inline-block;width: 80%;">{{ form.fields.type_transport.choices }}</span>#}
+{#                            </label>#}
+{#                        </div>#}
+    </div>
+    <div class="methods_transportation_form_filters">
+        <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 %}
+                <option value="{{ item.0 }}" {% if form.initial.from_place == item.0  %} selected{% endif %}>{{ item.1 }}</option>
+            {% endfor %}
+
+
+
+        </select>
+    </div>
+    <div class="methods_transportation_form_filters">
+        <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 %}
+                <option value="{{ item.0 }}" {% if 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 }}" />
+        </div>
+        <div class="inputs_for_slider_cont">
+            <input type="text" class="input_f_slider_start" value="100" />
+            <input type="text" class="input_f_slider_end" value="900" />
+            <div class="clear_both"></div>
+        </div>
+
+    </div>
+    <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>
+        </select>
+    </div>
+
+</div>
\ No newline at end of file
diff --git a/templates/forms/f_find_route_form_main_find_routes.html b/templates/forms/f_find_route_form_main_find_routes.html
new file mode 100644
index 0000000..2384b7f
--- /dev/null
+++ b/templates/forms/f_find_route_form_main_find_routes.html
@@ -0,0 +1,101 @@
+{% load static %}
+<div class="container_form_search_carrier">
+    <div class="cont-el-form-search-carrier first abbreviation">
+        <label for="id_from_address_point_txt">Откуда</label>
+
+{#                        <input onfocus="focus_el_ins(this)" onclick="show_list_w_places(this)" oninput="searchTown(this)" class="inp_form_find_route_w_abbreviation first" id="inp_form_find_route_w_abbreviation_1" type="text">#}
+
+{#                        <div class="insert-airports-place" id="insert-airports-place_1">#}
+{#                            {% include "widgets/w_places_input.html" %}#}
+{#                        </div>#}
+        <div class="container_inp_w_abr">
+            <input
+                type="number"
+                name="from_address_point"
+                id="id_from_address_point"
+                class="el_form_find_route"
+                hidden
+                class="disp-none"
+                {% if form.initial.from_address_point %}value="{{ form.initial.from_address_point }}"{% endif %}
+            />
+            <input
+                oninput="searchTown(this)"
+                onclick="showSearchList(this)"
+                onblur="onblurInputField(event, this)"
+                onFocus="this.select()"
+                autocomplete="off"
+                type="text"
+                minlength="3"
+                name="from_address_point_txt"
+                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 %}
+            />
+            <div class="abbreviation_airport_in_search"><text>MSQ</text></div>
+            <div class="input_list find_route" name="from_address_point_txt_list">
+
+            </div>
+        </div>
+    </div>
+    <div class="cont-el-form-search-carrier">
+        <label for="id_to_address_point_txt">Куда</label>
+{#                    <div class="container_inp_w_abr">#}
+{#                        <input onfocus="focus_el_ins(this)" onclick="show_list_w_places(this)" oninput="searchTown(this)" class="inp_form_find_route_w_abbreviation" id="inp_form_find_route_w_abbreviation_2" type="text">#}
+
+{#                        <div class="insert-airports-place" id="insert-airports-place_2">#}
+{#                            {% include "widgets/w_ac_input_address_point.html" %}#}
+{#                        </div>#}
+{#                    </div>#}
+        <div class="container_inp_w_abr">
+            <input
+                    type="number"
+                    name="to_address_point"
+                    id="id_to_address_point"
+                    class="el_form_find_route"
+                    hidden
+                    class="disp-none"
+                    {% if form.initial.to_address_point %}value="{{ form.initial.to_address_point}}"{% endif %}/>
+            <input
+                oninput="searchTown(this)"
+                onclick="showSearchList(this)"
+                onblur="onblurInputField(event, this)"
+
+                onFocus="this.select()"
+                autocomplete="off"
+                type="text"
+                name="to_address_point_txt"
+{#                            {% 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 %}/>
+                <div class="abbreviation_airport_in_search"><text>WAW</text></div>
+                <div class="input_list find_route" name="to_address_point_txt_list">
+
+                </div>
+        </div>
+    </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 %} >
+    </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 %}>
+    </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 %}>
+            <option value="" selected="selected">--не имеет значения--</option>
+            {% for item in form.fields.cargo_type.choices %}
+                <option value="{{ item.0 }}" {% if form.initial.cargo_type == item.0  %} selected{% endif %}>{{ item.1 }}</option>
+            {% endfor %}
+
+
+        </select>
+    </div>
+    <div class="cont-el-form-search-carrier el_form_find_route">
+        <label style="opacity: 0">test</label>
+        <button onclick="filters_func_find_route_main(this)">Найти</button>
+    </div>
+</div>
\ No newline at end of file
diff --git a/templates/pages/p_results_find_route.html b/templates/pages/p_results_find_route.html
index 5c5df2b..21181e6 100644
--- a/templates/pages/p_results_find_route.html
+++ b/templates/pages/p_results_find_route.html
@@ -23,122 +23,9 @@
         <div class="text-align-center">
             <h1 class="title_page">Поиск перевозчика</h1>
         </div>
-        <form name="find_route">
-            {% csrf_token %}
 
-            {% include "blocks/b_find_route_form.html" %}
+        {% include "blocks/b_find_route_form.html" %}
 
-            <div class="block-find-route">
-                <div class="block-filters-find-route">
-                    <div class="title_filters_find_route">Все фильтры</div>
-                    <div class="methods_transportation_form_filters">
-                        <div class="title_el_methods_transportation">Способ перевозки</div>
-    {#                    <div>#}
-    {#                        <div class="method_transport">#}
-    {#                            <input class="method_transport_inp_hide" type="checkbox">#}
-    {#                            <div class="method_transport_inp"></div>#}
-    {#                        </div>#}
-    {#                        <label>#}
-    {#                            <img>#}
-    {#                            <text></text>#}
-    {#                        </label>#}
-    {#                    </div>#}
-                        {% for item in form.fields.type_transport.choices %}
-                            {% if forloop.counter0 > 0 %}
-                                <div>
-                                    <input
-                                        class="custom-checkbox el_form_find_route"
-                                        type="checkbox"
-                                        name="type_transport"
-                                        id="id_cargo_type_car_{{ forloop.counter }}"
-                                        onchange="filters_func_find_route_main(this)"
-                                        value="{{ item.0 }}"
-                                    />
-
-                                    <label for="id_cargo_type_car_{{ forloop.counter }}" >
-                                        <img style="display: inline-block;padding-top: 11px;" src="{% static "img/svg/Car.svg" %}">
-                                        <span style="display: inline-block;width: 80%;">{{ item.1 }}</span>
-                                    </label>
-                                </div>
-                            {% endif %}
-                        {% endfor %}
-{#                        <div>#}
-{#                            <input#}
-{#                                class="custom-checkbox"#}
-{#                                type="checkbox"#}
-{#                                name="type_transport"#}
-{#                                id="id_cargo_type_plane"#}
-{#                            />#}
-{##}{#                                <img style="display: inline-block;padding-top: 11px;" src="{% static "img/svg/Airplane.svg" %}">#}
-{#                            <label for="id_cargo_type_plane" >#}
-{#                                <span style="display: inline-block;width: 80%;">{{ form.fields.type_transport.choices }}</span>#}
-{#                            </label>#}
-{#                        </div>#}
-                    </div>
-                    <div class="methods_transportation_form_filters">
-                        <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 %}
-                                <option value="{{ item.0 }}" {% if form.initial.from_place == item.0  %} selected{% endif %}>{{ item.1 }}</option>
-                            {% endfor %}
-
-
-
-                        </select>
-                    </div>
-                    <div class="methods_transportation_form_filters">
-                        <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 %}
-                                <option value="{{ item.0 }}" {% if 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 }}" />
-                        </div>
-                        <div class="inputs_for_slider_cont">
-                            <input type="text" class="input_f_slider_start" value="100" />
-                            <input type="text" class="input_f_slider_end" value="900" />
-                            <div class="clear_both"></div>
-                        </div>
-
-                    </div>
-                    <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>
-                        </select>
-                    </div>
-
-                </div>
-                <div class="block-finded-routes">
-                    {% if not routes %}
-                        <span style='color: #ff0000;font-weight: 800;font-size: 18px;padding: 10px;'>Нечего не найдено!</span>
-                    {% endif %}
-                    <img class="loader_filters_routes" src="{% static "img/svg/loader.svg" %}">
-                    <div class="page_routes_1">
-                        {% include "blocks/b_search_routes.html" %}
-                    </div>
-                    <div class="page_routes_2">
-
-                    </div>
-                    {% if last_block_routes == false %}
-                        <div class="text-align-center">
-                            <button class="button-find-more-routes" id="25" onclick="load_routes(this)">Показать ещё 10</button>
-                            <img class="loader_f_loading_routes" src="{% static "img/svg/loader.svg" %}">
-                        </div>
-                    {% endif %}
-
-                </div>
-
-                <div class="clear_both"></div>
-            </div>
-        </form>
     </div>
 
 {% endblock %}
\ No newline at end of file