tricc-oo 1.5.6__tar.gz → 1.5.8__tar.gz

{tricc_oo-1.5.6 → tricc_oo-1.5.8}/PKG-INFO

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

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

{tricc_oo-1.5.6 → tricc_oo-1.5.8}/tricc_oo/converters/drawio_type_map.py

@@ -202,13 +202,13 @@ TYPE_MAP = {
     },
     TriccNodeType.diagnosis: {
         "objects": ["UserObject", "object"],
-        "attributes": ["save", "reference","priority"],
+        "attributes": ["save", "reference", "priority"],
         "mandatory_attributes": [ "name", 'label'],
         "model": TriccNodeDiagnosis
     },
     TriccNodeType.proposed_diagnosis: {
         "objects": ["UserObject", "object"],
-        "attributes": ["save", "reference", "severity"],
+        "attributes": ["save", "reference", "severity", "priority"],
         "mandatory_attributes": [ "name", 'label'],
         "model": TriccNodeProposedDiagnosis
     },

{tricc_oo-1.5.6 → tricc_oo-1.5.8}/tricc_oo/models/calculate.py

@@ -182,6 +182,7 @@ class TriccNodeActivityEnd(TriccNodeFakeCalculateBase):
 class TriccNodeEnd(TriccNodeDisplayCalculateBase):
     tricc_type: TriccNodeType = TriccNodeType.end
     process: str = None
+    priority: int = 1000
     def __init__(self, **data):
         if data.get('name', None) is None:
             data['name'] = 'tricc_end_' + data.get('process', '') 

{tricc_oo-1.5.6 → tricc_oo-1.5.8}/tricc_oo/strategies/output/xls_form.py

@@ -227,7 +227,6 @@ class XLSFormStrategy(BaseOutPutStrategy):
                     **self.get_kwargs()
                 )
                 # arrange empty group
-                
                 walktrhough_tricc_node_processed_stached(
                     s_node,
                     self.generate_export,
@@ -237,6 +236,7 @@ class XLSFormStrategy(BaseOutPutStrategy):
                     groups=groups,
                     cur_group=s_node.group,
                     recursive=False,
+                    process = process,
                     **self.get_kwargs()
                 )
                 # add end group if new node where added OR if the previous end group was removed

{tricc_oo-1.5.6 → tricc_oo-1.5.8}/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 = int(getattr(l_node, "priority", None) or 400) / 100
+        priority = int(getattr(l_node, "priority", None) or 400) / 1000
         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)

{tricc_oo-1.5.6 → tricc_oo-1.5.8}/tricc_oo.egg-info/PKG-INFO

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