From 6c0b187d252710c1d7fb742e5c9118df74243fb8 Mon Sep 17 00:00:00 2001 From: borissedw Date: Tue, 29 Aug 2023 18:54:45 +0300 Subject: [PATCH] 0.0.198 --- static/js/dynamic_loading_routes.js | 26 ++++++++++++++++++----- static/js/filters_functions_find_route.js | 11 ++++++---- 2 files changed, 28 insertions(+), 9 deletions(-) diff --git a/static/js/dynamic_loading_routes.js b/static/js/dynamic_loading_routes.js index b57bc36..3e540bb 100644 --- a/static/js/dynamic_loading_routes.js +++ b/static/js/dynamic_loading_routes.js @@ -3,11 +3,13 @@ let separator_iterator = 1 function load_routes (el) { let number_last_route = el.id - let data = { + let data_d = { 'from_el':parseInt(number_last_route) + 1, 'to_el':parseInt(number_last_route) + 11 } - data = forloop_func_form(data) + let list = forloop_func_form(data_d,"get") + data_d = list[0] + let get_url = list[1] let loader = document.querySelector(".loader_f_loading_routes") loader.classList.toggle("show") el.classList.toggle("hide") @@ -29,7 +31,7 @@ function load_routes (el) { processData: false, contentType: false, // enctype: 'json', - data: JSON.stringify(data), + data: JSON.stringify(data_d), success: function(data){ // new_el.parentNode.insertBefore(data.html, new_el.nextSibling); @@ -70,7 +72,7 @@ function load_routes (el) { } -function forloop_func_form (data) { +function forloop_func_form (data,get,str) { 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 @@ -89,21 +91,35 @@ function forloop_func_form (data) { let old_val = data["type_transport"] if (old_val){ data["type_transport"] = `${data["type_transport"]},${value_el}` + if (get !== null){ + str.replace(`type_transport=${old_val}`,`type_transport=${old_val},${value_el}/`) + } } else { data[name_el] = value_el + if (get !== null){ + str = `${str}${name_el}=${value_el}/` + } } } } else { data[name_el] = "" + str = `${str}${name_el}=""/` } } else { let name_el = name_attr.value data[name_el] = value_el + str = `${str}${name_el}=${value_el}/` } } } - return data + if (get !== null){ + let list = [data,str] + return list + } else { + 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 7ad06f1..a0faa87 100644 --- a/static/js/filters_functions_find_route.js +++ b/static/js/filters_functions_find_route.js @@ -1,9 +1,11 @@ function filters_func_find_route_main (el){ event.preventDefault() // let form = el.form - // let formData = new FormData(form) - let data = {} - data = forloop_func_form(data) + // let formData = new FormDat a(form) + let data_d = {} + let list = forloop_func_form(data_d,"get") + data_d = list[0] + let get_url = list[1] $.ajax({ headers: { "X-CSRFToken": $('input[name=csrfmiddlewaretoken]').val() }, url: '/ru/routes/find_routes/', @@ -13,7 +15,7 @@ function filters_func_find_route_main (el){ processData: false, contentType: false, // enctype: 'json', - data: JSON.stringify(data), + data: JSON.stringify(data_d), success: function(data){ document.querySelector(".block-finded-routes").innerHTML = data.html if (data.html === "\n\n\n\n\n"){ @@ -21,6 +23,7 @@ function filters_func_find_route_main (el){ } else { document.querySelector(".block-finded-routes").innerHTML = data.html } + // window.location.href = window.location.href + "?" + JSON.stringify(data_d) }, errors: function (data){