From c8a902998f403794ed84516b49bf017f75494a6b Mon Sep 17 00:00:00 2001
From: borissedw <strigevitch.boris@gmail.com>
Date: Thu, 31 Aug 2023 18:56:13 +0300
Subject: [PATCH] 0.0.218

---
 templates/blocks/b_find_route_form.html   | 101 ++++++++++++++++++++++
 templates/pages/p_results_find_route.html |  99 +--------------------
 2 files changed, 102 insertions(+), 98 deletions(-)
 create mode 100644 templates/blocks/b_find_route_form.html

diff --git a/templates/blocks/b_find_route_form.html b/templates/blocks/b_find_route_form.html
new file mode 100644
index 0000000..2384b7f
--- /dev/null
+++ b/templates/blocks/b_find_route_form.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 3e5340e..5c5df2b 100644
--- a/templates/pages/p_results_find_route.html
+++ b/templates/pages/p_results_find_route.html
@@ -25,106 +25,9 @@
         </div>
         <form name="find_route">
             {% csrf_token %}
-            <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">#}
+            {% include "blocks/b_find_route_form.html" %}
 
-{#                        <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>
             <div class="block-find-route">
                 <div class="block-filters-find-route">
                     <div class="title_filters_find_route">Все фильтры</div>