tricc-oo 1.6.20__tar.gz → 1.6.22__tar.gz

{tricc_oo-1.6.20/tricc_oo.egg-info → tricc_oo-1.6.22}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: tricc-oo
-Version: 1.6.20
+Version: 1.6.22
 Summary: Python library that converts CDSS L2 in L3
 Project-URL: Homepage, https://github.com/SwissTPH/tricc
 Project-URL: Issues, https://github.com/SwissTPH/tricc/issues

{tricc_oo-1.6.20 → tricc_oo-1.6.22}/pyproject.toml

@@ -4,7 +4,7 @@ build-backend = "setuptools.build_meta"
 
 [project]
 name = "tricc-oo"
-version = "1.6.20"
+version = "1.6.22"
 description = "Python library that converts CDSS L2 in L3"
 readme = "README.md"
 requires-python = ">=3.8"

{tricc_oo-1.6.20 → tricc_oo-1.6.22}/tricc_oo/strategies/output/xls_form.py

@@ -25,6 +25,7 @@ from tricc_oo.models.tricc import (
     TriccNodeCalculateBase,
     TriccNodeBaseModel,
     TriccNodeSelectOption,
+    TriccNodeSelect,
     TriccNodeInputModel,
     TriccNodeDisplayModel,
     TRICC_FALSE_VALUE,
@@ -87,6 +88,8 @@ OPERATOR_COALESCE_FALLBACK = {
     TriccOperator.MORE_OR_EQUAL: -2147483648,
     TriccOperator.LESS: 2147483647,
     TriccOperator.LESS_OR_EQUAL: 2147483647,
+    TriccOperator.CONTAINS: "''",
+    TriccOperator.SELECTED: "''",
 }
 
 
@@ -127,7 +130,6 @@ class XLSFormStrategy(BaseOutPutStrategy):
             "df_calculate": self.df_calculate,
             "calculates": self.calculates,
         }
-        
 
     def generate_export(self, node, **kwargs):
         return generate_xls_form_export(self, node, **kwargs)
@@ -743,7 +745,7 @@ class XLSFormStrategy(BaseOutPutStrategy):
         elif isinstance(r, TriccNodeSelectOption):
             logger.debug(f"select option {r.get_name()} from {r.select.get_name()} was used as a reference")
             return get_export_name(r)
-        elif issubclass(r.__class__, TriccNodeInputModel):
+        elif issubclass(r.__class__, (TriccNodeInputModel, TriccNodeSelect)):
             return f"coalesce(${{{get_export_name(r)}}},{coalesce_fallback})"
         elif issubclass(r.__class__, TriccNodeBaseModel):
             return f"${{{get_export_name(r)}}}"

{tricc_oo-1.6.20 → tricc_oo-1.6.22}/tricc_oo/visitors/tricc.py

@@ -2194,7 +2194,9 @@ def get_prev_node_expression(node, processed_nodes, get_overall_exp=False, exclu
 
     for act_id in prev_activities:
         act_expression_inputs = []
+        none_input_prev_node = False
         for prev_node in prev_activities[act_id]:
+            none_input_prev_node = none_input_prev_node or not issubclass(prev_node.__class__, TriccNodeInputModel)
             if (
                 excluded_name is None
                 or prev_node != excluded_name
@@ -2230,7 +2232,7 @@ def get_prev_node_expression(node, processed_nodes, get_overall_exp=False, exclu
                     negate=False,
                     process=process,
                 )
-            elif not issubclass(prev_node.__class__, TriccNodeInputModel):
+            elif none_input_prev_node:
                 # For non-input nodes, AND the activity relevance with the prev expression
                 activity_relevance = get_node_expression(
                     prev_node.activity,

{tricc_oo-1.6.20 → tricc_oo-1.6.22/tricc_oo.egg-info}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: tricc-oo
-Version: 1.6.20
+Version: 1.6.22
 Summary: Python library that converts CDSS L2 in L3
 Project-URL: Homepage, https://github.com/SwissTPH/tricc
 Project-URL: Issues, https://github.com/SwissTPH/tricc/issues