0.0.32

change fields Route

ReferenceDataApp/funcs.py

@@ -8,7 +8,7 @@ from django.db.models import Q
 def search_cities_in_db(search_str):
     Q_obj = Q(name_en__icontains=search_str) | Q(name_ru__icontains=search_str) | \
             Q(country__name_en__icontains=search_str) | Q(country__name_ru__icontains=search_str)
-    res_data = City.objects.filter(Q_obj).values('name', 'country__name')
+    res_data = City.objects.filter(Q_obj).values('id', 'name', 'country__name')
     return res_data
 
 def search_airports_in_db(search_str):
@@ -17,7 +17,7 @@ def search_airports_in_db(search_str):
             Q(city__name_en__icontains=search_str) | Q(city__name_ru__icontains=search_str) | \
             Q(city__country__name_en__icontains=search_str) | \
             Q(city__country__name_ru__icontains=search_str)
-    res_data = Airport.objects.filter(Q_obj).values('name', 'iata_code', 'city__name', 'city__country__name')
+    res_data = Airport.objects.filter(Q_obj).values('id', 'name', 'iata_code', 'city__name', 'city__country__name')
     return res_data
 
 

RoutesApp/js_views.py

@@ -41,19 +41,7 @@ def create_route_ajax(request):
             html = render_to_string('blocks/profile/b_new_route.html', Dict, request=request)
             return JsonResponse({'html': html}, status=400)
 
-        # from django.contrib.auth import authenticate
+
-        # user = authenticate(username=form.data['username'], password=form.data['password'])
-        # if user is not None:
-        #     auth.login(request, user)
-        # else:
-        #     errors_Dict = {
-        #         'errors': {
-        #             'all__': f'неверный логин и\или пароль'
-        #         }
-        #     }
-        #     Dict = {'form': errors_Dict}
-        #     html = render_to_string('blocks/profile/b_new_route.html', Dict, request=request)
-        #     return JsonResponse({'html': html}, status=400)
 
 
         res_Dict = {

RoutesApp/migrations/0002_remove_route_from_country_remove_route_to_country_and_more.py

@@ -0,0 +1,33 @@
+# Generated by Django 4.2.2 on 2023-07-20 17:22
+
+from django.db import migrations, models
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ('RoutesApp', '0001_initial'),
+    ]
+
+    operations = [
+        migrations.RemoveField(
+            model_name='route',
+            name='from_country',
+        ),
+        migrations.RemoveField(
+            model_name='route',
+            name='to_country',
+        ),
+        migrations.AddField(
+            model_name='route',
+            name='from_address_point',
+            field=models.IntegerField(default=-1, verbose_name='Пункт выезда'),
+            preserve_default=False,
+        ),
+        migrations.AddField(
+            model_name='route',
+            name='to_address_point',
+            field=models.IntegerField(default=-1, verbose_name='Пункт приезда'),
+            preserve_default=False,
+        ),
+    ]

RoutesApp/models.py

@@ -38,8 +38,8 @@ class Route(BaseModel):
         choices=type_transport_choices, default='avia', verbose_name=_('Выберите способ перевозки'))
     departure_DT = models.DateTimeField(default=True, verbose_name=_('Дата и время выезда'))
     arrival_DT = models.DateTimeField(default=True, verbose_name=_('Дата и время прибытия'))
-    from_country = models.CharField(verbose_name=_('Пункт выезда'))
+    from_address_point = models.IntegerField(verbose_name=_('Пункт выезда'))
-    to_country = models.CharField(verbose_name=_('Пункт приезда'))
+    to_address_point = models.IntegerField(verbose_name=_('Пункт приезда'))
     # from_city = forms.CharField(required=True)
     # to_city = forms.CharField(required=True)
     from_place = models.CharField(choices=transfer_location_choices, default='other',