tricc-oo 1.6.19__tar.gz → 1.6.21__tar.gz

{tricc_oo-1.6.19/tricc_oo.egg-info → tricc_oo-1.6.21}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: tricc-oo
-Version: 1.6.19
+Version: 1.6.21
 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.19 → tricc_oo-1.6.21}/pyproject.toml

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

{tricc_oo-1.6.19 → tricc_oo-1.6.21}/tricc_oo/strategies/output/xls_form.py

@@ -127,7 +127,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)

{tricc_oo-1.6.19 → tricc_oo-1.6.21}/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,6 +2232,17 @@ def get_prev_node_expression(node, processed_nodes, get_overall_exp=False, exclu
                     negate=False,
                     process=process,
                 )
+            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,
+                    processed_nodes=processed_nodes,
+                    get_overall_exp=get_overall_exp,
+                    is_prev=True,
+                    negate=False,
+                    process=process,
+                )
+                act_sub = and_join([activity_relevance, act_sub])
             add_sub_expression(expression_inputs, act_sub)
             # avoid void is there is not conditions to avoid looping too much itme
     # expression_inputs = clean_or_list(

{tricc_oo-1.6.19 → tricc_oo-1.6.21/tricc_oo.egg-info}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: tricc-oo
-Version: 1.6.19
+Version: 1.6.21
 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