diff --git a/static/css/styles.css b/static/css/styles.css index e5b3b52..07af798 100644 --- a/static/css/styles.css +++ b/static/css/styles.css @@ -1332,6 +1332,13 @@ h2.title_new_route{ .prof_second_line>a { color: #FF613A; + cursor: pointer; +} +#id_email{ + cursor: unset; +} +#error_arrival_DT.hide, #error_departure_DT.hide{ + display: none; } .prof_third_line>a { diff --git a/static/js/user_profile.js b/static/js/user_profile.js index 8a13392..e286ca6 100644 --- a/static/js/user_profile.js +++ b/static/js/user_profile.js @@ -826,11 +826,11 @@ function checkDate() { // alert("End date cannot be less than Start date."); dateArrival.value = "" - let arrivalDiv = document.getElementById('arrival_div') - let errorMessage = document.createElement('span'); - errorMessage.textContent = "Дата прибытия, не может быть установлена раньше даты отправки" - errorMessage.classList.add('errorlist') - arrivalDiv.appendChild(errorMessage); + // let arrivalDiv = document.getElementById('arrival_div') + // let errorMessage = document.createElement('span'); + // // errorMessage.textContent = "Дата прибытия, не может быть установлена раньше даты отправки" + // errorMessage.classList.add('errorlist') + // arrivalDiv.appendChild(errorMessage); } else if (DateEnd > DateStart){ let arrivalDiv = document.getElementById('arrival_div'); @@ -958,22 +958,30 @@ function RequestCommercialOffer (el){ } function hideErrors(el) { - let error_feeedback_text = document.getElementById('error_feedback_text') - let error_feeedback = el.nextElementSibling - let counter_text = document.querySelector('.counter-text') - let footer_button = document.getElementById('footer_input_button') - let error_footer = document.getElementById('error_footer') - let agree_error = document.getElementById('reg_agree_error') + let error_feeedback_text = document.getElementById('error_feedback_text') + let error_feeedback = el.nextElementSibling + let counter_text = document.querySelector('.counter-text') + let footer_button = document.getElementById('footer_input_button') + let error_footer = document.getElementById('error_footer') + let agree_error = document.getElementById('reg_agree_error') + let error_departure_DT = document.getElementById('error_departure_DT') + let error_arrival_DT = document.getElementById('error_arrival_DT') + + if(error_feeedback === counter_text && error_feeedback !== null && error_feeedback_text !== null ){ error_feeedback_text.classList.add('hide') } else if(error_feeedback === footer_button && error_footer !== null ){ error_footer.classList.add('hide') - } else if(error_feeedback !== null) { - error_feeedback.classList.add('hide') } else if(el.id === 'agreement_check'){ agree_error.classList.add('hide') + } else if(el.id === 'id_arrival_DT' && error_arrival_DT !== null){ + error_arrival_DT.classList.add('hide') + }else if(el.id === 'id_departure_DT' && error_departure_DT !== null){ + error_departure_DT.classList.add('hide') + } else if(error_feeedback !== null) { + error_feeedback.classList.add('hide') } diff --git a/templates/blocks/profile/b_new_route.html b/templates/blocks/profile/b_new_route.html index 2d4485e..d0795ed 100644 --- a/templates/blocks/profile/b_new_route.html +++ b/templates/blocks/profile/b_new_route.html @@ -75,11 +75,19 @@ {# {% if form.initial.departure_DT %}value="{{ form.initial.departure_DT.date|date:"Y-m-d" }}T{{ form.initial.departure_DT.time|date:"H:i" }}"{% endif %}#} {# />#} {# boris change input #} - +
{% if not errors_off and form.errors and form.errors.departure_DT %} - {{ form.errors.departure_DT }} + {{ form.errors.departure_DT }} {% endif %} @@ -96,12 +104,20 @@ {# {% if form.initial.arrival_DT %}value="{{ form.initial.arrival_DT.date|date:"Y-m-d" }}T{{ form.initial.arrival_DT.time|date:"H:i" }}"{% endif %}#} {# />#} {# boris change input #} - + {# end #} {% if not errors_off and form.errors and form.errors.arrival_DT %} - {{ form.errors.arrival_DT }} + {{ form.errors.arrival_DT }} {% endif %} diff --git a/templates/pages/p_main.html b/templates/pages/p_main.html index afef037..54d8f99 100644 --- a/templates/pages/p_main.html +++ b/templates/pages/p_main.html @@ -37,12 +37,12 @@