From 9d2e35246a510f71e23c2f0a1d3d78adf0490649 Mon Sep 17 00:00:00 2001 From: ArtemB Date: Thu, 11 Jan 2024 15:14:45 +0300 Subject: [PATCH] 0.1.333 upd 404_page and create conditions for unfound routes --- static/js/user_profile.js | 109 +++++++++++----------- templates/blocks/profile/b_new_route.html | 5 +- 2 files changed, 61 insertions(+), 53 deletions(-) diff --git a/static/js/user_profile.js b/static/js/user_profile.js index f27f32c..e7a40be 100644 --- a/static/js/user_profile.js +++ b/static/js/user_profile.js @@ -486,58 +486,62 @@ function sendRoute(el, routeID = null){ el.disabled = true - let list_of_elements_form = document.querySelectorAll(".el_form_b_new_route"); - let checked_cargo_type = document.querySelectorAll('.cargo_check'); + // let list_of_elements_form = document.querySelectorAll(".el_form_b_new_route"); + // let checked_cargo_type = document.querySelectorAll('.cargo_check'); + // + // let obj_w_el_form = {} + // + // + // for (let n = 0;n < checked_cargo_type.length; n++){ + // let checked_cargo = checked_cargo_type[n] + // if(checked_cargo.checked === true){ + // let name_cargo = checked_cargo.name + // let value_cargo = checked_cargo_type[n].value + // obj_w_el_form[name_cargo] = value_cargo + // + // + // } + // } + // + // + // + // + // 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"] + // if (name_attr) { + // let name_el = name_attr.value + // let value_el = list_of_elements_form[i].value + // obj_w_el_form[name_el] = value_el + // } + // } + // + // + // + // let selected_owner_type = document.querySelectorAll("#customer, #mover") + // + // selected_owner_type.forEach(function(item) { + // if (item.classList.contains('selected')) { + // let { id, innerText } = item + // obj_w_el_form['owner_type'] = id + // } + // }); + // + // if (selected_owner_type[0].classList.contains('selected')){ + // + // }else{} + let owner_type_value = document.getElementById('hide_owner_type').value - - - let obj_w_el_form = {} - - - for (let n = 0;n < checked_cargo_type.length; n++){ - let checked_cargo = checked_cargo_type[n] - if(checked_cargo.checked === true){ - let name_cargo = checked_cargo.name - let value_cargo = checked_cargo_type[n].value - obj_w_el_form[name_cargo] = value_cargo - - - } - } - - - - - 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"] - if (name_attr) { - let name_el = name_attr.value - let value_el = list_of_elements_form[i].value - obj_w_el_form[name_el] = value_el - } - } - - - - let selected_owner_type = document.querySelectorAll("#customer, #mover") - - selected_owner_type.forEach(function(item) { - if (item.classList.contains('selected')) { - let { id, innerText } = item - obj_w_el_form['owner_type'] = id - } - }); - - if (selected_owner_type[0].classList.contains('selected')){ - - }else{} + let form = el.form + let formData = new FormData(form); + let owner_type = owner_type_value + formData.set('owner_type', owner_type) let url = '/routes/create_or_change_route/' if (routeID !== null){ @@ -553,7 +557,8 @@ function sendRoute(el, routeID = null){ processData: false, contentType: false, // enctype: 'json', - data: JSON.stringify(obj_w_el_form), + // data: JSON.stringify(obj_w_el_form), + data: formData, success: function(data){ let data_route_id = data.route_id diff --git a/templates/blocks/profile/b_new_route.html b/templates/blocks/profile/b_new_route.html index 9f046ff..91f7a74 100644 --- a/templates/blocks/profile/b_new_route.html +++ b/templates/blocks/profile/b_new_route.html @@ -439,7 +439,10 @@
- +