Find: add "remain" field (operations and sites) (refs #5460)

3 files changed, 25 insertions, 2 deletions

diff --git a/CHANGES.md b/CHANGES.md
index 71db3fcbc..3083fc4c9 100644
--- a/CHANGES.md
+++ b/CHANGES.md
@@ -20,7 +20,8 @@ Ishtar changelog
 - Import: improve bad encoding detection
 - Search:
   - add created before/after field
-  - Operation: add "old code" search
+  - Operation: add "old code" field
+  - Find: add "remain" field (operations and sites)
 - Free text search:
   - use accent and unaccented string
   - add french_archeo thesaurus config
diff --git a/archaeological_finds/forms.py b/archaeological_finds/forms.py
index d6e711c48..9bc3f56ff 100644
--- a/archaeological_finds/forms.py
+++ b/archaeological_finds/forms.py
@@ -31,7 +31,7 @@ from django.forms.formsets import formset_factory
 from ishtar_common.utils import ugettext_lazy as _
 
 from . import models
-from archaeological_operations.models import CulturalAttributionType
+from archaeological_operations.models import CulturalAttributionType, RemainType
 from archaeological_context_records.models import (
     DatingType,
     DatingQuality,
@@ -1306,6 +1306,9 @@ class FindSelect(GeoItemSelect, PeriodSelect):
     base_finds__context_record__operation__common_name = forms.CharField(
         label=_("Operation - Name"),
     )
+    base_finds__context_record__operation__remains = forms.ChoiceField(
+        label=_("Operation - Remains"), choices=[]
+    )
     base_finds__context_record__town__areas = forms.ChoiceField(
         label=_("Areas"), choices=[]
     )
@@ -1331,6 +1334,9 @@ class FindSelect(GeoItemSelect, PeriodSelect):
     archaeological_sites_context_record_name = forms.CharField(
         label=_("Archaeological site name (attached to the context record)")
     )
+    base_finds__context_record__archaeological_site__remains = forms.ChoiceField(
+        label=_("Archaeological site - Remains"), choices=[]
+    )
     base_finds__context_record = forms.IntegerField(
         label=_("Context record"),
         widget=widgets.JQueryAutoComplete(
@@ -1538,6 +1544,14 @@ class FindSelect(GeoItemSelect, PeriodSelect):
         FieldType("alteration_causes", models.AlterationCauseType),
         FieldType("treatment_emergency", models.TreatmentEmergencyType),
         FieldType("cultural_attributions", CulturalAttributionType),
+        FieldType(
+            "base_finds__context_record__archaeological_site__remains",
+            RemainType
+        ),
+        FieldType(
+            "base_finds__context_record__operation__remains",
+            RemainType
+        ),
     ] + GeoItemSelect.TYPES
     SITE_KEYS = {
         "archaeological_sites": "attached-to-operation",
diff --git a/archaeological_finds/models_finds.py b/archaeological_finds/models_finds.py
index 4538e0d59..5a9f9e3ae 100644
--- a/archaeological_finds/models_finds.py
+++ b/archaeological_finds/models_finds.py
@@ -1650,6 +1650,14 @@ class Find(
             pgettext_lazy("key for text search", "operation-name"),
             "base_finds__context_record__operation__common_name__iexact",
         ),
+        "base_finds__context_record__operation__remains": SearchAltName(
+            pgettext_lazy("key for text search", "operation-remain"),
+            "base_finds__context_record__operation__remains__label__iexact"
+        ),
+        "base_finds__context_record__archaeological_site__remains": SearchAltName(
+            pgettext_lazy("key for text search", "site-remain"),
+            "base_finds__context_record__archaeological_site__remains__label__iexact"
+        ),
     }
     ALT_NAMES.update(BaseHistorizedItem.ALT_NAMES)
     ALT_NAMES.update(DocumentItem.ALT_NAMES)