tricc-oo 1.5.13__py3-none-any.whl → 1.6.8__py3-none-any.whl

tricc_oo/converters/xml_to_tricc.py

@@ -1,14 +1,56 @@
+import html2text
+import logging
 import base64
 import os
 import re
-from curses.ascii import isalnum, isalpha, isdigit
 
-from numpy import isnan
 
-from tricc_oo.converters.utils import clean_name, remove_html
+from tricc_oo.converters.utils import remove_html, clean_str
 from tricc_oo.converters.cql_to_operation import transform_cql_to_operation
-from tricc_oo.models.tricc import *
-from tricc_oo.models.base import TriccNodeType, OPERATION_LIST
+from tricc_oo.converters.utils import generate_id
+from tricc_oo.models.base import (
+    TriccOperator, TriccOperation,
+    TriccStatic, TriccReference, TriccNodeType, TriccEdge, OPERATION_LIST
+)
+from tricc_oo.models.calculate import (
+    TriccNodeDisplayBridge,
+    TriccNodeBridge,
+    TriccNodeActivityEnd,
+    TriccNodeActivityStart,
+    TriccNodeEnd,
+    TriccNodeCalculate,
+    TriccNodeRhombus,
+    TriccNodeDisplayCalculateBase,
+    TriccNodeExclusive,
+    TriccNodeProposedDiagnosis,
+    TriccNodeDiagnosis,
+    TriccRhombusMixIn,
+    TriccNodeInput,
+
+)
+from tricc_oo.models.tricc import (
+    TriccNodeCalculateBase,
+    TriccNodeMainStart,
+    TriccNodeActivity,
+    TriccGroup,
+    TriccNodeSelect,
+    TriccNodeGoTo,
+    TriccNodeSelectMultiple,
+    TriccNodeInputModel,
+    TriccNodeSelectNotAvailable,
+    TriccNodeSelectOption,
+    TriccNodeDisplayModel,
+    TriccNodeMoreInfo,
+    TriccNodeText,
+    TriccNodeDecimal,
+    TriccNodeInteger,
+    TriccNodeDate,
+    TriccNodeSelectOne,
+    TriccNodeSelectYesNo,
+    TriccNodeNote,
+)
+
+
 from tricc_oo.models.ocl import get_data_type
 from tricc_oo.converters.drawio_type_map import TYPE_MAP
 from tricc_oo.parsers.xml import (
@@ -20,7 +62,11 @@ from tricc_oo.parsers.xml import (
     get_tricc_type_list,
 )
 import hashlib
-from tricc_oo.visitors.tricc import *
+from tricc_oo.visitors.tricc import (
+    get_select_yes_no_options, get_select_not_available_options,
+    set_prev_next_node,  inject_node_before,
+    merge_node, remove_prev_next, get_activity_wait, get_count_terms_details
+)
 from tricc_oo.converters.datadictionnary import add_concept
 
 TRICC_YES_LABEL = ["yes", "oui"]
@@ -28,15 +74,9 @@ TRICC_NO_LABEL = ["no", "non"]
 TRICC_FOLLOW_LABEL = ["follow", "suivre", "continue"]
 NO_LABEL = "NO_LABEL"
 TRICC_LIST_NAME = "list_{0}"
-import logging
-DISPLAY_ATTRIBUTES = [
-    'label',
-    'hint',
-    'help'
-]
-logger = logging.getLogger("default")
-import html2text
 
+DISPLAY_ATTRIBUTES = ["label", "hint", "help"]
+logger = logging.getLogger("default")
 
 
 def get_all_nodes(diagram, activity, nodes):
@@ -51,29 +91,30 @@ def get_all_nodes(diagram, activity, nodes):
                 activity,
                 attributes=TYPE_MAP[tricc_type]["attributes"],
                 mandatory_attributes=TYPE_MAP[tricc_type]["mandatory_attributes"],
-                has_options=TYPE_MAP[tricc_type].get('has_options', None)
+                has_options=TYPE_MAP[tricc_type].get("has_options", None),
             )
 
     return nodes
 
+
 def create_activity(diagram, media_path, project):
 
     external_id = diagram.attrib.get("id")
-    id = get_id( external_id,  diagram.attrib.get("id"))
-    root = create_root_node(diagram)
-    name = diagram.attrib.get("name")
+    id = get_id(external_id, diagram.attrib.get("id"))
+    root, name = create_root_node(diagram)
+    label = diagram.attrib.get("name")
     form_id = diagram.attrib.get("name", None)
     if root is not None:
         activity = TriccNodeActivity(
             root=root,
-            name=get_rand_name(f"a{id}"),
+            name=name,  # start node 'name' is saved in label
             id=id,
             external_id=external_id,
-            label=name,
+            label=label,
             form_id=form_id,
         )
         if root.relevance is not None:
-            activity.applicability=root.relevance
+            activity.applicability = root.relevance
         # activity definition is never instanciated
         if isinstance(root, TriccNodeActivityStart):
             activity.instance = 0
@@ -85,21 +126,45 @@ def create_activity(diagram, media_path, project):
             activity.edges = edges
         nodes = get_nodes(diagram, activity)
         for n in nodes.values():
-            
+
             if (
-                issubclass(n.__class__, (TriccNodeDisplayModel, TriccNodeDisplayCalculateBase)) 
+                issubclass(n.__class__, (TriccNodeDisplayModel, TriccNodeDisplayCalculateBase))
                 and not isinstance(n, (TriccRhombusMixIn, TriccNodeRhombus, TriccNodeDisplayBridge))
-                and not n.name.startswith('label_')
+                and not n.name.startswith("label_")  # FIXME
             ):
-                system = n.name.split('.')[0] if '.' in n.name else 'tricc'
+                system = n.name.split(".")[0] if "." in n.name else "tricc"
                 if isinstance(n, TriccNodeSelectOption) and isinstance(n.select, TriccNodeSelectNotAvailable):
-                    add_concept(project.code_systems, system, n.select.name, n.label, {"datatype": 'Boolean'})
+                    add_concept(
+                        project.code_systems,
+                        system,
+                        n.select.name,
+                        n.label,
+                        {"datatype": "Boolean", "contextType": get_context_type(n)},
+                    )
                 elif not isinstance(n, TriccNodeSelectNotAvailable):
-                    add_concept(project.code_systems, system, n.name, n.label, {"datatype": get_data_type(n.tricc_type)})
-                if getattr(n,'save', None):
-                    system = n.save.split('.')[0] if '.' in n.save else 'tricc'
-                    add_concept(project.code_systems, system, n.save, n.label, {"datatype": get_data_type(n.tricc_type)})
-            
+                    add_concept(
+                        project.code_systems,
+                        system,
+                        n.name,
+                        n.label,
+                        {
+                            "datatype": get_data_type(n.tricc_type),
+                            "contextType": get_context_type(n),
+                        },
+                    )
+                if getattr(n, "save", None):
+                    system = n.save.split(".")[0] if "." in n.save else "tricc"
+                    add_concept(
+                        project.code_systems,
+                        system,
+                        n.save,
+                        n.label,
+                        {
+                            "datatype": get_data_type(n.tricc_type),
+                            "contextType": get_context_type(n),
+                        },
+                    )
+
         groups = get_groups(diagram, nodes, activity)
         if groups and len(groups) > 0:
             activity.groups = groups
@@ -110,7 +175,7 @@ def create_activity(diagram, media_path, project):
         # link back the activity
         activity.root.activity = activity
         manage_dangling_calculate(activity)
-        
+
         if activity is not None:
             if activity.root is not None:
                 project.pages[activity.id] = activity
@@ -119,7 +184,7 @@ def create_activity(diagram, media_path, project):
                         activity.root.process == "main" or activity.root.process is None
                     ):
                         project.start_pages["main"] = activity
-                        activity.root.process = 'main'
+                        activity.root.process = "main"
                     elif activity.root.process is not None:
                         if activity.root.process not in project.start_pages:
                             project.start_pages[activity.root.process] = []
@@ -127,24 +192,27 @@ def create_activity(diagram, media_path, project):
                     else:
                         logger.warning(
                             "Page {0} has a start node but there is already a start node in page  {1}".format(
-                                activity.label, start_page.label
+                                activity.label, project.start_pages[activity.root.process][0]
                             )
                         )
         if images:
             project.images += images
-        for node in list(filter(lambda p_node: isinstance(p_node, TriccNodeSelectNotAvailable),list(activity.nodes.values()))):
+        for node in list(
+            filter(
+                lambda p_node: isinstance(p_node, TriccNodeSelectNotAvailable),
+                list(activity.nodes.values()),
+            )
+        ):
             prev_node = None
-            prev_edges = list(filter(lambda p_e: p_e.target == node.id,list(activity.edges))) 
+            prev_edges = list(filter(lambda p_e: p_e.target == node.id, list(activity.edges)))
             if len(prev_edges):
                 prev_node = [n for n in activity.nodes.values() if n.id in [p_e.source for p_e in prev_edges]]
                 if prev_node:
                     node.parent = prev_node[0]
-            if not  node.parent :    
+            if not node.parent:
                 logger.critical(f"unable to find the parent of the NotApplicable node {node.get_name()}")
                 exit(1)
 
-
-  
     else:
         return None, None
         logger.warning("root not found for page {0}".format(name))
@@ -158,10 +226,7 @@ def manage_dangling_calculate(activity):
             for n in list(
                 filter(
                     lambda x: (x.target == node.id or x.target == node)
-                    and (
-                        x.source in activity.nodes
-                        or x.source in activity.nodes.values()
-                    ),
+                    and (x.source in activity.nodes or x.source in activity.nodes.values()),
                     activity.edges,
                 )
             )
@@ -188,7 +253,9 @@ def process_edges(diagram, media_path, activity, nodes):
             if image is not None:
                 images.append({"file_path": enriched, "image_content": image})
 
-        elif isinstance(nodes[edge.target], (TriccNodeActivityEnd)) or (isinstance(nodes[edge.target], (TriccNodeEnd)) and isinstance(activity.root, TriccNodeMainStart )):
+        elif isinstance(nodes[edge.target], (TriccNodeActivityEnd)) or (
+            isinstance(nodes[edge.target], (TriccNodeEnd)) and isinstance(activity.root, TriccNodeMainStart)
+        ):
             end_found = True
         if (
             edge.target in nodes
@@ -197,19 +264,16 @@ def process_edges(diagram, media_path, activity, nodes):
         ):
             edge.target = nodes[edge.target].path.id
         # modify edge for selectyesNo
-        if edge.source in nodes and isinstance(
-            nodes[edge.source], TriccNodeSelectYesNo
-        ):
+        if edge.source in nodes and isinstance(nodes[edge.source], TriccNodeSelectYesNo):
             process_yesno_edge(edge, nodes)
 
         # create calculate based on edges label
         elif edge.value is not None:
             label = edge.value.strip()
+            label_html_free = html2text.html2text(label)
             processed = False
             calc = None
-            if (
-                 label.lower() in TRICC_FOLLOW_LABEL
-            ):
+            if label.lower() in TRICC_FOLLOW_LABEL:
                 if isinstance(nodes[edge.source], TriccNodeRhombus):
                     edge.source = nodes[edge.source].path.id
                     edge.source_external_id = None
@@ -221,9 +285,12 @@ def process_edges(diagram, media_path, activity, nodes):
                 calc = process_factor_edge(edge, nodes)
             elif label.lower() in TRICC_NO_LABEL:
                 calc = process_exclusive_edge(edge, nodes)
-            elif  any(reserved in html2text.html2text(label.lower()) for reserved in ([str(o) for o in list(TriccOperator)] + list(OPERATION_LIST.keys()) + ['$this'])):
+            elif any(
+                reserved in label_html_free
+                for reserved in ([str(o) for o in list(TriccOperator)] + list(OPERATION_LIST.keys()) + ["$this"])
+            ):
                 # manage comment
-                calc = process_condition_edge(edge, nodes)
+                calc = process_condition_edge(edge, label_html_free, nodes)
             else:
                 logger.warning(f"unsupported edge label {label} in {diagram.attrib.get('name', diagram.attrib['id'])}")
                 processed = True
@@ -242,25 +309,23 @@ def process_edges(diagram, media_path, activity, nodes):
                         "not management found",
                     )
                 )
-        elif edge.source in  nodes and isinstance(nodes[edge.source], TriccNodeRhombus):
-            logger.critical(
-                "rhombus {} node with labelless edges".format(nodes[edge.source].get_name())
-            )
+        elif edge.source in nodes and isinstance(nodes[edge.source], TriccNodeRhombus):
+            logger.critical("rhombus {} node with labelless edges".format(nodes[edge.source].get_name()))
     if not end_found:
         fake_end = TriccNodeActivityEnd(id=generate_id(f"e{activity.name}"), activity=activity, group=activity)
         last_nodes = [
-            n for n in list(activity.nodes.values())
+            n
+            for n in list(activity.nodes.values())
             if (
                 issubclass(
-                    n.__class__, 
+                    n.__class__,
                     (
-                        TriccNodeInputModel, 
-                        TriccNodeText, 
+                        TriccNodeInputModel,
+                        TriccNodeText,
                         TriccNodeNote,
-                    )
-                ) and (
-                    not any([n.id == e.source for e in activity.edges])
+                    ),
                 )
+                and (not any([n.id == e.source for e in activity.edges]))
             )
         ]
         if last_nodes:
@@ -271,10 +336,7 @@ def process_edges(diagram, media_path, activity, nodes):
         else:
             logger.warning(f"Activity {activity.label} have no end, calculated might be included in the end definition")
             last_nodes = [
-                n for n in list(activity.nodes.values())
-                if (
-                        not any([n.id == e.source for e in activity.edges])
-                )
+                n for n in list(activity.nodes.values()) if (not any([n.id == e.source for e in activity.edges]))
             ]
             if last_nodes:
                 for n in last_nodes:
@@ -283,20 +345,19 @@ def process_edges(diagram, media_path, activity, nodes):
             else:
                 logger.critical(f"cannot guess end for {activity.get_name()}")
                 exit(1)
-    
+
     return images
 
+
 def get_id(elm_id, activity_id):
-   return  str(elm_id) if len(elm_id)>8 else str(activity_id) + str(elm_id)
+    return str(elm_id) if len(elm_id) > 8 else str(activity_id) + str(elm_id)
+
 
 def _get_name(name, id, act_id):
-    if (
-        name is not None
-        and (name.endswith(("_", ".")))
-    ):
+    if name is not None and (name.endswith(("_", "."))):
         return name + get_id(id, act_id)
     return name
-   
+
 
 def get_nodes(diagram, activity):
     nodes = {activity.root.id: activity.root}
@@ -304,12 +365,9 @@ def get_nodes(diagram, activity):
     new_nodes = {}
     node_to_remove = []
     activity_end_node = None
-    end_node = None
     for node in nodes.values():
         # clean name
-        if (
-            hasattr(node, "name")
-        ):
+        if hasattr(node, "name"):
             node.name = _get_name(node.name, node.id, activity.id)
         if issubclass(node.__class__, TriccRhombusMixIn) and node.path is None:
             # generate rhombuse path
@@ -331,12 +389,10 @@ def get_nodes(diagram, activity):
             next_nodes_id = [e.target for e in activity.edges if e.source == node.id]
             if len(next_nodes_id) > 0:
 
-                calc = get_activity_wait(
-                    path, [node], next_nodes_id, node, edge_only=True
-                )
+                calc = get_activity_wait(path, [node], next_nodes_id, node, edge_only=True)
                 new_nodes[calc.id] = calc
                 for goto_next_node in next_nodes_id:
-                    remove_prev_next(node, goto_next_node, activity) 
+                    remove_prev_next(node, goto_next_node, activity)
         elif isinstance(node, TriccNodeActivityEnd):
             if not activity_end_node:
                 activity_end_node = node
@@ -345,12 +401,11 @@ def get_nodes(diagram, activity):
                 node_to_remove.append(node.id)
         # add activity relevance to calculate
         elif (
-            issubclass(node.__class__, TriccNodeDisplayCalculateBase) 
-            and not getattr(node, 'relevance', None)
+            issubclass(node.__class__, TriccNodeDisplayCalculateBase)
+            and not getattr(node, "relevance", None)
             and node.activity.applicability
         ):
             node.applicability = node.activity.applicability
-            
 
     nodes.update(new_nodes)
 
@@ -371,7 +426,7 @@ def create_root_node(diagram):
         elm = get_tricc_type(diagram, "UserObject", TriccNodeType.start)
     if elm is not None:
         external_id = elm.attrib.get("id")
-        id = get_id( external_id,  diagram.attrib.get("id"))
+        id = get_id(external_id, diagram.attrib.get("id"))
         node = TriccNodeMainStart(
             id=id,
             external_id=external_id,
@@ -380,7 +435,7 @@ def create_root_node(diagram):
             label=elm.attrib.get("label"),
             form_id=elm.attrib.get("form_id"),
             relevance=elm.attrib.get("relevance"),
-            process=elm.attrib.get('process', 'main'),
+            process=elm.attrib.get("process", "registration"),
         )
     else:
         elm = get_tricc_type(diagram, "object", TriccNodeType.activity_start)
@@ -388,22 +443,19 @@ def create_root_node(diagram):
             elm = get_tricc_type(diagram, "UserObject", TriccNodeType.activity_start)
         if elm is not None:
             external_id = elm.attrib.get("id")
-            id = get_id( external_id,  diagram.attrib.get("id"))
+            id = get_id(external_id, diagram.attrib.get("id"))
+            name = generate_id("start"+external_id)
             node = TriccNodeActivityStart(
                 id=id,
                 external_id=external_id,
-                #parent=elm.attrib.get("parent"),
-                name="ma" + id,
+                # parent=elm.attrib.get("parent"),
+                name=name,
                 label=diagram.attrib.get("name"),
                 relevance=elm.attrib.get("relevance"),
-                instance=int(
-                    elm.attrib.get("instance")
-                    if elm.attrib.get("instance") is not None
-                    else 1
-                ),
+                instance=int(elm.attrib.get("instance") if elm.attrib.get("instance") is not None else 1),
             )
     load_expressions(node)
-    return node
+    return node, _get_name(elm.attrib.get("name", "act_"), external_id, diagram.attrib.get("id")) if node else None
 
 
 # converter XML item to object
@@ -425,6 +477,39 @@ def set_additional_attributes(attribute_names, elm, node):
             setattr(node, attributename, attribute)
 
 
+def get_context_type(node):
+    context_type = getattr(node, "context_type", None)
+    if context_type:
+        return context_type
+    if isinstance(node, TriccNodeSelectMultiple):
+        return "Question"
+    elif isinstance(node, TriccNodeSelectOption):
+        if isinstance(node.select, TriccNodeSelectMultiple):
+            return "Symptom-Finding"
+        else:
+            return "Value"
+    elif isinstance(node, TriccNodeNote):
+        return "InteractSet"
+    elif isinstance(
+        node,
+        (
+            TriccNodeDecimal,
+            TriccNodeInteger,
+            TriccNodeText,
+            TriccNodeDate,
+            TriccNodeSelectOne,
+            TriccNodeSelectYesNo,
+            TriccNodeSelectNotAvailable,
+            TriccNodeInput,
+        ),
+    ):
+        return "Symptom-Finding"
+    elif isinstance(node, (TriccNodeProposedDiagnosis, TriccNodeDiagnosis)):
+        return "Diagnosis"
+    elif issubclass(node.__class__, TriccNodeCalculateBase):
+        return "Calculation"
+    else:
+        return "Misc"
 
 
 def get_select_options(diagram, select_node, nodes):
@@ -435,16 +520,12 @@ def get_select_options(diagram, select_node, nodes):
     for elm in list:
         name = elm.attrib.get("name")
         if name in options_name_list and not name.endswith("_"):
-            logger.critical(
-                "Select question {0} have twice the option name {1}".format(
-                    select_node.get_name(), name
-                )
-            )
+            logger.critical("Select question {0} have twice the option name {1}".format(select_node.get_name(), name))
         else:
             options_name_list.append(name)
-        
+
         external_id = elm.attrib.get("id")
-        id = get_id(external_id, diagram.attrib.get('id'))  
+        id = get_id(external_id, diagram.attrib.get("id"))
         option = TriccNodeSelectOption(
             id=id,
             label=elm.attrib.get("label"),
@@ -453,8 +534,8 @@ def get_select_options(diagram, select_node, nodes):
             list_name=select_node.list_name,
             activity=select_node.activity,
             group=select_node.group,
-            )
-        set_additional_attributes(["save", "relevance"], elm, option)
+        )
+        set_additional_attributes(["save", "relevance", "context_type"], elm, option)
         load_expressions(option)
         options[i] = option
         nodes[id] = option
@@ -464,7 +545,7 @@ def get_select_options(diagram, select_node, nodes):
     else:
         return options
 
-    ##TBR START
+    # TBR START
 
 
 def get_max_version(dict):
@@ -484,11 +565,10 @@ def get_max_named_version(calculates, name):
     return max
 
 
-
 def inject_bridge_path(node, nodes):
     calc_name = "p" + node.id
     calc_id = generate_id(calc_name)
-    
+
     data = {
         "id": calc_id,
         "group": node.group,
@@ -501,22 +581,16 @@ def inject_bridge_path(node, nodes):
         nodes[n.source]
         for n in list(
             filter(
-                lambda x: (x.target == node.id or x.target == node)
-                and x.source in nodes,
+                lambda x: (x.target == node.id or x.target == node) and x.source in nodes,
                 node.activity.edges,
             )
         )
     ]
-    if ( len(prev_nodes)>1 and 
-        sum(
+    if (
+        len(prev_nodes) > 1
+        and sum(
             [
-                (
-                    0
-                    if issubclass(
-                        n.__class__, (TriccNodeDisplayCalculateBase, TriccNodeRhombus)
-                    )
-                    else 1
-                )
+                (0 if issubclass(n.__class__, (TriccNodeDisplayCalculateBase, TriccNodeRhombus)) else 1)
                 for n in prev_nodes
             ]
         )
@@ -545,7 +619,7 @@ def enrich_node(diagram, media_path, edge, node, activity, help_before=False):
         # get node and process type
         type, message = get_message(diagram, edge.source_external_id)
         if type is not None:
-            if type == 'help':
+            if type == "help":
                 help = TriccNodeMoreInfo(
                     id=generate_id(),
                     name=f"{node.name}.more_info",
@@ -553,7 +627,7 @@ def enrich_node(diagram, media_path, edge, node, activity, help_before=False):
                     parent=node,
                     required=None,
                 )
-                #node.help = message
+                # node.help = message
                 if help_before:
                     inject_node_before(help, node, activity)
                 else:
@@ -585,34 +659,41 @@ def enrich_node(diagram, media_path, edge, node, activity, help_before=False):
                     return None, None
             else:
                 logger.warning(f"edge from an unsuported node {edge.source_external_id}")
-                
+
             return None, None
 
 
-get_style_dict = lambda style: dict(item.split('=', 1) for item in style.split(';') if '=' in item)
+def get_style_dict(style):
+    return dict(item.split("=", 1) for item in style.split(";") if "=" in item)
 
 
-def severity_from_color(color):  
-    if color == '#fff2cc':
-        return 'moderate'
-    elif color == '#f8cecc':
-        return 'severe'
+def severity_from_color(color):
+    if color == "#fff2cc":
+        return "moderate"
+    elif color == "#f8cecc":
+        return "severe"
     else:
-        return 'light'
-    
+        return "light"
 
 
 def add_tricc_base_node(
-    diagram, nodes, type, list, group, attributes=[], mandatory_attributes=[], has_options=None
+    diagram,
+    nodes,
+    type,
+    list,
+    group,
+    attributes=[],
+    mandatory_attributes=[],
+    has_options=None,
 ):
     for elm in list:
         external_id = elm.attrib.get("id")
-        id = get_id( external_id,  diagram.attrib.get("id"))
-        parent = elm.attrib.get("parent")    
+        id = get_id(external_id, diagram.attrib.get("id"))
+        elm.attrib.get("parent")
         node = type(
             external_id=external_id,
             id=id,
-            #parent=parent,
+            # parent=parent,
             group=group,
             activity=group,
             **set_mandatory_attribute(elm, mandatory_attributes, diagram),
@@ -630,102 +711,99 @@ def add_tricc_base_node(
             node.options = get_select_yes_no_options(node, group)
             nodes[node.options[0].id] = node.options[0]
             nodes[node.options[1].id] = node.options[1]
-        elif type == TriccNodeProposedDiagnosis and getattr(node, 'severity', '') == None:
+        elif type == TriccNodeProposedDiagnosis and getattr(node, "severity", "") is None:
             mxcell = get_mxcell(diagram, external_id)
-            styles = get_style_dict(mxcell.attrib.get('style',''))
-            if 'fillColor' in styles and styles['fillColor'] != 'none':
-                node.severity = severity_from_color(styles['fillColor'])
-            
-    
-                
+            styles = get_style_dict(mxcell.attrib.get("style", ""))
+            if "fillColor" in styles and styles["fillColor"] != "none":
+                node.severity = severity_from_color(styles["fillColor"])
+
         set_additional_attributes(attributes, elm, node)
         load_expressions(node)
         nodes[id] = node
 
 
 def load_expressions(node):
-    if getattr(node, 'expression', None):
-        node.expression = parse_expression('', node.expression)
-    if getattr(node, 'relevance', None):
-        node.relevance = parse_expression('', node.relevance)
-    if getattr(node, 'default', None):
-        node.default = parse_expression('', node.default)
-    if getattr(node, 'reference', None):
+    if getattr(node, "constraint", None):
+        node.constraint = parse_expression("", node.constraint)
+    if getattr(node, "expression", None):
+        node.expression = parse_expression("", node.expression)
+    if getattr(node, "relevance", None):
+        node.relevance = parse_expression("", node.relevance)
+    if getattr(node, "trigger", None):
+        node.trigger = parse_expression("", node.trigger)
+    if getattr(node, "default", None):
+        node.default = parse_expression("", node.default)
+    if getattr(node, "reference", None):
         if isinstance(node, TriccNodeRhombus):
             node.label = remove_html(node.label)
             node.expression_reference = parse_expression(node.label, node.reference)
         else:
-            node.expression_reference = parse_expression('', node.reference)
-            
+            node.expression_reference = parse_expression("", node.reference)
+
         node.reference = node.expression_reference.get_references()
-    
-        
-        
+
 
 def parse_expression(label=None, expression=None):
     if expression:
-        ref_pattern = r'(\$\{[^\}]+\})'
-            # only if simple ref
+        ref_pattern = r"(\$\{[^\}]+\})"
+        # only if simple ref
         if not re.search(ref_pattern, expression):
             operation = transform_cql_to_operation(expression, label)
             if isinstance(operation, TriccReference):
                 if label:
-                    if label[0] == '[' and label[-1] == ']':
+                    if label[0] == "[" and label[-1] == "]":
                         operation = TriccOperation(
                             operator=TriccOperator.SELECTED,
                             reference=[
                                 operation,
-                                TriccReference(operation.value + label)
-                            ]
+                                TriccReference(operation.value + label),
+                            ],
                         )
                     else:
                         for operator in OPERATION_LIST:
                             if operator in label:
-                                if operator == '==':
-                                    operator = '='
+                                if operator == "==":
+                                    operator = "="
                                 terms = label.split(operator)
                                 operation = transform_cql_to_operation(
                                     f"{expression} {operator} {terms[1].replace('?', '').strip()}",
-                                    label
+                                    label,
                                 )
                                 break
                 # implied is true
                 if isinstance(operation, TriccReference):
-                     operation = TriccOperation(
-                            operator=TriccOperator.ISTRUE,
-                            reference=[
-                                operation,
-                            ]
-                        )
-                    
+                    operation = TriccOperation(
+                        operator=TriccOperator.ISTRUE,
+                        reference=[
+                            operation,
+                        ],
+                    )
+
             else:
                 pass
 
         else:
-            operation = transform_cql_to_operation(
-                expression.replace('${', '"').replace('}', '"'),
-                label
-            )
-        
+            operation = transform_cql_to_operation(expression.replace("${", '"').replace("}", '"'), label)
+
     if operation is None:
         logger.warning(f"unable to parse: {expression} ")
         return expression
     return operation
-        
+
 
 def set_mandatory_attribute(elm, mandatory_attributes, diagram=None):
     param = {}
-    diagram_id = diagram.attrib.get('id')
+    diagram_id = diagram.attrib.get("id")
     for attributes in mandatory_attributes:
-        if attributes == 'name':
+        if attributes == "name":
             name = elm.attrib.get("name")
             id = elm.attrib.get("id")
             attribute_value = _get_name(name, id, diagram_id)
-        elif attributes == 'list_name':
+        elif attributes == "list_name":
             name = elm.attrib.get("name")
             id = elm.attrib.get("id")
-            attribute_value = TRICC_LIST_NAME.format(clean_str(_get_name(name, id, diagram_id), replace_dots= True))
-        else:   
+            attribute_value = TRICC_LIST_NAME.format(clean_str(_get_name(name, id, diagram_id), replace_dots=True))
+        else:
             attribute_value = elm.attrib.get(attributes)
         if attribute_value is None:
             if elm.attrib.get("label") is not None:
@@ -734,21 +812,19 @@ def set_mandatory_attribute(elm, mandatory_attributes, diagram=None):
                 display_name = elm.attrib.get("name")
             else:
                 display_name = elm.attrib.get("id")
-                 
+
             if attributes == "source":
                 if elm.attrib.get("target") is not None:
-                    logger.critical(
-                        "the attibute target is {}".format(elm.attrib.get("target"))
-                    )
+                    logger.critical("the attibute target is {}".format(elm.attrib.get("target")))
             elif attributes == "target":
                 if elm.attrib.get("source") is not None:
-                    logger.critical(
-                        "the attibute target is {}".format(elm.attrib.get("source"))
-                    )
-            
+                    logger.critical("the attibute target is {}".format(elm.attrib.get("source")))
+
             logger.critical(
                 "the attibute {} is mandatory but not found in {} within group {}".format(
-                    attributes, display_name, diagram.attrib.get('name') if diagram is not None else ""
+                    attributes,
+                    display_name,
+                    diagram.attrib.get("name") if diagram is not None else "",
                 )
             )
             exit(1)
@@ -770,15 +846,15 @@ def clean_link(link):
         return link_parts[1]
 
 
-def get_groups(diagram, nodes, parent_group):
+def get_groups(diagram, nodes, activity):
     groups = {}
     list = get_tricc_type_list(diagram, "object", TriccNodeType.page)
     for elm in list:
-        add_group(elm, diagram, nodes, groups, parent_group)
+        add_group(elm, diagram, nodes, groups, activity, activity)
     return groups
 
 
-def add_group(elm, diagram, nodes, groups, parent_group):
+def add_group(elm, diagram, nodes, groups, parent_group, activity):
     external_id = elm.attrib.get("id")
     id = get_id(external_id, diagram.attrib.get("id"))
     if id not in groups:
@@ -788,11 +864,10 @@ def add_group(elm, diagram, nodes, groups, parent_group):
             id=id,
             external_id=external_id,
             group=parent_group,
+            activity=activity,
         )
         # get elememt witn parent = id and tricc_type defiend
-        list_child = get_tricc_type_list(
-            diagram, ["object", "UserObject"], tricc_type=None, parent_id=id
-        )
+        list_child = get_tricc_type_list(diagram, ["object", "UserObject"], tricc_type=None, parent_id=id)
         add_group_to_child(group, diagram, list_child, nodes, groups, parent_group)
         if group is not None:
             groups[group.id] = group
@@ -808,12 +883,10 @@ def add_group_to_child(group, diagram, list_child, nodes, groups, parent_group):
                 tricc_type=None,
                 parent_id=child_elm.attrib.get("id"),
             )
-            add_group_to_child(
-                group, diagram, list_sub_child, nodes, groups, parent_group
-            )
+            add_group_to_child(group, diagram, list_sub_child, nodes, groups, parent_group)
         elif child_elm.attrib.get("tricc_type") == TriccNodeType.page:
             child_group_id = child_elm.attrib.get("id")
-            if not child_group_id in groups:
+            if child_group_id not in groups:
                 child_group = add_group(child_elm, diagram, nodes, groups, group)
             else:
                 child_group = groups[child_group_id]
@@ -838,16 +911,14 @@ def add_image_from_style(style, path):
     image_attrib = None
     if style is not None and "image=data:image/" in style:
         image_attrib = style.split("image=data:image/")
-    if image_attrib is not None and len(image_attrib)== 2:
+    if image_attrib is not None and len(image_attrib) == 2:
         image_parts = image_attrib[1].split(",")
         if len(image_parts) == 2:
             payload = image_parts[1][:-1]
-            image_name = hashlib.md5(payload.encode('utf-8')).hexdigest()
+            image_name = hashlib.md5(payload.encode("utf-8")).hexdigest()
             path = os.path.join(path, "images")
             file_name = os.path.join(path, image_name + "." + image_parts[0])
-            if not (
-                os.path.isdir(path)
-            ):  # check if it exists, because if it does, error will be raised
+            if not (os.path.isdir(path)):  # check if it exists, because if it does, error will be raised
                 # (later change to make folder complaint to CHT)
                 os.makedirs(path, exist_ok=True)
             with open(file_name, "wb") as fh:
@@ -857,13 +928,6 @@ def add_image_from_style(style, path):
     return None, None
 
 
-def get_contained_main_node(diagram, id):
-    list = get_mxcell_parent_list(diagram, id, media_nodes)
-    if isinstance(list, List) and len(list) > 0:
-        # use only the first one
-        return list[0]
-
-
 def get_message(diagram, id):
     elm = get_elm(diagram, id)
     if elm is not None:
@@ -884,14 +948,12 @@ def get_edges(diagram):
         id = get_id(external_id, diagram.attrib.get("id"))
         edge = TriccEdge(
             id=id,
-            **set_mandatory_attribute(
-                elm, ["source", "parent", "target"], diagram
-            ),
+            **set_mandatory_attribute(elm, ["source", "parent", "target"], diagram),
         )
         edge.source_external_id = edge.source
         edge.target_external_id = edge.target
-        edge.source = get_id(edge.source,  diagram.attrib.get("id"))
-        edge.target = get_id(edge.target,  diagram.attrib.get("id"))
+        edge.source = get_id(edge.source, diagram.attrib.get("id"))
+        edge.target = get_id(edge.target, diagram.attrib.get("id"))
         set_additional_attributes(["value"], elm, edge)
         if edge.value is not None:
             edge.value = remove_html(edge.value)
@@ -899,7 +961,7 @@ def get_edges(diagram):
     return edges
 
 
-## Process edges
+# Process edges
 
 
 def process_factor_edge(edge, nodes):
@@ -908,7 +970,10 @@ def process_factor_edge(edge, nodes):
         source = nodes[edge.source]
         return TriccNodeCalculate(
             id=edge.id,
-            expression_reference=TriccOperation(TriccOperator.MULTIPLIED, [TriccReference(nodes[edge.source].name),TriccStatic(float(factor))]),
+            expression_reference=TriccOperation(
+                TriccOperator.MULTIPLIED,
+                [TriccReference(nodes[edge.source].name), TriccStatic(float(factor))],
+            ),
             reference=[TriccReference(source.name)],
             activity=source.activity,
             group=source.group,
@@ -917,15 +982,20 @@ def process_factor_edge(edge, nodes):
     return None
 
 
-def process_condition_edge(edge, nodes):
-    label = edge.value.strip()
-    node = nodes[edge.source]
-    node_ref = f'"{nodes[edge.source].name}"'
-    if '$this' in label:
-        operation = parse_expression('', expression=label.replace('$this', node_ref ))
+def process_condition_edge(edge, label, nodes):
+    source = nodes[edge.source]
+    node_ref = f'"{source.name}"'
+    if "$this" in label:
+        operation = parse_expression("", expression=label.replace("$this", node_ref))
     else:
         operation = parse_expression(label, expression=node_ref)
+
     if operation and isinstance(operation, TriccOperation):
+        # special management for simple operation
+        if issubclass(source.__class__, TriccNodeSelect) and "$this" not in label:
+            operation.replace_node(
+                TriccReference(source.name),
+                get_count_terms_details(source, None, False))
         # insert rhombus
         return TriccNodeRhombus(
             id=edge.id,
@@ -934,13 +1004,10 @@ def process_condition_edge(edge, nodes):
             path=nodes[edge.source],
             activity=nodes[edge.source].activity,
             group=nodes[edge.source].group,
-            label=label
+            label=label,
         )
 
 
-
-        
-
 def process_exclusive_edge(edge, nodes):
     error = None
     if issubclass(nodes[edge.source].__class__, TriccNodeCalculateBase):
@@ -971,9 +1038,7 @@ def process_exclusive_edge(edge, nodes):
 
 def process_yesno_edge(edge, nodes):
     if not edge.value:
-        logger.critical(
-            "yesNo {} node with labelless edges".format(nodes[edge.source].get_name())
-        )
+        logger.critical("yesNo {} node with labelless edges".format(nodes[edge.source].get_name()))
         exit(1)
     label = edge.value.strip().lower()
     yes_option = None
@@ -992,8 +1057,4 @@ def process_yesno_edge(edge, nodes):
         edge.source = no_option.id
         edge.source_external_id = None
     else:
-        logger.warning(
-            "edge {0} is coming from select {1}".format(
-                edge.id, nodes[edge.source].get_name()
-            )
-        )
+        logger.warning("edge {0} is coming from select {1}".format(edge.id, nodes[edge.source].get_name()))