tricc-oo 1.4.2__tar.gz → 1.4.4__tar.gz

{tricc_oo-1.4.2 → tricc_oo-1.4.4}/PKG-INFO

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

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

{tricc_oo-1.4.2 → tricc_oo-1.4.4}/tricc_oo/converters/cql_to_operation.py

@@ -85,9 +85,9 @@ class cqlToXlsFormVisitor(cqlVisitor):
     def visitBooleanLiteral(self, ctx):
         literal =  ctx.getChild(0).getText()
         if literal == 'true':
-            return True
+            return TriccStatic(True)
         elif literal == 'false':
-            return False
+            return TriccStatic(False)
         else:
             return None
    

{tricc_oo-1.4.2 → tricc_oo-1.4.4}/tricc_oo/converters/drawio_type_map.py

@@ -18,7 +18,7 @@ TYPE_MAP = {
     },
     TriccNodeType.note: {
         "objects": ["UserObject", "object"],
-        "attributes": [],
+        "attributes": ['relevance'],
         "mandatory_attributes": ["label", "name"],
         "model": TriccNodeNote
     },
@@ -43,6 +43,8 @@ TYPE_MAP = {
             "filter",
             "constraint",
             "constraint_message",
+            "relevance",
+
         ],
         "mandatory_attributes": ["label", "name", "list_name"],
         "model": TriccNodeSelectOne
@@ -56,6 +58,7 @@ TYPE_MAP = {
             "filter",
             "constraint",
             "constraint_message",
+            "relevance",
         ],
         "mandatory_attributes": ["label", "name", "list_name"],
         "model": TriccNodeSelectMultiple
@@ -69,6 +72,7 @@ TYPE_MAP = {
             "save",
             "constraint_message",
             "required",
+            "relevance",
         ],
         "mandatory_attributes": ["label", "name"],
         "model": TriccNodeDecimal
@@ -82,6 +86,7 @@ TYPE_MAP = {
             "save",
             "constraint_message",
             "required",
+            "relevance",
         ],
         "mandatory_attributes": ["label", "name"],
         "model": TriccNodeInteger
@@ -89,13 +94,13 @@ TYPE_MAP = {
 
     TriccNodeType.text: {
         "objects": ["UserObject", "object"],
-        "attributes": [],
+        "attributes": ["relevance"],
         "mandatory_attributes": ["label", 'name'],
         "model": TriccNodeText
     },
     TriccNodeType.date: {
         "objects": ["UserObject", "object"],
-        "attributes": [],
+        "attributes": ["relevance"],
         "mandatory_attributes": ["label", "name"],
         "model": TriccNodeDate
     },
@@ -149,6 +154,7 @@ TYPE_MAP = {
             "filter",
             "constraint",
             "constraint_message",
+            "relevance",
         ],
         "mandatory_attributes": ["label", "name", "list_name"],
         "model": TriccNodeSelectYesNo

{tricc_oo-1.4.2 → tricc_oo-1.4.4}/tricc_oo/converters/xml_to_tricc.py

@@ -67,6 +67,8 @@ def create_activity(diagram, media_path, project):
             label=name,
             form_id=form_id,
         )
+        if root.relevance is not None:
+            activity.applicability=root.relevance
         # activity definition is never instanciated
         if isinstance(root, TriccNodeActivityStart):
             activity.instance = 0
@@ -334,9 +336,9 @@ def get_nodes(diagram, activity):
         elif (
             issubclass(node.__class__, TriccNodeDisplayCalculateBase) 
             and not getattr(node, 'relevance', None)
-            and node.activity.root.relevance
+            and node.activity.applicability
         ):
-            node.applicability = node.activity.root.relevance
+            node.applicability = node.activity.applicability
             
 
     nodes.update(new_nodes)

{tricc_oo-1.4.2 → tricc_oo-1.4.4}/tricc_oo/strategies/input/base_input_strategy.py

@@ -38,7 +38,8 @@ class BaseInputStrategy:
                 if diag.name not in seen_diags:
                     unique_diags.append(diag)
                     seen_diags.add(diag.name)
-
+            severity_order = { "severe": 3, "moderate": 2, "mild":1, 'light': 0}
+            unique_diags = sorted(unique_diags, key=lambda x: (-getattr(severity_order, x.severity or 'light', 0), x.label))
             for process in self.processes:
                 if process in [p[0] for p in page_processes]:
                     sorted_pages[process] = [

{tricc_oo-1.4.2 → tricc_oo-1.4.4}/tricc_oo/strategies/output/xls_form.py

@@ -464,7 +464,7 @@ class XLSFormStrategy(BaseOutPutStrategy):
                 else_found = True
                 parts.append(ref_expressions[i])
         #join the if
-        exp = ','.join(parts)
+        exp = ','.join(map(str,parts))
         # in case there is no default put ''
         if not else_found:
             exp += ",''"

{tricc_oo-1.4.2 → tricc_oo-1.4.4}/tricc_oo/visitors/tricc.py

@@ -1521,11 +1521,11 @@ def get_node_expression( in_node, processed_nodes, is_calculate=False, is_prev=F
             for past_instance in past_instances:
                 add_sub_expression(expression_inputs, get_node_expression(past_instance, processed_nodes=processed_nodes, is_calculate=False, is_prev=True))
             
-            if isinstance(node.root.relevance,(TriccStatic,TriccOperation, TriccReference)):
+            if isinstance(node.applicability,(TriccStatic,TriccOperation, TriccReference)):
                 if expression:
-                    expression = and_join([node.root.relevance, expression])
+                    expression = and_join([node.applicability, expression])
                 else:
-                    expression = node.root.relevance
+                    expression = node.applicability
             if expression and expression_inputs:
                 add_sub_expression(expression_inputs, expression)
                 expression = nand_join(expression, or_join(expression_inputs))
@@ -1553,8 +1553,8 @@ def get_node_expression( in_node, processed_nodes, is_calculate=False, is_prev=F
                 else:
                     expression = end_operation
 
-            elif node.root.relevance:
-                expression = and_join([expression, node.root.relevance])
+            elif node.applicability:
+                expression = and_join([expression, node.applicability])
               
     if negate:
         if negate_expression is not None:

{tricc_oo-1.4.2 → tricc_oo-1.4.4}/tricc_oo.egg-info/PKG-INFO

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