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

4 files changed, 143 insertions, 267 deletions

diff --git a/archaeological_finds/forms.py b/archaeological_finds/forms.py
index 967168c66..4e3dfef14 100644
--- a/archaeological_finds/forms.py
+++ b/archaeological_finds/forms.py
@@ -1613,37 +1613,24 @@ class FindSelect(GeoItemSelect, PeriodSelect):
             _("Discovery"),
             [
                 "base_finds__comment",
-                "base_finds__discovery_date__before",
-                "base_finds__discovery_date__after",
-                "base_finds__discovery_date_taq__before",
-                "base_finds__discovery_date_taq__after",
+                "base_finds__discovery_date",
+                "base_finds__discovery_date_taq",
             ],
         ),
         (
             _("Dimensions"),
             [
-                "length__higher",
-                "width__higher",
-                "height__higher",
-                "thickness__higher",
-                "diameter__higher",
-                "circumference__higher",
-                "volume__higher",
-                "weight__higher",
-                "clutter_long_side__higher",
-                "clutter_short_side__higher",
-                "clutter_height__higher",
-                "length__lower",
-                "width__lower",
-                "height__lower",
-                "thickness__lower",
-                "diameter__lower",
-                "circumference__lower",
-                "volume__lower",
-                "weight__lower",
-                "clutter_long_side__lower",
-                "clutter_short_side__lower",
-                "clutter_height__lower",
+                "length",
+                "width",
+                "height",
+                "thickness",
+                "diameter",
+                "circumference",
+                "volume",
+                "weight",
+                "clutter_long_side",
+                "clutter_short_side",
+                "clutter_height",
                 "dimensions_comment",
             ],
         ),
@@ -1832,17 +1819,11 @@ class FindSelect(GeoItemSelect, PeriodSelect):
 
     description = forms.CharField(label=_("Description"))
     base_finds__comment = forms.CharField(label=_("Base find - Comment on the circumstances of discovery"))
-    base_finds__discovery_date__after = forms.DateField(
-        label=_("Discovery date (exact or beginning) after"), widget=DatePicker
+    base_finds__discovery_date = forms.DateField(
+        label=_("Discovery date (exact or beginning)"), widget=DatePicker
     )
-    base_finds__discovery_date__before = forms.DateField(
-        label=_("Discovery date (exact or beginning) before"), widget=DatePicker
-    )
-    base_finds__discovery_date_taq__after = forms.DateField(
-        label=_("Discovery date (end) after"), widget=DatePicker
-    )
-    base_finds__discovery_date_taq__before = forms.DateField(
-        label=_("Discovery date (end) before"), widget=DatePicker
+    base_finds__discovery_date_taq = forms.DateField(
+        label=_("Discovery date (end)"), widget=DatePicker
     )
     base_finds__batch = forms.ChoiceField(label=_("Batch/object"), choices=[])
     is_complete = forms.NullBooleanField(label=_("Is complete?"))
@@ -1904,73 +1885,24 @@ class FindSelect(GeoItemSelect, PeriodSelect):
     )
     dating_comment = forms.CharField(label=_("Comment on dating"))
 
-    length__higher = FloatField(
-        label=_("Length - higher than (cm)"), widget=widgets.CentimeterMeterWidget
-    )
-    length__lower = FloatField(
-        label=_("Length - lower than (cm)"), widget=widgets.CentimeterMeterWidget
-    )
-    width__lower = FloatField(
-        label=_("Width - lower than (cm)"), widget=widgets.CentimeterMeterWidget
-    )
-    width__higher = FloatField(
-        label=_("Width - higher than (cm)"), widget=widgets.CentimeterMeterWidget
-    )
-    height__lower = FloatField(
-        label=_("Height - lower than (cm)"), widget=widgets.CentimeterMeterWidget
-    )
-    height__higher = FloatField(
-        label=_("Height - higher than (cm)"), widget=widgets.CentimeterMeterWidget
-    )
-    thickness__lower = FloatField(
-        label=_("Thickness - lower than (cm)"), widget=widgets.CentimeterMeterWidget
-    )
-    thickness__higher = FloatField(
-        label=_("Thickness - higher than (cm)"), widget=widgets.CentimeterMeterWidget
-    )
-    diameter__lower = FloatField(
-        label=_("Diameter - lower than (cm)"), widget=widgets.CentimeterMeterWidget
-    )
-    diameter__higher = FloatField(
-        label=_("Diameter - higher than (cm)"), widget=widgets.CentimeterMeterWidget
-    )
-    circumference__lower = FloatField(
-        label=_("Circumference - lower than (cm)"), widget=widgets.CentimeterMeterWidget
-    )
-    circumference__higher = FloatField(
-        label=_("Circumference - higher than (cm)"),
-        widget=widgets.CentimeterMeterWidget,
-    )
-    volume__lower = FloatField(label=_("Volume - lower than (l)"))
-    volume__higher = FloatField(label=_("Volume - higher than (l)"))
-    weight__lower = FloatField(
-        label=_("Weight - lower than (g)"), widget=widgets.GramKilogramWidget
-    )
-    weight__higher = FloatField(
-        label=_("Weight - higher than (g)"), widget=widgets.GramKilogramWidget
-    )
-    clutter_long_side__lower = FloatField(
-        label=_("Clutter long side - lower than (cm)"),
-        widget=widgets.CentimeterMeterWidget,
-    )
-    clutter_long_side__higher = FloatField(
-        label=_("Clutter long side - higher than (cm)"),
-        widget=widgets.CentimeterMeterWidget,
-    )
-    clutter_short_side__lower = FloatField(
-        label=_("Clutter short side - lower than (cm)"),
-        widget=widgets.CentimeterMeterWidget,
-    )
-    clutter_short_side__higher = FloatField(
-        label=_("Clutter short side - higher than (cm)"),
+    length = FloatField(label=_("Length (cm)"), widget=widgets.CentimeterMeterWidget)
+    width = FloatField(label=_("Width (cm)"), widget=widgets.CentimeterMeterWidget)
+    height = FloatField(label=_("Height (cm)"), widget=widgets.CentimeterMeterWidget)
+    thickness = FloatField(label=_("Thickness (cm)"), widget=widgets.CentimeterMeterWidget)
+    diameter = FloatField(label=_("Diameter (cm)"), widget=widgets.CentimeterMeterWidget)
+    circumference = FloatField(label=_("Circumference (cm)"), widget=widgets.CentimeterMeterWidget)
+    volume = FloatField(label=_("Volume (l)"))
+    weight = FloatField(label=_("Weight - lower than (g)"), widget=widgets.GramKilogramWidget)
+    clutter_long_side = FloatField(
+        label=_("Clutter long side (cm)"),
         widget=widgets.CentimeterMeterWidget,
     )
-    clutter_height__lower = FloatField(
-        label=_("Clutter height - lower than (cm)"),
+    clutter_short_side = FloatField(
+        label=_("Clutter short side (cm)"),
         widget=widgets.CentimeterMeterWidget,
     )
-    clutter_height__higher = FloatField(
-        label=_("Clutter height - higher than (cm)"),
+    clutter_height = FloatField(
+        label=_("Clutter height (cm)"),
         widget=widgets.CentimeterMeterWidget,
     )
     dimensions_comment = forms.CharField(label=_("Dimensions comment"))
@@ -1979,10 +1911,7 @@ class FindSelect(GeoItemSelect, PeriodSelect):
         label=_("Point of topographic reference"),
     )
     checked_type = forms.ChoiceField(label=_("Check"))
-    check_date__after = forms.DateField(label=_("Check date after"), widget=DatePicker)
-    check_date__before = forms.DateField(
-        label=_("Check date before"), widget=DatePicker
-    )
+    check_date = forms.DateField(label=_("Check date"), widget=DatePicker)
     integrities = forms.ChoiceField(label=_("Integrity"), choices=[])
     remarkabilities = forms.ChoiceField(label=_("Remarkability"), choices=[])
     conservatory_states = forms.ChoiceField(label=_("Conservatory states"), choices=[])
@@ -1994,23 +1923,16 @@ class FindSelect(GeoItemSelect, PeriodSelect):
     )
     treatment_emergency = forms.ChoiceField(choices=[], label=_("Treatment emergency"))
 
-    estimated_value__higher = FloatField(label=_("Estimated value - higher than"))
-    estimated_value__lower = FloatField(label=_("Estimated value - lower than"))
-    insurance_value__higher = FloatField(label=_("Insurance value - higher than"))
-    insurance_value__lower = FloatField(label=_("Insurance value - lower than"))
-    appraisal_date__after = forms.DateField(
-        label=_("Appraisal date after"), widget=DatePicker
-    )
-    appraisal_date__before = forms.DateField(
-        label=_("Appraisal date before"), widget=DatePicker
-    )
+    estimated_value = FloatField(label=_("Estimated value"))
+    insurance_value = FloatField(label=_("Insurance value"))
+    appraisal_date = forms.DateField(label=_("Appraisal date"), widget=DatePicker)
 
     loan = forms.NullBooleanField(label=_("Loan?"))
     treatments_file_end_date = forms.DateField(
-        label=_("Treatment file end date before"), widget=DatePicker
+        label=_("Treatment file end date"), widget=DatePicker
     )
     treatments_end_date = forms.DateField(
-        label=_("Treatment end date before"), widget=DatePicker
+        label=_("Treatment end date"), widget=DatePicker
     )
     # museum
     museum_id_comment = forms.CharField(label=_("Museum - Comment on museum ID"))
@@ -2035,17 +1957,11 @@ class FindSelect(GeoItemSelect, PeriodSelect):
     museum_depositor_inventory_number = forms.CharField(label=_("Museum - Depositor inventory number"))
     museum_collection_entry_mode = forms.ChoiceField(label=_("Museum - Collections entry mode"), choices=[])
     museum_entry_mode_comment = forms.CharField(label=_("Museum - Comment on museum entry mode"))
-    museum_entry_date_before = forms.DateField(
-        label=_("Museum - Entry date (exact or start) - before"), widget=DatePicker
-    )
-    museum_entry_date_after = forms.DateField(
-        label=_("Museum - Entry date (exact or start) - after"), widget=DatePicker
-    )
-    museum_entry_date_end_before = forms.DateField(
-        label=_("Museum - Entry date end - before"), widget=DatePicker
+    museum_entry_date = forms.DateField(
+        label=_("Museum - Entry date (exact or start)"), widget=DatePicker
     )
-    museum_entry_date_end_after = forms.DateField(
-        label=_("Museum - Entry date end - after"), widget=DatePicker
+    museum_entry_date_end = forms.DateField(
+        label=_("Museum - Entry date end"), widget=DatePicker
     )
     museum_entry_date_comment = forms.CharField(label=_("Museum - Comment on entry date"))
     museum_donor = forms.IntegerField(
diff --git a/archaeological_finds/forms_treatments.py b/archaeological_finds/forms_treatments.py
index 0d87a5eea..a717b905d 100644
--- a/archaeological_finds/forms_treatments.py
+++ b/archaeological_finds/forms_treatments.py
@@ -666,18 +666,8 @@ class TreatmentFileSelect(DocumentItemSelect):
 
     end_date = forms.DateField(label=_("Closing date"), required=False,
                                widget=DatePicker)
-    exhibition_start_before = forms.DateField(
-        label=_("Exhibition started before"), widget=DatePicker
-    )
-    exhibition_start_after = forms.DateField(
-        label=_("Exhibition started after"), widget=DatePicker
-    )
-    exhibition_end_before = forms.DateField(
-        label=_("Exhibition ended before"), widget=DatePicker
-    )
-    exhibition_end_after = forms.DateField(
-        label=_("Exhibition ended after"), widget=DatePicker
-    )
+    exhibition_start = forms.DateField(label=_("Exhibition start date"), widget=DatePicker)
+    exhibition_end = forms.DateField(label=_("Exhibition end date"), widget=DatePicker)
 
     def __init__(self, *args, **kwargs):
         super(TreatmentFileSelect, self).__init__(*args, **kwargs)
diff --git a/archaeological_finds/models_finds.py b/archaeological_finds/models_finds.py
index 7a8715f1b..79faecb0d 100644
--- a/archaeological_finds/models_finds.py
+++ b/archaeological_finds/models_finds.py
@@ -1241,25 +1241,35 @@ class Find(
     }
 
     DATED_FIELDS = BaseHistorizedItem.DATED_FIELDS + [
-        "treatments__file__end_date__lte",
-        "treatments__end_date__lte",
-        "base_finds__discovery_date__lte",
-        "base_finds__discovery_date__gte",
-        "base_finds__discovery_date_taq__lte",
-        "base_finds__discovery_date_taq__gte",
-        "check_date__lte",
-        "check_date__gte",
-        "appraisal_date__lte",
-        "appraisal_date__gte",
-        "museum_entry_date__lte",
-        "museum_entry_date__gte",
-        "museum_entry_date_end__lte",
-        "museum_entry_date_end__gte",
+        "treatments__file__end_date",
+        "treatments__end_date",
+        "base_finds__discovery_date",
+        "base_finds__discovery_date_taq",
+        "check_date",
+        "appraisal_date",
+        "museum_entry_date",
+        "museum_entry_date_end",
         "museum_allocation_date",
-        "museum_allocation_date__lte",
-        "museum_allocation_date__gte",
     ]
-    NUMBER_FIELDS = ["base_finds__context_record__operation__year"]
+    NUMBER_FIELDS = [
+        "base_finds__context_record__operation__year",
+        "base_finds__context_record__operation__operation_code",
+        "insurance_value",
+        "estimated_value",
+        "length",
+        "width",
+        "height",
+        "thickness",
+        "diameter",
+        "circumference",
+        "volume",
+        "weight",
+        "clutter_long_side",
+        "clutter_short_side",
+        "clutter_height",
+        "estimated_value",
+        "insurance_value",
+    ] + GeographicSubTownItem.NUMBER_FIELDS
     BASE_REQUEST = {"downstream_treatment__isnull": True}
     EXTRA_REQUEST_KEYS = {
         "all_base_finds__context_record": "base_finds__context_record__context_record_tree_parent__cr_parent_id",
@@ -1432,12 +1442,12 @@ class Find(
         ),
         "loan": SearchAltName(pgettext_lazy("key for text search", "loan"), query_loan),
         "treatments_file_end_date": SearchAltName(
-            pgettext_lazy("key for text search", "treatment-file-end-date-before"),
-            "treatments__file__end_date__lte",
+            pgettext_lazy("key for text search", "treatment-file-end-date"),
+            "treatments__file__end_date",
         ),
         "treatments_end_date": SearchAltName(
-            pgettext_lazy("key for text search", "treatment-end-date-before"),
-            "treatments__end_date__lte",
+            pgettext_lazy("key for text search", "treatment-end-date"),
+            "treatments__end_date",
         ),
         "previous_id": SearchAltName(
             pgettext_lazy("key for text search", "previous-id"), "previous_id__iexact"
@@ -1466,21 +1476,13 @@ class Find(
         "mark": SearchAltName(
             pgettext_lazy("key for text search", "mark"), "mark__iexact"
         ),
-        "base_finds__discovery_date__before": SearchAltName(
-            pgettext_lazy("key for text search", "discovery-date-before"),
-            "base_finds__discovery_date__lte",
-        ),
-        "base_finds__discovery_date__after": SearchAltName(
-            pgettext_lazy("key for text search", "discovery-date-after"),
-            "base_finds__discovery_date__gte",
+        "base_finds__discovery_date": SearchAltName(
+            pgettext_lazy("key for text search", "discovery-date"),
+            "base_finds__discovery_date",
         ),
-        "base_finds__discovery_date_taq__before": SearchAltName(
-            pgettext_lazy("key for text search", "discovery-date-taq-before"),
-            "base_finds__discovery_date_taq__lte",
-        ),
-        "base_finds__discovery_date_taq__after": SearchAltName(
-            pgettext_lazy("key for text search", "discovery-date-taq-after"),
-            "base_finds__discovery_date_taq__gte",
+        "base_finds__discovery_date_taq": SearchAltName(
+            pgettext_lazy("key for text search", "discovery-date-taq"),
+            "base_finds__discovery_date_taq",
         ),
         "is_complete": SearchAltName(
             pgettext_lazy("key for text search", "is-complete"), "is_complete"
@@ -1566,42 +1568,42 @@ class Find(
             pgettext_lazy("key for text search", "clutter-height-lower"),
             "clutter_height__lte",
         ),
-        "length__higher": SearchAltName(
-            pgettext_lazy("key for text search", "length-higher"), "length__gte"
+        "length": SearchAltName(
+            pgettext_lazy("key for text search", "length"), "length"
         ),
-        "width__higher": SearchAltName(
-            pgettext_lazy("key for text search", "width-higher"), "width__gte"
+        "width": SearchAltName(
+            pgettext_lazy("key for text search", "width"), "width"
         ),
-        "height__higher": SearchAltName(
-            pgettext_lazy("key for text search", "height-higher"), "height__gte"
+        "height": SearchAltName(
+            pgettext_lazy("key for text search", "height"), "height"
         ),
-        "thickness__higher": SearchAltName(
-            pgettext_lazy("key for text search", "thickness-higher"), "thickness__gte"
+        "thickness": SearchAltName(
+            pgettext_lazy("key for text search", "thickness"), "thickness"
         ),
-        "diameter__higher": SearchAltName(
-            pgettext_lazy("key for text search", "diameter-higher"), "diameter__gte"
+        "diameter": SearchAltName(
+            pgettext_lazy("key for text search", "diameter"), "diameter"
         ),
-        "circumference__higher": SearchAltName(
-            pgettext_lazy("key for text search", "circumference-higher"),
-            "circumference__gte",
+        "circumference": SearchAltName(
+            pgettext_lazy("key for text search", "circumference"),
+            "circumference",
         ),
-        "volume__higher": SearchAltName(
-            pgettext_lazy("key for text search", "volume-higher"), "volume__gte"
+        "volume": SearchAltName(
+            pgettext_lazy("key for text search", "volume"), "volume"
         ),
-        "weight__higher": SearchAltName(
-            pgettext_lazy("key for text search", "weight-higher"), "weight__gte"
+        "weight": SearchAltName(
+            pgettext_lazy("key for text search", "weight"), "weight"
         ),
-        "clutter_long_side__higher": SearchAltName(
-            pgettext_lazy("key for text search", "clutter-long-side-higher"),
-            "clutter_long_side__gte",
+        "clutter_long_side": SearchAltName(
+            pgettext_lazy("key for text search", "clutter-long-side"),
+            "clutter_long_side",
         ),
-        "clutter_short_side__higher": SearchAltName(
-            pgettext_lazy("key for text search", "clutter-short-side-higher"),
-            "clutter_short_side__gte",
+        "clutter_short_side": SearchAltName(
+            pgettext_lazy("key for text search", "clutter-short-side"),
+            "clutter_short_side",
         ),
-        "clutter_height__higher": SearchAltName(
-            pgettext_lazy("key for text search", "clutter-height-higher"),
-            "clutter_height__gte",
+        "clutter_height": SearchAltName(
+            pgettext_lazy("key for text search", "clutter-height"),
+            "clutter_height",
         ),
         "dimensions_comment": SearchAltName(
             pgettext_lazy("key for text search", "dimensions-comment"),
@@ -1611,11 +1613,8 @@ class Find(
             pgettext_lazy("key for text search", "topographic-localisation"),
             "base_finds__topographic_localisation__iexact",
         ),
-        "check_date__before": SearchAltName(
-            pgettext_lazy("key for text search", "check-date-before"), "check_date__lte"
-        ),
-        "check_date__after": SearchAltName(
-            pgettext_lazy("key for text search", "check-date-after"), "check_date__gte"
+        "check_date": SearchAltName(
+            pgettext_lazy("key for text search", "check-date"), "check_date"
         ),
         "alterations": SearchAltName(
             pgettext_lazy("key for text search", "alterations"),
@@ -1629,29 +1628,17 @@ class Find(
             pgettext_lazy("key for text search", "treatment-emergency"),
             "treatment_emergency__label__iexact",
         ),
-        "estimated_value__higher": SearchAltName(
-            pgettext_lazy("key for text search", "estimated-value-higher"),
-            "estimated_value__gte",
-        ),
-        "estimated_value__lower": SearchAltName(
-            pgettext_lazy("key for text search", "estimated-value-lower"),
-            "estimated_value__lte",
+        "estimated_value": SearchAltName(
+            pgettext_lazy("key for text search", "estimated-value"),
+            "estimated_value",
         ),
-        "insurance_value__higher": SearchAltName(
-            pgettext_lazy("key for text search", "insurance-value-higher"),
-            "insurance_value__gte",
+        "insurance_value": SearchAltName(
+            pgettext_lazy("key for text search", "insurance-value"),
+            "insurance_value",
         ),
-        "insurance_value__lower": SearchAltName(
-            pgettext_lazy("key for text search", "insurance-value-lower"),
-            "insurance_value__lte",
-        ),
-        "appraisal_date__before": SearchAltName(
-            pgettext_lazy("key for text search", "appraisal-date-before"),
-            "appraisal_date__lte",
-        ),
-        "appraisal_date__after": SearchAltName(
-            pgettext_lazy("key for text search", "appraisal-date-after"),
-            "appraisal_date__gte",
+        "appraisal_date": SearchAltName(
+            pgettext_lazy("key for text search", "appraisal-date"),
+            "appraisal_date",
         ),
         "cultural_attributions": SearchAltName(
             pgettext_lazy("key for text search", "cultural-attribution"),
@@ -1728,21 +1715,13 @@ class Find(
             pgettext_lazy("key for text search", "museum-entry-mode-comment"),
             "museum_entry_mode_comment__iexact"
         ),
-        "museum_entry_date_before": SearchAltName(
-            pgettext_lazy("key for text search", "museum-entry-date-before"),
-            "museum_entry_date__lte"
-        ),
-        "museum_entry_date_after": SearchAltName(
-            pgettext_lazy("key for text search", "museum-entry-date-after"),
-            "museum_entry_date__gte"
+        "museum_entry_date": SearchAltName(
+            pgettext_lazy("key for text search", "museum-entry-date"),
+            "museum_entry_date"
         ),
-        "museum_entry_date_end_before": SearchAltName(
-            pgettext_lazy("key for text search", "museum-entry-date-end-before"),
-            "museum_entry_date_end__lte"
-        ),
-        "museum_entry_date_end_after": SearchAltName(
-            pgettext_lazy("key for text search", "museum-entry-date-end-after"),
-            "museum_entry_date_end__gte"
+        "museum_entry_date_end": SearchAltName(
+            pgettext_lazy("key for text search", "museum-entry-date-end"),
+            "museum_entry_date_end"
         ),
         "museum_entry_date_comment": SearchAltName(
             pgettext_lazy("key for text search", "museum-entry-date-comment"),
@@ -1797,13 +1776,9 @@ class Find(
             "museum_original_repro__label__iexact",
             related_name="museum_original_repro"
     ),
-        "museum_allocation_date_before": SearchAltName(
-            pgettext_lazy("key for text search", "museum-allocation-date-before"),
-            "museum_allocation_date__lte"
-        ),
-        "museum_allocation_date_after": SearchAltName(
-            pgettext_lazy("key for text search", "museum-allocation-date-after"),
-            "museum_allocation_date__gte"
+        "museum_allocation_date": SearchAltName(
+            pgettext_lazy("key for text search", "museum-allocation-date"),
+            "museum_allocation_date"
         ),
         "museum_purchase_price": SearchAltName(
             pgettext_lazy("key for text search", "museum-purchase-price"),
@@ -2825,8 +2800,7 @@ class Find(
         return self.non_modif_treatments(15)
 
     def associated_treatment_files(self):
-        from archaeological_finds.models_treatments import TreatmentFile
-
+        TreatmentFile = apps.get_model("archaeological_finds", "TreatmentFile")
         return TreatmentFile.objects.filter(
             associated_basket__items__pk=self.pk
         ).order_by("reception_date", "creation_date", "end_date")
diff --git a/archaeological_finds/models_treatments.py b/archaeological_finds/models_treatments.py
index 04747e3a1..eb149b0de 100644
--- a/archaeological_finds/models_treatments.py
+++ b/archaeological_finds/models_treatments.py
@@ -172,6 +172,7 @@ class Treatment(
     HISTORICAL_M2M = [
         "treatment_types",
     ]
+    NUMBER_FIELDS = ["year", "index"]
 
     BASE_SEARCH_VECTORS = [
         SearchVectorConfig("treatment_types__label"),
@@ -1037,6 +1038,12 @@ class TreatmentFile(
         SearchVectorConfig("index"),
     ]
     PARENT_SEARCH_VECTORS = ["in_charge", "applicant", "applicant_organisation"]
+    NUMBER_FIELDS = ["year", "index"]
+    DATED_FIELDS = BaseHistorizedItem.DATED_FIELDS + [
+        "end_date",
+        "exhibition_start_date",
+        "exhibition_end_date",
+    ]
 
     EXTRA_REQUEST_KEYS = {
         "in_charge__pk": "in_charge__pk",  # used by dynamic_table_documents
@@ -1075,33 +1082,22 @@ class TreatmentFile(
             "applicant_organisation__cached_label__iexact",
             related_name="applicant_organisation"
         ),
-        "exhibition_start_before": SearchAltName(
-            pgettext_lazy("key for text search", "exhibition-start-before"),
-            "exhibition_start_date__lte",
-        ),
-        "exhibition_start_after": SearchAltName(
-            pgettext_lazy("key for text search", "exhibition-start-after"),
-            "exhibition_start_date__gte",
+        "end_date": SearchAltName(
+            pgettext_lazy("key for text search", "end-date"),
+            "end_date",
         ),
-        "exhibition_end_before": SearchAltName(
-            pgettext_lazy("key for text search", "exhibition-end-before"),
-            "exhibition_end_date__lte",
+        "exhibition_start": SearchAltName(
+            pgettext_lazy("key for text search", "exhibition-start"),
+            "exhibition_start_date",
         ),
-        "exhibition_end_after": SearchAltName(
-            pgettext_lazy("key for text search", "exhibition-end-after"),
-            "exhibition_end_date__gte",
+        "exhibition_end": SearchAltName(
+            pgettext_lazy("key for text search", "exhibition-end"),
+            "exhibition_end_date",
         ),
     }
     ALT_NAMES.update(BaseHistorizedItem.ALT_NAMES)
     ALT_NAMES.update(DocumentItem.ALT_NAMES)
 
-    DATED_FIELDS = BaseHistorizedItem.DATED_FIELDS + [
-        "exhibition_start_date__lte",
-        "exhibition_start_date__gte",
-        "exhibition_end_date__lte",
-        "exhibition_end_date__gte",
-    ]
-
     # fields
     year = models.IntegerField(_("Year"), default=get_current_year)
     index = models.IntegerField(_("Index"), default=1)