tricc-oo 1.5.4__py3-none-any.whl → 1.5.6__py3-none-any.whl

tricc_oo/visitors/tricc.py

@@ -1416,7 +1416,7 @@ def reorder_node_list(list_node, group, processed_nodes):
     
     # Define a lambda to assign numeric priorities
     def filter_logic(l_node):
-        priority = (getattr(l_node, "priority", None) or 0) / 100
+        priority = int(getattr(l_node, "priority", None) or 400) / 100
         if (
             isinstance(l_node, TriccNodeWait)
             and any(isinstance(rn, TriccNodeActivity) and any(sn.activity == rn for sn in list_node) for rn in l_node.reference)
@@ -1837,10 +1837,10 @@ def get_prev_node_expression( node, processed_nodes, is_calculate=False, exclude
                     is_calculate=is_calculate,
                     is_prev=True,
                     process=process)
-                if not isinstance(node, TriccNodeActivity) or is_calculate:
-                    add_sub_expression(expression_inputs, sub )
-                else:
+                if  isinstance(node, TriccNodeActivity) or is_calculate:
                     add_sub_expression(act_expression_inputs, sub )
+                else:
+                    add_sub_expression(expression_inputs, sub )
                 
         if act_expression_inputs:
             act_sub = or_join(act_expression_inputs)

{tricc_oo-1.5.4.dist-info → tricc_oo-1.5.6.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: tricc-oo
-Version: 1.5.4
+Version: 1.5.6
 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.5.4.dist-info → tricc_oo-1.5.6.dist-info}/RECORD

@@ -37,10 +37,10 @@ tricc_oo/strategies/output/xlsform_cdss.py,sha256=8oLlgS1Hr6IVvI0O71kIk5oIKXbt2l
 tricc_oo/strategies/output/xlsform_cht.py,sha256=QcWcmXqIoaQWqLU2cILqnU7ybKYBs2Xd6cUL0gSr3gw,20148
 tricc_oo/strategies/output/xlsform_cht_hf.py,sha256=0D_H68a2S7oLKJENEePaRGIocrRIF45BofHlLOtGsKo,2206
 tricc_oo/visitors/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-tricc_oo/visitors/tricc.py,sha256=aGWpjk3cLd4DfZg7Zwqp8hzEv6qTn7ewpNha-VFRX4s,99121
+tricc_oo/visitors/tricc.py,sha256=e-lJduvw1RNyA_NWZ9aC2SZbEf9EGiepJ4uhu7GvsRQ,99123
 tricc_oo/visitors/utils.py,sha256=Gol4JNozPEd30Q1l8IPIPhx5fqVyy9R81GofGVebgD8,484
 tricc_oo/visitors/xform_pd.py,sha256=jgjBLbfElVdi0NmClhw6NK6qNcIgWYm4KMXfVwiQwXM,9705
-tricc_oo-1.5.4.dist-info/METADATA,sha256=lj1ko4jc633Z3zjDhgLjlLrQLOoa8-Bph5nc7R-vixQ,7877
-tricc_oo-1.5.4.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
-tricc_oo-1.5.4.dist-info/top_level.txt,sha256=NvbfMNAiy9m4b1unBsqpeOQWh4IgA1Xa33BtKA4abxk,15
-tricc_oo-1.5.4.dist-info/RECORD,,
+tricc_oo-1.5.6.dist-info/METADATA,sha256=z4GgDtL5N9UGHl46M7xaRaLKS4bFlMMxrlSKSA_o8aM,7877
+tricc_oo-1.5.6.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
+tricc_oo-1.5.6.dist-info/top_level.txt,sha256=NvbfMNAiy9m4b1unBsqpeOQWh4IgA1Xa33BtKA4abxk,15
+tricc_oo-1.5.6.dist-info/RECORD,,