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

0.0.127 bug fix cargo_type in create_new_route

Browse Source
This commit is contained in:
ArtemB
2023-09-04 19:09:09 +03:00
parent f2580cf766
commit 28504cbc45
4 changed files with 226 additions and 65 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
static/css/styles.css
View File

@@ -1504,6 +1504,9 @@ input#id_extra_phone
height: 280px;
display: inline-block;
}
.route_info_about{
margin-bottom: 30px;
}
.route_info_point {
width: 96%;
@@ -1578,7 +1581,7 @@ input#id_extra_phone
button#edit_route {
display: block;
height: 44px;
width: 76%;
width: 98%;
background: #FF613A;
color: #FFF;
font-family: Inter;
@@ -1602,24 +1605,26 @@ button#remove_route {
width: 285px;
}
button.confirm_remove{
width: 46% !important;
width: 49% !important;
background: #ff0000a8;
border-radius: 10px;
color: white;
font-style: normal;
font-weight: 600;
margin-right: 3px;
padding: 5px 0px 5px 0px;
}
button.cancel_remove{
width: 46%;
width: 48%;
background: #808080cc;
border-radius: 10px;
color: white;
font-style: normal;
font-weight: 600;
padding: 5px 0px 5px 0px;
}

36
static/js/user_profile.js
View File

@@ -364,12 +364,35 @@ function sendRoute(el, routeID = null){
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 i = 0;i < list_of_elements_form.length;i++) {
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
@@ -377,6 +400,9 @@ function sendRoute(el, routeID = null){
obj_w_el_form[name_el] = value_el
}
}
let selected_owner_type = document.querySelectorAll("#customer, #mover")
selected_owner_type.forEach(function(item) {
@@ -434,6 +460,14 @@ 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);
}
}

7
templates/blocks/profile/b_new_route.html
View File

@@ -228,7 +228,8 @@
{% for item in form.fields.cargo_type.choices %}
<div>
<input
class="custom-checkbox el_form_b_new_route"
onclick="validate(this)"
class="custom-checkbox cargo_check"
type="checkbox"
name="cargo_type"
id="id_cargo_type_{{ forloop.counter }}"
@@ -239,7 +240,9 @@
{% endif %}
/>
<label for="id_cargo_type_{{ forloop.counter }}" >
<label
for="id_cargo_type_{{ forloop.counter }}" >
<span>{{ item.1 }}</span>
</label>
</div>

237
templates/widgets/w_route_info.html
View File

@@ -1,7 +1,113 @@
{% for route in routes %}
{% for route in routes %}
<div class="my_route">
<div class="route_info">
{% load static %}
{% load i18n %}
<div class="carrier-card" data-number-of-route="{{ route.id }}">
<div class="left-part-carrier-card">
{# <div class="first-line-card-carrier">#}
{# <div class="carrier-title">#}
{# Перевозчик:#}
{# </div>#}
{# <div class="type_transportation_carrier">#}
{# {{ route.get_type_transport_display }}#}
{# </div>#}
{# <div class="clear_both"></div>#}
{# </div>#}
<div class="route_info_about">
<span>
Тип:{{ route.get_cargo_type_display }}
</span>
<span>
Вес:{{ route.weight }} кг
</span>
<span>
{{ route.get_type_transport_display }}
</span>
</div>
<div class="from-to-country-container-carrier">
<div class="from-to-country-text left fl-left txt-al-right" title="{% if route.from_country %}{{ route.from_country }}{% else %}Неизвестно{% endif %} / {% if route.from_city %}{{ route.from_city }}{% else %}Неизвестно{% endif %}">
{% if route.from_country %}{{ route.from_country }}{% else %}Неизвестно{% endif %} / {% if route.from_city %}{{ route.from_city }}{% else %}Неизвестно{% endif %}
</div>
<div class="splitter-from-to-country"></div>
<div class="from-to-country-text right fl-right txt-al-left" title="{% if route.to_country %}{{ route.to_country }}{% else %}Неизвестно{% endif %} / {% if route.to_city %}{{ route.to_city }}{% else %}Неизвестно{% endif %}">
{% if route.to_country %}{{ route.to_country }}{% else %}Неизвестно{% endif %} / {% if route.to_city %}{{ route.to_city }}{% else %}Неизвестно{% endif %}
</div>
</div>
{% include "small_INCLUDES/carrier_card/inf_about_moving.html" %}
</div>
<div class="splliter-left-right-part-carrier-card"></div>
<div class="inf_carrier_container">
<div class="title_container_inf_carrier">
{% translate 'Контакты' %}
{% if route.owner_type == 'mover' %}
{% translate "перевозчика" %}
<img class="inf_carrier_icon" src="{% static "/img/svg/mover.svg" %}"/>
{% elif route.owner_type == 'customer'%}
{% translate "отправителя" %}
<img class="inf_carrier_icon" src="{% static "/img/svg/cargo.svg" %}"/>
{% endif %}
</div>
<div>
<img src="{% static "/delete_later/Avatar.png" %}">
<span class="name_carrier">{{ route.owner.last_name }} {{ route.owner.first_name }}</span>
</div>
<div name="form_carrier">
<div class="inf_carrier">
<a class="phones_carrier" href="tel:{{ route.phone }}">
<img class="inf_carrier_icon" src="{% static "/img/svg/phone.svg" %}"/>
<span class="phones_carrier_span{% if route.owner == user %} active{% endif %} el_for_open_el">{{ route.phone }}</span>
<input value="{{ route.phone }}">
<div class="clear_both"></div>
</a>
<a class="email_carrier" href="mailto:{{ route.owner.email }}">
<img class="inf_carrier_icon" src="{% static "/img/svg/email.svg" %}">
<span class="email_carrier_span{% if route.owner == user %} active{% endif %} el_for_open_el">{{ route.owner.email }}</span>
<input value="{{ route.owner.email }}">
<div class="clear_both"></div>
</a>
<div class="button_edit_route">
<button onclick="editRoute({{ route.id }})"
id="edit_route">
Редактировать
</button>
</div>
<div class="button_remove_route">
<button
onclick="confirmRemove(this)"
id="remove_route">
Удалить
</button>
</div>
</div>
{% if route.owner != user %}
<button class="open_chat_carrier" onclick="open_chat({{ route.owner_id }})">
<img src="{% static "img/svg/Logo.svg" %}" width="30px">
<span >Написать сообщение</span>
<img src="{% static "/img/svg/email.svg" %}" width="25px" style="position:relative;left: 3px;">
</button>
<button class="open_inf_carrier" onclick="show_inf_carrier(this)">Открыть контакт</button>
{% endif %}
</div>
</div>
<div class="clear_both"></div>
</div>
{% endfor %}
{#<div class="my_route">#}
{# <div class="route_info">#}
<div class="route_info_about">
<span>
Тип:{{ route.get_cargo_type_display }}
@@ -17,68 +123,81 @@
</span>
</div>
<div class="route_info_point">
<div>
<div>
<span>
{{ route.from_country.name }}/{{ route.from_city.name }}
</span>
<div></div>
</div>
{##}
{# <div class="route_info_point">#}
{##}
{# <div>#}
{# <div>#}
{# <span>#}
{# {{ route.from_country.name }}/{{ route.from_city.name }}#}
{# </span>#}
{##}
{# <div></div>#}
{# </div>#}
{##}
{##}
{# <span>#}
{# {{ route.to_country.name }}/{{ route.to_city.name }}#}
{# </span>#}
{# </div>#}
{# </div>#}
{##}
{# <div class="route_info_date">#}
{# Отправка: {{route.departure_DT }}#}
{# Прибытие: {{route.arrival_DT }}#}
{# </div>#}
{##}
{# <div class="route_info_ft_place">#}
{# Откуда заберёт:{{ route.from_place }}#}
{# Куда доставит:{{ route.to_place }}#}
{# </div>#}
{##}
{# </div>#}
{##}
{# #}
{# <div class="route_contact">#}
{##}
{# <h2>Контакты перевозчика:</h2>#}
{##}
{# <div class="route_contact_name">#}
{# {{ route.owner.last_name }} {{ route.owner.first_name }}#}
{# </div>#}
{##}
{# <div class="route_contact_phone_email">#}
{# {{ route.phone }}#}
{# <br>#}
{# {{ route.extra_phone }}#}
{# <br>#}
{# {{ route.owner.email }}#}
{# </div>#}
{# <div class="button_edit_route">#}
{# <button onclick="editRoute({{ route.id }})"#}
{# id="edit_route">#}
{# Редактировать#}
{# </button>#}
{# </div>#}
{# <div class="button_remove_route">#}
{# <button#}
{# onclick="confirmRemove(this)"#}
{# id="remove_route">#}
{# Удалить#}
{# </button>#}
{# </div>#}
{##}
{# </div>#}
{# </div>#}
<span>
{{ route.to_country.name }}/{{ route.to_city.name }}
</span>
</div>
</div>
<div class="route_info_date">
Отправка: {{route.departure_DT }}
Прибытие: {{route.arrival_DT }}
</div>
<div class="route_info_ft_place">
Откуда заберёт:{{ route.from_place }}
Куда доставит:{{ route.to_place }}
</div>
</div>
<div class="route_contact">
<h2>Контакты перевозчика:</h2>
<div class="route_contact_name">
{{ route.owner.last_name }} {{ route.owner.first_name }}
</div>
<div class="route_contact_phone_email">
{{ route.phone }}
<br>
{{ route.extra_phone }}
<br>
{{ route.owner.email }}
</div>
<div class="button_edit_route">
<button onclick="editRoute({{ route.id }})"
id="edit_route">
Редактировать
</button>
</div>
<div class="button_remove_route">
<button
onclick="confirmRemove(this)"
id="remove_route">
Удалить
</button>
</div>
</div>
</div>
{% endfor %}