tricc-oo 1.5.0__tar.gz → 1.5.2__tar.gz

{tricc_oo-1.5.0/tricc_oo.egg-info → tricc_oo-1.5.2}/PKG-INFO

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

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

{tricc_oo-1.5.0 → tricc_oo-1.5.2}/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-1.5.0 → tricc_oo-1.5.2}/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-1.5.0 → tricc_oo-1.5.2}/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-1.5.0 → tricc_oo-1.5.2}/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-1.5.0 → tricc_oo-1.5.2}/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,
@@ -2068,7 +2069,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-1.5.0 → tricc_oo-1.5.2}/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 → tricc_oo-1.5.2/tricc_oo.egg-info}/PKG-INFO

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