sysadminix/tripwithbonus
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/main'

Browse Source
This commit is contained in:
SBD
2023-12-13 17:59:25 +03:00
parent 085f905125 dc16ced786
commit a3faa17754
9 changed files with 158 additions and 55 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
static/css/mobile_styles.css
View File

@@ -120,6 +120,9 @@
font-size: 29px;
line-height: 33px;
}
.header_buttons{
display: none;
}
.not_found_routes>img{
display: none;
@@ -1796,9 +1799,7 @@
height: 30px;
}
.header_buttons{
display: none;
}
/*.to_address_point_txt.find_route {*/
/* width: 48.4%;*/
/*}*/

4
static/css/styles(boris).css
View File

@@ -1232,7 +1232,7 @@
}
.not_found_routes{
width: 98%;
width: 96%;
height: 250px;
background: #FFFFFF;
box-shadow: -1px 4px 10px 0 rgba(198, 199, 203, 0.20), 0 -1px 10px 0 rgba(198, 199, 203, 0.20);
@@ -2550,6 +2550,7 @@
position: absolute;
top: 293px;
transition: 0ms;
scrollbar-width: none;
}
@@ -2674,6 +2675,7 @@
height: calc(100vh - 95px);
max-height: 697px;
background: #F8F8F8;
scrollbar-width: none;
}
.menu_profile.background{

13
static/css/styles.css
View File

@@ -557,6 +557,7 @@ header .header-first {
height: 390px;
box-shadow: -1px 4px 10px 0px rgba(198, 199, 203, 0.20), 0px -1px 10px 0px rgba(198, 199, 203, 0.20);
z-index: 1;
top: 30px;
}
.dropdown-content.show{
display:block;
@@ -635,7 +636,8 @@ header .header-second {
.button_profile_header_mobile{
display: none;
cursor: pointer;
cursor: pointer;
vertical-align: middle;
}
.route_contact_avatar{
@@ -764,7 +766,7 @@ span.btn_profile_name {
/*END Language select*/
.header-second>div>img{
#support_img{
margin-right: 5px;
margin-left: 40px;
}
@@ -1424,6 +1426,7 @@ span.errorlist{
/*create new route*/
select#id_type_transport{
cursor: pointer;
display: block;
height: 60px;
width: 47%;
@@ -1617,6 +1620,10 @@ div.departure_arrival>div>input{
}
#hide_owner_type{
display: none;
}
/*end create new route*/
@@ -1703,7 +1710,7 @@ div.departure_arrival>div>input{
.input_list .hide{
display: none;
}
span.hide{
span.hide, .error_to_address_point.hide, #id_cargo_lable.hide, #error_id_phone.hide{
display: none;
}
#agreement_check.hide{

82
static/js/user_profile.js
View File

@@ -598,12 +598,20 @@ function sendRoute(el, routeID = null){
function validate(el) {
if (el.checked) {
console.log('cheked', el.id);
} else {
console.log("You didn't check it! Let me check it for you.", el.id);
}
// function validate(el) {
// if (el.checked) {
// console.log('cheked', el.id);
// } else {
// console.log("You didn't check it! Let me check it for you.", el.id);
// }
// }
function setIcon(el) {
if(el.id === 'id_departure_DT' ){
document.getElementById('id_departure_DT').style.background = 'url("/static/img/svg/IconCalendar.svg") white 98% no-repeat';
}
}
@@ -612,9 +620,22 @@ function validate(el) {
//cleaning route inputs after selection changes
function OnSelectionChange(el) {
event.preventDefault()
let form = el.form;
// if (customer.classList.contains('selected')) {
// owner_type = form.dataset['customer']
// } else if (mover.classList.contains('selected')) {
// owner_type = form.dataset['customer']
// }
let owner_type_value = document.getElementById('hide_owner_type').value
let formData = new FormData(form);
let owner_type = owner_type_value
formData.set('owner_type', owner_type)
// formData.set('owner_type', owner_type)
// let data = {};
// data['csrfmiddlewaretoken'] = $('input[name="csrfmiddlewaretoken"]')[0].value;
@@ -962,33 +983,38 @@ function hideErrors(el) {
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(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')
}
let error_from_address_point = document.getElementById('error_from_address_point')
let error_to_address_point = document.getElementById('error_to_address_point')
let error_cargo_type = document.getElementById('error_cargo_type')
let error_id_phone = document.getElementById('error_id_phone')
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(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(el.id === 'id_from_address_point_txt' && error_from_address_point !== null ){
error_from_address_point.classList.add('hide')
}else if(el.id === 'id_to_address_point_txt' && error_to_address_point !== null ){
error_to_address_point.classList.add('hide')
} else if(el.id === 'id_cargo_lable' && error_cargo_type !== null){
error_cargo_type.classList.add('hide')
} else if(el.id === 'id_phone' && error_id_phone !==null){
error_id_phone.classList.add('hide')
}
// if(el.nextElementSibling === errorFeeedback){
// errorFeeedback.classList.add('hide')
// }
else if(error_feeedback !== null) {
error_feeedback.classList.add('hide')
}
}