diff options
author | Étienne Loks <etienne.loks@iggdrasil.net> | 2017-06-30 18:13:31 +0200 |
---|---|---|
committer | Étienne Loks <etienne.loks@iggdrasil.net> | 2017-06-30 18:13:31 +0200 |
commit | 11eefad9b7db1dc5a4d7a844dd2ad0b78bec6d0c (patch) | |
tree | 51e3ce3686ef3c2a4356cd1b7b5b7eae5b5bc9a0 | |
parent | f88845f0566764cd72f0ba94ed16b6abe7a9affe (diff) | |
download | Ishtar-11eefad9b7db1dc5a4d7a844dd2ad0b78bec6d0c.tar.bz2 Ishtar-11eefad9b7db1dc5a4d7a844dd2ad0b78bec6d0c.zip |
v1 merge: adapt initial migrations
4 files changed, 37 insertions, 7 deletions
diff --git a/archaeological_context_records/migrations/0001_initial.py b/archaeological_context_records/migrations/0001_initial.py index 7f8602afc..743659f01 100644 --- a/archaeological_context_records/migrations/0001_initial.py +++ b/archaeological_context_records/migrations/0001_initial.py @@ -90,7 +90,7 @@ class Migration(migrations.Migration): ('image', models.ImageField(max_length=255, null=True, upload_to=b'upload/', blank=True)), ('thumbnail', models.ImageField(max_length=255, null=True, upload_to=b'upload/thumbs/', blank=True)), ('title', models.CharField(max_length=300, verbose_name='Title')), - ('external_id', models.CharField(max_length=12, null=True, verbose_name='External ID', blank=True)), + ('external_id', models.TextField(max_length=300, null=True, verbose_name='External ID', blank=True)), ('scale', models.CharField(max_length=30, null=True, verbose_name='Scale', blank=True)), ('associated_url', models.URLField(null=True, verbose_name='Numerical ressource (web address)', blank=True)), ('receipt_date', models.DateField(null=True, verbose_name='Receipt date', blank=True)), diff --git a/archaeological_finds/migrations/0001_initial.py b/archaeological_finds/migrations/0001_initial.py index c3e43d362..0f436867e 100644 --- a/archaeological_finds/migrations/0001_initial.py +++ b/archaeological_finds/migrations/0001_initial.py @@ -145,7 +145,7 @@ class Migration(migrations.Migration): ('image', models.ImageField(max_length=255, null=True, upload_to=b'upload/', blank=True)), ('thumbnail', models.ImageField(max_length=255, null=True, upload_to=b'upload/thumbs/', blank=True)), ('title', models.CharField(max_length=300, verbose_name='Title')), - ('external_id', models.CharField(max_length=12, null=True, verbose_name='External ID', blank=True)), + ('external_id', models.TextField(max_length=300, null=True, verbose_name='External ID', blank=True)), ('scale', models.CharField(max_length=30, null=True, verbose_name='Scale', blank=True)), ('associated_url', models.URLField(null=True, verbose_name='Numerical ressource (web address)', blank=True)), ('receipt_date', models.DateField(null=True, verbose_name='Receipt date', blank=True)), @@ -456,7 +456,7 @@ class Migration(migrations.Migration): ('image', models.ImageField(max_length=255, null=True, upload_to=b'upload/', blank=True)), ('thumbnail', models.ImageField(max_length=255, null=True, upload_to=b'upload/thumbs/', blank=True)), ('title', models.CharField(max_length=300, verbose_name='Title')), - ('external_id', models.CharField(max_length=12, null=True, verbose_name='External ID', blank=True)), + ('external_id', models.TextField(max_length=300, null=True, verbose_name='External ID', blank=True)), ('scale', models.CharField(max_length=30, null=True, verbose_name='Scale', blank=True)), ('associated_url', models.URLField(null=True, verbose_name='Numerical ressource (web address)', blank=True)), ('receipt_date', models.DateField(null=True, verbose_name='Receipt date', blank=True)), @@ -500,7 +500,7 @@ class Migration(migrations.Migration): ('image', models.ImageField(max_length=255, null=True, upload_to=b'upload/', blank=True)), ('thumbnail', models.ImageField(max_length=255, null=True, upload_to=b'upload/thumbs/', blank=True)), ('title', models.CharField(max_length=300, verbose_name='Title')), - ('external_id', models.CharField(max_length=12, null=True, verbose_name='External ID', blank=True)), + ('external_id', models.TextField(max_length=300, null=True, verbose_name='External ID', blank=True)), ('scale', models.CharField(max_length=30, null=True, verbose_name='Scale', blank=True)), ('associated_url', models.URLField(null=True, verbose_name='Numerical ressource (web address)', blank=True)), ('receipt_date', models.DateField(null=True, verbose_name='Receipt date', blank=True)), diff --git a/archaeological_operations/migrations/0001_initial.py b/archaeological_operations/migrations/0001_initial.py index 7effdc075..65d741aaa 100644 --- a/archaeological_operations/migrations/0001_initial.py +++ b/archaeological_operations/migrations/0001_initial.py @@ -121,7 +121,7 @@ class Migration(migrations.Migration): ('optional_man_days', models.IntegerField(null=True, verbose_name='Optional man-days', blank=True)), ('effective_man_days', models.IntegerField(null=True, verbose_name='Effective man-days', blank=True)), ('old_code', models.CharField(max_length=200, null=True, verbose_name='Old code', blank=True)), - ('code_patriarche', models.IntegerField(db_index=True, null=True, verbose_name='Code PATRIARCHE', blank=True)), + ('code_patriarche', models.TextField(db_index=True, null=True, verbose_name='Code PATRIARCHE', blank=True)), ('fnap_financing', models.FloatField(null=True, verbose_name='Financement FNAP (%)', blank=True)), ('fnap_cost', models.IntegerField(null=True, verbose_name='Financement FNAP (\u20ac)', blank=True)), ('zoning_prescription', models.NullBooleanField(verbose_name='Prescription on zoning')), @@ -174,7 +174,7 @@ class Migration(migrations.Migration): ('optional_man_days', models.IntegerField(null=True, verbose_name='Optional man-days', blank=True)), ('effective_man_days', models.IntegerField(null=True, verbose_name='Effective man-days', blank=True)), ('old_code', models.CharField(max_length=200, null=True, verbose_name='Old code', blank=True)), - ('code_patriarche', models.IntegerField(unique=True, null=True, verbose_name='Code PATRIARCHE', blank=True)), + ('code_patriarche', models.TextField(db_index=True, null=True, verbose_name='Code PATRIARCHE', blank=True)), ('fnap_financing', models.FloatField(null=True, verbose_name='Financement FNAP (%)', blank=True)), ('fnap_cost', models.IntegerField(null=True, verbose_name='Financement FNAP (\u20ac)', blank=True)), ('zoning_prescription', models.NullBooleanField(verbose_name='Prescription on zoning')), @@ -214,7 +214,7 @@ class Migration(migrations.Migration): ('image', models.ImageField(max_length=255, null=True, upload_to=b'upload/', blank=True)), ('thumbnail', models.ImageField(max_length=255, null=True, upload_to=b'upload/thumbs/', blank=True)), ('title', models.CharField(max_length=300, verbose_name='Title')), - ('external_id', models.CharField(max_length=12, null=True, verbose_name='External ID', blank=True)), + ('external_id', models.TextField(max_length=300, null=True, verbose_name='External ID', blank=True)), ('scale', models.CharField(max_length=30, null=True, verbose_name='Scale', blank=True)), ('associated_url', models.URLField(null=True, verbose_name='Numerical ressource (web address)', blank=True)), ('receipt_date', models.DateField(null=True, verbose_name='Receipt date', blank=True)), diff --git a/ishtar_common/migrations/0001_initial.py b/ishtar_common/migrations/0001_initial.py index a8d3c4a7d..f69553103 100644 --- a/ishtar_common/migrations/0001_initial.py +++ b/ishtar_common/migrations/0001_initial.py @@ -801,4 +801,34 @@ class Migration(migrations.Migration): name='importercolumn', unique_together=set([('importer_type', 'col_number')]), ), + migrations.CreateModel( + name='AdministrationScript', + fields=[ + ('id', models.AutoField(verbose_name='ID', serialize=False, auto_created=True, primary_key=True)), + ('path', models.CharField(max_length=30, verbose_name='Filename')), + ('name', models.TextField(null=True, verbose_name='Name', blank=True)), + ], + options={ + 'ordering': ['name'], + 'verbose_name': 'Administration script', + 'verbose_name_plural': 'Administration scripts', + }, + ), + migrations.CreateModel( + name='AdministrationTask', + fields=[ + ('id', models.AutoField(verbose_name='ID', serialize=False, auto_created=True, primary_key=True)), + ('state', models.CharField(default=b'S', max_length=2, verbose_name='State', choices=[(b'S', 'Scheduled'), (b'P', 'In progress'), (b'FE', 'Finished with errors'), (b'F', 'Finished')])), + ('creation_date', models.DateTimeField(default=datetime.datetime.now)), + ('launch_date', models.DateTimeField(null=True, blank=True)), + ('finished_date', models.DateTimeField(null=True, blank=True)), + ('result', models.TextField(null=True, verbose_name='Result', blank=True)), + ('script', models.ForeignKey(to='ishtar_common.AdministrationScript')), + ], + options={ + 'ordering': ['script'], + 'verbose_name': 'Administration task', + 'verbose_name_plural': 'Administration tasks', + }, + ), ] |