Merge pull request #26 from simoneanam/2.3

Merge fork simone 2.3

Author: archetipo

backend/ozon/core/ModelData.py

@@ -1,6 +1,7 @@
 # Copyright INRIM (https://www.inrim.eu)
 # See LICENSE file for full licensing details.
 import pydantic
+from pydantic.v1.fields import ModelField
 
 from .BaseClass import PluginBase
 from .QueryEngine import QueryEngine, DateTimeEncoder
@@ -165,6 +166,74 @@ async def component_by_type(self, model_type):
     async def component_distinct_model(self):
         return await search_distinct(Component)
 
+    def _decode_mongo_query(self, query: Any, model_cls: Type[ModelType]):
+        DT_OPS = {
+            "$eq", "$ne", "$gt", "$gte", "$lt", "$lte",
+            "$in", "$nin",
+        }
+
+        LOGICAL_OPS = {"$and", "$or", "$nor"}
+
+        def parse_dt(v: str) -> datetime | str:
+            # parse ISO-ish strings; keep original if not parseable
+            s = v.strip()
+            if s.endswith("Z"):
+                s = s[:-1] + "+00:00"
+            try:
+                return datetime.fromisoformat(s)
+            except ValueError:
+                return v
+
+        def is_datetime_field(field: ModelField | None) -> bool:
+            # Pydantic v1: Optional[datetime] still has type_ == datetime
+            return bool(field and field.type_ is datetime)
+
+        fields = model_cls.__fields__
+
+        def walk(node: Any, *, force_dt: bool = False) -> Any:
+            # force_dt means: we are inside a datetime field filter subtree
+            if isinstance(node, dict):
+                out: dict[str, Any] = {}
+                for k, v in node.items():
+                    # logical operators contain subfilters
+                    if k in LOGICAL_OPS and isinstance(v, list):
+                        out[k] = [walk(item, force_dt=False) for item in v]
+                        continue
+
+                    # Mongo operators (when inside a datetime field)
+                    if force_dt and k in DT_OPS:
+                        if isinstance(v, str):
+                            out[k] = parse_dt(v)
+                        elif isinstance(v, list):
+                            out[k] = [parse_dt(x) if isinstance(x, str) else x for x in v]
+                        else:
+                            out[k] = v
+                        continue
+
+                    # Normal field at root / nested document style
+                    field = fields.get(k)
+                    if is_datetime_field(field):
+                        # Under a datetime field: parse direct strings, and also operator dict values
+                        if isinstance(v, str):
+                            out[k] = parse_dt(v)
+                        else:
+                            out[k] = walk(v, force_dt=True)
+                    else:
+                        out[k] = walk(v, force_dt=False)
+                return out
+
+            if isinstance(node, list):
+                return [walk(x, force_dt=force_dt) for x in node]
+
+            # primitives
+            if force_dt and isinstance(node, str):
+                return parse_dt(node)
+            return node
+
+        res = walk(query, force_dt=False)
+        logger.debug(f"[_decode_mongo_query]: {res}]")
+        return res
+
     async def search_base(
             self,
             data_model: Type[ModelType],
@@ -185,6 +254,9 @@ async def search_base(
             #
             sort = [("list_order", ASCENDING), ("rec_name", DESCENDING)]
 
+        if query:
+            query = self._decode_mongo_query(query, data_model)
+
         if use_aggregate:
             list_data = await aggregate(
                 data_model, query, sort=sort, limit=limit, skip=skip
@@ -248,6 +320,10 @@ async def count_by_filter(
         model = data_model
         if not isinstance(data_model, str):
             model = data_model.str_name()
+
+        if query:
+            query = self._decode_mongo_query(query, data_model)
+
         return await count_by_filter(model, domain=query)
 
     async def search(

web-client/core/main/custom_components.py

@@ -1099,8 +1099,6 @@ def __init__(self, raw, builder, **kwargs):
         )
         self.isodate_regex = self.dte.isodate_regex
 
-        self.size = 12
-
     def parse_date(self, val):
         if not self.is_time:
             value_date = self.dte.server_datetime_to_ui_date_str(val)

web-client/core/themes/italia/static/css/project.css

@@ -138,4 +138,11 @@ body, html, table, button {
     flex: 0 0 auto !important;
     width: auto !important;
     max-width: 100% !important;
+}
+
+.it-datepicker-wrapper small.form-text {
+    position: absolute;
+    padding: .25rem .5rem;
+    font-size: .777rem;
+    margin-top: -3rem;
 }

web-client/core/themes/italia/templates/components/datetime/form_date_time.html

@@ -38,6 +38,9 @@
                 </div>
             {% endif %}
         </div>
+        {% if desc %}
+            <small class="form-text text-muted">{{ desc | safe }}</small>
+        {% endif %}
     </div>
 
 </div>