diff --git a/RoutesApp/js_views.py b/RoutesApp/js_views.py
index ef1f683..0cd132f 100644
--- a/RoutesApp/js_views.py
+++ b/RoutesApp/js_views.py
@@ -19,10 +19,19 @@ def new_route_view_ajax(request):
if request.method != 'POST':
raise Http404
+ data = request.POST
+
+ form = CreateRouteForm(data)
+
+ if not form.is_valid():
+ pass
+
Dict = {
- 'form': CreateRouteForm()
+ 'form': form
}
+ # print(form)
+
html = render_to_string('blocks/profile/b_new_route.html', Dict, request=request)
return JsonResponse({'html': html}, status=200)
diff --git a/RoutesApp/models.py b/RoutesApp/models.py
index cdbfdfd..3985ce3 100644
--- a/RoutesApp/models.py
+++ b/RoutesApp/models.py
@@ -3,10 +3,11 @@ from django.utils.translation import gettext_lazy as _
from BaseModels.base_models import BaseModel
-type_transport_choices = (
+type_transport_choices = [
+ ('', _('-- Выберите cпособ перевозки --')),
('avia', _('Авиатранспорт')),
('road', _('Наземный транспорт'))
-)
+]
transfer_location_choices = (
('airport', _('В аэропорту')),
@@ -35,7 +36,7 @@ class Route(BaseModel):
choices=owner_type_choices, default='customer', verbose_name=_('Тип опреации'))
type_transport = models.CharField(
- choices=type_transport_choices, default='avia', verbose_name=_('Выберите способ перевозки'))
+ choices=type_transport_choices, default='', verbose_name=_('Выберите способ перевозки'))
departure_DT = models.DateTimeField(default=True, verbose_name=_('Дата и время выезда'))
arrival_DT = models.DateTimeField(default=True, verbose_name=_('Дата и время прибытия'))
from_address_point = models.IntegerField(verbose_name=_('Пункт выезда'))
diff --git a/static/js/sendRoute.js b/static/js/sendRoute.js
index 5497781..993d616 100644
--- a/static/js/sendRoute.js
+++ b/static/js/sendRoute.js
@@ -42,10 +42,13 @@ function sendRoute(el){
//cleaning route inputs after selection changes
function OnSelectionChange(el) {
- let form = el.form;
- let formData = new FormData(form);
- $.ajax({
- headers: { "X-CSRFToken": $('input[name=csrfmiddlewaretoken]').val() },
+ event.preventDefault()
+
+ let form = el.form;
+ let formData = new FormData(form);
+
+ $.ajax({
+ headers: {"X-CSRFToken": $('input[name=csrfmiddlewaretoken]').val()},
url: '/ru/user_account/new_route_view/',
type: "POST",
// async: true,
@@ -54,24 +57,22 @@ function OnSelectionChange(el) {
contentType: false,
// enctype: 'json',
data: formData,
- success: function(data){
- // console.log('data received')
+ success: function (data) {
+ console.log('data.html');
// location.href = '/profile'
document.querySelector(".info_profile").innerHTML = data.html
-
- $(document).ready(function (e){
- $('#id_weight').ionRangeSlider({
- skin: "round",
- type: "single",
- min: 0,
- max: 1000,
- from: 100,
- step: 1,
- grid: true,
- grid_num: 5,
- });
-
-});
+ //
+ // $(document).ready(function (e){
+ // $('#id_weight').ionRangeSlider({
+ // skin: "round",
+ // type: "single",
+ // min: 0,
+ // max: 1000,
+ // from: 100,
+ // step: 1,
+ // grid: true,
+ // grid_num: 5,
+ // }
//get dynamic value
// let fromCountry = document.getElementById('id_from_country');
diff --git a/templates/blocks/profile/b_new_route.html b/templates/blocks/profile/b_new_route.html
index 8d39127..3a559a4 100644
--- a/templates/blocks/profile/b_new_route.html
+++ b/templates/blocks/profile/b_new_route.html
@@ -9,14 +9,18 @@
+
@@ -25,19 +29,72 @@
{% endif %}
-
-
-
-
+{% if form.cleaned_data and form.cleaned_data.type_transport and form.cleaned_data.type_transport != '' %}
+
+
+
+
+
+
+
+
+
+
+ {% if form.errors and form.errors.from_address_point %}
+
{{ form.errors.from_address_point}}
+ {% endif %}
+
+
+ {#
#}
+ {# #}
+ {# #}
+ {#
#}
+ {#
#}
+ {# #}
+ {# #}
+ {#
#}
+
+
+
+
+ {% if form.errors and form.errors.from_place %}
+ {{ form.errors.from_place }}
+ {% endif %}
+
+
+
+
+ {% if form.errors and form.errors.to_place %}
+ {{ form.errors.to_place }}
+ {% endif %}
+
+
+
+
+
+
+
+
+ {#
#}
+ {# #}
+
+ {#
#}
-
- {% if form.errors and form.errors.to_address_point %}
-
{{ form.errors.to_address_point }}
- {% endif %}
-
-
-{# #}
-{# #}
-{# #}
-{#
#}
-{# #}
-{# #}
-{# #}
-{#
#}
-
-
-
- {% if form.errors and form.errors.from_place %}
- {{ form.errors.from_place }}
- {% endif %}
-
-
-
-
- {% if form.errors and form.errors.to_place %}
- {{ form.errors.to_place }}
- {% endif %}
-
-
-
-
-
-
-
-
-{##}
-{# #}
-
-{#
#}
-
+ {% for item in form.fields.cargo_type.choices %}
+ {{ item.1 }}
+ {% endfor %}
{% for item in form.fields.cargo_type.choices %}
{{ item.1 }}
{% endfor %}
-{# #}
-{##}
-{# #}
- {% if form.errors and form.errors.cargo_type %}
- {{ form.errors.cargo_type }}
- {% endif %}
-
+ {# #}
+ {##}
+ {# #}
+ {% if form.errors and form.errors.cargo_type %}
+ {{ form.errors.cargo_type }}
+ {% endif %}
+
-
+
-
-
-
- {% if form.errors and form.errors.weight %}
- {{ form.errors.weight }}
- {% endif %}
-
-
-
-
-
-
-
-
- {% if form.errors and form.errors.phone %}
-
{{ form.errors.phone }}
+
+
+
+ {% if form.errors and form.errors.weight %}
+ {{ form.errors.weight }}
{% endif %}
-
+
-
+
-
-
- {% if form.errors and form.errors.extra_phone %}
- {{ form.errors.extra_phone }}
- {% endif %}
-
-
+
+
+
+
+ />
+ {% if form.errors and form.errors.phone %}
+ {{ form.errors.phone }}
+ {% endif %}
+
-
-
-
- {% if form.errors and form.errors.receive_msg_by_email %}
- {{ form.errors.receive_msg_by_email }}
- {% endif %}
-
-
-
-
+
+
+
+
+ {% if form.errors and form.errors.extra_phone %}
+ {{ form.errors.extra_phone }}
+ {% endif %}
+
+
+
+
+
+
+
+
+ {% if form.errors and form.errors.receive_msg_by_email %}
+ {{ form.errors.receive_msg_by_email }}
+ {% endif %}
+
+
+
+
+
+
+{% endif %}
\ No newline at end of file