diff options
| -rw-r--r-- | archaeological_context_records/migrations/0107_auto_20220218_1050.py (renamed from archaeological_context_records/migrations/0107_auto_20220214_1920.py) | 4 | ||||
| -rw-r--r-- | archaeological_finds/migrations/0109_auto_20220218_1050.py (renamed from archaeological_finds/migrations/0109_auto_20220214_1920.py) | 4 | ||||
| -rw-r--r-- | archaeological_operations/migrations/0109_auto_20220218_1049.py (renamed from archaeological_operations/migrations/0109_auto_20220214_1920.py) | 4 | ||||
| -rw-r--r-- | archaeological_warehouse/migrations/0113_auto_20220218_1050.py (renamed from archaeological_warehouse/migrations/0113_auto_20220214_1920.py) | 4 | ||||
| -rw-r--r-- | ishtar_common/management/commands/migrate_to_geo_v4.py | 97 | ||||
| -rw-r--r-- | ishtar_common/migrations/0220_auto_20220218_1049.py (renamed from ishtar_common/migrations/0220_auto_20220214_1920.py) | 8 | ||||
| -rw-r--r-- | ishtar_common/models_common.py | 2 | ||||
| -rw-r--r-- | ishtar_common/utils.py | 4 | ||||
| -rw-r--r-- | locale/fr/LC_MESSAGES/django.po | 2 |
9 files changed, 84 insertions, 45 deletions
diff --git a/archaeological_context_records/migrations/0107_auto_20220214_1920.py b/archaeological_context_records/migrations/0107_auto_20220218_1050.py index 1e507d219..446dd2758 100644 --- a/archaeological_context_records/migrations/0107_auto_20220214_1920.py +++ b/archaeological_context_records/migrations/0107_auto_20220218_1050.py @@ -1,4 +1,4 @@ -# Generated by Django 2.2.24 on 2022-02-14 19:20 +# Generated by Django 2.2.24 on 2022-02-18 10:50 import django.contrib.postgres.fields.jsonb from django.db import migrations, models @@ -8,7 +8,7 @@ import django.db.models.deletion class Migration(migrations.Migration): dependencies = [ - ('ishtar_common', '0220_auto_20220214_1920'), + ('ishtar_common', '0220_auto_20220218_1049'), ('archaeological_context_records', '0106_auto_20210326_1434'), ] diff --git a/archaeological_finds/migrations/0109_auto_20220214_1920.py b/archaeological_finds/migrations/0109_auto_20220218_1050.py index 90df20f3e..d8573fbf9 100644 --- a/archaeological_finds/migrations/0109_auto_20220214_1920.py +++ b/archaeological_finds/migrations/0109_auto_20220218_1050.py @@ -1,4 +1,4 @@ -# Generated by Django 2.2.24 on 2022-02-14 19:20 +# Generated by Django 2.2.24 on 2022-02-18 10:50 import archaeological_finds.models_treatments import django.contrib.postgres.fields.jsonb @@ -9,7 +9,7 @@ import django.db.models.deletion class Migration(migrations.Migration): dependencies = [ - ('ishtar_common', '0220_auto_20220214_1920'), + ('ishtar_common', '0220_auto_20220218_1049'), ('archaeological_finds', '0108_auto_20210602_2234'), ] diff --git a/archaeological_operations/migrations/0109_auto_20220214_1920.py b/archaeological_operations/migrations/0109_auto_20220218_1049.py index e5ef7152e..0d29c6956 100644 --- a/archaeological_operations/migrations/0109_auto_20220214_1920.py +++ b/archaeological_operations/migrations/0109_auto_20220218_1049.py @@ -1,4 +1,4 @@ -# Generated by Django 2.2.24 on 2022-02-14 19:20 +# Generated by Django 2.2.24 on 2022-02-18 10:49 import django.contrib.postgres.fields.jsonb from django.db import migrations, models @@ -8,8 +8,8 @@ import django.db.models.deletion class Migration(migrations.Migration): dependencies = [ + ('ishtar_common', '0220_auto_20220218_1049'), ('archaeological_operations', '0108_auto_20220214_1920'), - ('ishtar_common', '0220_auto_20220214_1920'), ] operations = [ diff --git a/archaeological_warehouse/migrations/0113_auto_20220214_1920.py b/archaeological_warehouse/migrations/0113_auto_20220218_1050.py index 1892b8adf..ec65b1214 100644 --- a/archaeological_warehouse/migrations/0113_auto_20220214_1920.py +++ b/archaeological_warehouse/migrations/0113_auto_20220218_1050.py @@ -1,4 +1,4 @@ -# Generated by Django 2.2.24 on 2022-02-14 19:20 +# Generated by Django 2.2.24 on 2022-02-18 10:50 import django.contrib.postgres.fields.jsonb from django.db import migrations, models @@ -8,7 +8,7 @@ import django.db.models.deletion class Migration(migrations.Migration): dependencies = [ - ('ishtar_common', '0220_auto_20220214_1920'), + ('ishtar_common', '0220_auto_20220218_1049'), ('archaeological_warehouse', '0112_auto_20210308_1628'), ] diff --git a/ishtar_common/management/commands/migrate_to_geo_v4.py b/ishtar_common/management/commands/migrate_to_geo_v4.py index df275bd85..64ab25c16 100644 --- a/ishtar_common/management/commands/migrate_to_geo_v4.py +++ b/ishtar_common/management/commands/migrate_to_geo_v4.py @@ -62,43 +62,74 @@ def migrate(quiet=False, log=True): ) q = Operation.objects.exclude(main_geodata__isnull=False) nb = q.count() + data_type_area, __ = models_common.GeoDataType.objects.get_or_create( + txt_idx="operation-area", defaults={"label": "Emprise de l'opération"} + ) + data_type_center, __ = models_common.GeoDataType.objects.get_or_create( + txt_idx="operation-center", defaults={"label": "Centre de l'opération"} + ) for idx, operation in enumerate(q.all()): - if operation.multi_polygon_source == "T": - operation._no_move = True - operation.skip_history_when_saving = True - operation.save() # auto managed - elif operation.multi_polygon_source == "P": - # TODO - - """ - q = operation.towns.filter(limit__isnull=False) - nb = q.count - if not nb: - break - elif nb == 1: - town = q.all()[0] - geo = models_common.GeoVectorData.objects.get( - source_content_type=town_content_type, - source_id=town.pk - ) - else: + if not quiet: + sys.stdout.write(f"\r[{percent(idx, nb)}] Migrate operations {idx + 1}/{nb}") + sys.stdout.flush() + operation._no_move = True + operation.skip_history_when_saving = True + operation.save() # auto manage geo town association + q_towns = operation.towns.filter(main_geodata__multi_polygon__isnull=False) + if q_towns.count() > 1: + changed.append( + ["operation", str(operation), operation.pk, + "Association géo de zone communale"]) + elif q_towns.count() == 1: + changed.append( + ["operation", str(operation), operation.pk, + "Association géo de commune"]) + if operation.multi_polygon_source == "P" and operation.multi_polygon: + attrs = { + "name": f"{_('Operation')}{_(':')} {str(operation)}", + "source_content_type": operation_content_type, + "source_id": operation.pk, + "multi_polygon": operation.multi_polygon, + "data_type": data_type_area, + } + data = models_common.GeoVectorData.objects.create(**attrs) + operation.main_geodata = data + operation.save() + changed.append( + ["geovectordata", data.name, data.pk, "Multi-polygone opération"]) + if operation.point_source == "P" and operation.point_2d: + if operation.x and operation.y: attrs = { - "name": name, - "source_content_type": town_content_type, - "source_id": town.pk, - "data_type": data_type, - "provider": provider, - "multi_polygon": poly, + "name": f"{_('Operation')}{_(':')} {str(operation)}", + "source_content_type": operation_content_type, + "source_id": operation.pk, + "data_type": data_type_center, + "x": operation.x, + "y": operation.y, + "z": operation.z, } - geo, created = models_common.GeoVectorData.objects.get_or_create( - **attrs) - - operation.main_geodata = geo - operation.skip_history_when_saving = True - operation._no_move = True - operation.save() - """ + data = models_common.GeoVectorData.objects.create(**attrs) + operation.main_geodata = data + operation.save() + changed.append( + ["geovectordata", data.name, data.pk, "Coordonnées opération"]) + elif operation.point_2d: + attrs = { + "name": f"{_('Operation')}{_(':')} {str(operation)}", + "source_content_type": operation_content_type, + "source_id": operation.pk, + "data_type": data_type_center, + } + if operation.point: + attrs["point_3d"] = operation.point + else: + attrs["point_2d"] = operation.point_2d + data = models_common.GeoVectorData.objects.create(**attrs) + operation.main_geodata = data + operation.save() + changed.append( + ["geovectordata", data.name, data.pk, "Point opération"]) if log and changed: diff --git a/ishtar_common/migrations/0220_auto_20220214_1920.py b/ishtar_common/migrations/0220_auto_20220218_1049.py index 2f40eab00..2c64c3e29 100644 --- a/ishtar_common/migrations/0220_auto_20220214_1920.py +++ b/ishtar_common/migrations/0220_auto_20220218_1049.py @@ -1,4 +1,4 @@ -# Generated by Django 2.2.24 on 2022-02-14 19:20 +# Generated by Django 2.2.24 on 2022-02-18 10:49 import django.contrib.gis.db.models.fields import django.core.validators @@ -71,6 +71,10 @@ class Migration(migrations.Migration): bases=(ishtar_common.models_common.Cached, models.Model), ), migrations.AlterModelOptions( + name='area', + options={'ordering': ('label',), 'verbose_name': 'Town - Area', 'verbose_name_plural': 'Town - Areas'}, + ), + migrations.AlterModelOptions( name='person', options={'ordering': ['name', 'surname'], 'permissions': (('view_own_person', 'Can view own Person'), ('add_own_person', 'Can add own Person'), ('change_own_person', 'Can change own Person'), ('delete_own_person', 'Can delete own Person')), 'verbose_name': 'Person', 'verbose_name_plural': 'Persons'}, ), @@ -82,7 +86,7 @@ class Migration(migrations.Migration): name='GeoVectorData', fields=[ ('id', models.AutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')), - ('name', models.CharField(default='Default', max_length=200, verbose_name='Name')), + ('name', models.TextField(default='Default', verbose_name='Name')), ('source_id', models.PositiveIntegerField()), ('comment', models.TextField(blank=True, default='', verbose_name='Comment')), ('x', models.FloatField(blank=True, help_text='User input', null=True, verbose_name='X')), diff --git a/ishtar_common/models_common.py b/ishtar_common/models_common.py index 95ceee948..9aae922cc 100644 --- a/ishtar_common/models_common.py +++ b/ishtar_common/models_common.py @@ -2063,7 +2063,7 @@ class GeoProviderType(HierarchicalType): class GeoVectorData(models.Model): - name = models.CharField(_("Name"), default=_("Default"), max_length=200) + name = models.TextField(_("Name"), default=_("Default")) source_content_type = models.ForeignKey( ContentType, related_name="content_type_geovectordata", on_delete=models.CASCADE ) diff --git a/ishtar_common/utils.py b/ishtar_common/utils.py index 02eeff93c..53727b6d3 100644 --- a/ishtar_common/utils.py +++ b/ishtar_common/utils.py @@ -774,6 +774,7 @@ def _post_save_geodata(sender, **kwargs): modified = True # managed cached coordinates + # TODO cached_x, cached_y, cached_z = None, None, None coords = instance.display_coordinates(rounded=False, dim=3) @@ -845,6 +846,9 @@ def _post_save_geo(sender, **kwargs): if not instance: return + return + # TODO to delete + kls_name = instance.__class__.__name__ if not profile.locate_warehouses and ( diff --git a/locale/fr/LC_MESSAGES/django.po b/locale/fr/LC_MESSAGES/django.po index 04a46d1e6..f9fc97e4b 100644 --- a/locale/fr/LC_MESSAGES/django.po +++ b/locale/fr/LC_MESSAGES/django.po @@ -1353,7 +1353,7 @@ msgstr "Unité d'Enregistrement parente" #: ishtar_common/templates/widgets/clearable_file_input.html:7 #: ishtar_common/wizards.py:496 msgid ":" -msgstr ":" +msgstr " :" #: archaeological_context_records/templates/ishtar/forms/qa_operation_contextrecord.html:11 msgid "Quick add context record" |