diff options
7 files changed, 111 insertions, 3 deletions
diff --git a/archaeological_finds/forms.py b/archaeological_finds/forms.py index 371bf3205..66702e53f 100644 --- a/archaeological_finds/forms.py +++ b/archaeological_finds/forms.py @@ -152,6 +152,8 @@ class FindForm(CustomForm, ManageOldType): label=_(u"Excavation ID"), required=False) museum_id = forms.CharField(label=_(u"Museum ID"), required=False) denomination = forms.CharField(label=_(u"Label"), required=False) + mark = forms.CharField(label=_(u"Mark"), widget=forms.Textarea, + required=False) HEADERS['description'] = FormHeader(_(u"Description")) description = forms.CharField(label=_(u"Description"), @@ -174,9 +176,9 @@ class FindForm(CustomForm, ManageOldType): label=_(u"Minimum number of individuals (MNI)"), required=False) decoration = forms.CharField(label=_(u"Decoration"), widget=forms.Textarea, - required=False) - mark = forms.CharField(label=_(u"Mark"), widget=forms.Textarea, - required=False) + required=False) + inscription = forms.CharField(label=_(u"Inscription"), + widget=forms.Textarea, required=False) manufacturing_place = forms.CharField( label=_(u"Manufacturing place"), required=False) communicabilitie = widgets.Select2MultipleField( diff --git a/archaeological_finds/migrations/0018_auto_20180303_0812.py b/archaeological_finds/migrations/0018_auto_20180303_0812.py new file mode 100644 index 000000000..92f0287b6 --- /dev/null +++ b/archaeological_finds/migrations/0018_auto_20180303_0812.py @@ -0,0 +1,31 @@ +# -*- coding: utf-8 -*- +# Generated by Django 1.11.10 on 2018-03-03 08:12 +from __future__ import unicode_literals + +from django.db import migrations, models +import virtualtime + + +class Migration(migrations.Migration): + + dependencies = [ + ('archaeological_finds', '0017_auto_20180228_1741'), + ] + + operations = [ + migrations.AddField( + model_name='find', + name='inscription', + field=models.TextField(blank=True, null=True, verbose_name='Inscription'), + ), + migrations.AddField( + model_name='historicalfind', + name='inscription', + field=models.TextField(blank=True, null=True, verbose_name='Inscription'), + ), + migrations.AlterField( + model_name='property', + name='history_date', + field=models.DateTimeField(default=virtualtime.datetime.now), + ), + ] diff --git a/archaeological_finds/models_finds.py b/archaeological_finds/models_finds.py index 48cab29ab..13b6ddfce 100644 --- a/archaeological_finds/models_finds.py +++ b/archaeological_finds/models_finds.py @@ -682,6 +682,7 @@ class Find(BulkUpdatedItem, ValueGetter, BaseHistorizedItem, ImageModel, museum_id = models.TextField(_(u"Museum ID"), blank=True, null=True) description = models.TextField(_(u"Description"), blank=True, null=True) decoration = models.TextField(_(u"Decoration"), blank=True, null=True) + inscription = models.TextField(_(u"Inscription"), blank=True, null=True) manufacturing_place = models.TextField( _(u"Manufacturing place"), blank=True, null=True) material_types = models.ManyToManyField( diff --git a/archaeological_finds/templates/ishtar/sheet_find.html b/archaeological_finds/templates/ishtar/sheet_find.html index 3b3f8bf14..c2116efe8 100644 --- a/archaeological_finds/templates/ishtar/sheet_find.html +++ b/archaeological_finds/templates/ishtar/sheet_find.html @@ -43,6 +43,7 @@ {% field_flex_full "Description" item.description "<pre>" "</pre>" %} {% field_flex_full "Mark" item.mark "<pre>" "</pre>" %} {% field_flex_full "Decoration" item.decoration "<pre>" "</pre>" %} + {% field_flex_full "Inscription" item.inscription "<pre>" "</pre>" %} {% field_flex "Manufacturing place" item.manufacturing_place %} {% field_flex "Find number" item.find_number %} diff --git a/archaeological_operations/migrations/0020_auto_20180303_0812.py b/archaeological_operations/migrations/0020_auto_20180303_0812.py new file mode 100644 index 000000000..5b50facfe --- /dev/null +++ b/archaeological_operations/migrations/0020_auto_20180303_0812.py @@ -0,0 +1,26 @@ +# -*- coding: utf-8 -*- +# Generated by Django 1.11.10 on 2018-03-03 08:12 +from __future__ import unicode_literals + +from django.db import migrations, models +import virtualtime + + +class Migration(migrations.Migration): + + dependencies = [ + ('archaeological_operations', '0019_auto_20180228_1741'), + ] + + operations = [ + migrations.AlterField( + model_name='parcel', + name='history_date', + field=models.DateTimeField(default=virtualtime.datetime.now), + ), + migrations.AlterField( + model_name='parcelowner', + name='history_date', + field=models.DateTimeField(default=virtualtime.datetime.now), + ), + ] diff --git a/archaeological_warehouse/migrations/0015_auto_20180303_0812.py b/archaeological_warehouse/migrations/0015_auto_20180303_0812.py new file mode 100644 index 000000000..f14dd38b7 --- /dev/null +++ b/archaeological_warehouse/migrations/0015_auto_20180303_0812.py @@ -0,0 +1,26 @@ +# -*- coding: utf-8 -*- +# Generated by Django 1.11.10 on 2018-03-03 08:12 +from __future__ import unicode_literals + +from django.db import migrations, models +import virtualtime + + +class Migration(migrations.Migration): + + dependencies = [ + ('archaeological_warehouse', '0014_auto_20180228_1741'), + ] + + operations = [ + migrations.AlterField( + model_name='collection', + name='history_date', + field=models.DateTimeField(default=virtualtime.datetime.now), + ), + migrations.AlterField( + model_name='container', + name='history_date', + field=models.DateTimeField(default=virtualtime.datetime.now), + ), + ] diff --git a/ishtar_common/migrations/0032_auto_20180303_0812.py b/ishtar_common/migrations/0032_auto_20180303_0812.py new file mode 100644 index 000000000..e1f72aeea --- /dev/null +++ b/ishtar_common/migrations/0032_auto_20180303_0812.py @@ -0,0 +1,21 @@ +# -*- coding: utf-8 -*- +# Generated by Django 1.11.10 on 2018-03-03 08:12 +from __future__ import unicode_literals + +from django.db import migrations, models +import virtualtime + + +class Migration(migrations.Migration): + + dependencies = [ + ('ishtar_common', '0031_auto_20180228_1741'), + ] + + operations = [ + migrations.AlterField( + model_name='administrationtask', + name='creation_date', + field=models.DateTimeField(default=virtualtime.datetime.now), + ), + ] |