diff --git a/static/js/dynamic_loading_routes.js b/static/js/dynamic_loading_routes.js
index 82488c0..d1f6172 100644
--- a/static/js/dynamic_loading_routes.js
+++ b/static/js/dynamic_loading_routes.js
@@ -2,6 +2,41 @@ let page_iterator = 2
function load_routes (el) {
+ let number_last_route = el.id
+ let data = {
+ 'from_el':parseInt(number_last_route) + 1,
+ 'to_el':parseInt(number_last_route) + 11
+ }
+ let list_of_elements_form = document.querySelectorAll(".el_form_find_route");
+ for (let i = 0;i < list_of_elements_form.length;i++) {
+ // let id_el = list_of_elements_form[i].id
+ // if (id_el){
+ // if (id_el === "")
+ // }
+ let name_attr = list_of_elements_form[i].attributes["name"]
+ let value_el = list_of_elements_form[i].value
+ if (name_attr) {
+ if (list_of_elements_form[i].tagName === "INPUT" && list_of_elements_form[i].type === "checkbox"){
+ let name_el = name_attr.value
+ data[name_el] = ""
+ if (list_of_elements_form[i].checked){
+
+ if (name_el === "type_transport"){
+ let old_val = data["type_transport"]
+ if (old_val){
+ data["type_transport"] = `${data["type_transport"]},${value_el}`
+ }
+ }
+
+ data[name_el] = value_el
+ }
+
+ } else {
+ let name_el = name_attr.value
+ data[name_el] = value_el
+ }
+ }
+ }
let loader = document.querySelector(".loader_f_loading_routes")
loader.classList.toggle("show")
el.classList.toggle("hide")
@@ -12,11 +47,8 @@ function load_routes (el) {
// if (new_el_dataset){
// let number_last_route = new_el_dataset['numberOfRoute']
// let number_last_route = el.dataset['lastRoute']
- let number_last_route = el.id
- let data = {
- 'from_el':parseInt(number_last_route) + 1,
- 'to_el':parseInt(number_last_route) + 11
- }
+
+
$.ajax({
headers: { "X-CSRFToken": $('input[name=csrfmiddlewaretoken]').val() },
url: '/ru/routes/find_routes/',
@@ -36,7 +68,9 @@ function load_routes (el) {
let old_page_iterator = page_iterator
page_iterator++
loader.classList.toggle("show")
- el.classList.toggle("hide")
+ if (!data.last_block_routes){
+ el.classList.toggle("hide")
+ }
let el_scroll = place_ins.firstElementChild
el_scroll.scrollIntoView(
{
diff --git a/templates/pages/p_results_find_route.html b/templates/pages/p_results_find_route.html
index b02c830..c1de435 100644
--- a/templates/pages/p_results_find_route.html
+++ b/templates/pages/p_results_find_route.html
@@ -39,6 +39,7 @@
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 %}
@@ -77,6 +78,7 @@
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 %}/>
@@ -101,15 +103,15 @@
-
+
-
+
-
-