diff options
| -rw-r--r-- | archaeological_context_records/migrations/0107_auto_20220317_1120.py (renamed from archaeological_context_records/migrations/0107_auto_20220222_1534.py) | 4 | ||||
| -rw-r--r-- | archaeological_finds/migrations/0109_auto_20220317_1120.py (renamed from archaeological_finds/migrations/0109_auto_20220222_1534.py) | 4 | ||||
| -rw-r--r-- | archaeological_operations/migrations/0109_auto_20220317_1120.py (renamed from archaeological_operations/migrations/0109_auto_20220222_1534.py) | 4 | ||||
| -rw-r--r-- | archaeological_warehouse/migrations/0113_auto_20220317_1120.py (renamed from archaeological_warehouse/migrations/0113_auto_20220222_1535.py) | 4 | ||||
| -rw-r--r-- | ishtar_common/forms_common.py | 1 | ||||
| -rw-r--r-- | ishtar_common/migrations/0220_auto_20220317_1120.py (renamed from ishtar_common/migrations/0220_auto_20220222_1534.py) | 17 | ||||
| -rw-r--r-- | ishtar_common/migrations/0221_importertype_type.py | 18 | ||||
| -rw-r--r-- | ishtar_common/models_imports.py | 24 | ||||
| -rw-r--r-- | requirements.txt | 2 |
9 files changed, 45 insertions, 33 deletions
diff --git a/archaeological_context_records/migrations/0107_auto_20220222_1534.py b/archaeological_context_records/migrations/0107_auto_20220317_1120.py index 319c97824..0fec6fb6c 100644 --- a/archaeological_context_records/migrations/0107_auto_20220222_1534.py +++ b/archaeological_context_records/migrations/0107_auto_20220317_1120.py @@ -1,4 +1,4 @@ -# Generated by Django 2.2.24 on 2022-02-22 15:34 +# Generated by Django 2.2.24 on 2022-03-17 11:20 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_20220222_1534'), + ('ishtar_common', '0220_auto_20220317_1120'), ('archaeological_context_records', '0106_auto_20210326_1434'), ] diff --git a/archaeological_finds/migrations/0109_auto_20220222_1534.py b/archaeological_finds/migrations/0109_auto_20220317_1120.py index 0e7cafdde..1e53b9633 100644 --- a/archaeological_finds/migrations/0109_auto_20220222_1534.py +++ b/archaeological_finds/migrations/0109_auto_20220317_1120.py @@ -1,4 +1,4 @@ -# Generated by Django 2.2.24 on 2022-02-22 15:34 +# Generated by Django 2.2.24 on 2022-03-17 11:20 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_20220222_1534'), + ('ishtar_common', '0220_auto_20220317_1120'), ('archaeological_finds', '0108_auto_20210602_2234'), ] diff --git a/archaeological_operations/migrations/0109_auto_20220222_1534.py b/archaeological_operations/migrations/0109_auto_20220317_1120.py index c815afab9..477fa8ea2 100644 --- a/archaeological_operations/migrations/0109_auto_20220222_1534.py +++ b/archaeological_operations/migrations/0109_auto_20220317_1120.py @@ -1,4 +1,4 @@ -# Generated by Django 2.2.24 on 2022-02-22 15:34 +# Generated by Django 2.2.24 on 2022-03-17 11:20 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_20220222_1534'), + ('ishtar_common', '0220_auto_20220317_1120'), ('archaeological_operations', '0108_auto_20220214_1920'), ] diff --git a/archaeological_warehouse/migrations/0113_auto_20220222_1535.py b/archaeological_warehouse/migrations/0113_auto_20220317_1120.py index 16b1265d3..8011bc073 100644 --- a/archaeological_warehouse/migrations/0113_auto_20220222_1535.py +++ b/archaeological_warehouse/migrations/0113_auto_20220317_1120.py @@ -1,4 +1,4 @@ -# Generated by Django 2.2.24 on 2022-02-22 15:35 +# Generated by Django 2.2.24 on 2022-03-17 11:20 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_20220222_1534'), + ('ishtar_common', '0220_auto_20220317_1120'), ('archaeological_warehouse', '0112_auto_20210308_1628'), ] diff --git a/ishtar_common/forms_common.py b/ishtar_common/forms_common.py index ed59b6c85..0490c1203 100644 --- a/ishtar_common/forms_common.py +++ b/ishtar_common/forms_common.py @@ -333,7 +333,6 @@ class NewImportGISForm(NewImportFormBase): "importer_type", "imported_file", "associated_group", - "skip_lines", ) HEADERS = { diff --git a/ishtar_common/migrations/0220_auto_20220222_1534.py b/ishtar_common/migrations/0220_auto_20220317_1120.py index b6f4db445..5103b6178 100644 --- a/ishtar_common/migrations/0220_auto_20220222_1534.py +++ b/ishtar_common/migrations/0220_auto_20220317_1120.py @@ -1,4 +1,4 @@ -# Generated by Django 2.2.24 on 2022-02-22 15:34 +# Generated by Django 2.2.24 on 2022-03-17 11:20 import django.contrib.gis.db.models.fields import django.core.validators @@ -82,6 +82,21 @@ class Migration(migrations.Migration): name='spatialreferencesystem', options={'ordering': ('order', 'label'), 'verbose_name': 'Spatial reference system', 'verbose_name_plural': 'Spatial reference systems'}, ), + migrations.AddField( + model_name='importertype', + name='is_main_geometry', + field=models.BooleanField(default=True, help_text='Only relevant for GIS files', verbose_name='Set to main geometry'), + ), + migrations.AddField( + model_name='importertype', + name='layer_name', + field=models.CharField(blank=True, help_text='For GIS file with multiple layers', max_length=200, null=True, verbose_name='Layer name'), + ), + migrations.AddField( + model_name='importertype', + name='type', + field=models.CharField(choices=[('tab', 'Table'), ('gis', 'GIS')], default='tab', max_length=3, verbose_name='Type'), + ), migrations.AlterField( model_name='area', name='reference', diff --git a/ishtar_common/migrations/0221_importertype_type.py b/ishtar_common/migrations/0221_importertype_type.py deleted file mode 100644 index 7c15f31b6..000000000 --- a/ishtar_common/migrations/0221_importertype_type.py +++ /dev/null @@ -1,18 +0,0 @@ -# Generated by Django 2.2.24 on 2022-03-16 17:57 - -from django.db import migrations, models - - -class Migration(migrations.Migration): - - dependencies = [ - ('ishtar_common', '0220_auto_20220222_1534'), - ] - - operations = [ - migrations.AddField( - model_name='importertype', - name='type', - field=models.CharField(choices=[('tab', 'Table'), ('gis', 'GIS')], default='tab', max_length=3, verbose_name='Type'), - ), - ] diff --git a/ishtar_common/models_imports.py b/ishtar_common/models_imports.py index 85b3473f9..b931cc4b4 100644 --- a/ishtar_common/models_imports.py +++ b/ishtar_common/models_imports.py @@ -120,7 +120,7 @@ class ImporterTypeManager(models.Manager): IMPORT_TYPES = ( - ("tab", "Table"), + ("tab", _("Table")), ("gis", _("GIS")), ) @@ -135,8 +135,21 @@ class ImporterType(models.Model): description = models.CharField( _("Description"), blank=True, null=True, max_length=500 ) - type = models.CharField(_("Type"), max_length=3, choices=IMPORT_TYPES, - default='tab') + type = models.CharField( + _("Type"), max_length=3, choices=IMPORT_TYPES, default="tab" + ) + layer_name = models.CharField( + _("Layer name"), + max_length=200, + blank=True, + null=True, + help_text=_("For GIS file with multiple layers"), + ) + is_main_geometry = models.BooleanField( + _("Set to main geometry"), + default=True, + help_text=_("Only relevant for GIS files"), + ) users = models.ManyToManyField("IshtarUser", verbose_name=_("Users"), blank=True) associated_models = models.ForeignKey( ImporterModel, @@ -464,7 +477,8 @@ class ImporterDefaultValues(models.Model): return field = fields[target] if not hasattr(field, "remote_field") or not hasattr( - field.remote_field, "model"): + field.remote_field, "model" + ): return self.value model = field.remote_field.model # if value is an id @@ -546,7 +560,7 @@ class ImporterColumn(models.Model): return ", ".join([dp.field_name or "" for dp in self.duplicate_fields.all()]) def formater_type_lbl(self): - return ', '.join([str(target.formater_type) for target in self.targets.all()]) + return ", ".join([str(target.formater_type) for target in self.targets.all()]) class ImporterDuplicateFieldManager(models.Manager): diff --git a/requirements.txt b/requirements.txt index 0d18b197f..f43f1790a 100644 --- a/requirements.txt +++ b/requirements.txt @@ -3,6 +3,8 @@ # gdal==2.4.0 # 3.2 +fiona==1.8.18 + psycopg2-binary==2.8.6 # old 2.7.7 |