diff --git a/ReferenceDataApp/funcs.py b/ReferenceDataApp/funcs.py index c138af7..0be3ce6 100644 --- a/ReferenceDataApp/funcs.py +++ b/ReferenceDataApp/funcs.py @@ -18,7 +18,7 @@ def search_cities_in_db(search_str): for item in objs_wo_tz: item.get_n_save_timezone() res_data = City.objects.filter(id__in=ids).values( - 'id', 'name', 'country__name', 'timezone', 'country__flag' + 'id', 'name', 'country__name', 'timezone', 'country__flag', 'country__short_code' ) return list(res_data) diff --git a/ReferenceDataApp/js_views.py b/ReferenceDataApp/js_views.py index b8e9f50..e76ad59 100644 --- a/ReferenceDataApp/js_views.py +++ b/ReferenceDataApp/js_views.py @@ -78,10 +78,11 @@ def get_address_point_ajax(request): return JsonResponse(res_Dict) except Exception as e: - + msg = f'ошибка в запросе = {str(e)}' + print(msg) errors_Dict = { 'errors': { - 'all__': f'ошибка в запросе = {str(e)}' + 'all__': msg } } return JsonResponse(errors_Dict, status=400) \ No newline at end of file diff --git a/RoutesApp/migrations/0011_alter_route_from_address_point_and_more.py b/RoutesApp/migrations/0011_alter_route_from_address_point_and_more.py new file mode 100644 index 0000000..f02fc7d --- /dev/null +++ b/RoutesApp/migrations/0011_alter_route_from_address_point_and_more.py @@ -0,0 +1,23 @@ +# Generated by Django 4.2.2 on 2024-12-26 15:56 + +from django.db import migrations, models + + +class Migration(migrations.Migration): + + dependencies = [ + ('RoutesApp', '0010_route_comment_alter_route_cargo_type_and_more'), + ] + + operations = [ + migrations.AlterField( + model_name='route', + name='from_address_point', + field=models.IntegerField(blank=True, null=True, verbose_name='Пункт выезда'), + ), + migrations.AlterField( + model_name='route', + name='to_address_point', + field=models.IntegerField(blank=True, null=True, verbose_name='Пункт приезда'), + ), + ] diff --git a/RoutesApp/models.py b/RoutesApp/models.py index 55eb45d..e7a9f0f 100644 --- a/RoutesApp/models.py +++ b/RoutesApp/models.py @@ -47,9 +47,13 @@ class Route(BaseModel): ) arrival_DT = models.DateTimeField(verbose_name=_('Дата и время прибытия')) # не используем с v2 - from_address_point = models.IntegerField(verbose_name=_('Пункт выезда')) + from_address_point = models.IntegerField( + verbose_name=_('Пункт выезда'), null=True, blank=True + ) # не используем с v2 - to_address_point = models.IntegerField(verbose_name=_('Пункт приезда')) + to_address_point = models.IntegerField( + verbose_name=_('Пункт приезда'), null=True, blank=True + ) from_city = models.ForeignKey( City, verbose_name=_('Город отправки'), related_name='rel_routes_for_cityFrom', on_delete=models.SET_NULL, diff --git a/templates/widgets/w_ac_input_address_point.html b/templates/widgets/w_ac_input_address_point.html index dd3314f..535400a 100644 --- a/templates/widgets/w_ac_input_address_point.html +++ b/templates/widgets/w_ac_input_address_point.html @@ -1,3 +1,7 @@ +{#