tricc-oo 1.5.0__py3-none-any.whl → 1.5.3__py3-none-any.whl

tricc_oo/converters/drawio_type_map.py

@@ -6,19 +6,19 @@ from tricc_oo.models.calculate import *
 TYPE_MAP = {
     TriccNodeType.start: {
         "objects": ["UserObject", "object"],
-        "attributes": ['process', 'parent', 'form_id','relevance'],
+        "attributes": ['process', 'parent', 'form_id','relevance',"priority"],
         "mandatory_attributes": ["label"],
         "model": TriccNodeMainStart
     },
     TriccNodeType.activity_start: {
         "objects": ["UserObject", "object"],
-        "attributes": ['parent', 'parent', 'instance', 'relevance'],
+        "attributes": ['parent', 'parent', 'instance', 'relevance',"priority"],
         "mandatory_attributes": ["label", "name"],
         "model": TriccNodeActivityStart
     },
     TriccNodeType.note: {
         "objects": ["UserObject", "object"],
-        "attributes": ['relevance'],
+        "attributes": ['relevance',"priority"],
         "mandatory_attributes": ["label", "name"],
         "model": TriccNodeNote
     },
@@ -44,6 +44,7 @@ TYPE_MAP = {
             "constraint",
             "constraint_message",
             "relevance",
+            "priority"
 
         ],
         "mandatory_attributes": ["label", "name", "list_name"],
@@ -59,6 +60,7 @@ TYPE_MAP = {
             "constraint",
             "constraint_message",
             "relevance",
+            "priority"
         ],
         "mandatory_attributes": ["label", "name", "list_name"],
         "model": TriccNodeSelectMultiple
@@ -73,6 +75,7 @@ TYPE_MAP = {
             "constraint_message",
             "required",
             "relevance",
+            "priority"
         ],
         "mandatory_attributes": ["label", "name"],
         "model": TriccNodeDecimal
@@ -87,6 +90,8 @@ TYPE_MAP = {
             "constraint_message",
             "required",
             "relevance",
+            "priority"
+            
         ],
         "mandatory_attributes": ["label", "name"],
         "model": TriccNodeInteger
@@ -94,13 +99,13 @@ TYPE_MAP = {
 
     TriccNodeType.text: {
         "objects": ["UserObject", "object"],
-        "attributes": ["save", "relevance"],
+        "attributes": ["save", "relevance","priority"],
         "mandatory_attributes": ["label", 'name'],
         "model": TriccNodeText
     },
     TriccNodeType.date: {
         "objects": ["UserObject", "object"],
-        "attributes": ["save", "relevance"],
+        "attributes": ["save", "relevance","priority"],
         "mandatory_attributes": ["label", "name"],
         "model": TriccNodeDate
     },
@@ -154,7 +159,7 @@ TYPE_MAP = {
             "filter",
             "constraint",
             "constraint_message",
-            "relevance",
+            "relevance","priority"
         ],
         "mandatory_attributes": ["label", "name", "list_name"],
         "model": TriccNodeSelectYesNo
@@ -173,7 +178,7 @@ TYPE_MAP = {
     },
     TriccNodeType.goto: {
         "objects": ["UserObject", "object"],
-        "attributes": ["instance"],
+        "attributes": ["instance","priority"],
         "mandatory_attributes": ["link", "label", "name"],
         "model": TriccNodeGoTo
     },
@@ -191,13 +196,13 @@ TYPE_MAP = {
     },
     TriccNodeType.bridge: {
         "objects": ["UserObject", "object"],
-        "attributes": ["label"],
+        "attributes": ["label","priority"],
         "mandatory_attributes": [],
         "model": TriccNodeBridge
     },
     TriccNodeType.diagnosis: {
         "objects": ["UserObject", "object"],
-        "attributes": ["save", "reference"],
+        "attributes": ["save", "reference","priority"],
         "mandatory_attributes": [ "name", 'label'],
         "model": TriccNodeDiagnosis
     },

tricc_oo/converters/xml_to_tricc.py

@@ -518,7 +518,7 @@ def inject_bridge_path(node, nodes):
             )
         )
     ]
-    if (
+    if ( len(prev_nodes)>1 and 
         sum(
             [
                 (

tricc_oo/models/calculate.py

@@ -53,6 +53,7 @@ class TriccNodeCount(TriccNodeDisplayCalculateBase):
 class TriccNodeProposedDiagnosis(TriccNodeDisplayCalculateBase):
     tricc_type: TriccNodeType = TriccNodeType.proposed_diagnosis
     severity: str = None
+    priority: Union[float, int, None] = None
     
 class TriccNodeFakeCalculateBase(TriccNodeCalculateBase):
     ...
@@ -130,6 +131,7 @@ class TriccNodeRhombus(TriccNodeCalculateBase,TriccRhombusMixIn):
 class TriccNodeDiagnosis(TriccNodeDisplayCalculateBase):
     tricc_type: TriccNodeType = TriccNodeType.diagnosis
     severity: str = None
+    priority: Union[float, int, None] = None
     def __init__(self, **data):
         data['reference'] = f'"final.{data["name"]}" is true'
         super().__init__(**data)

tricc_oo/models/tricc.py

@@ -237,7 +237,7 @@ class TriccNodeDisplayModel(TriccNodeBaseModel):
     help: Optional[Union[str, TriccNodeBaseModel]] = None
     group: Optional[Union[TriccGroup, TriccNodeActivity]] = None
     relevance: Optional[Union[Expression, TriccOperation]] = None
-
+    priority: Union[float, int, None] = None
 
     # to use the enum value of the TriccNodeType
 
@@ -348,6 +348,7 @@ class TriccNodeSelectYesNo(TriccNodeSelectOne):
 
 class TriccNodeAcceptDiagnostic(TriccNodeSelectOne):
     severity: Optional[str] = None
+    priority: Union[float, int, None] = None
 
 
 class TriccParentMixIn(BaseModel):

tricc_oo/visitors/tricc.py

@@ -67,7 +67,7 @@ def get_last_version(name, processed_nodes,  _list=None):
 # node is the node to calculate
 # processed_nodes are the list of processed nodes
 def get_node_expressions(node, processed_nodes, process=None):
-    is_calculate = issubclass(node.__class__, TriccNodeCalculateBase)
+    is_calculate = issubclass(node.__class__, TriccNodeCalculateBase) and not issubclass(node.__class__, (TriccNodeDisplayBridge,TriccNodeBridge))
     expression = None
     # in case of recursive call processed_nodes will be None
     if processed_nodes is None or is_ready_to_process(node, processed_nodes=processed_nodes):
@@ -369,7 +369,7 @@ def get_bridge_path(prev_nodes, node=None,edge_only=False):
         'path_len': node.path_len + 1 * (node == p_p_node)
     }
     
-    if sum([0 if issubclass(n.__class__, (TriccNodeDisplayCalculateBase, TriccNodeRhombus)) else 1 for n in prev_nodes])>0 : #and len(node.prev_nodes)>1:
+    if len(prev_nodes)>1 and sum([0 if issubclass(n.__class__, (TriccNodeDisplayCalculateBase, TriccNodeRhombus)) else 1 for n in prev_nodes])>0 :
         calc= TriccNodeDisplayBridge( **data)
     else:
         calc =  TriccNodeBridge( **data)
@@ -1416,31 +1416,30 @@ 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
         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)
         ):
-            return 7
+            pass
         elif group is not None and hasattr(l_node, 'group') and l_node.group and l_node.group.id == group.id:
-            return 0  # Highest priority: Same group
+            priority += 7  # Highest priority: Same group
         elif issubclass(l_node.__class__, TriccRhombusMixIn) :
-            return 6
+            priority += 1
         elif hasattr(group, 'group') and group.group and l_node.group and l_node.group.id == group.group.id:
-            return 1  # Second priority: Parent group
+            priority += 6  # Second priority: Parent group
         elif not isinstance(l_node.activity.root, TriccNodeActivityStart) and l_node.activity in active_activities:
-            return 2  # Third priority: Active activities
+            priority += 5  # Third priority: Active activities
         elif not isinstance(l_node.activity.root, TriccNodeActivityStart):
-            return 3  # Third priority: Active activities
+            priority += 4  # Third priority: Active activities
         elif l_node.activity in active_activities:
-            return 4  # Third priority: Active activities
- 
-
+            priority += 3 # Third priority: Active activities
         else:
-            return 5  # Lowest priority: Others
+            priority += 2  # Lowest priority: Others
+        return priority
     
     # Sort list_node in place using filter_logic as the key
-    list_node.sort(key=filter_logic, reverse=False)
+    list_node.sort(key=filter_logic, reverse=True)
     return None
     
 def loop_info(loop, **kwargs):
@@ -1530,7 +1529,7 @@ def get_node_expression( in_node, processed_nodes, is_calculate=False, is_prev=F
         prev_exp = get_node_expression(
             node.path,
             processed_nodes=processed_nodes,
-            is_calculate=is_calculate,
+            is_calculate=False,
             is_prev=True,
             process=process)
         if prev_exp and expression:
@@ -1700,7 +1699,7 @@ def get_accept_diagnostic_node(code, display, severity, activity):
     node.options = get_select_accept_reject_options(node, node.activity)
     return node
 
-def get_diagnostic_node(code, display, severity, activity):
+def get_diagnostic_node(code, display, severity, priority, activity):
     node = TriccNodeAcceptDiagnostic(
         id=generate_id("final." + code),
         name="final." + code,
@@ -1708,7 +1707,9 @@ def get_diagnostic_node(code, display, severity, activity):
         list_name="acc_rej",
         activity=activity,
         group=activity,
-        severity=severity
+        severity=severity,
+        priority=priority
+        
     )
     node.options = get_select_accept_reject_options(node, node.activity)
     return node
@@ -1760,7 +1761,7 @@ def create_determine_diagnosis_activity(diags):
     )
     activity.nodes[end.id]=end
     for proposed in diags:
-        d = get_diagnostic_node(proposed.name, proposed.label, proposed.severity, activity)
+        d = get_diagnostic_node(proposed.name, proposed.label, proposed.severity, proposed.priority, activity)
         diags_conf.append(d)
         r = TriccNodeRhombus(
             id=generate_id(f"proposed-rhombus{proposed.id}"),
@@ -1782,7 +1783,7 @@ def create_determine_diagnosis_activity(diags):
     # fallback
     f = TriccNodeSelectMultiple(
         name="tricc.manual.diag",
-        label="Add a diagnostic",
+        label="Add diagnosis",
         list_name='manual_diag',
         id=generate_id("tricc.manual.diag"),
         activity=activity,
@@ -1817,17 +1818,42 @@ def get_prev_node_expression( node, processed_nodes, is_calculate=False, exclude
         expression_inputs = node.expression_inputs
         expression_inputs = clean_or_list(expression_inputs)
     else:
-        expression_inputs = []        
+        expression_inputs = []  
+    prev_activities = {}
     for prev_node in node.prev_nodes:
-        if excluded_name is None or prev_node != excluded_name or (
-                isinstance(excluded_name, str) and hasattr(prev_node, 'name') and prev_node.name != excluded_name): # or isinstance(prev_node, TriccNodeActivityEnd):
-            # the rhombus should calculate only reference
-            add_sub_expression(expression_inputs, get_node_expression(
-                prev_node,
-                processed_nodes=processed_nodes,
-                is_calculate=is_calculate,
-                is_prev=True,
-                process=process))
+        if prev_node.activity.id not in prev_activities:
+            prev_activities[prev_node.activity.id]=[]
+        prev_activities[prev_node.activity.id].append(prev_node)
+    
+    for act_id in prev_activities:
+        for prev_node in prev_activities[act_id]:
+            act_expression_inputs = [] 
+            if excluded_name is None or prev_node != excluded_name or (
+                    isinstance(excluded_name, str) and hasattr(prev_node, 'name') and prev_node.name != excluded_name): # or isinstance(prev_node, TriccNodeActivityEnd):
+                # the rhombus should calculate only reference
+                sub = get_node_expression(
+                    prev_node,
+                    processed_nodes=processed_nodes,
+                    is_calculate=is_calculate,
+                    is_prev=True,
+                    process=process)
+                if not isinstance(node, TriccNodeActivity):
+                    add_sub_expression(expression_inputs, sub )
+                else:
+                    add_sub_expression(act_expression_inputs, sub )
+                
+        if act_expression_inputs:
+            act_sub = or_join(act_expression_inputs)
+            if act_sub == TriccStatic(True): 
+                        act_sub = get_node_expression(
+                        prev_node.activity,
+                        processed_nodes=processed_nodes,
+                        is_calculate=True,
+                        is_prev=True,
+                        negate=False,
+                        process=process
+                    )
+            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(
     #     [
@@ -1836,12 +1862,8 @@ def get_prev_node_expression( node, processed_nodes, is_calculate=False, exclude
     #         else e 
     #         for e in expression_inputs])
     
-    expression = None
-    if len(expression_inputs) == 1:
-        expression = expression_inputs[0]
-    
-    elif expression_inputs:
-        expression = or_join(
+    if expression_inputs:
+        expression =  or_join(
             expression_inputs
         )
         # if isinstance(node,  TriccNodeExclusive):
@@ -2068,7 +2090,7 @@ def get_rhombus_terms( node, processed_nodes, is_calculate=False, negate=False,
         exit(1)
 
     if expression is not None:
-        if isinstance(expression, TriccOperation):
+        if isinstance(expression, (TriccOperation, TriccStatic)):
             return expression
         elif issubclass(expression.__class__ , TriccNodeCalculateBase):
             return TriccOperation(

tricc_oo/visitors/xform_pd.py

@@ -182,6 +182,7 @@ def get_task_js(form_id, calculate_name, title, form_types, hidden_names, df_sur
 /* eslint-disable */
 
 const {{injectDataFromForm, isFormArrayHasSourceId}} = require('./stph-extras');
+const {{getField}} = require("./nools-extras");
 
 const CASE_DATA = ['{"','".join(hidden_names)}'];
     
@@ -216,7 +217,9 @@ function {task_name}ResolveIf(contact, report, event, dueDate) {{
 }}
 
 function {task_name}AppliesIf(contact, report, event, dueDate) {{
-  return report.{calculate_name} === '1';
+    return getField(report, "source_id") === "" &&
+    getField(report, "pause_test") === "1"
+
 }}
 
 module.exports = {{
@@ -247,6 +250,7 @@ module.exports = {{
 //        appliesTo: 'reports',
 //        appliesToType: {task_name_upper}_FORMS,
 //        appliesIf: {task_name}AppliesIf,
+//        contactLabel: {task_name}ContactLabel,
 //        actions: [
 //            {{
 //                type: 'report',

{tricc_oo-1.5.0.dist-info → tricc_oo-1.5.3.dist-info}/METADATA

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

@@ -6,21 +6,21 @@ tricc_oo/converters/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSu
 tricc_oo/converters/codesystem_to_ocl.py,sha256=-ZKMBeIvzgqmhJfnn6ptuwpnHQtuE-fCDDfKpfGvUSU,6066
 tricc_oo/converters/cql_to_operation.py,sha256=bsVD4HO5Zr2clHuIWz86gIUnI7aZ676IXDK5S7x32_o,14439
 tricc_oo/converters/datadictionnary.py,sha256=WWKcTtKLfc4aduHcDBhr4JSfU2NqRMaslwX-wdZPIAw,3968
-tricc_oo/converters/drawio_type_map.py,sha256=6ZcnQMtBU1dhf_NP_s0iX1DvRf0qS7-3UAe_WAPFVoQ,7027
+tricc_oo/converters/drawio_type_map.py,sha256=6jkWza3lYM8_LyqPI-cB36J6eywUoXz2ChNACMczGgA,7230
 tricc_oo/converters/tricc_to_xls_form.py,sha256=bJVd-FLrivrCxGI6mO2i0V7GVVuJZdaDuwcEf3gHNR8,2327
 tricc_oo/converters/utils.py,sha256=UyndDORsDbRV5-gYW-yInK5ztjtYdeCw6K-mrYr1Emk,1688
-tricc_oo/converters/xml_to_tricc.py,sha256=IO6jL1ljhrkWnPTe5EsQCfJ4wUoYitLH2P7TIJm4A9I,37457
+tricc_oo/converters/xml_to_tricc.py,sha256=GDaANkzSMZw6YwN5mevG7x7TQcaEt9zyOlsJ83tPBig,37480
 tricc_oo/converters/cql/cqlLexer.py,sha256=t0-QvDv5kxCiBZJ9SfDumFOgnRSry_HJpakBZV224Ig,49126
 tricc_oo/converters/cql/cqlListener.py,sha256=ketvj7XvO7t047S6A3_gTPvp2MlYk1bojmkl10v5E6Y,57523
 tricc_oo/converters/cql/cqlParser.py,sha256=hIUdR907WX24P2Jlrxk-H0IT94n51yh_ZsCmwQhnFas,414730
 tricc_oo/converters/cql/cqlVisitor.py,sha256=SWSDIqVYBhucR4VgLn_EPNs7LV9yCqsOmzFZ0bmRSGc,33865
 tricc_oo/models/__init__.py,sha256=Rdk1fsNXHrbmXTQD1O7i0NC_A6os648Ap6CtWRliOg8,92
 tricc_oo/models/base.py,sha256=_jJMYKvP60gaQSvzmA3TORrcRgv0oF5xG0FEBsE_Nhk,24399
-tricc_oo/models/calculate.py,sha256=Bw7OGa4OYxHP529wA23CZftMYDL_CA0SPQ0j1IFyTNA,7456
+tricc_oo/models/calculate.py,sha256=mQ6FbeSwb9qlRiA5DZpW6KREF4k5Zbc1TnmhXhxiznI,7546
 tricc_oo/models/lang.py,sha256=SwKaoxyRhE7gH_ZlYyFXzGuTQ5RE19y47LWAA35zYxg,2338
 tricc_oo/models/ocl.py,sha256=ol35Gl1jCBp0Ven0yxOKzDIZkVL5Kx9uwaR_64pjxKI,8931
 tricc_oo/models/ordered_set.py,sha256=wbbmppjgKy0xcKD9kIAbT4kgNkuwTILPxRw_KAAoPEY,4178
-tricc_oo/models/tricc.py,sha256=32WvBVBShODBlszdXSoCjisd5gpt6CM_TNabJap1Zfs,16509
+tricc_oo/models/tricc.py,sha256=OdTrhivtGxTRAn0H4mg3qghVu67QUfncaTKuioZVrWA,16598
 tricc_oo/parsers/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 tricc_oo/parsers/xml.py,sha256=vq9PA5Zt4G3QMtZ1zgyN8110O1w19Jqt6JClJYhHJlU,4410
 tricc_oo/serializers/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
@@ -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=5xJpFb6ne9NtcVCfkc_c5jzOv2JINKS9WTui9VIpZHA,97875
+tricc_oo/visitors/tricc.py,sha256=qwbjhgjUZsfNuGPscNBNVxSMl6JEci1H-2eqjFI6CH8,99105
 tricc_oo/visitors/utils.py,sha256=Gol4JNozPEd30Q1l8IPIPhx5fqVyy9R81GofGVebgD8,484
-tricc_oo/visitors/xform_pd.py,sha256=RkKSfW9853Xm5IvZ-nQ7PKxupY7OyOvlUJFdVOrY_fs,9555
-tricc_oo-1.5.0.dist-info/METADATA,sha256=P7up5bjCoX7hG3A_ZzMtKa-uGTk7aQE8W0HaCeuFUuE,7877
-tricc_oo-1.5.0.dist-info/WHEEL,sha256=zaaOINJESkSfm_4HQVc5ssNzHCPXhJm0kEUakpsEHaU,91
-tricc_oo-1.5.0.dist-info/top_level.txt,sha256=NvbfMNAiy9m4b1unBsqpeOQWh4IgA1Xa33BtKA4abxk,15
-tricc_oo-1.5.0.dist-info/RECORD,,
+tricc_oo/visitors/xform_pd.py,sha256=jgjBLbfElVdi0NmClhw6NK6qNcIgWYm4KMXfVwiQwXM,9705
+tricc_oo-1.5.3.dist-info/METADATA,sha256=1Mc29DAWwOaE6eZctpKEE0kwdPDFmUndPrF6BnsIgLg,7877
+tricc_oo-1.5.3.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
+tricc_oo-1.5.3.dist-info/top_level.txt,sha256=NvbfMNAiy9m4b1unBsqpeOQWh4IgA1Xa33BtKA4abxk,15
+tricc_oo-1.5.3.dist-info/RECORD,,

{tricc_oo-1.5.0.dist-info → tricc_oo-1.5.3.dist-info}/WHEEL

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