From 2287f9bbf0b8836aadc1f32a9a90203f1886d26d Mon Sep 17 00:00:00 2001 From: Étienne Loks Date: Wed, 6 Feb 2019 16:17:58 +0100 Subject: Merge migrations --- .../migrations/0039_auto_20190122_1550.py | 87 ---------- .../migrations/0040_auto_20190206_1423.py | 35 ---- .../migrations/0041_auto_20190122_1550.py | 87 ++++++++++ .../migrations/0042_auto_20190206_1423.py | 35 ++++ .../migrations/0059_auto_20190204_1134.py | 32 ---- .../migrations/0060_auto_20190206_1423.py | 35 ---- .../migrations/0061_auto_20190204_1134.py | 32 ++++ .../migrations/0062_auto_20190206_1423.py | 35 ++++ .../migrations/0047_auto_20190122_1550.py | 178 --------------------- .../migrations/0048_point_to_point_2d.py | 27 ---- .../migrations/0049_auto_20190122_1550.py | 178 +++++++++++++++++++++ .../migrations/0049_auto_20190122_1621.py | 36 ----- .../migrations/0050_auto_20190206_1423.py | 55 ------- .../migrations/0050_point_to_point_2d.py | 27 ++++ .../migrations/0051_auto_20190122_1621.py | 36 +++++ .../migrations/0052_auto_20190206_1423.py | 55 +++++++ .../0084_ishtarsiteprofile_use_town_for_geo.py | 20 --- .../migrations/0085_auto_20190204_1149.py | 26 --- .../0085_ishtarsiteprofile_use_town_for_geo.py | 20 +++ .../migrations/0086_auto_20190204_1149.py | 26 +++ 20 files changed, 531 insertions(+), 531 deletions(-) delete mode 100644 archaeological_context_records/migrations/0039_auto_20190122_1550.py delete mode 100644 archaeological_context_records/migrations/0040_auto_20190206_1423.py create mode 100644 archaeological_context_records/migrations/0041_auto_20190122_1550.py create mode 100644 archaeological_context_records/migrations/0042_auto_20190206_1423.py delete mode 100644 archaeological_finds/migrations/0059_auto_20190204_1134.py delete mode 100644 archaeological_finds/migrations/0060_auto_20190206_1423.py create mode 100644 archaeological_finds/migrations/0061_auto_20190204_1134.py create mode 100644 archaeological_finds/migrations/0062_auto_20190206_1423.py delete mode 100644 archaeological_operations/migrations/0047_auto_20190122_1550.py delete mode 100644 archaeological_operations/migrations/0048_point_to_point_2d.py create mode 100644 archaeological_operations/migrations/0049_auto_20190122_1550.py delete mode 100644 archaeological_operations/migrations/0049_auto_20190122_1621.py delete mode 100644 archaeological_operations/migrations/0050_auto_20190206_1423.py create mode 100644 archaeological_operations/migrations/0050_point_to_point_2d.py create mode 100644 archaeological_operations/migrations/0051_auto_20190122_1621.py create mode 100644 archaeological_operations/migrations/0052_auto_20190206_1423.py delete mode 100644 ishtar_common/migrations/0084_ishtarsiteprofile_use_town_for_geo.py delete mode 100644 ishtar_common/migrations/0085_auto_20190204_1149.py create mode 100644 ishtar_common/migrations/0085_ishtarsiteprofile_use_town_for_geo.py create mode 100644 ishtar_common/migrations/0086_auto_20190204_1149.py diff --git a/archaeological_context_records/migrations/0039_auto_20190122_1550.py b/archaeological_context_records/migrations/0039_auto_20190122_1550.py deleted file mode 100644 index 05d12abc4..000000000 --- a/archaeological_context_records/migrations/0039_auto_20190122_1550.py +++ /dev/null @@ -1,87 +0,0 @@ -# -*- coding: utf-8 -*- -# Generated by Django 1.11.10 on 2019-01-22 15:50 -from __future__ import unicode_literals - -from django.db import migrations, models -import django.db.models.deletion - - -class Migration(migrations.Migration): - - dependencies = [ - ('ishtar_common', '0084_ishtarsiteprofile_use_town_for_geo'), - ('archaeological_context_records', '0038_migrate_main_image'), - ] - - operations = [ - migrations.AddField( - model_name='contextrecord', - name='estimated_error_x', - field=models.FloatField(blank=True, null=True, verbose_name='Erreur estim\xe9e pour X'), - ), - migrations.AddField( - model_name='contextrecord', - name='estimated_error_y', - field=models.FloatField(blank=True, null=True, verbose_name='Erreur estim\xe9e pour Y'), - ), - migrations.AddField( - model_name='contextrecord', - name='estimated_error_z', - field=models.FloatField(blank=True, null=True, verbose_name='Erreur estim\xe9e pour Z'), - ), - migrations.AddField( - model_name='contextrecord', - name='spatial_reference_system', - field=models.ForeignKey(blank=True, null=True, on_delete=django.db.models.deletion.CASCADE, to='ishtar_common.SpatialReferenceSystem', verbose_name='Syst\xe8me de r\xe9f\xe9rence spatiale'), - ), - migrations.AddField( - model_name='contextrecord', - name='x', - field=models.FloatField(blank=True, null=True, verbose_name='X'), - ), - migrations.AddField( - model_name='contextrecord', - name='y', - field=models.FloatField(blank=True, null=True, verbose_name='Y'), - ), - migrations.AddField( - model_name='contextrecord', - name='z', - field=models.FloatField(blank=True, null=True, verbose_name='Z'), - ), - migrations.AddField( - model_name='historicalcontextrecord', - name='estimated_error_x', - field=models.FloatField(blank=True, null=True, verbose_name='Erreur estim\xe9e pour X'), - ), - migrations.AddField( - model_name='historicalcontextrecord', - name='estimated_error_y', - field=models.FloatField(blank=True, null=True, verbose_name='Erreur estim\xe9e pour Y'), - ), - migrations.AddField( - model_name='historicalcontextrecord', - name='estimated_error_z', - field=models.FloatField(blank=True, null=True, verbose_name='Erreur estim\xe9e pour Z'), - ), - migrations.AddField( - model_name='historicalcontextrecord', - name='spatial_reference_system', - field=models.ForeignKey(blank=True, db_constraint=False, null=True, on_delete=django.db.models.deletion.DO_NOTHING, related_name='+', to='ishtar_common.SpatialReferenceSystem'), - ), - migrations.AddField( - model_name='historicalcontextrecord', - name='x', - field=models.FloatField(blank=True, null=True, verbose_name='X'), - ), - migrations.AddField( - model_name='historicalcontextrecord', - name='y', - field=models.FloatField(blank=True, null=True, verbose_name='Y'), - ), - migrations.AddField( - model_name='historicalcontextrecord', - name='z', - field=models.FloatField(blank=True, null=True, verbose_name='Z'), - ), - ] diff --git a/archaeological_context_records/migrations/0040_auto_20190206_1423.py b/archaeological_context_records/migrations/0040_auto_20190206_1423.py deleted file mode 100644 index b3c5a6837..000000000 --- a/archaeological_context_records/migrations/0040_auto_20190206_1423.py +++ /dev/null @@ -1,35 +0,0 @@ -# -*- coding: utf-8 -*- -# Generated by Django 1.11.10 on 2019-02-06 14:23 -from __future__ import unicode_literals - -from django.db import migrations, models - - -class Migration(migrations.Migration): - - dependencies = [ - ('archaeological_context_records', '0039_auto_20190122_1550'), - ] - - operations = [ - migrations.AddField( - model_name='contextrecord', - name='multi_polygon_source', - field=models.CharField(blank=True, choices=[(b'T', 'Commune'), (b'P', 'Precise')], max_length=1, null=True, verbose_name='Multi-polygon source'), - ), - migrations.AddField( - model_name='contextrecord', - name='point_source', - field=models.CharField(blank=True, choices=[(b'T', 'Commune'), (b'P', 'Precise')], max_length=1, null=True, verbose_name='Point source'), - ), - migrations.AddField( - model_name='historicalcontextrecord', - name='multi_polygon_source', - field=models.CharField(blank=True, choices=[(b'T', 'Commune'), (b'P', 'Precise')], max_length=1, null=True, verbose_name='Multi-polygon source'), - ), - migrations.AddField( - model_name='historicalcontextrecord', - name='point_source', - field=models.CharField(blank=True, choices=[(b'T', 'Commune'), (b'P', 'Precise')], max_length=1, null=True, verbose_name='Point source'), - ), - ] diff --git a/archaeological_context_records/migrations/0041_auto_20190122_1550.py b/archaeological_context_records/migrations/0041_auto_20190122_1550.py new file mode 100644 index 000000000..5931083eb --- /dev/null +++ b/archaeological_context_records/migrations/0041_auto_20190122_1550.py @@ -0,0 +1,87 @@ +# -*- coding: utf-8 -*- +# Generated by Django 1.11.10 on 2019-01-22 15:50 +from __future__ import unicode_literals + +from django.db import migrations, models +import django.db.models.deletion + + +class Migration(migrations.Migration): + + dependencies = [ + ('ishtar_common', '0085_ishtarsiteprofile_use_town_for_geo'), + ('archaeological_context_records', '0040_auto_20190206_1522'), + ] + + operations = [ + migrations.AddField( + model_name='contextrecord', + name='estimated_error_x', + field=models.FloatField(blank=True, null=True, verbose_name='Erreur estim\xe9e pour X'), + ), + migrations.AddField( + model_name='contextrecord', + name='estimated_error_y', + field=models.FloatField(blank=True, null=True, verbose_name='Erreur estim\xe9e pour Y'), + ), + migrations.AddField( + model_name='contextrecord', + name='estimated_error_z', + field=models.FloatField(blank=True, null=True, verbose_name='Erreur estim\xe9e pour Z'), + ), + migrations.AddField( + model_name='contextrecord', + name='spatial_reference_system', + field=models.ForeignKey(blank=True, null=True, on_delete=django.db.models.deletion.CASCADE, to='ishtar_common.SpatialReferenceSystem', verbose_name='Syst\xe8me de r\xe9f\xe9rence spatiale'), + ), + migrations.AddField( + model_name='contextrecord', + name='x', + field=models.FloatField(blank=True, null=True, verbose_name='X'), + ), + migrations.AddField( + model_name='contextrecord', + name='y', + field=models.FloatField(blank=True, null=True, verbose_name='Y'), + ), + migrations.AddField( + model_name='contextrecord', + name='z', + field=models.FloatField(blank=True, null=True, verbose_name='Z'), + ), + migrations.AddField( + model_name='historicalcontextrecord', + name='estimated_error_x', + field=models.FloatField(blank=True, null=True, verbose_name='Erreur estim\xe9e pour X'), + ), + migrations.AddField( + model_name='historicalcontextrecord', + name='estimated_error_y', + field=models.FloatField(blank=True, null=True, verbose_name='Erreur estim\xe9e pour Y'), + ), + migrations.AddField( + model_name='historicalcontextrecord', + name='estimated_error_z', + field=models.FloatField(blank=True, null=True, verbose_name='Erreur estim\xe9e pour Z'), + ), + migrations.AddField( + model_name='historicalcontextrecord', + name='spatial_reference_system', + field=models.ForeignKey(blank=True, db_constraint=False, null=True, on_delete=django.db.models.deletion.DO_NOTHING, related_name='+', to='ishtar_common.SpatialReferenceSystem'), + ), + migrations.AddField( + model_name='historicalcontextrecord', + name='x', + field=models.FloatField(blank=True, null=True, verbose_name='X'), + ), + migrations.AddField( + model_name='historicalcontextrecord', + name='y', + field=models.FloatField(blank=True, null=True, verbose_name='Y'), + ), + migrations.AddField( + model_name='historicalcontextrecord', + name='z', + field=models.FloatField(blank=True, null=True, verbose_name='Z'), + ), + ] diff --git a/archaeological_context_records/migrations/0042_auto_20190206_1423.py b/archaeological_context_records/migrations/0042_auto_20190206_1423.py new file mode 100644 index 000000000..a3bfc70d4 --- /dev/null +++ b/archaeological_context_records/migrations/0042_auto_20190206_1423.py @@ -0,0 +1,35 @@ +# -*- coding: utf-8 -*- +# Generated by Django 1.11.10 on 2019-02-06 14:23 +from __future__ import unicode_literals + +from django.db import migrations, models + + +class Migration(migrations.Migration): + + dependencies = [ + ('archaeological_context_records', '0041_auto_20190122_1550'), + ] + + operations = [ + migrations.AddField( + model_name='contextrecord', + name='multi_polygon_source', + field=models.CharField(blank=True, choices=[(b'T', 'Commune'), (b'P', 'Precise')], max_length=1, null=True, verbose_name='Multi-polygon source'), + ), + migrations.AddField( + model_name='contextrecord', + name='point_source', + field=models.CharField(blank=True, choices=[(b'T', 'Commune'), (b'P', 'Precise')], max_length=1, null=True, verbose_name='Point source'), + ), + migrations.AddField( + model_name='historicalcontextrecord', + name='multi_polygon_source', + field=models.CharField(blank=True, choices=[(b'T', 'Commune'), (b'P', 'Precise')], max_length=1, null=True, verbose_name='Multi-polygon source'), + ), + migrations.AddField( + model_name='historicalcontextrecord', + name='point_source', + field=models.CharField(blank=True, choices=[(b'T', 'Commune'), (b'P', 'Precise')], max_length=1, null=True, verbose_name='Point source'), + ), + ] diff --git a/archaeological_finds/migrations/0059_auto_20190204_1134.py b/archaeological_finds/migrations/0059_auto_20190204_1134.py deleted file mode 100644 index b2a96097a..000000000 --- a/archaeological_finds/migrations/0059_auto_20190204_1134.py +++ /dev/null @@ -1,32 +0,0 @@ -# -*- coding: utf-8 -*- -# Generated by Django 1.11.10 on 2019-02-04 11:34 -from __future__ import unicode_literals - -from django.db import migrations, models -import django.db.models.deletion - - -class Migration(migrations.Migration): - - dependencies = [ - ('archaeological_finds', '0058_views_find_nonmodif_treatments'), - ] - - operations = [ - migrations.CreateModel( - name='FindNonModifTreatments', - fields=[ - ('treatment', models.OneToOneField(on_delete=django.db.models.deletion.CASCADE, primary_key=True, serialize=False, to='archaeological_finds.Treatment', verbose_name='Traitement')), - ('treatment_nb', models.IntegerField(verbose_name='Ordre')), - ], - options={ - 'ordering': ('find', '-treatment_nb'), - 'db_table': 'find_nonmodif_treatments', - 'managed': False, - }, - ), - migrations.AlterModelOptions( - name='treatment', - options={'ordering': ('-year', '-index', '-start_date'), 'permissions': (('view_treatment', 'Can view all Treatments'), ('view_own_treatment', 'Can view own Treatment'), ('add_own_treatment', 'Can add own Treatment'), ('change_own_treatment', 'Can change own Treatment'), ('delete_own_treatment', 'Can delete own Treatment')), 'verbose_name': 'Traitement', 'verbose_name_plural': 'Traitements'}, - ), - ] diff --git a/archaeological_finds/migrations/0060_auto_20190206_1423.py b/archaeological_finds/migrations/0060_auto_20190206_1423.py deleted file mode 100644 index 6ddfa5145..000000000 --- a/archaeological_finds/migrations/0060_auto_20190206_1423.py +++ /dev/null @@ -1,35 +0,0 @@ -# -*- coding: utf-8 -*- -# Generated by Django 1.11.10 on 2019-02-06 14:23 -from __future__ import unicode_literals - -from django.db import migrations, models - - -class Migration(migrations.Migration): - - dependencies = [ - ('archaeological_finds', '0059_auto_20190204_1134'), - ] - - operations = [ - migrations.AddField( - model_name='basefind', - name='multi_polygon_source', - field=models.CharField(blank=True, choices=[(b'T', 'Commune'), (b'P', 'Precise')], max_length=1, null=True, verbose_name='Multi-polygon source'), - ), - migrations.AddField( - model_name='basefind', - name='point_source', - field=models.CharField(blank=True, choices=[(b'T', 'Commune'), (b'P', 'Precise')], max_length=1, null=True, verbose_name='Point source'), - ), - migrations.AddField( - model_name='historicalbasefind', - name='multi_polygon_source', - field=models.CharField(blank=True, choices=[(b'T', 'Commune'), (b'P', 'Precise')], max_length=1, null=True, verbose_name='Multi-polygon source'), - ), - migrations.AddField( - model_name='historicalbasefind', - name='point_source', - field=models.CharField(blank=True, choices=[(b'T', 'Commune'), (b'P', 'Precise')], max_length=1, null=True, verbose_name='Point source'), - ), - ] diff --git a/archaeological_finds/migrations/0061_auto_20190204_1134.py b/archaeological_finds/migrations/0061_auto_20190204_1134.py new file mode 100644 index 000000000..bc719b24c --- /dev/null +++ b/archaeological_finds/migrations/0061_auto_20190204_1134.py @@ -0,0 +1,32 @@ +# -*- coding: utf-8 -*- +# Generated by Django 1.11.10 on 2019-02-04 11:34 +from __future__ import unicode_literals + +from django.db import migrations, models +import django.db.models.deletion + + +class Migration(migrations.Migration): + + dependencies = [ + ('archaeological_finds', '0060_auto_20190206_1522'), + ] + + operations = [ + migrations.CreateModel( + name='FindNonModifTreatments', + fields=[ + ('treatment', models.OneToOneField(on_delete=django.db.models.deletion.CASCADE, primary_key=True, serialize=False, to='archaeological_finds.Treatment', verbose_name='Traitement')), + ('treatment_nb', models.IntegerField(verbose_name='Ordre')), + ], + options={ + 'ordering': ('find', '-treatment_nb'), + 'db_table': 'find_nonmodif_treatments', + 'managed': False, + }, + ), + migrations.AlterModelOptions( + name='treatment', + options={'ordering': ('-year', '-index', '-start_date'), 'permissions': (('view_treatment', 'Can view all Treatments'), ('view_own_treatment', 'Can view own Treatment'), ('add_own_treatment', 'Can add own Treatment'), ('change_own_treatment', 'Can change own Treatment'), ('delete_own_treatment', 'Can delete own Treatment')), 'verbose_name': 'Traitement', 'verbose_name_plural': 'Traitements'}, + ), + ] diff --git a/archaeological_finds/migrations/0062_auto_20190206_1423.py b/archaeological_finds/migrations/0062_auto_20190206_1423.py new file mode 100644 index 000000000..8f4a26cec --- /dev/null +++ b/archaeological_finds/migrations/0062_auto_20190206_1423.py @@ -0,0 +1,35 @@ +# -*- coding: utf-8 -*- +# Generated by Django 1.11.10 on 2019-02-06 14:23 +from __future__ import unicode_literals + +from django.db import migrations, models + + +class Migration(migrations.Migration): + + dependencies = [ + ('archaeological_finds', '0061_auto_20190204_1134'), + ] + + operations = [ + migrations.AddField( + model_name='basefind', + name='multi_polygon_source', + field=models.CharField(blank=True, choices=[(b'T', 'Commune'), (b'P', 'Precise')], max_length=1, null=True, verbose_name='Multi-polygon source'), + ), + migrations.AddField( + model_name='basefind', + name='point_source', + field=models.CharField(blank=True, choices=[(b'T', 'Commune'), (b'P', 'Precise')], max_length=1, null=True, verbose_name='Point source'), + ), + migrations.AddField( + model_name='historicalbasefind', + name='multi_polygon_source', + field=models.CharField(blank=True, choices=[(b'T', 'Commune'), (b'P', 'Precise')], max_length=1, null=True, verbose_name='Multi-polygon source'), + ), + migrations.AddField( + model_name='historicalbasefind', + name='point_source', + field=models.CharField(blank=True, choices=[(b'T', 'Commune'), (b'P', 'Precise')], max_length=1, null=True, verbose_name='Point source'), + ), + ] diff --git a/archaeological_operations/migrations/0047_auto_20190122_1550.py b/archaeological_operations/migrations/0047_auto_20190122_1550.py deleted file mode 100644 index 628a997c6..000000000 --- a/archaeological_operations/migrations/0047_auto_20190122_1550.py +++ /dev/null @@ -1,178 +0,0 @@ -# -*- coding: utf-8 -*- -# Generated by Django 1.11.10 on 2019-01-22 15:50 -from __future__ import unicode_literals - -import django.contrib.gis.db.models.fields -from django.db import migrations, models -import django.db.models.deletion - - -class Migration(migrations.Migration): - - dependencies = [ - ('ishtar_common', '0084_ishtarsiteprofile_use_town_for_geo'), - ('archaeological_operations', '0046_migrate_main_image'), - ] - - operations = [ - migrations.AddField( - model_name='archaeologicalsite', - name='estimated_error_x', - field=models.FloatField(blank=True, null=True, verbose_name='Erreur estim\xe9e pour X'), - ), - migrations.AddField( - model_name='archaeologicalsite', - name='estimated_error_y', - field=models.FloatField(blank=True, null=True, verbose_name='Erreur estim\xe9e pour Y'), - ), - migrations.AddField( - model_name='archaeologicalsite', - name='estimated_error_z', - field=models.FloatField(blank=True, null=True, verbose_name='Erreur estim\xe9e pour Z'), - ), - migrations.AddField( - model_name='archaeologicalsite', - name='point_2d', - field=django.contrib.gis.db.models.fields.PointField(blank=True, null=True, srid=4326, verbose_name='Point (2D)'), - ), - migrations.AddField( - model_name='archaeologicalsite', - name='spatial_reference_system', - field=models.ForeignKey(blank=True, null=True, on_delete=django.db.models.deletion.CASCADE, to='ishtar_common.SpatialReferenceSystem', verbose_name='Syst\xe8me de r\xe9f\xe9rence spatiale'), - ), - migrations.AddField( - model_name='archaeologicalsite', - name='x', - field=models.FloatField(blank=True, null=True, verbose_name='X'), - ), - migrations.AddField( - model_name='archaeologicalsite', - name='y', - field=models.FloatField(blank=True, null=True, verbose_name='Y'), - ), - migrations.AddField( - model_name='archaeologicalsite', - name='z', - field=models.FloatField(blank=True, null=True, verbose_name='Z'), - ), - migrations.AddField( - model_name='historicalarchaeologicalsite', - name='estimated_error_x', - field=models.FloatField(blank=True, null=True, verbose_name='Erreur estim\xe9e pour X'), - ), - migrations.AddField( - model_name='historicalarchaeologicalsite', - name='estimated_error_y', - field=models.FloatField(blank=True, null=True, verbose_name='Erreur estim\xe9e pour Y'), - ), - migrations.AddField( - model_name='historicalarchaeologicalsite', - name='estimated_error_z', - field=models.FloatField(blank=True, null=True, verbose_name='Erreur estim\xe9e pour Z'), - ), - migrations.AddField( - model_name='historicalarchaeologicalsite', - name='point_2d', - field=django.contrib.gis.db.models.fields.PointField(blank=True, null=True, srid=4326, verbose_name='Point (2D)'), - ), - migrations.AddField( - model_name='historicalarchaeologicalsite', - name='spatial_reference_system', - field=models.ForeignKey(blank=True, db_constraint=False, null=True, on_delete=django.db.models.deletion.DO_NOTHING, related_name='+', to='ishtar_common.SpatialReferenceSystem'), - ), - migrations.AddField( - model_name='historicalarchaeologicalsite', - name='x', - field=models.FloatField(blank=True, null=True, verbose_name='X'), - ), - migrations.AddField( - model_name='historicalarchaeologicalsite', - name='y', - field=models.FloatField(blank=True, null=True, verbose_name='Y'), - ), - migrations.AddField( - model_name='historicalarchaeologicalsite', - name='z', - field=models.FloatField(blank=True, null=True, verbose_name='Z'), - ), - migrations.AddField( - model_name='historicaloperation', - name='estimated_error_x', - field=models.FloatField(blank=True, null=True, verbose_name='Erreur estim\xe9e pour X'), - ), - migrations.AddField( - model_name='historicaloperation', - name='estimated_error_y', - field=models.FloatField(blank=True, null=True, verbose_name='Erreur estim\xe9e pour Y'), - ), - migrations.AddField( - model_name='historicaloperation', - name='estimated_error_z', - field=models.FloatField(blank=True, null=True, verbose_name='Erreur estim\xe9e pour Z'), - ), - migrations.AddField( - model_name='historicaloperation', - name='point_2d', - field=django.contrib.gis.db.models.fields.PointField(blank=True, null=True, srid=4326, verbose_name='Point (2D)'), - ), - migrations.AddField( - model_name='historicaloperation', - name='spatial_reference_system', - field=models.ForeignKey(blank=True, db_constraint=False, null=True, on_delete=django.db.models.deletion.DO_NOTHING, related_name='+', to='ishtar_common.SpatialReferenceSystem'), - ), - migrations.AddField( - model_name='historicaloperation', - name='x', - field=models.FloatField(blank=True, null=True, verbose_name='X'), - ), - migrations.AddField( - model_name='historicaloperation', - name='y', - field=models.FloatField(blank=True, null=True, verbose_name='Y'), - ), - migrations.AddField( - model_name='historicaloperation', - name='z', - field=models.FloatField(blank=True, null=True, verbose_name='Z'), - ), - migrations.AddField( - model_name='operation', - name='estimated_error_x', - field=models.FloatField(blank=True, null=True, verbose_name='Erreur estim\xe9e pour X'), - ), - migrations.AddField( - model_name='operation', - name='estimated_error_y', - field=models.FloatField(blank=True, null=True, verbose_name='Erreur estim\xe9e pour Y'), - ), - migrations.AddField( - model_name='operation', - name='estimated_error_z', - field=models.FloatField(blank=True, null=True, verbose_name='Erreur estim\xe9e pour Z'), - ), - migrations.AddField( - model_name='operation', - name='point_2d', - field=django.contrib.gis.db.models.fields.PointField(blank=True, null=True, srid=4326, verbose_name='Point (2D)'), - ), - migrations.AddField( - model_name='operation', - name='spatial_reference_system', - field=models.ForeignKey(blank=True, null=True, on_delete=django.db.models.deletion.CASCADE, to='ishtar_common.SpatialReferenceSystem', verbose_name='Syst\xe8me de r\xe9f\xe9rence spatiale'), - ), - migrations.AddField( - model_name='operation', - name='x', - field=models.FloatField(blank=True, null=True, verbose_name='X'), - ), - migrations.AddField( - model_name='operation', - name='y', - field=models.FloatField(blank=True, null=True, verbose_name='Y'), - ), - migrations.AddField( - model_name='operation', - name='z', - field=models.FloatField(blank=True, null=True, verbose_name='Z'), - ), - ] diff --git a/archaeological_operations/migrations/0048_point_to_point_2d.py b/archaeological_operations/migrations/0048_point_to_point_2d.py deleted file mode 100644 index 9b590ff7b..000000000 --- a/archaeological_operations/migrations/0048_point_to_point_2d.py +++ /dev/null @@ -1,27 +0,0 @@ -# -*- coding: utf-8 -*- -# Generated by Django 1.11.10 on 2019-01-22 15:54 -from __future__ import unicode_literals - -from django.db import migrations - - -def point_to_point_2d(apps, schema_editor): - ArchaeologicalSite = apps.get_model( - 'archaeological_operations', 'ArchaeologicalSite') - Operation = apps.get_model('archaeological_operations', 'Operation') - for kls in [ArchaeologicalSite, Operation]: - for item in kls.objects.exclude(point__isnull=True).all(): - item.point_2d = item.point - item.point = None - item.save() - - -class Migration(migrations.Migration): - - dependencies = [ - ('archaeological_operations', '0047_auto_20190122_1550'), - ] - - operations = [ - migrations.RunPython(point_to_point_2d) - ] diff --git a/archaeological_operations/migrations/0049_auto_20190122_1550.py b/archaeological_operations/migrations/0049_auto_20190122_1550.py new file mode 100644 index 000000000..b85df18f2 --- /dev/null +++ b/archaeological_operations/migrations/0049_auto_20190122_1550.py @@ -0,0 +1,178 @@ +# -*- coding: utf-8 -*- +# Generated by Django 1.11.10 on 2019-01-22 15:50 +from __future__ import unicode_literals + +import django.contrib.gis.db.models.fields +from django.db import migrations, models +import django.db.models.deletion + + +class Migration(migrations.Migration): + + dependencies = [ + ('ishtar_common', '0085_ishtarsiteprofile_use_town_for_geo'), + ('archaeological_operations', '0048_auto_20190206_1522'), + ] + + operations = [ + migrations.AddField( + model_name='archaeologicalsite', + name='estimated_error_x', + field=models.FloatField(blank=True, null=True, verbose_name='Erreur estim\xe9e pour X'), + ), + migrations.AddField( + model_name='archaeologicalsite', + name='estimated_error_y', + field=models.FloatField(blank=True, null=True, verbose_name='Erreur estim\xe9e pour Y'), + ), + migrations.AddField( + model_name='archaeologicalsite', + name='estimated_error_z', + field=models.FloatField(blank=True, null=True, verbose_name='Erreur estim\xe9e pour Z'), + ), + migrations.AddField( + model_name='archaeologicalsite', + name='point_2d', + field=django.contrib.gis.db.models.fields.PointField(blank=True, null=True, srid=4326, verbose_name='Point (2D)'), + ), + migrations.AddField( + model_name='archaeologicalsite', + name='spatial_reference_system', + field=models.ForeignKey(blank=True, null=True, on_delete=django.db.models.deletion.CASCADE, to='ishtar_common.SpatialReferenceSystem', verbose_name='Syst\xe8me de r\xe9f\xe9rence spatiale'), + ), + migrations.AddField( + model_name='archaeologicalsite', + name='x', + field=models.FloatField(blank=True, null=True, verbose_name='X'), + ), + migrations.AddField( + model_name='archaeologicalsite', + name='y', + field=models.FloatField(blank=True, null=True, verbose_name='Y'), + ), + migrations.AddField( + model_name='archaeologicalsite', + name='z', + field=models.FloatField(blank=True, null=True, verbose_name='Z'), + ), + migrations.AddField( + model_name='historicalarchaeologicalsite', + name='estimated_error_x', + field=models.FloatField(blank=True, null=True, verbose_name='Erreur estim\xe9e pour X'), + ), + migrations.AddField( + model_name='historicalarchaeologicalsite', + name='estimated_error_y', + field=models.FloatField(blank=True, null=True, verbose_name='Erreur estim\xe9e pour Y'), + ), + migrations.AddField( + model_name='historicalarchaeologicalsite', + name='estimated_error_z', + field=models.FloatField(blank=True, null=True, verbose_name='Erreur estim\xe9e pour Z'), + ), + migrations.AddField( + model_name='historicalarchaeologicalsite', + name='point_2d', + field=django.contrib.gis.db.models.fields.PointField(blank=True, null=True, srid=4326, verbose_name='Point (2D)'), + ), + migrations.AddField( + model_name='historicalarchaeologicalsite', + name='spatial_reference_system', + field=models.ForeignKey(blank=True, db_constraint=False, null=True, on_delete=django.db.models.deletion.DO_NOTHING, related_name='+', to='ishtar_common.SpatialReferenceSystem'), + ), + migrations.AddField( + model_name='historicalarchaeologicalsite', + name='x', + field=models.FloatField(blank=True, null=True, verbose_name='X'), + ), + migrations.AddField( + model_name='historicalarchaeologicalsite', + name='y', + field=models.FloatField(blank=True, null=True, verbose_name='Y'), + ), + migrations.AddField( + model_name='historicalarchaeologicalsite', + name='z', + field=models.FloatField(blank=True, null=True, verbose_name='Z'), + ), + migrations.AddField( + model_name='historicaloperation', + name='estimated_error_x', + field=models.FloatField(blank=True, null=True, verbose_name='Erreur estim\xe9e pour X'), + ), + migrations.AddField( + model_name='historicaloperation', + name='estimated_error_y', + field=models.FloatField(blank=True, null=True, verbose_name='Erreur estim\xe9e pour Y'), + ), + migrations.AddField( + model_name='historicaloperation', + name='estimated_error_z', + field=models.FloatField(blank=True, null=True, verbose_name='Erreur estim\xe9e pour Z'), + ), + migrations.AddField( + model_name='historicaloperation', + name='point_2d', + field=django.contrib.gis.db.models.fields.PointField(blank=True, null=True, srid=4326, verbose_name='Point (2D)'), + ), + migrations.AddField( + model_name='historicaloperation', + name='spatial_reference_system', + field=models.ForeignKey(blank=True, db_constraint=False, null=True, on_delete=django.db.models.deletion.DO_NOTHING, related_name='+', to='ishtar_common.SpatialReferenceSystem'), + ), + migrations.AddField( + model_name='historicaloperation', + name='x', + field=models.FloatField(blank=True, null=True, verbose_name='X'), + ), + migrations.AddField( + model_name='historicaloperation', + name='y', + field=models.FloatField(blank=True, null=True, verbose_name='Y'), + ), + migrations.AddField( + model_name='historicaloperation', + name='z', + field=models.FloatField(blank=True, null=True, verbose_name='Z'), + ), + migrations.AddField( + model_name='operation', + name='estimated_error_x', + field=models.FloatField(blank=True, null=True, verbose_name='Erreur estim\xe9e pour X'), + ), + migrations.AddField( + model_name='operation', + name='estimated_error_y', + field=models.FloatField(blank=True, null=True, verbose_name='Erreur estim\xe9e pour Y'), + ), + migrations.AddField( + model_name='operation', + name='estimated_error_z', + field=models.FloatField(blank=True, null=True, verbose_name='Erreur estim\xe9e pour Z'), + ), + migrations.AddField( + model_name='operation', + name='point_2d', + field=django.contrib.gis.db.models.fields.PointField(blank=True, null=True, srid=4326, verbose_name='Point (2D)'), + ), + migrations.AddField( + model_name='operation', + name='spatial_reference_system', + field=models.ForeignKey(blank=True, null=True, on_delete=django.db.models.deletion.CASCADE, to='ishtar_common.SpatialReferenceSystem', verbose_name='Syst\xe8me de r\xe9f\xe9rence spatiale'), + ), + migrations.AddField( + model_name='operation', + name='x', + field=models.FloatField(blank=True, null=True, verbose_name='X'), + ), + migrations.AddField( + model_name='operation', + name='y', + field=models.FloatField(blank=True, null=True, verbose_name='Y'), + ), + migrations.AddField( + model_name='operation', + name='z', + field=models.FloatField(blank=True, null=True, verbose_name='Z'), + ), + ] diff --git a/archaeological_operations/migrations/0049_auto_20190122_1621.py b/archaeological_operations/migrations/0049_auto_20190122_1621.py deleted file mode 100644 index 16dbb507f..000000000 --- a/archaeological_operations/migrations/0049_auto_20190122_1621.py +++ /dev/null @@ -1,36 +0,0 @@ -# -*- coding: utf-8 -*- -# Generated by Django 1.11.10 on 2019-01-22 16:21 -from __future__ import unicode_literals - -import django.contrib.gis.db.models.fields -from django.db import migrations - - -class Migration(migrations.Migration): - - dependencies = [ - ('archaeological_operations', '0048_point_to_point_2d'), - ] - - operations = [ - migrations.AlterField( - model_name='archaeologicalsite', - name='point', - field=django.contrib.gis.db.models.fields.PointField(blank=True, dim=3, null=True, srid=4326, verbose_name='Point'), - ), - migrations.AlterField( - model_name='historicalarchaeologicalsite', - name='point', - field=django.contrib.gis.db.models.fields.PointField(blank=True, dim=3, null=True, srid=4326, verbose_name='Point'), - ), - migrations.AlterField( - model_name='historicaloperation', - name='point', - field=django.contrib.gis.db.models.fields.PointField(blank=True, dim=3, null=True, srid=4326, verbose_name='Point'), - ), - migrations.AlterField( - model_name='operation', - name='point', - field=django.contrib.gis.db.models.fields.PointField(blank=True, dim=3, null=True, srid=4326, verbose_name='Point'), - ), - ] diff --git a/archaeological_operations/migrations/0050_auto_20190206_1423.py b/archaeological_operations/migrations/0050_auto_20190206_1423.py deleted file mode 100644 index a632b6059..000000000 --- a/archaeological_operations/migrations/0050_auto_20190206_1423.py +++ /dev/null @@ -1,55 +0,0 @@ -# -*- coding: utf-8 -*- -# Generated by Django 1.11.10 on 2019-02-06 14:23 -from __future__ import unicode_literals - -from django.db import migrations, models - - -class Migration(migrations.Migration): - - dependencies = [ - ('archaeological_operations', '0049_auto_20190122_1621'), - ] - - operations = [ - migrations.AddField( - model_name='archaeologicalsite', - name='multi_polygon_source', - field=models.CharField(blank=True, choices=[(b'T', 'Commune'), (b'P', 'Precise')], max_length=1, null=True, verbose_name='Multi-polygon source'), - ), - migrations.AddField( - model_name='archaeologicalsite', - name='point_source', - field=models.CharField(blank=True, choices=[(b'T', 'Commune'), (b'P', 'Precise')], max_length=1, null=True, verbose_name='Point source'), - ), - migrations.AddField( - model_name='historicalarchaeologicalsite', - name='multi_polygon_source', - field=models.CharField(blank=True, choices=[(b'T', 'Commune'), (b'P', 'Precise')], max_length=1, null=True, verbose_name='Multi-polygon source'), - ), - migrations.AddField( - model_name='historicalarchaeologicalsite', - name='point_source', - field=models.CharField(blank=True, choices=[(b'T', 'Commune'), (b'P', 'Precise')], max_length=1, null=True, verbose_name='Point source'), - ), - migrations.AddField( - model_name='historicaloperation', - name='multi_polygon_source', - field=models.CharField(blank=True, choices=[(b'T', 'Commune'), (b'P', 'Precise')], max_length=1, null=True, verbose_name='Multi-polygon source'), - ), - migrations.AddField( - model_name='historicaloperation', - name='point_source', - field=models.CharField(blank=True, choices=[(b'T', 'Commune'), (b'P', 'Precise')], max_length=1, null=True, verbose_name='Point source'), - ), - migrations.AddField( - model_name='operation', - name='multi_polygon_source', - field=models.CharField(blank=True, choices=[(b'T', 'Commune'), (b'P', 'Precise')], max_length=1, null=True, verbose_name='Multi-polygon source'), - ), - migrations.AddField( - model_name='operation', - name='point_source', - field=models.CharField(blank=True, choices=[(b'T', 'Commune'), (b'P', 'Precise')], max_length=1, null=True, verbose_name='Point source'), - ), - ] diff --git a/archaeological_operations/migrations/0050_point_to_point_2d.py b/archaeological_operations/migrations/0050_point_to_point_2d.py new file mode 100644 index 000000000..59fdcccda --- /dev/null +++ b/archaeological_operations/migrations/0050_point_to_point_2d.py @@ -0,0 +1,27 @@ +# -*- coding: utf-8 -*- +# Generated by Django 1.11.10 on 2019-01-22 15:54 +from __future__ import unicode_literals + +from django.db import migrations + + +def point_to_point_2d(apps, schema_editor): + ArchaeologicalSite = apps.get_model( + 'archaeological_operations', 'ArchaeologicalSite') + Operation = apps.get_model('archaeological_operations', 'Operation') + for kls in [ArchaeologicalSite, Operation]: + for item in kls.objects.exclude(point__isnull=True).all(): + item.point_2d = item.point + item.point = None + item.save() + + +class Migration(migrations.Migration): + + dependencies = [ + ('archaeological_operations', '0049_auto_20190122_1550'), + ] + + operations = [ + migrations.RunPython(point_to_point_2d) + ] diff --git a/archaeological_operations/migrations/0051_auto_20190122_1621.py b/archaeological_operations/migrations/0051_auto_20190122_1621.py new file mode 100644 index 000000000..a51235945 --- /dev/null +++ b/archaeological_operations/migrations/0051_auto_20190122_1621.py @@ -0,0 +1,36 @@ +# -*- coding: utf-8 -*- +# Generated by Django 1.11.10 on 2019-01-22 16:21 +from __future__ import unicode_literals + +import django.contrib.gis.db.models.fields +from django.db import migrations + + +class Migration(migrations.Migration): + + dependencies = [ + ('archaeological_operations', '0050_point_to_point_2d'), + ] + + operations = [ + migrations.AlterField( + model_name='archaeologicalsite', + name='point', + field=django.contrib.gis.db.models.fields.PointField(blank=True, dim=3, null=True, srid=4326, verbose_name='Point'), + ), + migrations.AlterField( + model_name='historicalarchaeologicalsite', + name='point', + field=django.contrib.gis.db.models.fields.PointField(blank=True, dim=3, null=True, srid=4326, verbose_name='Point'), + ), + migrations.AlterField( + model_name='historicaloperation', + name='point', + field=django.contrib.gis.db.models.fields.PointField(blank=True, dim=3, null=True, srid=4326, verbose_name='Point'), + ), + migrations.AlterField( + model_name='operation', + name='point', + field=django.contrib.gis.db.models.fields.PointField(blank=True, dim=3, null=True, srid=4326, verbose_name='Point'), + ), + ] diff --git a/archaeological_operations/migrations/0052_auto_20190206_1423.py b/archaeological_operations/migrations/0052_auto_20190206_1423.py new file mode 100644 index 000000000..0d61f4fd3 --- /dev/null +++ b/archaeological_operations/migrations/0052_auto_20190206_1423.py @@ -0,0 +1,55 @@ +# -*- coding: utf-8 -*- +# Generated by Django 1.11.10 on 2019-02-06 14:23 +from __future__ import unicode_literals + +from django.db import migrations, models + + +class Migration(migrations.Migration): + + dependencies = [ + ('archaeological_operations', '0051_auto_20190122_1621'), + ] + + operations = [ + migrations.AddField( + model_name='archaeologicalsite', + name='multi_polygon_source', + field=models.CharField(blank=True, choices=[(b'T', 'Commune'), (b'P', 'Precise')], max_length=1, null=True, verbose_name='Multi-polygon source'), + ), + migrations.AddField( + model_name='archaeologicalsite', + name='point_source', + field=models.CharField(blank=True, choices=[(b'T', 'Commune'), (b'P', 'Precise')], max_length=1, null=True, verbose_name='Point source'), + ), + migrations.AddField( + model_name='historicalarchaeologicalsite', + name='multi_polygon_source', + field=models.CharField(blank=True, choices=[(b'T', 'Commune'), (b'P', 'Precise')], max_length=1, null=True, verbose_name='Multi-polygon source'), + ), + migrations.AddField( + model_name='historicalarchaeologicalsite', + name='point_source', + field=models.CharField(blank=True, choices=[(b'T', 'Commune'), (b'P', 'Precise')], max_length=1, null=True, verbose_name='Point source'), + ), + migrations.AddField( + model_name='historicaloperation', + name='multi_polygon_source', + field=models.CharField(blank=True, choices=[(b'T', 'Commune'), (b'P', 'Precise')], max_length=1, null=True, verbose_name='Multi-polygon source'), + ), + migrations.AddField( + model_name='historicaloperation', + name='point_source', + field=models.CharField(blank=True, choices=[(b'T', 'Commune'), (b'P', 'Precise')], max_length=1, null=True, verbose_name='Point source'), + ), + migrations.AddField( + model_name='operation', + name='multi_polygon_source', + field=models.CharField(blank=True, choices=[(b'T', 'Commune'), (b'P', 'Precise')], max_length=1, null=True, verbose_name='Multi-polygon source'), + ), + migrations.AddField( + model_name='operation', + name='point_source', + field=models.CharField(blank=True, choices=[(b'T', 'Commune'), (b'P', 'Precise')], max_length=1, null=True, verbose_name='Point source'), + ), + ] diff --git a/ishtar_common/migrations/0084_ishtarsiteprofile_use_town_for_geo.py b/ishtar_common/migrations/0084_ishtarsiteprofile_use_town_for_geo.py deleted file mode 100644 index 182187e8b..000000000 --- a/ishtar_common/migrations/0084_ishtarsiteprofile_use_town_for_geo.py +++ /dev/null @@ -1,20 +0,0 @@ -# -*- coding: utf-8 -*- -# Generated by Django 1.11.10 on 2019-01-22 15:44 -from __future__ import unicode_literals - -from django.db import migrations, models - - -class Migration(migrations.Migration): - - dependencies = [ - ('ishtar_common', '0083_document_index_external_id'), - ] - - operations = [ - migrations.AddField( - model_name='ishtarsiteprofile', - name='use_town_for_geo', - field=models.BooleanField(default=True, verbose_name='Use town to locate when coordinates are missing'), - ), - ] diff --git a/ishtar_common/migrations/0085_auto_20190204_1149.py b/ishtar_common/migrations/0085_auto_20190204_1149.py deleted file mode 100644 index d89a8ac94..000000000 --- a/ishtar_common/migrations/0085_auto_20190204_1149.py +++ /dev/null @@ -1,26 +0,0 @@ -# -*- coding: utf-8 -*- -# Generated by Django 1.11.10 on 2019-02-04 11:49 -from __future__ import unicode_literals - -import django.contrib.gis.db.models.fields -from django.db import migrations, models - - -class Migration(migrations.Migration): - - dependencies = [ - ('ishtar_common', '0084_ishtarsiteprofile_use_town_for_geo'), - ] - - operations = [ - migrations.AddField( - model_name='ishtarsiteprofile', - name='default_center', - field=django.contrib.gis.db.models.fields.PointField(default=b'SRID=4326;POINT(2.4397 46.5528)', srid=4326, verbose_name='Maps - default center'), - ), - migrations.AddField( - model_name='ishtarsiteprofile', - name='default_zoom', - field=models.IntegerField(default=6, verbose_name='Maps - default zoom'), - ), - ] diff --git a/ishtar_common/migrations/0085_ishtarsiteprofile_use_town_for_geo.py b/ishtar_common/migrations/0085_ishtarsiteprofile_use_town_for_geo.py new file mode 100644 index 000000000..8180ffa15 --- /dev/null +++ b/ishtar_common/migrations/0085_ishtarsiteprofile_use_town_for_geo.py @@ -0,0 +1,20 @@ +# -*- coding: utf-8 -*- +# Generated by Django 1.11.10 on 2019-01-22 15:44 +from __future__ import unicode_literals + +from django.db import migrations, models + + +class Migration(migrations.Migration): + + dependencies = [ + ('ishtar_common', '0084_auto_20190206_1522'), + ] + + operations = [ + migrations.AddField( + model_name='ishtarsiteprofile', + name='use_town_for_geo', + field=models.BooleanField(default=True, verbose_name='Use town to locate when coordinates are missing'), + ), + ] diff --git a/ishtar_common/migrations/0086_auto_20190204_1149.py b/ishtar_common/migrations/0086_auto_20190204_1149.py new file mode 100644 index 000000000..0796aa34a --- /dev/null +++ b/ishtar_common/migrations/0086_auto_20190204_1149.py @@ -0,0 +1,26 @@ +# -*- coding: utf-8 -*- +# Generated by Django 1.11.10 on 2019-02-04 11:49 +from __future__ import unicode_literals + +import django.contrib.gis.db.models.fields +from django.db import migrations, models + + +class Migration(migrations.Migration): + + dependencies = [ + ('ishtar_common', '0085_ishtarsiteprofile_use_town_for_geo'), + ] + + operations = [ + migrations.AddField( + model_name='ishtarsiteprofile', + name='default_center', + field=django.contrib.gis.db.models.fields.PointField(default=b'SRID=4326;POINT(2.4397 46.5528)', srid=4326, verbose_name='Maps - default center'), + ), + migrations.AddField( + model_name='ishtarsiteprofile', + name='default_zoom', + field=models.IntegerField(default=6, verbose_name='Maps - default zoom'), + ), + ] -- cgit v1.2.3