Extended REsultOptions with time series column metadata

bikalims · Sep 4, 2024 · f290805 · f290805
1 parent c7adb2f
commit f290805
Showing 1 changed file with 48 additions and 6 deletions.
diff --git a/src/bika/lims/content/abstractbaseanalysis.py b/src/bika/lims/content/abstractbaseanalysis.py
@@ -641,19 +641,15 @@
     schemata="Result Options",
     widget=StringWidget(
         label=_("Graph Title"),
-        description=_(
-            "Title that appears above the time series graph"
-       )
+        description=_("Title that appears above the time series graph")
     )
 )
 GraphXAxisTitle = StringField(
     "GraphXAxisTitle",
     schemata="Result Options",
     widget=StringWidget(
         label=_("Graph X-Axis Title"),
-        description=_(
-            "Title that appears on the X-Axis of the time series graph"
-       )
+        description=_("Title that appears on the X-Axis of the time series graph")
     )
 )
 GraphYAxisTitle = StringField(
@@ -666,6 +662,51 @@
        )
     )
 )
+TimeSeriesColumns = RecordsField(
+    "TimeSeriesColumns",
+    schemata="Result Options",
+    subfields=(
+        "ColumnType",
+        "ColumnTitle",
+        "ColumnDataType",
+    ),
+    subfield_labels={'ColumnType': _("Column Type"),
+                    'ColumnTitle': _("Column Title"),
+                    'ColumnDataType': _("Column Data Type"),
+                    },
+    subfield_validators={},
+    subfield_types={'ColumnType': "string",
+                    'ColumnTitle': "string",
+                    'ColumnDataType': "string",
+                    },
+    subfield_sizes={'ColumnType': 1,
+                    # 'ColumnTitle': 25,
+                    'ColumnDataType': 1,
+                    },
+    subfield_maxlength={'ColumnType': 1,
+                    'ColumnTitle': 25,
+                    'ColumnDataType': 1,
+                    },
+    subfield_vocabularies={
+        "ColumnType": DisplayList((
+            ('index', _('Index')),
+            ('data', _('Data')),
+            ('average', _('Average')),
+        )),
+        "ColumnDataType": DisplayList((
+            ('float', _('Float')),
+            ('number', _('Number')),
+            ('date', _('Date')),
+        )),
+    },
+    widget=RecordsWidget(
+        label=_("Time Series Columns"),
+        description=_(
+            "List of possible final results. When set, no custom result is "
+            "allowed on results entry and user has to choose from these values"
+        ),
+    )
+)
 
 # TODO Remove ResultOptionsType field. It was Replaced by ResultType
 ResultOptionsType = StringField(
@@ -839,6 +880,7 @@
     GraphTitle,
     GraphXAxisTitle,
     GraphYAxisTitle,
+    TimeSeriesColumns,
     ResultOptionsType,
     ResultOptionsSorting,
     Hidden,