From 9d44384d229f5a87cd665e0d2e07a3b21295a838 Mon Sep 17 00:00:00 2001 From: borissedw Date: Mon, 30 Oct 2023 15:06:24 +0300 Subject: [PATCH] 0.0.306 --- static/css/styles(boris).css | 4 ++ static/js/filters_functions_find_route.js | 63 +++++++++++++++++++---- 2 files changed, 58 insertions(+), 9 deletions(-) diff --git a/static/css/styles(boris).css b/static/css/styles(boris).css index ed3e5b6..19b39fa 100644 --- a/static/css/styles(boris).css +++ b/static/css/styles(boris).css @@ -1858,6 +1858,10 @@ border-radius: 10px; } +.button-find-more-routes.hidden{ + display: none; +} + .button-find-more-routes.hide{ display: none; } diff --git a/static/js/filters_functions_find_route.js b/static/js/filters_functions_find_route.js index f658d54..ea70378 100644 --- a/static/js/filters_functions_find_route.js +++ b/static/js/filters_functions_find_route.js @@ -84,16 +84,37 @@ function ajax_for_filter (data_d,get_url){ // let ins_bef_el = document.querySelector(".block-finded-routes").firstChild // // $(div).insertBefore(ins_bef_el) + page_iterator = 1 + standart_page_iterator = 1 + separator_iterator = 1 + iterator_f_check = 1 let new_page_routes = document.createElement("div") new_page_routes.classList.add("page_paging_elements_" + page_iterator) - $(new_page_routes).insertAfter(".page_paging_elements_" + old_page_iterator); - let line_separator = document.createElement("div") - line_separator.classList.add("line_separator_page_w_el") - $(line_separator).insertAfter(".page_paging_elements_" + separator_iterator); + let insert_place_main = document.querySelector(".block-finded-routes") + if (insert_place_main){ + insert_place_main.innerHTML = '' + insert_place_main.appendChild(new_page_routes) + } + + // $(new_page_routes).insertAfter(".page_paging_elements_" + old_page_iterator); + // let line_separator = document.createElement("div") + // line_separator.classList.add("line_separator_page_w_el") + // $(line_separator).insertAfter(".page_paging_elements_" + separator_iterator); // document.querySelector(".info_profile").innerHTML = data.html; - separator_iterator++ - // document.querySelector(".block-finded-routes").innerHTML = data.html + if (data.last_block){ + let block_last_block_routes = document.querySelector(".button-find-more-routes") + if (block_last_block_routes){ + block_last_block_routes.classList.add("hidden") + } + } else { + let block_last_block_routes = document.querySelector(".button-find-more-routes") + if (block_last_block_routes) { + if (block_last_block_routes.classList.contains('hidden')) { + block_last_block_routes.classList.remove("hidden") + } + } + } if (data.html === "\n\n\n\n\n"){ // document.querySelector(".block-finded-routes").innerHTML = "Нечего не найдено!" document.querySelector(".block-finded-routes").innerHTML = "
\n" + @@ -106,13 +127,35 @@ function ajax_for_filter (data_d,get_url){ " \n" + "
" + } else { - let insert_place = document.querySelector(`.page_paging_elements_${old_page_iterator}`) + let block_not_found_routes = document.querySelector(".not_found_routes") + if (block_not_found_routes){ + if (block_not_found_routes.classList.contains('show')){ + block_not_found_routes.classList.remove("show") + } + + } + let insert_place = document.querySelector(`.page_paging_elements_${page_iterator}`) if (insert_place){ - document.querySelector(`.page_paging_elements_${old_page_iterator}`).innerHTML = data.html + document.querySelector(`.page_paging_elements_${page_iterator}`).innerHTML = data.html } else { old_page_iterator = 1 - document.querySelector(`.page_paging_elements_${old_page_iterator}`).innerHTML = data.html + let new_search = document.querySelector(`.page_paging_elements_${page_iterator}`) + if (new_search){ + new_search.innerHTML = data.html + } else { + let new_page_routes1 = document.createElement("div") + new_page_routes1.classList.add("page_paging_elements_" + page_iterator) + new_page_routes1.innerHTML = data.html + let new_insert_place = document.querySelector('.block-finded-routes') + if (new_insert_place){ + new_insert_place.appendChild(new_page_routes1) + } else { + console.log(`error! || you cannot find block for routes on the host ${window.location.host} in the time ${moment()}`) + alert(`error! || you cannot find block for routes on the host ${window.location.host} in the time ${moment()}`) + } + } } document.querySelector(".loader_filters_routes").classList.toggle("show") @@ -121,6 +164,8 @@ function ajax_for_filter (data_d,get_url){ // } } + + // window.location.href = window.location.href + "?" + get_url // window.location.search = "?" + get_url