From 96f48f88df75b58e6863f8ff8b9340f8849c7278 Mon Sep 17 00:00:00 2001
From: borissedw <strigevitch.boris@gmail.com>
Date: Tue, 29 Aug 2023 18:10:03 +0300
Subject: [PATCH] 0.0.196

---
 static/js/dynamic_loading_routes.js       | 70 +++++++++++++----------
 static/js/filters_functions_find_route.js |  8 ++-
 2 files changed, 45 insertions(+), 33 deletions(-)

diff --git a/static/js/dynamic_loading_routes.js b/static/js/dynamic_loading_routes.js
index 5f35f71..b57bc36 100644
--- a/static/js/dynamic_loading_routes.js
+++ b/static/js/dynamic_loading_routes.js
@@ -7,36 +7,7 @@ function load_routes (el) {
      '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
-            }
-        }
-    }
+    data = forloop_func_form(data)
     let loader = document.querySelector(".loader_f_loading_routes")
     loader.classList.toggle("show")
     el.classList.toggle("hide")
@@ -94,6 +65,45 @@ function load_routes (el) {
 
         }
     });
+
     // }
 
+}
+
+function forloop_func_form (data) {
+    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
+
+                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}`
+                        } else {
+                            data[name_el] = value_el
+                        }
+                    }
+
+
+                } else {
+                    data[name_el] = ""
+                }
+
+            } else {
+                let name_el = name_attr.value
+                data[name_el] = value_el
+            }
+        }
+    }
+    return data
 }
\ No newline at end of file
diff --git a/static/js/filters_functions_find_route.js b/static/js/filters_functions_find_route.js
index 5a532d2..7ad06f1 100644
--- a/static/js/filters_functions_find_route.js
+++ b/static/js/filters_functions_find_route.js
@@ -1,7 +1,9 @@
 function filters_func_find_route_main (el){
     event.preventDefault()
-    let form = el.form
-    let formData = new FormData(form)
+    // let form = el.form
+    // let formData = new FormData(form)
+    let data = {}
+    data = forloop_func_form(data)
     $.ajax({
         headers: { "X-CSRFToken": $('input[name=csrfmiddlewaretoken]').val() },
         url: '/ru/routes/find_routes/',
@@ -11,7 +13,7 @@ function filters_func_find_route_main (el){
         processData: false,
         contentType: false,
         // enctype: 'json',
-        data: formData,
+        data: JSON.stringify(data),
         success: function(data){
             document.querySelector(".block-finded-routes").innerHTML = data.html
             if (data.html === "\n\n\n\n\n"){