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

0.0.66

Browse Source
This commit is contained in:
SDE
2023-08-01 17:01:49 +03:00
parent ff008bfc7d
commit 7d743652c0
7 changed files with 68 additions and 322 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
RoutesApp/js_views.py
View File

@@ -141,7 +141,7 @@ def new_route_view_ajax(request):
# form.errors.append({'__all__': f'Ошибка: {str(e)}'})
print(str(e))
html = render_to_string('blocks/profile/b_new_route2.html', Dict, request=request)
html = render_to_string('blocks/profile/b_new_route.html', Dict, request=request)
return JsonResponse({'html': html}, status=200)
@@ -189,7 +189,7 @@ def create_or_change_route_ajax(request):
if not form.is_valid():
form.initial = form.cleaned_data
Dict = {'form': form}
html = render_to_string('blocks/profile/b_new_route2.html', Dict, request=request)
html = render_to_string('blocks/profile/b_new_route.html', Dict, request=request)
return JsonResponse({'html': html}, status=400)
obj = form.save(commit=False)
@@ -201,7 +201,7 @@ def create_or_change_route_ajax(request):
if 'errors' in routes_Dict:
form.errors.update(routes_Dict['errors'])
Dict = {'form': form}
html = render_to_string('blocks/profile/b_new_route2.html', Dict, request=request)
html = render_to_string('blocks/profile/b_new_route.html', Dict, request=request)
return JsonResponse({'html': html}, status=400)
html = render_to_string('blocks/profile/b_my_routes.html', routes_Dict, request=request)
@@ -220,5 +220,5 @@ def create_or_change_route_ajax(request):
}
}
Dict = {'form': errors_Dict}
html = render_to_string('blocks/profile/b_new_route2.html', Dict, request=request)
html = render_to_string('blocks/profile/b_new_route.html', Dict, request=request)
return JsonResponse({'html': html}, status=400)

6
TWB/settings.py
View File

@@ -271,15 +271,15 @@ CKEDITOR_OPTIONS = {
try:
from tEDataProj import db_local_sets
import db_local_sets
DATABASES = db_local_sets.DATABASES
except ImportError as e:
pass
# global prod_server
try:
import local_sets
SERVER_URL = local_sets.SERVER_URL
import db_local_sets
# SERVER_URL = local_sets.SERVER_URL
except ImportError:
pass

34
static/css/styles.css
View File

@@ -1175,18 +1175,44 @@ input#id_cargo_type{
margin: 10px;
}
.route_info_point>span{
.route_info_point > div > span{
float: right;
font-family: Inter, serif;
font-size: 16px;
font-style: normal;
font-weight: 500;
line-height: 22px;
width: 50%;
text-align: left;
}
.route_info_point > div > div{
float: left;
width: 50%;
text-align: right;
font-family: Inter, serif;
font-size: 16px;
font-style: normal;
font-weight: 500;
line-height: 22px;
}
.route_info_point>div{
border: 2px solid #FF613A;
width: 20px;
.route_info_point > div{
width: 100%;
height: 20px;
top: 30%;
position: relative;
padding-left: 17px;
}
.route_info_point > div > div > div{
border: 1px solid #FF613A;
width: 20px;
display: inline-block;
margin-right: 5px;
margin-bottom: 4px;
}
.route_info_about>span:first-child{
background: url("/static/img/png/Tag.png") left center no-repeat;

4
static/js/user_profile.js
View File

@@ -150,7 +150,7 @@ function searchTown(el){
}
});
}, 1000);
}, 1500);
}
@@ -220,7 +220,7 @@ function sendRoute(el){
$.ajax({
headers: { "X-CSRFToken": $('input[name=csrfmiddlewaretoken]').val() },
url: '/ru/routes/create_route/',
url: '/ru/routes/create_or_change_route/',
type: "POST",
// async: true,
cache: false,

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

@@ -17,7 +17,7 @@
{% for item in form.fields.type_transport.choices %}
<option
value="{{ item.0 }}"
{% if form.cleaned_data.type_transport == item.0 %}
{% if form.initial.type_transport == item.0 %}
selected="selected"
{% endif %}>
{{ item.1 }}
@@ -29,7 +29,7 @@
{% endif %}
</div>
{% if form.cleaned_data and form.cleaned_data.type_transport and form.cleaned_data.type_transport != '' %}
{% if form.initial and form.initial.type_transport and form.initial.type_transport != '' %}
<hr>
<div class="departure_arrival">
<div>
@@ -40,7 +40,7 @@
name="departure_DT"
{% if form.fields.departure_DT.required %} required{% endif %}
id="id_departure_DT"
{% if form.data.departure_DT %}value="{{ form.data.departure_DT }}"{% endif %}
{% 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 %}
/>
{% if not errors_off and form.errors and form.errors.departure_DT %}
@@ -54,8 +54,7 @@
name="arrival_DT"
{% if form.fields.arrival_DT.required %} required{% endif %}
id="id_arrival_DT"
{% if form.data.arrival_DT %}value="{{ form.data.arrival_DT }}"{% endif %}
{# |date: 'Y-m-d H:i' #}
{% 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 %}
/>
{% if not errors_off and form.errors and form.errors.arrival_DT %}
<span>{{ form.errors.arrival_DT }}</span>
@@ -71,12 +70,13 @@
oninput="searchTown(this)"
onclick="searchTown(this)"
onblur="setTimeout(()=>onblurInputField(event, this), 100)"
onFocus="this.select()"
autocomplete="off"
type="text"
list="from_address_point"
name="from_address_point_txt"
{% if form.fields.from_address_point.required %} required{% endif %}
id="id_from_address_point_txt"
{% if form.cleaned_data.from_address_point_txt %}value="{{ form.cleaned_data.from_address_point_txt }}"{% endif %}
{% if form.initial.from_address_point_txt %}value="{{ form.initial.from_address_point_txt }}"{% endif %}
/>
<datalist id="from_address_point">
@@ -95,11 +95,13 @@
oninput="searchTown(this)"
onclick="searchTown(this)"
onblur="setTimeout(()=>onblurInputField(event, this), 100)"
onFocus="this.select()"
autocomplete="off"
type="text"
name="to_address_point_txt"
{% if form.fields.to_address_point.required %} required{% endif %}
id="id_to_address_point_txt"
{% if form.cleaned_data.to_address_point_txt %}value="{{ form.cleaned_data.to_address_point_txt}}"{% endif %}
{% if form.initial.to_address_point_txt %}value="{{ form.initial.to_address_point_txt}}"{% endif %}
/>
<div class="input_list" name="to_address_point_txt_list">
@@ -128,7 +130,7 @@
{% if form.fields.from_place.required %} required{% endif %}>
{% for item in form.fields.from_place.choices %}
<option
value="{{ item.0 }}"{% if form.cleaned_data.from_place == item.0 %}
value="{{ item.0 }}"{% if form.initial.from_place == item.0 %}
selected="selected"{% endif %}>{{ item.1 }}
</option>
{% endfor %}
@@ -145,7 +147,7 @@
{% if form.fields.to_place.required %} required{% endif %}>
{% for item in form.fields.to_place.choices %}
<option
value="{{ item.0 }}"{% if form.cleaned_data.to_place == item.0 %}
value="{{ item.0 }}"{% if form.initial.to_place == item.0 %}
selected="selected"{% endif %}>{{ item.1 }}
</option>
{% endfor %}
@@ -210,7 +212,7 @@
{% if form.fields.weight.required %} required{% endif %}
name="weight"
value=""
{% if form.cleaned_data.weight %}value="{{ form.cleaned_data.weight}}"{% endif %}
{% if form.initial.weight %}value="{{ form.initial.weight}}"{% endif %}
/>
{% if not errors_off and form.errors and form.errors.weight %}
<span>{{ form.errors.weight }}</span>
@@ -240,12 +242,12 @@
<div>
<label for="id_phone">{{ form.fields.phone.label }}</label>
<input
type="text"
type="phone"
name="phone"
placeholder="{{ form.fields.phone.label }}"
{% if form.fields.phone.required %} required{% endif %}
id="id_phone"
{% if form.cleaned_data.phone %}value="{{ form.cleaned_data.phone}}"{% endif %}
{% if form.initial.phone %}value="{{ form.initial.phone}}"{% endif %}
/>
{% if not errors_off and form.errors and form.errors.phone %}
@@ -257,11 +259,11 @@
<label for="id_extra_phone">{{ form.fields.extra_phone.label }}</label>
<input
type="text"
type="phone"
name="extra_phone"
id="id_extra_phone"
placeholder="{{ form.fields.extra_phone.label }}"
{% if form.cleaned_data.extra_phone %}value="{{ form.cleaned_data.extra_phone}}"{% endif %}
{% if form.initial.extra_phone %}value="{{ form.initial.extra_phone}}"{% endif %}
/>
{% if not errors_off and form.errors and form.errors.extra_phone %}
<span>{{ form.errors.extra_phone }}</span>

287
templates/blocks/profile/b_new_route2.html
View File

@@ -1,287 +0,0 @@
{% load static %}
<link rel="stylesheet" href="{% static 'css/ion.rangeSlider.min.css' %}">
<form class = "new_route" name="new_route" method="post">
{% csrf_token %}
<div>
<label for="id_type_transport">{{ form.fields.type_transport.label }}</label>
</div>
<div>
<select
onchange="OnSelectionChange(this)"
name="type_transport"
id="id_type_transport">
{% for item in form.fields.type_transport.choices %}
<option
value="{{ item.0 }}"
{% if form.initial.type_transport == item.0 %}
selected="selected"
{% endif %}>
{{ item.1 }}
</option>
{% endfor %}
</select>
{% if not errors_off and form.errors and form.errors.type_transport %}
<span>{{ form.errors.type_transport }}</span>
{% endif %}
</div>
{% if form.initial and form.initial.type_transport and form.initial.type_transport != '' %}
<hr>
<div class="departure_arrival">
<div>
<label for="id_departure_DT">{{ form.fields.departure_DT.label }}</label>
<input
type="datetime-local"
name="departure_DT"
{% if form.fields.departure_DT.required %} required{% endif %}
id="id_departure_DT"
{% 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 %}
/>
{% if not errors_off and form.errors and form.errors.departure_DT %}
<span>{{ form.errors.departure_DT }}</span>
{% endif %}
</div>
<div>
<label for="id_arrival_DT">{{ form.fields.arrival_DT.label }}</label>
<input
type="datetime-local"
name="arrival_DT"
{% if form.fields.arrival_DT.required %} required{% endif %}
id="id_arrival_DT"
{% 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 %}
/>
{% if not errors_off and form.errors and form.errors.arrival_DT %}
<span>{{ form.errors.arrival_DT }}</span>
{% endif %}
</div>
</div>
<hr>
<div class="from_to_country">
<div class="from_country_container">
<label for="id_from_address_point">{{ form.fields.from_address_point.label }}</label>
<input type="number" name="from_address_point" id="id_from_address_point" hidden />
<input
oninput="searchTown(this)"
onclick="searchTown(this)"
onblur="setTimeout(()=>onblurInputField(event, this), 100)"
type="text"
list="from_address_point"
name="from_address_point_txt"
{% if form.fields.from_address_point.required %} required{% endif %}
id="id_from_address_point_txt"
{% if form.initial.from_address_point_txt %}value="{{ form.initial.from_address_point_txt }}"{% endif %}
/>
<datalist id="from_address_point">
</datalist>
<div class="input_list" name="from_address_point_txt_list">
</div>
{% if not errors_off and form.errors and form.errors.from_address_point %}
<span>{{ form.errors.from_address_point}}</span>
{% endif %}
</div>
<div>
<label for="id_to_address_point">{{ form.fields.to_address_point.label }}</label>
<input type="number" name="to_address_point" id="id_to_address_point" hidden />
<input
oninput="searchTown(this)"
onclick="searchTown(this)"
onblur="setTimeout(()=>onblurInputField(event, this), 100)"
type="text"
name="to_address_point_txt"
{% if form.fields.to_address_point.required %} required{% endif %}
id="id_to_address_point_txt"
{% if form.initial.to_address_point_txt %}value="{{ form.initial.to_address_point_txt}}"{% endif %}
/>
<div class="input_list" name="to_address_point_txt_list">
</div>
{% if not errors_off and form.errors and form.errors.to_address_point %}
<span>{{ form.errors.to_address_point }}</span>
{% endif %}
</div>
</div>
{# <div>#}
{# <label for="id_from_city">{{ form.fields.from_city.label }}</label>#}
{# <input type="text" name="from_city"{% if form.fields.from_city.required %} required{% endif %} id="id_from_city">#}
{# </div>#}
{# <div>#}
{# <label for="id_to_city">{{ form.fields.to_city.label }}</label>#}
{# <input type="text" name="to_city"{% if form.fields.to_city.required %} required{% endif %} id="id_to_city">#}
{# </div>#}
<div class="from_to_place">
<div>
<label for="id_from_place">{{ form.fields.from_place.label }}</label>
<select
name="from_place"
{# onchange="hideErrorMsg(this)"#}
id="id_from_place"
{% if form.fields.from_place.required %} required{% endif %}>
{% for item in form.fields.from_place.choices %}
<option
value="{{ item.0 }}"{% if form.initial.from_place == item.0 %}
selected="selected"{% endif %}>{{ item.1 }}
</option>
{% endfor %}
</select>
{% if not errors_off and form.errors and form.errors.from_place %}
<span>{{ form.errors.from_place }}</span>
{% endif %}
</div>
<div>
<label for="id_to_place">{{ form.fields.to_place.label }}</label>
<select
name="to_place"
id="id_to_place"
{% if form.fields.to_place.required %} required{% endif %}>
{% for item in form.fields.to_place.choices %}
<option
value="{{ item.0 }}"{% if form.initial.to_place == item.0 %}
selected="selected"{% endif %}>{{ item.1 }}
</option>
{% endfor %}
</select>
{% if not errors_off and form.errors and form.errors.to_place %}
<span>{{ form.errors.to_place }}</span>
{% endif %}
</div>
</div>
<hr>
<div>
<label for="id_cargo_type">{{ form.fields.cargo_type.label }}</label>
</div>
{#<div>#}
{# <select#}
{# multiple#}
{# size="5"#}
{# name="cargo_type"#}
{# id="id_cargo_type"#}
{# {% if form.fields.cargo_type.required %} required{% endif %}>#}
{# {% for item in form.fields.cargo_type.choices %}#}
{# <option#}
{# value="{{ item.0 }}"{% if form.fields.cargo_type == item.0 %}#}
{# selected="selected"{% endif %}>{{ item.1 }}#}
{# </option>#}
{# {% endfor %}#}
{##}
{# </select>#}
{# </div>#}
<div class="checkbox_cargo_type">
{% for item in form.fields.cargo_type.choices %}
<input
type="checkbox"
name="cargo_type"
id="id_cargo_type"
{% if form.fields.cargo_type.required %} required{% endif %}
value="{{ item.0 }}"
{% if form.fields.cargo_type == item.0 %}
{% endif %}/>{{ item.1 }}
{% endfor %}
{# <lable for="">#}
{##}
{# </lable>#}
{% if not errors_off and form.errors and form.errors.cargo_type %}
<span>{{ form.errors.cargo_type }}</span>
{% endif %}
</div>
<hr>
<div class="range-slider">
<label for="id_weight">{{ form.fields.weight.label }}</label>
<input
type="text"
id="id_weight"
{% if form.fields.weight.required %} required{% endif %}
name="weight"
value=""
{% if form.initial.weight %}value="{{ form.initial.weight}}"{% endif %}
/>
{% if not errors_off and form.errors and form.errors.weight %}
<span>{{ form.errors.weight }}</span>
{% endif %}
</div>
{# <div class="prise-slider-div">#}
{# <span class="filter-span">Цена</span>#}
{# <div id="slider-range"></div>#}
{# <div class="input-control-price">#}
{# <div class="slider-range-div-input">#}
{# <span class="span-price-placeholder">от</span>#}
{# <input min="0" max="1000" type="number" onchange="set_range(this)" class="form-control" name="price" id="control-price-1">#}
{# </div>#}
{##}
{# <div class="slider-range-div-input">#}
{# <span class="span-price-placeholder">до</span>#}
{# <input min="0" max="1000" type="number" onchange="set_range(this)" class="form-control" name="price" id="control-price-2">#}
{# </div>#}
{# </div>#}
{# </div>#}
<hr>
<div class="phone">
<div>
<label for="id_phone">{{ form.fields.phone.label }}</label>
<input
type="text"
name="phone"
placeholder="{{ form.fields.phone.label }}"
{% if form.fields.phone.required %} required{% endif %}
id="id_phone"
{% if form.initial.phone %}value="{{ form.initial.phone}}"{% endif %}
/>
{% if not errors_off and form.errors and form.errors.phone %}
<span>{{ form.errors.phone }}</span>
{% endif %}
</div>
<div>
<label for="id_extra_phone">{{ form.fields.extra_phone.label }}</label>
<input
type="text"
name="extra_phone"
id="id_extra_phone"
placeholder="{{ form.fields.extra_phone.label }}"
{% if form.initial.extra_phone %}value="{{ form.initial.extra_phone}}"{% endif %}
/>
{% if not errors_off and form.errors and form.errors.extra_phone %}
<span>{{ form.errors.extra_phone }}</span>
{% endif %}
</div>
</div>
<hr>
<div>
<label for="id_receive_msg_by_email">{{ form.fields.receive_msg_by_email.label }}</label>
<input type="checkbox" name="receive_msg_by_email" id="id_receive_msg_by_email">
{% if not errors_off and form.errors and form.errors.receive_msg_by_email %}
<span>{{ form.errors.receive_msg_by_email }}</span>
{% endif %}
</div>
<div class="button_register">
<button id="registration" onclick="sendRoute(this)"> Разместить объявления </button>
</div>
{% endif %}
</form>

19
templates/widgets/w_route_info.html
View File

@@ -19,16 +19,21 @@
</div>
<div class="route_info_point">
<span>
{{ route.from_country.name }}/{{ route.from_city.name }}
</span>
<div></div>
<div>
<div>
<span>
{{ route.from_country.name }}/{{ route.from_city.name }}
</span>
<span>
{{ route.to_country.name }}/{{ route.to_city.name }}
</span>
<div></div>
</div>
<span>
{{ route.to_country.name }}/{{ route.to_city.name }}
</span>
</div>
</div>
<div class="route_info_date">