adding search by person-in-charge on finds

5 files changed, 16 insertions, 4 deletions

diff --git a/archaeological_context_records/.forms.py.swo b/archaeological_context_records/.forms.py.swo
deleted file mode 100644
index a30cc08fa..000000000
--- a/archaeological_context_records/.forms.py.swo
+++ /dev/null
diff --git a/archaeological_finds/forms.py b/archaeological_finds/forms.py
index a2326e4f2..caa666e9a 100644
--- a/archaeological_finds/forms.py
+++ b/archaeological_finds/forms.py
@@ -974,6 +974,7 @@ class FindSelect(DocumentItemSelect, PeriodSelect):
             "base_finds__context_record__operation__operation_code",
             "base_finds__context_record__operation__code_patriarche",
             "base_finds__context_record__operation__operation_type",
+            "base_finds__context_record__operation__person_in_charge"
             "base_finds__context_record__town__areas",
             "archaeological_sites",
             "archaeological_sites_context_record",
@@ -1012,6 +1013,14 @@ class FindSelect(DocumentItemSelect, PeriodSelect):
         label=_("Full text search"), widget=widgets.SearchWidget(
             'archaeological-finds', 'find'
         ))
+    address = forms.CharField(label=_("Address"))
+    base_finds__context_record__operation__person_in_charge = forms.IntegerField(
+        label=_("Person in charge"),
+        widget=widgets.JQueryAutoComplete(
+            reverse_lazy("autocomplete-person")#, associated_model=Person
+        ),
+        #validators=[valid_id(Person)],
+    )
     label = forms.CharField(label=_("Free ID"))
     denomination = forms.CharField(label=_("Denomination"))
     previous_id = forms.CharField(label=_("Previous ID"))
diff --git a/archaeological_finds/models_finds.py b/archaeological_finds/models_finds.py
index c292cd368..a588381d2 100644
--- a/archaeological_finds/models_finds.py
+++ b/archaeological_finds/models_finds.py
@@ -1580,6 +1580,13 @@ class Find(
             pgettext_lazy("key for text search", "functional-area"),
             "functional_areas__label__iexact",
         ),
+        "address": SearchAltName(
+            pgettext_lazy("key for text search", "address"), "address__icontains"
+        ),
+        "base_finds__context_record__operation__person_in_charge": SearchAltName(
+            pgettext_lazy("key for text search", "person-in-charge"),
+            "base_finds__context_record__operation__person_in_charge__cached_label__iexact",
+        )
     }
     ALT_NAMES.update(BaseHistorizedItem.ALT_NAMES)
     ALT_NAMES.update(DocumentItem.ALT_NAMES)
diff --git a/archaeological_warehouse/forms.py b/archaeological_warehouse/forms.py
index b1ff0a480..f70bf5595 100644
--- a/archaeological_warehouse/forms.py
+++ b/archaeological_warehouse/forms.py
@@ -150,7 +150,6 @@ class WarehouseSelect(CustomForm, TableSelect):
         ),
         validators=[valid_id(Person)],
     )
-    address = forms.CharField(label=_("Address"))
 
 
     def __init__(self, *args, **kwargs):
diff --git a/archaeological_warehouse/models.py b/archaeological_warehouse/models.py
index 94d07c792..fd1a0f3da 100644
--- a/archaeological_warehouse/models.py
+++ b/archaeological_warehouse/models.py
@@ -319,9 +319,6 @@ class Warehouse(
             pgettext_lazy("key for text search", "person-in-charge"),
             "person_in_charge__cached_label__icontains",
         ),
-        "address": SearchAltName(
-            pgettext_lazy("key for text search", "address"), "address__icontains"
-        ),
     }
     GEO_LABEL = "name"
     DOWN_MODEL_UPDATE = ["containers"]