Merge branch 'dev_1' into 'dev'

fix other objects

See merge request spatial/postamates!85

service/migrations/0030_auto_20230903_2006.py

@@ -0,0 +1,35 @@
+# Generated by Django 3.2 on 2023-09-03 17:06
+
+from django.db import migrations, models
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ('service', '0029_alter_placementpoint_postamat_id'),
+    ]
+
+    operations = [
+        migrations.AlterModelOptions(
+            name='otherobjects',
+            options={'ordering': ('id',), 'verbose_name': 'Прочий объект', 'verbose_name_plural': 'Прочие объекты'},
+        ),
+        migrations.AlterModelOptions(
+            name='placementpoint',
+            options={'ordering': ('id',), 'verbose_name': 'Точка', 'verbose_name_plural': 'Точки'},
+        ),
+        migrations.AlterModelOptions(
+            name='post_and_pvz',
+            options={'ordering': ('id',), 'verbose_name': 'Постамат или ПВЗ', 'verbose_name_plural': 'Постаматы и ПВЗ'},
+        ),
+        migrations.AddField(
+            model_name='otherobjects',
+            name='param3',
+            field=models.FloatField(blank=True, null=True),
+        ),
+        migrations.AddField(
+            model_name='otherobjects',
+            name='param4',
+            field=models.FloatField(blank=True, null=True),
+        ),
+    ]

service/models.py

@@ -130,6 +130,8 @@ class OtherObjects(models.Model):
     group = models.ForeignKey('OtherObjectsGroup', default=None, related_name='other_objects', on_delete=models.CASCADE)
     param1 = models.FloatField(blank=True, null=True)
     param2 = models.TextField(blank=True, null=True)
+    param3 = models.FloatField(blank=True, null=True)
+    param4 = models.FloatField(blank=True, null=True)
     visible = models.BooleanField(default=True)