tricc-oo 1.5.7__py3-none-any.whl → 1.5.8__py3-none-any.whl

tricc_oo/converters/drawio_type_map.py

@@ -202,13 +202,13 @@ TYPE_MAP = {
     },
     TriccNodeType.diagnosis: {
         "objects": ["UserObject", "object"],
-        "attributes": ["save", "reference","priority"],
+        "attributes": ["save", "reference", "priority"],
         "mandatory_attributes": [ "name", 'label'],
         "model": TriccNodeDiagnosis
     },
     TriccNodeType.proposed_diagnosis: {
         "objects": ["UserObject", "object"],
-        "attributes": ["save", "reference", "severity"],
+        "attributes": ["save", "reference", "severity", "priority"],
         "mandatory_attributes": [ "name", 'label'],
         "model": TriccNodeProposedDiagnosis
     },

tricc_oo/models/calculate.py

@@ -182,6 +182,7 @@ class TriccNodeActivityEnd(TriccNodeFakeCalculateBase):
 class TriccNodeEnd(TriccNodeDisplayCalculateBase):
     tricc_type: TriccNodeType = TriccNodeType.end
     process: str = None
+    priority: int = 1000
     def __init__(self, **data):
         if data.get('name', None) is None:
             data['name'] = 'tricc_end_' + data.get('process', '') 

tricc_oo/strategies/output/xls_form.py

@@ -227,7 +227,6 @@ class XLSFormStrategy(BaseOutPutStrategy):
                     **self.get_kwargs()
                 )
                 # arrange empty group
-                
                 walktrhough_tricc_node_processed_stached(
                     s_node,
                     self.generate_export,
@@ -237,6 +236,7 @@ class XLSFormStrategy(BaseOutPutStrategy):
                     groups=groups,
                     cur_group=s_node.group,
                     recursive=False,
+                    process = process,
                     **self.get_kwargs()
                 )
                 # add end group if new node where added OR if the previous end group was removed

{tricc_oo-1.5.7.dist-info → tricc_oo-1.5.8.dist-info}/METADATA

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

@@ -6,7 +6,7 @@ tricc_oo/converters/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSu
 tricc_oo/converters/codesystem_to_ocl.py,sha256=-ZKMBeIvzgqmhJfnn6ptuwpnHQtuE-fCDDfKpfGvUSU,6066
 tricc_oo/converters/cql_to_operation.py,sha256=bsVD4HO5Zr2clHuIWz86gIUnI7aZ676IXDK5S7x32_o,14439
 tricc_oo/converters/datadictionnary.py,sha256=WWKcTtKLfc4aduHcDBhr4JSfU2NqRMaslwX-wdZPIAw,3968
-tricc_oo/converters/drawio_type_map.py,sha256=6jkWza3lYM8_LyqPI-cB36J6eywUoXz2ChNACMczGgA,7230
+tricc_oo/converters/drawio_type_map.py,sha256=rHNuED6QX10bhaT2zDuYJHzzWOxQ9vmpUOwscmlbUCI,7243
 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=GDaANkzSMZw6YwN5mevG7x7TQcaEt9zyOlsJ83tPBig,37480
@@ -16,7 +16,7 @@ tricc_oo/converters/cql/cqlParser.py,sha256=hIUdR907WX24P2Jlrxk-H0IT94n51yh_ZsCm
 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=_jJMYKvP60gaQSvzmA3TORrcRgv0oF5xG0FEBsE_Nhk,24399
-tricc_oo/models/calculate.py,sha256=mQ6FbeSwb9qlRiA5DZpW6KREF4k5Zbc1TnmhXhxiznI,7546
+tricc_oo/models/calculate.py,sha256=znxGy5SobhCWAkyBam1ekn9OqKcr2vyS5ugwwiNETVM,7571
 tricc_oo/models/lang.py,sha256=SwKaoxyRhE7gH_ZlYyFXzGuTQ5RE19y47LWAA35zYxg,2338
 tricc_oo/models/ocl.py,sha256=ol35Gl1jCBp0Ven0yxOKzDIZkVL5Kx9uwaR_64pjxKI,8931
 tricc_oo/models/ordered_set.py,sha256=wbbmppjgKy0xcKD9kIAbT4kgNkuwTILPxRw_KAAoPEY,4178
@@ -32,7 +32,7 @@ tricc_oo/strategies/input/base_input_strategy.py,sha256=-GQ_xRvJXzn-q_eT8R-wtFOT
 tricc_oo/strategies/input/drawio.py,sha256=glLts9whixJM4HOV_GAWAK8az_H-eo9aeFAQbn99-4c,13362
 tricc_oo/strategies/output/base_output_strategy.py,sha256=WiJwqm4g_x-rbksrjoE0ABhNMtM0_fAMoPH34RKZdc0,7173
 tricc_oo/strategies/output/spice.py,sha256=s_COahyYCoc4Xv5TGh_AW9evDOW6GOex0Xwa_JWeLsI,11280
-tricc_oo/strategies/output/xls_form.py,sha256=0x0NEvKXY_6W3X4D8vU56i1hlO1CxS9bVxzNbf8cpCk,31015
+tricc_oo/strategies/output/xls_form.py,sha256=1jNkF8qZXonDh-aOKpVN7HEBrRufKn_7ECvpNnQC73g,31037
 tricc_oo/strategies/output/xlsform_cdss.py,sha256=8oLlgS1Hr6IVvI0O71kIk5oIKXbt2lPVc1SZIjzcSTc,9452
 tricc_oo/strategies/output/xlsform_cht.py,sha256=QcWcmXqIoaQWqLU2cILqnU7ybKYBs2Xd6cUL0gSr3gw,20148
 tricc_oo/strategies/output/xlsform_cht_hf.py,sha256=0D_H68a2S7oLKJENEePaRGIocrRIF45BofHlLOtGsKo,2206
@@ -40,7 +40,7 @@ tricc_oo/visitors/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU
 tricc_oo/visitors/tricc.py,sha256=lahdFIiQwYk5fQNj5xncHX8FyOLyOX7q1OTffy2EvCE,99124
 tricc_oo/visitors/utils.py,sha256=Gol4JNozPEd30Q1l8IPIPhx5fqVyy9R81GofGVebgD8,484
 tricc_oo/visitors/xform_pd.py,sha256=jgjBLbfElVdi0NmClhw6NK6qNcIgWYm4KMXfVwiQwXM,9705
-tricc_oo-1.5.7.dist-info/METADATA,sha256=29KUMVBzLhrJCHFDSItou-5iucQDQOXBiU4m5oc89gg,7877
-tricc_oo-1.5.7.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
-tricc_oo-1.5.7.dist-info/top_level.txt,sha256=NvbfMNAiy9m4b1unBsqpeOQWh4IgA1Xa33BtKA4abxk,15
-tricc_oo-1.5.7.dist-info/RECORD,,
+tricc_oo-1.5.8.dist-info/METADATA,sha256=j_BLBVrVQakfIgKE6A5HFwhbb6jAwtHmzRsnGdvlT38,7877
+tricc_oo-1.5.8.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
+tricc_oo-1.5.8.dist-info/top_level.txt,sha256=NvbfMNAiy9m4b1unBsqpeOQWh4IgA1Xa33BtKA4abxk,15
+tricc_oo-1.5.8.dist-info/RECORD,,