✨ criteria search: adapt searches for relative search (dates and numbers)

8 files changed, 31 insertions, 65 deletions

diff --git a/archaeological_files/forms.py b/archaeological_files/forms.py
index 7ec040187..21fa9ddfa 100644
--- a/archaeological_files/forms.py
+++ b/archaeological_files/forms.py
@@ -1157,8 +1157,7 @@ class AdministrativeActFileSelect(TableSelect):
         )
     act_object = forms.CharField(label=_("Object"), max_length=300)
 
-    signature_date_before = DateField(label=_("Signature date before"))
-    signature_date_after = DateField(label=_("Signature date after"))
+    signature_date = DateField(label=_("Signature date"))
     associated_file__name = forms.CharField(label=_("File name"), max_length=200)
     associated_file__general_contractor = forms.IntegerField(
         label=_("General contractor"),
diff --git a/archaeological_finds/forms.py b/archaeological_finds/forms.py
index 60a3337d5..30dacf8f2 100644
--- a/archaeological_finds/forms.py
+++ b/archaeological_finds/forms.py
@@ -1639,24 +1639,20 @@ class FindSelect(GeoItemSelect, PeriodSelect):
                 "museum_depositor_inventory_number",
                 "museum_collection_entry_mode",
                 "museum_entry_mode_comment",
-                "museum_entry_date_before",
-                "museum_entry_date_after",
-                "museum_entry_date_end_before",
-                "museum_entry_date_end_after",
+                "museum_entry_date",
+                "museum_entry_date_end",
                 "museum_entry_date_comment",
                 "museum_donor",
                 "museum_inventory_marking_presence",
                 "museum_marking_type",
                 "museum_collection",
                 "museum_former_collections",
-                "museum_inventory_entry_year_before",
-                "museum_inventory_entry_year_after",
+                "museum_inventory_entry_year",
                 "museum_inventory_conformity",
                 "museum_conformity_comment",
                 "museum_inventory_transcript",
                 "museum_original_repro",
-                "museum_allocation_date_before",
-                "museum_allocation_date_after",
+                "museum_allocation_date",
                 "museum_purchase_price",
             ),
         ),
@@ -1672,24 +1668,20 @@ class FindSelect(GeoItemSelect, PeriodSelect):
             "museum_depositor_inventory_number",
             "museum_collection_entry_mode",
             "museum_entry_mode_comment",
-            "museum_entry_date_before",
-            "museum_entry_date_after",
-            "museum_entry_date_end_before",
-            "museum_entry_date_end_after",
+            "museum_entry_date",
+            "museum_entry_date_end",
             "museum_entry_date_comment",
             "museum_donor",
             "museum_inventory_marking_presence",
             "museum_marking_type",
             "museum_collection",
             "museum_former_collections",
-            "museum_inventory_entry_year_before",
-            "museum_inventory_entry_year_after",
+            "museum_inventory_entry_year",
             "museum_inventory_conformity",
             "museum_conformity_comment",
             "museum_inventory_transcript",
             "museum_original_repro",
-            "museum_allocation_date_before",
-            "museum_allocation_date_after",
+            "museum_allocation_date",
             "museum_purchase_price",
             "museum_inventory_quantity",
             "museum_observed_quantity",
@@ -1956,8 +1948,7 @@ class FindSelect(GeoItemSelect, PeriodSelect):
             reverse_lazy('autocomplete-biographicalnote'),
             associated_model=BiographicalNote),
         validators=[valid_id(BiographicalNote)])
-    museum_inventory_entry_year_before = forms.IntegerField(label=_("Museum - Inventory entry year - before"))
-    museum_inventory_entry_year_after = forms.IntegerField(label=_("Museum - Inventory entry year - after"))
+    museum_inventory_entry_year= forms.IntegerField(label=_("Museum - Inventory entry year"))
     museum_inventory_conformity = forms.ChoiceField(
         label=_("Museum - Conformity with inventory"), choices=[]
     )
diff --git a/archaeological_finds/forms_treatments.py b/archaeological_finds/forms_treatments.py
index 011dc2d30..f7d260f42 100644
--- a/archaeological_finds/forms_treatments.py
+++ b/archaeological_finds/forms_treatments.py
@@ -567,8 +567,7 @@ class AdministrativeActTreatmentSelect(TableSelect):
     act_object = forms.CharField(label=_("Object"),
                                  max_length=300)
 
-    signature_date_after = DateField(label=_("Signature date after"))
-    signature_date_before = DateField(label=_("Signature date before"))
+    signature_date = DateField(label=_("Signature date"))
     treatment__name = forms.CharField(
         label=_("Treatment name"), max_length=200)
     treatment__year = forms.IntegerField(label=_("Treatment year"))
@@ -826,8 +825,7 @@ class AdministrativeActTreatmentFileSelect(TableSelect):
     act_object = forms.CharField(label=_("Object"),
                                  max_length=300)
 
-    signature_date_after = DateField(label=_("Signature date after"))
-    signature_date_before = DateField(label=_("Signature date before"))
+    signature_date = DateField(label=_("Signature date"))
 
     treatment_file__name = forms.CharField(
         label=_("Treatment request name"), max_length=200)
diff --git a/archaeological_finds/models_finds.py b/archaeological_finds/models_finds.py
index 52ac8d581..7ce184fc0 100644
--- a/archaeological_finds/models_finds.py
+++ b/archaeological_finds/models_finds.py
@@ -1744,19 +1744,15 @@ class Find(
             pgettext_lazy("key for text search", "museum-collection"),
             "museum_collection__label__iexact",
             related_name="museum_collection"
-    ),
+        ),
         "museum_former_collections": SearchAltName(
             pgettext_lazy("key for text search", "museum-former-collection"),
             "museum_former_collections__denomination__iexact",
             related_name="museum_former_collections"
-    ),
-        "museum_inventory_entry_year_before": SearchAltName(
-            pgettext_lazy("key for text search", "museum-inventory-entry-year-before"),
-            "museum_inventory_entry_year__lte"
         ),
-        "museum_inventory_entry_year_after": SearchAltName(
-            pgettext_lazy("key for text search", "museum-inventory-entry-year-after"),
-            "museum_inventory_entry_year__gte"
+        "museum_inventory_entry_year": SearchAltName(
+            pgettext_lazy("key for text search", "museum-inventory-entry-year"),
+            "museum_inventory_entry_year"
         ),
         "museum_inventory_conformity": SearchAltName(
             pgettext_lazy("key for text search", "museum-inventory-conformity"),
diff --git a/archaeological_operations/forms.py b/archaeological_operations/forms.py
index c35cf47af..2340d36be 100644
--- a/archaeological_operations/forms.py
+++ b/archaeological_operations/forms.py
@@ -595,12 +595,10 @@ class OperationSelect(GeoItemSelect):
         profile = get_current_profile()
         if not profile.warehouse:
             self._remove_fields((
-                'documentation_deadline_before',
-                'documentation_deadline_after',
+                'documentation_deadline',
                 'documentation_received',
                 'documentation_deposit_date',
-                'finds_deadline_before',
-                'finds_deadline_after',
+                'finds_deadline',
                 'finds_received',
                 'finds_deposit_date',
             ))
diff --git a/archaeological_operations/models.py b/archaeological_operations/models.py
index e58ddffce..d012b0088 100644
--- a/archaeological_operations/models.py
+++ b/archaeological_operations/models.py
@@ -2626,8 +2626,7 @@ class AdministrativeAct(DocumentItem, BaseHistorizedItem, OwnPerms, ValueGetter,
             "operation__parcels__public_domain",
             "operation__associated_file__parcels__public_domain",
         ),
-        "signature_date_before": "signature_date__lte",
-        "signature_date_after": "signature_date__gte",
+        "signature_date": "signature_date",
         "year": "signature_date__year",
     }
     REVERSED_BOOL_FIELDS = [
diff --git a/ishtar_common/forms_common.py b/ishtar_common/forms_common.py
index 261bba4af..479d98315 100644
--- a/ishtar_common/forms_common.py
+++ b/ishtar_common/forms_common.py
@@ -2559,12 +2559,9 @@ class DocumentSelect(HistorySelect):
     )
     town = get_town_field()
     area = widgets.Select2SimpleField(label=_("Area"))
-    receipt_date__before = DateField(label=_("Receipt date before"))
-    receipt_date__after = DateField(label=_("Receipt date after"))
-    creation_date__before = DateField(label=_("Creation date before"))
-    creation_date__after = DateField(label=_("Creation date after"))
-    receipt_date_in_documentation__before = DateField(label=_("Receipt date before"))
-    receipt_date_in_documentation__after = DateField(label=_("Receipt date after"))
+    receipt_date = DateField(label=_("Receipt date"))
+    creation_date = DateField(label=_("Creation date"))
+    receipt_date_in_documentation = DateField(label=_("Receipt date"))
 
     TYPES = [
         FieldType("source_type", models.SourceType),
diff --git a/ishtar_common/models.py b/ishtar_common/models.py
index c14d59920..231d073e3 100644
--- a/ishtar_common/models.py
+++ b/ishtar_common/models.py
@@ -4459,31 +4459,19 @@ class Document(
             pgettext_lazy("key for text search", "has-file"),
             "associated_file__isnull",
         ),
-        "receipt_date__before": SearchAltName(
-            pgettext_lazy("key for text search", "receipt-date-before"),
-            "receipt_date__lte",
+        "receipt_date": SearchAltName(
+            pgettext_lazy("key for text search", "receipt-date"),
+            "receipt_date",
         ),
-        "receipt_date__after": SearchAltName(
-            pgettext_lazy("key for text search", "receipt-date-after"),
-            "receipt_date__gte",
-        ),
-        "receipt_date_in_documentation__before": SearchAltName(
+        "receipt_date_in_documentation": SearchAltName(
             pgettext_lazy(
-                "key for text search", "receipt-in-documentation-date-before"
+                "key for text search", "receipt-in-documentation-date"
             ),
-            "receipt_date_in_documentation__lte",
-        ),
-        "receipt_date_in_documentation__after": SearchAltName(
-            pgettext_lazy("key for text search", "receipt-in-documentation-date-after"),
-            "receipt_date_in_documentation__gte",
-        ),
-        "creation_date__before": SearchAltName(
-            pgettext_lazy("key for text search", "creation-date-before"),
-            "creation_date__lte",
+            "receipt_date_in_documentation",
         ),
-        "creation_date__after": SearchAltName(
-            pgettext_lazy("key for text search", "creation-date-after"),
-            "creation_date__gte",
+        "creation_date": SearchAltName(
+            pgettext_lazy("key for text search", "creation-date"),
+            "creation_date",
         ),
         "shooting_angle": SearchAltName(
             pgettext_lazy("key for text search", "shooting-angle"),