Merge remote-tracking branch 'origin/main'

This commit is contained in:
2023-08-29 17:27:27 +03:00
7 changed files with 167 additions and 26 deletions

View File

@@ -1,7 +1,42 @@
let page_iterator = 2
let separator_iterator = 1
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,18 +68,24 @@ function load_routes (el) {
let old_page_iterator = page_iterator
page_iterator++
loader.classList.toggle("show")
el.classList.toggle("hide")
let el_scroll = place_ins.firstElementChild
el_scroll.scrollIntoView(
{
behavior:"smooth"
}
)
if (!data.last_block_routes){
el.classList.toggle("hide")
}
// let el_scroll = place_ins.firstElementChild
// el_scroll.scrollIntoView(
// {
// behavior:"smooth"
// }
// )
let new_page_routes = document.createElement("div")
new_page_routes.classList.add("page_routes_" + page_iterator)
$(new_page_routes).insertAfter(".page_routes_" + old_page_iterator);
let line_separator = document.createElement("div")
line_separator.classList.add("line_separator_page_w_el")
$(line_separator).insertAfter(".page_routes_" + separator_iterator);
// document.querySelector(".info_profile").innerHTML = data.html;
el.setAttribute("id",parseInt(number_last_route) + 11)
separator_iterator++
// number_last_route = parseInt(number_last_route) + "11"
},
error: function (data){

View File

@@ -18,8 +18,8 @@ function inital_slider (){
type: "double",
min: min,
max: max,
from: 100,
to: 900,
from: 0,
to: 1000,
onStart: updateInputs,
onChange: updateInputs
});