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

1 files changed, 14 insertions, 23 deletions

diff --git a/ishtar_common/models_common.py b/ishtar_common/models_common.py
index 6d3270db4..ae4b5a64b 100644
--- a/ishtar_common/models_common.py
+++ b/ishtar_common/models_common.py
@@ -881,6 +881,7 @@ class FullSearch(models.Model):
     ALT_NAMES = {}
 
     BOOL_FIELDS = []
+    NUMBER_FIELDS = []
     REVERSED_BOOL_FIELDS = []
     CALLABLE_BOOL_FIELDS = []
     BASE_SEARCH_VECTORS = []
@@ -1565,10 +1566,8 @@ class BaseHistorizedItem(
     )
 
     DATED_FIELDS = [
-        "created__gte",
-        "created__lte",
-        "last_modified__gte",
-        "last_modified__lte",
+        "created",
+        "last_modified",
     ]
 
     BOOL_FIELDS = ["locked"]
@@ -1582,19 +1581,13 @@ class BaseHistorizedItem(
             pgettext_lazy("key for text search", "modified-by"),
             "history_modifier__ishtaruser__person__cached_label__iexact",
         ),
-        "created_before": SearchAltName(
-            pgettext_lazy("key for text search", "created-before"),
-            "created__lte",
+        "created": SearchAltName(
+            pgettext_lazy("key for text search", "created"),
+            "created",
         ),
-        "created_after": SearchAltName(
-            pgettext_lazy("key for text search", "created-after"), "created__gte"
-        ),
-        "modified_before": SearchAltName(
-            pgettext_lazy("key for text search", "modified-before"),
-            "last_modified__lte",
-        ),
-        "modified_after": SearchAltName(
-            pgettext_lazy("key for text search", "modified-after"), "last_modified__gte"
+        "modified": SearchAltName(
+            pgettext_lazy("key for text search", "modified"),
+            "last_modified",
         ),
         "locked": SearchAltName(
             pgettext_lazy("key for text search", "locked"), "locked"
@@ -2928,13 +2921,9 @@ class GeographicItem(models.Model):
         "geodata__provider": SearchAltName(
             pgettext_lazy("key for text search", "geo-provider"), "geodata__provider__label__iexact"
         ),
-        "geodata__z__gt": SearchAltName(
-            pgettext_lazy("key for text search", "z-higher"),
-            "geodata__cached_z__gte"
-        ),
-        "geodata__z__lt": SearchAltName(
-            pgettext_lazy("key for text search", "z-lower"),
-            "geodata__cached_z__lte"
+        "geodata__z": SearchAltName(
+            pgettext_lazy("key for text search", "z"),
+            "geodata__cached_z"
         ),
         "geodata__comment": SearchAltName(
             pgettext_lazy("key for text search", "geo-comment"), "geodata__comment__iexact"
@@ -4193,6 +4182,8 @@ class DynamicRequest:
 
 
 class GeoItem(GeographicItem):
+    NUMBER_FIELDS = ["geodata__cached_z"]
+
     # gis - to be removed
     GEO_SOURCE = (("T", _("Town")), ("P", _("Precise")), ("M", _("Polygon")))