diff options
| -rw-r--r-- | archaeological_finds/migrations/0019_auto_20180308_1829.py | 25 | ||||
| -rw-r--r-- | ishtar_common/migrations/0034_auto_20180308_1828.py | 35 | ||||
| -rw-r--r-- | ishtar_common/models_imports.py | 3 |
3 files changed, 63 insertions, 0 deletions
diff --git a/archaeological_finds/migrations/0019_auto_20180308_1829.py b/archaeological_finds/migrations/0019_auto_20180308_1829.py new file mode 100644 index 000000000..f89147860 --- /dev/null +++ b/archaeological_finds/migrations/0019_auto_20180308_1829.py @@ -0,0 +1,25 @@ +# -*- coding: utf-8 -*- +# Generated by Django 1.11.10 on 2018-03-08 18:29 +from __future__ import unicode_literals + +from django.db import migrations, models + + +class Migration(migrations.Migration): + + dependencies = [ + ('archaeological_finds', '0018_auto_20180303_0812'), + ] + + operations = [ + migrations.AlterField( + model_name='find', + name='denomination', + field=models.TextField(blank=True, null=True, verbose_name='Denomination'), + ), + migrations.AlterField( + model_name='historicalfind', + name='denomination', + field=models.TextField(blank=True, null=True, verbose_name='Denomination'), + ), + ] diff --git a/ishtar_common/migrations/0034_auto_20180308_1828.py b/ishtar_common/migrations/0034_auto_20180308_1828.py new file mode 100644 index 000000000..473298eb4 --- /dev/null +++ b/ishtar_common/migrations/0034_auto_20180308_1828.py @@ -0,0 +1,35 @@ +# -*- coding: utf-8 -*- +# Generated by Django 1.11.10 on 2018-03-08 18:28 +from __future__ import unicode_literals + +from django.db import migrations, models + + +class Migration(migrations.Migration): + + dependencies = [ + ('ishtar_common', '0033_auto_20180306_1054'), + ] + + operations = [ + migrations.AddField( + model_name='import', + name='current_line', + field=models.IntegerField(blank=True, null=True, verbose_name='Current line'), + ), + migrations.AlterField( + model_name='import', + name='end_date', + field=models.DateTimeField(auto_now_add=True, null=True, verbose_name='End date'), + ), + migrations.AlterField( + model_name='import', + name='state', + field=models.CharField(choices=[(b'C', 'Created'), (b'AP', 'Analyse in progress'), (b'A', 'Analysed'), (b'P', 'Import pending'), (b'IQ', 'Import in queue'), (b'IP', 'Import in progress'), (b'FE', 'Finished with errors'), (b'F', 'Finished'), (b'AC', 'Archived')], default='C', max_length=2, verbose_name='State'), + ), + migrations.AlterField( + model_name='ishtarsiteprofile', + name='archaeological_site_label', + field=models.CharField(choices=[(b'site', 'Site'), (b'entity', 'Archaeological entity')], default=b'site', max_length=200, verbose_name='Archaeological site type'), + ), + ] diff --git a/ishtar_common/models_imports.py b/ishtar_common/models_imports.py index b6b68d5a6..c3fbaa92d 100644 --- a/ishtar_common/models_imports.py +++ b/ishtar_common/models_imports.py @@ -827,6 +827,9 @@ class Import(models.Model): blank=True, null=True, editable=False) seconds_remaining = models.IntegerField( _(u"Remaining seconds"), blank=True, null=True, editable=False) + # used by step by step import + current_line = models.IntegerField(_(u"Current line"), blank=True, + null=True) class Meta: verbose_name = _(u"Import") |