tricc-oo 1.5.15__tar.gz → 1.5.16__tar.gz

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
Files changed (51) hide show
  1. {tricc_oo-1.5.15 → tricc_oo-1.5.16}/PKG-INFO +1 -1
  2. {tricc_oo-1.5.15 → tricc_oo-1.5.16}/pyproject.toml +1 -1
  3. {tricc_oo-1.5.15 → tricc_oo-1.5.16}/tricc_oo/converters/xml_to_tricc.py +4 -3
  4. {tricc_oo-1.5.15 → tricc_oo-1.5.16}/tricc_oo/models/base.py +1 -0
  5. {tricc_oo-1.5.15 → tricc_oo-1.5.16}/tricc_oo.egg-info/PKG-INFO +1 -1
  6. {tricc_oo-1.5.15 → tricc_oo-1.5.16}/README.md +0 -0
  7. {tricc_oo-1.5.15 → tricc_oo-1.5.16}/setup.cfg +0 -0
  8. {tricc_oo-1.5.15 → tricc_oo-1.5.16}/tests/build.py +0 -0
  9. {tricc_oo-1.5.15 → tricc_oo-1.5.16}/tests/test_cql.py +0 -0
  10. {tricc_oo-1.5.15 → tricc_oo-1.5.16}/tests/to_ocl.py +0 -0
  11. {tricc_oo-1.5.15 → tricc_oo-1.5.16}/tricc_oo/__init__.py +0 -0
  12. {tricc_oo-1.5.15 → tricc_oo-1.5.16}/tricc_oo/converters/__init__.py +0 -0
  13. {tricc_oo-1.5.15 → tricc_oo-1.5.16}/tricc_oo/converters/codesystem_to_ocl.py +0 -0
  14. {tricc_oo-1.5.15 → tricc_oo-1.5.16}/tricc_oo/converters/cql/cqlLexer.py +0 -0
  15. {tricc_oo-1.5.15 → tricc_oo-1.5.16}/tricc_oo/converters/cql/cqlListener.py +0 -0
  16. {tricc_oo-1.5.15 → tricc_oo-1.5.16}/tricc_oo/converters/cql/cqlParser.py +0 -0
  17. {tricc_oo-1.5.15 → tricc_oo-1.5.16}/tricc_oo/converters/cql/cqlVisitor.py +0 -0
  18. {tricc_oo-1.5.15 → tricc_oo-1.5.16}/tricc_oo/converters/cql_to_operation.py +0 -0
  19. {tricc_oo-1.5.15 → tricc_oo-1.5.16}/tricc_oo/converters/datadictionnary.py +0 -0
  20. {tricc_oo-1.5.15 → tricc_oo-1.5.16}/tricc_oo/converters/drawio_type_map.py +0 -0
  21. {tricc_oo-1.5.15 → tricc_oo-1.5.16}/tricc_oo/converters/tricc_to_xls_form.py +0 -0
  22. {tricc_oo-1.5.15 → tricc_oo-1.5.16}/tricc_oo/converters/utils.py +0 -0
  23. {tricc_oo-1.5.15 → tricc_oo-1.5.16}/tricc_oo/models/__init__.py +0 -0
  24. {tricc_oo-1.5.15 → tricc_oo-1.5.16}/tricc_oo/models/calculate.py +0 -0
  25. {tricc_oo-1.5.15 → tricc_oo-1.5.16}/tricc_oo/models/lang.py +0 -0
  26. {tricc_oo-1.5.15 → tricc_oo-1.5.16}/tricc_oo/models/ocl.py +0 -0
  27. {tricc_oo-1.5.15 → tricc_oo-1.5.16}/tricc_oo/models/ordered_set.py +0 -0
  28. {tricc_oo-1.5.15 → tricc_oo-1.5.16}/tricc_oo/models/tricc.py +0 -0
  29. {tricc_oo-1.5.15 → tricc_oo-1.5.16}/tricc_oo/parsers/__init__.py +0 -0
  30. {tricc_oo-1.5.15 → tricc_oo-1.5.16}/tricc_oo/parsers/xml.py +0 -0
  31. {tricc_oo-1.5.15 → tricc_oo-1.5.16}/tricc_oo/serializers/__init__.py +0 -0
  32. {tricc_oo-1.5.15 → tricc_oo-1.5.16}/tricc_oo/serializers/planuml.py +0 -0
  33. {tricc_oo-1.5.15 → tricc_oo-1.5.16}/tricc_oo/serializers/xls_form.py +0 -0
  34. {tricc_oo-1.5.15 → tricc_oo-1.5.16}/tricc_oo/strategies/__init__.py +0 -0
  35. {tricc_oo-1.5.15 → tricc_oo-1.5.16}/tricc_oo/strategies/input/__init__.py +0 -0
  36. {tricc_oo-1.5.15 → tricc_oo-1.5.16}/tricc_oo/strategies/input/base_input_strategy.py +0 -0
  37. {tricc_oo-1.5.15 → tricc_oo-1.5.16}/tricc_oo/strategies/input/drawio.py +0 -0
  38. {tricc_oo-1.5.15 → tricc_oo-1.5.16}/tricc_oo/strategies/output/base_output_strategy.py +0 -0
  39. {tricc_oo-1.5.15 → tricc_oo-1.5.16}/tricc_oo/strategies/output/spice.py +0 -0
  40. {tricc_oo-1.5.15 → tricc_oo-1.5.16}/tricc_oo/strategies/output/xls_form.py +0 -0
  41. {tricc_oo-1.5.15 → tricc_oo-1.5.16}/tricc_oo/strategies/output/xlsform_cdss.py +0 -0
  42. {tricc_oo-1.5.15 → tricc_oo-1.5.16}/tricc_oo/strategies/output/xlsform_cht.py +0 -0
  43. {tricc_oo-1.5.15 → tricc_oo-1.5.16}/tricc_oo/strategies/output/xlsform_cht_hf.py +0 -0
  44. {tricc_oo-1.5.15 → tricc_oo-1.5.16}/tricc_oo/visitors/__init__.py +0 -0
  45. {tricc_oo-1.5.15 → tricc_oo-1.5.16}/tricc_oo/visitors/tricc.py +0 -0
  46. {tricc_oo-1.5.15 → tricc_oo-1.5.16}/tricc_oo/visitors/utils.py +0 -0
  47. {tricc_oo-1.5.15 → tricc_oo-1.5.16}/tricc_oo/visitors/xform_pd.py +0 -0
  48. {tricc_oo-1.5.15 → tricc_oo-1.5.16}/tricc_oo.egg-info/SOURCES.txt +0 -0
  49. {tricc_oo-1.5.15 → tricc_oo-1.5.16}/tricc_oo.egg-info/dependency_links.txt +0 -0
  50. {tricc_oo-1.5.15 → tricc_oo-1.5.16}/tricc_oo.egg-info/requires.txt +0 -0
  51. {tricc_oo-1.5.15 → tricc_oo-1.5.16}/tricc_oo.egg-info/top_level.txt +0 -0
@@ -1,6 +1,6 @@
1
1
  Metadata-Version: 2.4
2
2
  Name: tricc-oo
3
- Version: 1.5.15
3
+ Version: 1.5.16
4
4
  Summary: Python library that converts CDSS L2 in L3
5
5
  Project-URL: Homepage, https://github.com/SwissTPH/tricc
6
6
  Project-URL: Issues, https://github.com/SwissTPH/tricc/issues
@@ -4,7 +4,7 @@ build-backend = "setuptools.build_meta"
4
4
 
5
5
  [project]
6
6
  name = "tricc-oo"
7
- version = "1.5.15"
7
+ version = "1.5.16"
8
8
  description = "Python library that converts CDSS L2 in L3"
9
9
  readme = "README.md"
10
10
  requires-python = ">=3.8"
@@ -774,15 +774,15 @@ def clean_link(link):
774
774
  return link_parts[1]
775
775
 
776
776
 
777
- def get_groups(diagram, nodes, parent_group):
777
+ def get_groups(diagram, nodes, activity):
778
778
  groups = {}
779
779
  list = get_tricc_type_list(diagram, "object", TriccNodeType.page)
780
780
  for elm in list:
781
- add_group(elm, diagram, nodes, groups, parent_group)
781
+ add_group(elm, diagram, nodes, groups, activity, activity)
782
782
  return groups
783
783
 
784
784
 
785
- def add_group(elm, diagram, nodes, groups, parent_group):
785
+ def add_group(elm, diagram, nodes, groups, parent_group, activity):
786
786
  external_id = elm.attrib.get("id")
787
787
  id = get_id(external_id, diagram.attrib.get("id"))
788
788
  if id not in groups:
@@ -792,6 +792,7 @@ def add_group(elm, diagram, nodes, groups, parent_group):
792
792
  id=id,
793
793
  external_id=external_id,
794
794
  group=parent_group,
795
+ activity=activity
795
796
  )
796
797
  # get elememt witn parent = id and tricc_type defiend
797
798
  list_child = get_tricc_type_list(
@@ -192,6 +192,7 @@ class TriccEdge(TriccBaseModel):
192
192
  class TriccGroup(TriccBaseModel):
193
193
  tricc_type: TriccNodeType = TriccNodeType.page
194
194
  group: Optional[TriccBaseModel] = None
195
+ activity: TriccBaseModel
195
196
  name: Optional[str] = None
196
197
  export_name:Optional[str] = None
197
198
  label: Optional[Union[str, Dict[str,str]]] = None
@@ -1,6 +1,6 @@
1
1
  Metadata-Version: 2.4
2
2
  Name: tricc-oo
3
- Version: 1.5.15
3
+ Version: 1.5.16
4
4
  Summary: Python library that converts CDSS L2 in L3
5
5
  Project-URL: Homepage, https://github.com/SwissTPH/tricc
6
6
  Project-URL: Issues, https://github.com/SwissTPH/tricc/issues
File without changes
File without changes
File without changes
File without changes
File without changes