From 0e22d62ec2cacfe501bdb7a4f3afde9081366d55 Mon Sep 17 00:00:00 2001
From: Étienne Loks <etienne.loks@iggdrasil.net>
Date: Tue, 17 Sep 2024 09:59:33 +0200
Subject: ✨ context record search: manage new fields (refs #6024)
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 archaeological_context_records/forms.py  | 11 ++++++++++-
 archaeological_context_records/models.py | 20 ++++++++++++++++++++
 2 files changed, 30 insertions(+), 1 deletion(-)

(limited to 'archaeological_context_records')

diff --git a/archaeological_context_records/forms.py b/archaeological_context_records/forms.py
index 0971fe363..f4176b619 100644
--- a/archaeological_context_records/forms.py
+++ b/archaeological_context_records/forms.py
@@ -159,7 +159,7 @@ class RecordSelect(GeoItemSelect, PeriodSelect):
     activity = forms.ChoiceField(label=_("Activity"), choices=[])
     identifications = forms.ChoiceField(label=_("Identification"), choices=[])
     cultural_attributions = forms.ChoiceField(
-        label=_("Cultural attribution"), choices=[], required=False)
+        label=_("Cultural attribution"), choices=[])
     documentations = forms.ChoiceField(label=_("Documentation"))
     description = forms.CharField(label=_("Description"))
     comment = forms.CharField(label=_("General comment"))
@@ -171,6 +171,11 @@ class RecordSelect(GeoItemSelect, PeriodSelect):
         label=_("Search within relations"), choices=[]
     )
     excavation_technics = forms.ChoiceField(label=_("Excavation techniques"), choices=[])
+    structures = forms.ChoiceField(label=_("Structure"), choices=[])
+    textures = forms.ChoiceField(label=_("Texture"), choices=[])
+    inclusions = forms.ChoiceField(label=_("Inclusions"), choices=[])
+    colors = forms.ChoiceField(label=_("Colors"), choices=[])
+    details_on_color = forms.CharField(label=_("Details on color"))
 
     TYPES = PeriodSelect.TYPES + [
         FieldType('cultural_attributions', models.CulturalAttributionType),
@@ -181,6 +186,10 @@ class RecordSelect(GeoItemSelect, PeriodSelect):
         FieldType("activity", models.ActivityType),
         FieldType("identifications", models.IdentificationType),
         FieldType("documentations", models.DocumentationType),
+        FieldType("structures", models.StructureType),
+        FieldType("textures", models.TextureType),
+        FieldType("inclusions", models.InclusionType),
+        FieldType("colors", models.ColorType),
     ] + GeoItemSelect.TYPES
     SITE_KEYS = {"archaeological_site": None}
 
diff --git a/archaeological_context_records/models.py b/archaeological_context_records/models.py
index 062535e04..a10c78552 100644
--- a/archaeological_context_records/models.py
+++ b/archaeological_context_records/models.py
@@ -712,6 +712,26 @@ class ContextRecord(
             pgettext_lazy("key for text search", "comment"),
             "comment__iexact"
         ),
+        "structures": SearchAltName(
+            pgettext_lazy("key for text search", "structure"),
+            "structures__label__iexact",
+        ),
+        "textures": SearchAltName(
+            pgettext_lazy("key for text search", "texture"),
+            "textures__label__iexact",
+        ),
+        "inclusions": SearchAltName(
+            pgettext_lazy("key for text search", "inclusion"),
+            "inclusions__label__iexact",
+        ),
+        "colors": SearchAltName(
+            pgettext_lazy("key for text search", "color"),
+            "colors__label__iexact",
+        ),
+        "details_on_color": SearchAltName(
+            pgettext_lazy("key for text search", "color-details"),
+            "details_on_color__iexact"
+        ),
     }
     ALT_NAMES.update(BaseHistorizedItem.ALT_NAMES)
     ALT_NAMES.update(DocumentItem.ALT_NAMES)
-- 
cgit v1.2.3