Find: add laboratory ID

4 files changed, 42 insertions, 7 deletions

diff --git a/archaeological_finds/forms.py b/archaeological_finds/forms.py
index 5162065c8..5fcf57a27 100644
--- a/archaeological_finds/forms.py
+++ b/archaeological_finds/forms.py
@@ -148,10 +148,10 @@ class BasicFindForm(CustomForm, ManageOldType):
         'checked_type': models.CheckedType,
     }
     field_order = [
-        'label', 'denomination', 'previous_id', 'museum_id', 'seal_number',
-        'mark', 'description', 'public_description', 'is_complete',
-        'material_type', 'material_type_quality', 'material_comment',
-        'object_type', 'object_type_quality', 'find_number',
+        'label', 'denomination', 'previous_id', 'museum_id', 'laboratory_id',
+        'seal_number', 'mark', 'description', 'public_description',
+        'is_complete', 'material_type', 'material_type_quality',
+        'material_comment', 'object_type', 'object_type_quality', 'find_number',
         'min_number_of_individuals', 'inscription', 'decoration',
         'manufacturing_place', 'communicabilitie', 'comment',
         'cultural_attribution', 'dating_comment',
@@ -168,6 +168,7 @@ class BasicFindForm(CustomForm, ManageOldType):
     denomination = forms.CharField(label=_(u"Denomination"), required=False)
     previous_id = forms.CharField(label=_("Previous ID"), required=False)
     museum_id = forms.CharField(label=_(u"Museum ID"), required=False)
+    laboratory_id = forms.CharField(label=_(u"Laboratory ID"), required=False)
     seal_number = forms.CharField(label=_(u"Seal number"), required=False)
     mark = forms.CharField(label=_(u"Mark"), required=False)
 
@@ -294,8 +295,8 @@ class FindForm(BasicFindForm):
     })
     field_order = [
         'label', 'denomination', 'previous_id',
-        'get_first_base_find__excavation_id', 'museum_id', 'seal_number',
-        'mark', 'description', 'public_description',
+        'get_first_base_find__excavation_id', 'museum_id', 'laboratory_id',
+        'seal_number', 'mark', 'description', 'public_description',
         'get_first_base_find__discovery_date',
         'get_first_base_find__discovery_date_taq', 'get_first_base_find__batch',
         'is_complete', 'material_type', 'material_type_quality',
@@ -587,7 +588,7 @@ class QAFindFormMulti(QAForm):
     SINGLE_FIELDS = [
         'qa_label', 'qa_previous_id',
         'qa_get_first_base_find__excavation_id', 'qa_museum_id',
-        'qa_seal_number', 'qa_mark',
+        'qa_laboratory_id', 'qa_seal_number', 'qa_mark',
     ]
     qa_ue = forms.IntegerField(
         label=_(u"Context record"),
@@ -604,6 +605,8 @@ class QAFindFormMulti(QAForm):
     qa_get_first_base_find__excavation_id = forms.CharField(
         label=_(u"Excavation ID"), required=False)
     qa_museum_id = forms.CharField(label=_(u"Museum ID"), required=False)
+    qa_laboratory_id = forms.CharField(label=_(u"Laboratory ID"),
+                                       required=False)
     qa_seal_number = forms.CharField(label=_(u"Seal number"), required=False)
     qa_mark = forms.CharField(label=_(u"Mark"), required=False)
 
@@ -948,6 +951,7 @@ class FindSelect(HistorySelect):
     base_finds__excavation_id = forms.CharField(label=_(u"Excavation ID"))
     seal_number = forms.CharField(label=_(u"Seal number"))
     museum_id = forms.CharField(label=_(u"Museum ID"))
+    laboratory_id = forms.CharField(label=_(u"Laboratory ID"))
     mark = forms.CharField(label=_(u"Mark"))
 
     base_finds__cache_short_id = forms.CharField(
diff --git a/archaeological_finds/migrations/0078_auto_20191209_1023.py b/archaeological_finds/migrations/0078_auto_20191209_1023.py
new file mode 100644
index 000000000..29c0663ef
--- /dev/null
+++ b/archaeological_finds/migrations/0078_auto_20191209_1023.py
@@ -0,0 +1,25 @@
+# -*- coding: utf-8 -*-
+# Generated by Django 1.11.18 on 2019-12-09 10:23
+from __future__ import unicode_literals
+
+from django.db import migrations, models
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ('archaeological_finds', '0077_find_cultural_attributions'),
+    ]
+
+    operations = [
+        migrations.AddField(
+            model_name='find',
+            name='laboratory_id',
+            field=models.TextField(blank=True, null=True, verbose_name='Laboratory ID'),
+        ),
+        migrations.AddField(
+            model_name='historicalfind',
+            name='laboratory_id',
+            field=models.TextField(blank=True, null=True, verbose_name='Laboratory ID'),
+        ),
+    ]
diff --git a/archaeological_finds/models_finds.py b/archaeological_finds/models_finds.py
index c98f72f2a..b795cf523 100644
--- a/archaeological_finds/models_finds.py
+++ b/archaeological_finds/models_finds.py
@@ -1120,6 +1120,10 @@ class Find(BulkUpdatedItem, ValueGetter, DocumentItem, BaseHistorizedItem,
             SearchAltName(
                 pgettext_lazy("key for text search", "museum-id"),
                 'museum_id__iexact'),
+        'laboratory_id':
+            SearchAltName(
+                pgettext_lazy("key for text search", "laboratory-id"),
+                'laboratory_id__iexact'),
         'mark':
             SearchAltName(
                 pgettext_lazy("key for text search", "mark"),
@@ -1482,6 +1486,7 @@ class Find(BulkUpdatedItem, ValueGetter, DocumentItem, BaseHistorizedItem,
     label = models.TextField(_(u"Free ID"))
     denomination = models.TextField(_(u"Denomination"), blank=True, null=True)
     museum_id = models.TextField(_(u"Museum ID"), blank=True, null=True)
+    laboratory_id = models.TextField(_("Laboratory 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)
diff --git a/archaeological_finds/templates/ishtar/sheet_find.html b/archaeological_finds/templates/ishtar/sheet_find.html
index ab82eb6d9..a696bcf9f 100644
--- a/archaeological_finds/templates/ishtar/sheet_find.html
+++ b/archaeological_finds/templates/ishtar/sheet_find.html
@@ -134,6 +134,7 @@
           {% field_flex "Previous ID" item.previous_id %}
           {% field_flex "Excavation ID" item.excavation_ids %}
           {% field_flex "Museum ID" item.museum_id %}
+          {% field_flex "Laboratory ID" item.laboratory_id %}
           {% field_flex "Seal number" item.seal_number %}
           {% trans "Administrative index" as admin_index_label %}
           {% field_flex admin_index_label item.administrative_index %}