tricc-oo 1.5.15__py3-none-any.whl → 1.5.16__py3-none-any.whl

tricc_oo/converters/xml_to_tricc.py

@@ -774,15 +774,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:
@@ -792,6 +792,7 @@ 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(

tricc_oo/models/base.py

@@ -192,6 +192,7 @@ class TriccEdge(TriccBaseModel):
 class TriccGroup(TriccBaseModel):
     tricc_type: TriccNodeType = TriccNodeType.page
     group: Optional[TriccBaseModel] = None
+    activity: TriccBaseModel
     name: Optional[str] = None
     export_name:Optional[str] = None
     label: Optional[Union[str, Dict[str,str]]] = None

{tricc_oo-1.5.15.dist-info → tricc_oo-1.5.16.dist-info}/METADATA

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

@@ -9,13 +9,13 @@ tricc_oo/converters/datadictionnary.py,sha256=WWKcTtKLfc4aduHcDBhr4JSfU2NqRMaslw
 tricc_oo/converters/drawio_type_map.py,sha256=Hr-QftrRZpVFI4SrYpxEZ6TBB9s1I3_0ieTpxlNwJXQ,7474
 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=o9u5ixn8w3miWwbvgIZubcEFW_6_DfnIm-32g-YMS8w,37369
+tricc_oo/converters/xml_to_tricc.py,sha256=rpqBX4wHYo3ZNEHynk-vlwritRN4FeQ7etmdShIefX4,37411
 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=qCR26kdCip3a9cJRl-dmq3qiHdpxNHtFW3jGe0bwRIo,24637
+tricc_oo/models/base.py,sha256=pOitJT-SHRo2Uqr7utx07PhvSJqHpyaldGrig56ZMIc,24666
 tricc_oo/models/calculate.py,sha256=60jSL8gbcTxqGYsZe1LoGZAdScIp6_suC88XlE0xg-c,7640
 tricc_oo/models/lang.py,sha256=SwKaoxyRhE7gH_ZlYyFXzGuTQ5RE19y47LWAA35zYxg,2338
 tricc_oo/models/ocl.py,sha256=ol35Gl1jCBp0Ven0yxOKzDIZkVL5Kx9uwaR_64pjxKI,8931
@@ -40,7 +40,7 @@ tricc_oo/visitors/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU
 tricc_oo/visitors/tricc.py,sha256=49YFqusHxzIZZd6MUuhytM_82Rz9ixwI2KQBUI8j0ug,100977
 tricc_oo/visitors/utils.py,sha256=Gol4JNozPEd30Q1l8IPIPhx5fqVyy9R81GofGVebgD8,484
 tricc_oo/visitors/xform_pd.py,sha256=jgjBLbfElVdi0NmClhw6NK6qNcIgWYm4KMXfVwiQwXM,9705
-tricc_oo-1.5.15.dist-info/METADATA,sha256=skfCRT8YnQ868dJXWHmlm9oqlpBMVsWcsSGZ-9lvM3E,7878
-tricc_oo-1.5.15.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
-tricc_oo-1.5.15.dist-info/top_level.txt,sha256=NvbfMNAiy9m4b1unBsqpeOQWh4IgA1Xa33BtKA4abxk,15
-tricc_oo-1.5.15.dist-info/RECORD,,
+tricc_oo-1.5.16.dist-info/METADATA,sha256=2Td_UNCs7EQjCit5tfX7NHgN5GYzD_d3DB37jpqqU28,7878
+tricc_oo-1.5.16.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
+tricc_oo-1.5.16.dist-info/top_level.txt,sha256=NvbfMNAiy9m4b1unBsqpeOQWh4IgA1Xa33BtKA4abxk,15
+tricc_oo-1.5.16.dist-info/RECORD,,