tricc-oo 1.5.28__tar.gz → 1.6.0__tar.gz

{tricc_oo-1.5.28/tricc_oo.egg-info → tricc_oo-1.6.0}/PKG-INFO

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

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

{tricc_oo-1.5.28 → tricc_oo-1.6.0}/tests/build.py

@@ -6,6 +6,7 @@ from tricc_oo.strategies.output.xls_form import XLSFormStrategy  # noqa: F401
 from tricc_oo.strategies.output.openmrs_form import OpenMRSStrategy  # noqa: F401
 from tricc_oo.strategies.output.fhir_form import FHIRStrategy  # noqa: F401
 from tricc_oo.strategies.output.html_form import HTMLStrategy  # noqa: F401
+from tricc_oo.strategies.output.dhis2_form import DHIS2Strategy  # noqa: F401
 from tricc_oo.strategies.input.drawio import DrawioStrategy  # noqa: F401
 import getopt
 import logging

{tricc_oo-1.5.28 → tricc_oo-1.6.0}/tricc_oo/converters/tricc_to_xls_form.py

@@ -53,8 +53,8 @@ def get_export_name(node, replace_dots=True):
             export_name = BOOLEAN_MAP[str(TRICC_FALSE_VALUE)]
         elif value == '$this':
             export_name = '.'
-        elif isinstance(value, str):
-            export_name = f"'{clean_str(value, replace_dots=replace_dots)}'"
+        elif isinstance(value, str) and not isinstance(node, str):
+            export_name = f"'{value}'"
         else:
             export_name = value
         if hasattr(node, 'export_name'):

{tricc_oo-1.5.28 → tricc_oo-1.6.0}/tricc_oo/converters/xml_to_tricc.py

@@ -101,16 +101,16 @@ 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")
+    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:
@@ -130,7 +130,7 @@ def create_activity(diagram, media_path, project):
             if (
                 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"
                 if isinstance(n, TriccNodeSelectOption) and isinstance(n.select, TriccNodeSelectNotAvailable):
@@ -444,17 +444,18 @@ def create_root_node(diagram):
         if elm is not None:
             external_id = elm.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,
+                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),
             )
     load_expressions(node)
-    return node
+    return node, elm.attrib.get("name", generate_id("act"+external_id))
 
 
 # converter XML item to object

{tricc_oo-1.5.28 → tricc_oo-1.6.0}/tricc_oo/models/base.py

@@ -494,6 +494,8 @@ class TriccOperation(BaseModel):
                 return "mixed"
             else:
                 return rtype.pop()
+        else:
+            return self.get_reference_datatype(self.reference)
 
     def get_reference_datatype(self, references):
         rtype = set()