diff --git a/static/css/styles.css b/static/css/styles.css index 3b16274..1b3f676 100644 --- a/static/css/styles.css +++ b/static/css/styles.css @@ -1619,6 +1619,10 @@ div.departure_arrival>div>input{ } +#hide_owner_type{ + display: none; +} + /*end create new route*/ diff --git a/static/js/user_profile.js b/static/js/user_profile.js index 4e7e7a8..4d33ed2 100644 --- a/static/js/user_profile.js +++ b/static/js/user_profile.js @@ -620,9 +620,22 @@ function setIcon(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; diff --git a/templates/blocks/profile/b_new_route.html b/templates/blocks/profile/b_new_route.html index 0ef540a..756a353 100644 --- a/templates/blocks/profile/b_new_route.html +++ b/templates/blocks/profile/b_new_route.html @@ -32,7 +32,7 @@ {# #} - +{# {% translate "Выберите способ перевозки" %}#} - + {% if form.initial and form.initial.type_transport and form.initial.type_transport != '' %} -{# {% if form.instance.owner_type == 'mover' %}#} -{# {% if form.initial.type_transport == 'road' %}{% translate "Дата и время выезда" %}{% elif form.initial.type_transport == 'avia' %}{% translate "Дата и время вылета" %}{% endif %}#} -{# {% endif %}#} -{# {% if form.owner_type == 'customer' %}#} -{# {% if form.instance.type_transport == 'road' %}{% translate "Дата и время отправки" %}{% elif form.initial.type_transport == 'avia' %}{% translate "Дата и время доставки посылки" %}{% endif %}#} -{# {% endif %}#} - {% if form.instance.owner_type == 'mover' and form.initial.type_transport == 'road' %}{% translate "Дата и время выезда" %}{% elif form.instance.owner_type == 'mover' and form.initial.type_transport == 'avia' %}{% translate "Дата и время вылета" %}{% endif %} + {% if form.initial.owner_type == 'mover' and form.initial.type_transport == 'road' %} + {% translate "Дата и время выезда" %} + {% elif form.initial.owner_type == 'mover' and form.initial.type_transport == 'avia' %} + {% translate "Дата и время вылета" %} + {% elif form.initial.owner_type == 'customer' and form.initial.type_transport == 'road' or form.initial.type_transport == 'avia' %} + {% translate "Дата и время отправки" %} + {% endif %} @@ -105,7 +105,19 @@ - Дата и время прибытия + + + {% if form.initial.owner_type == 'mover' and form.initial.type_transport == 'road' %} + {% translate "Дата и время прибытия" %} + {% elif form.initial.owner_type == 'mover' and form.initial.type_transport == 'avia' %} + {% translate "Дата и время прибытия" %} + {% elif form.initial.owner_type == 'customer' and form.initial.type_transport == 'avia' %} + {% translate "Дата и время доставки посылки" %} + {% elif form.initial.owner_type == 'customer' and form.initial.type_transport == 'road' %} + {% translate "Дата и время доставки посылки" %} + {% endif %} + + {# - {% if form.initial.type_transport == 'avia' %}Пункт вылета{% elif form.initial.type_transport == 'road' %}Пункт выезда{% endif %} + + {% if form.initial.owner_type == 'mover' and form.initial.type_transport == 'avia' %} + {% translate "Пункт вылета" %} + {% elif form.initial.owner_type == 'mover' and form.initial.type_transport == 'road' %} + {% translate "Пункт выезда" %} + {% elif form.initial.owner_type == 'customer' %} + {% translate "Пункт отправки" %} + {% endif %} + - {% if form.initial.type_transport == 'avia' %}Пункт прилета{% elif form.initial.type_transport == 'road' %}Пункт приезда{% endif %} + + {% if form.initial.owner_type == 'mover' and form.initial.type_transport == 'avia' %} + {% translate "Пункт прилета" %} + {% elif form.initial.owner_type == 'mover' and form.initial.type_transport == 'road' %} + {% translate "Пункт приезда" %} + {% elif form.initial.owner_type == 'customer'%} + {% translate "Пункт прибытия" %} + {% endif %} + #} - {{ form.fields.from_place.label }} + + {% if form.initial.owner_type == 'mover' %} + {% translate "Откуда можете забрать?" %} + {% elif form.initial.owner_type == 'customer' %} + {% translate "Откуда нужно забрать посылку?" %} + {% endif %} + - {{ form.fields.to_place.label }} + + {% if form.initial.owner_type == 'mover' %} + {% translate "Куда можете доставить?" %} + {% elif form.initial.owner_type == 'customer' %} + {% translate "Куда нужно доставить посылку?" %} + {% endif %} + - {{ form.fields.cargo_type.label }} + {% if form.initial.owner_type == 'mover' %} + {% translate "Могу перевезти:" %} + {% elif form.initial.owner_type == 'customer' %} + {% translate "Что нужно перевезти?" %} + {% endif %} +