tricc-oo 1.6.14__py3-none-any.whl → 1.6.15__py3-none-any.whl

tricc_oo/converters/xml_to_tricc.py

@@ -483,7 +483,7 @@ def set_additional_attributes(attribute_names, elm, node):
             # input expression can add a condition to either relevance (display) or calculate expression
             if attributename == "expression_inputs":
                 attribute = [attribute]
-            elif attributename == "instance":
+            elif attributename in ["priority", "instance"]:
                 attribute = int(attribute)
             else:
                 attribute
@@ -612,7 +612,11 @@ def inject_bridge_path(node, nodes):
         calc = TriccNodeDisplayBridge(**data)
     else:
         calc = TriccNodeBridge(**data)
-
+    if node:
+        priority = getattr(node, 'priority', None)
+        if priority:
+            calc.priority = priority
+            
     for e in node.activity.edges:
         if e.target == node.id:
             if e.source in node.activity.nodes and len(node.activity.nodes[e.source].next_nodes):

tricc_oo/visitors/tricc.py

@@ -405,6 +405,11 @@ def get_bridge_path(prev_nodes, node=None, edge_only=False):
         calc = TriccNodeDisplayBridge(**data)
     else:
         calc = TriccNodeBridge(**data)
+    if node:
+        priority = getattr(node, 'priority', None)
+        if priority:
+            calc.priority = priority
+    
     return calc
 
 
@@ -1753,6 +1758,8 @@ def reorder_node_list(node_list, group, processed_nodes):
             return MAP_PRIORITIES[node.id]
         if isinstance(node, (TriccNodeActivityStart, TriccNodeMainStart)):
             return get_priority(node.activity)
+        if isinstance(node, (TriccNodeSelectOption)):
+            return get_priority(node.select)
 
         # Cache attributes to avoid repeated getattr calls
         priority = int(getattr(node, "priority", 0) or 0) 

{tricc_oo-1.6.14.dist-info → tricc_oo-1.6.15.dist-info}/METADATA

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

@@ -9,7 +9,7 @@ tricc_oo/converters/datadictionnary.py,sha256=JasqlLKiZzKdidsA1xc2SJ_Af1Xr6A3sKf
 tricc_oo/converters/drawio_type_map.py,sha256=Zp8J9iHNSJkIVrmRSM0_d4vA1X8wFPLKb8nCMPUMXKU,9114
 tricc_oo/converters/tricc_to_xls_form.py,sha256=39hwWgYNitGE-AuKtjUwNLz39tEpwc7nd9gT_gw5wjc,3842
 tricc_oo/converters/utils.py,sha256=JZrtrvvOfXwdkw49pKauzinOcauWwsy-CVcw36TjyLo,1684
-tricc_oo/converters/xml_to_tricc.py,sha256=ea8LNEPDe32q74AJCbEjxaLt_Po47oH45K_G8fo7TzE,40388
+tricc_oo/converters/xml_to_tricc.py,sha256=V1lKsDbpFwftisOctdiU1qC9fRy07me7A5nb_yr8ud0,40536
 tricc_oo/converters/cql/cqlLexer.py,sha256=8HArbRphcrpnAG4uogJ2rHv4tc1WLzjN0B1uFeYILAc,49141
 tricc_oo/converters/cql/cqlListener.py,sha256=fA7-8DcS2Q69ckwjdg57-OfFHBxjTZFdoSKrtw7Hffc,57538
 tricc_oo/converters/cql/cqlParser.py,sha256=x3KdrwX9nwENSEJ5Ex7_l5NMnu3kWBO0uLdYu4moTq0,414745
@@ -41,11 +41,11 @@ tricc_oo/strategies/output/xlsform_cdss.py,sha256=X00Lt5MzV8TX14dR4dFI1MqllI5S1e
 tricc_oo/strategies/output/xlsform_cht.py,sha256=Zy8aggR1sTBP0b33RGbfUpk8pRppI1LGQEif4E1l49A,28523
 tricc_oo/strategies/output/xlsform_cht_hf.py,sha256=xm6SKirV3nMZvM2w54_zJcXAeAgAkq-EEqGEjnOWv6c,988
 tricc_oo/visitors/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-tricc_oo/visitors/tricc.py,sha256=QkVZpmDvSrMbMQeCxVn15zSk3iH-3-e-udMys96JkXE,110923
+tricc_oo/visitors/tricc.py,sha256=3MFP0V2dOj2S1Kif_EudLHrokiALZYLdrnFICAhecQQ,111149
 tricc_oo/visitors/utils.py,sha256=j83aAq5s5atXi3OC0jc_uJd54a8XrHHmizeeEbWZQJg,421
 tricc_oo/visitors/xform_pd.py,sha256=ryAnI3V9x3eTmJ2LNsUZfvl0_yfCqo6oBgeSu-WPqaE,9613
-tricc_oo-1.6.14.dist-info/licenses/LICENSE,sha256=Pz2eACSxkhsGfW9_iN60pgy-enjnbGTj8df8O3ebnQQ,16726
-tricc_oo-1.6.14.dist-info/METADATA,sha256=_WkaLTsN1Yj8koCLVrOmdY9egk06du90gsMqRCcQ0Js,8600
-tricc_oo-1.6.14.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
-tricc_oo-1.6.14.dist-info/top_level.txt,sha256=NvbfMNAiy9m4b1unBsqpeOQWh4IgA1Xa33BtKA4abxk,15
-tricc_oo-1.6.14.dist-info/RECORD,,
+tricc_oo-1.6.15.dist-info/licenses/LICENSE,sha256=Pz2eACSxkhsGfW9_iN60pgy-enjnbGTj8df8O3ebnQQ,16726
+tricc_oo-1.6.15.dist-info/METADATA,sha256=iVmzkCD26vre8c3sd4HGErVgAQrWbEzsHP8fwzLr1ds,8600
+tricc_oo-1.6.15.dist-info/WHEEL,sha256=qELbo2s1Yzl39ZmrAibXA2jjPLUYfnVhUNTlyF1rq0Y,92
+tricc_oo-1.6.15.dist-info/top_level.txt,sha256=NvbfMNAiy9m4b1unBsqpeOQWh4IgA1Xa33BtKA4abxk,15
+tricc_oo-1.6.15.dist-info/RECORD,,

{tricc_oo-1.6.14.dist-info → tricc_oo-1.6.15.dist-info}/WHEEL

@@ -1,5 +1,5 @@
 Wheel-Version: 1.0
-Generator: setuptools (80.9.0)
+Generator: setuptools (80.10.1)
 Root-Is-Purelib: true
 Tag: py3-none-any