tricc-oo 1.4.21__py3-none-any.whl → 1.4.23__py3-none-any.whl

tricc_oo/converters/xml_to_tricc.py

@@ -242,6 +242,10 @@ def process_edges(diagram, media_path, activity, nodes):
                         "not management found",
                     )
                 )
+        elif edge.source in  nodes and isinstance(nodes[edge.source], TriccNodeRhombus):
+            logger.critical(
+                "rhombus {} node with labelless edges".format(nodes[edge.source].get_name())
+            )
     if not end_found:
         fake_end = TriccNodeActivityEnd(id=generate_id(f"e{activity.name}"), activity=activity, group=activity)
         last_nodes = [
@@ -976,7 +980,7 @@ def process_exclusive_edge(edge, nodes):
 
 
 def process_yesno_edge(edge, nodes):
-    if edge.value is None:
+    if not edge.value:
         logger.critical(
             "yesNo {} node with labelless edges".format(nodes[edge.source].get_name())
         )

tricc_oo/strategies/output/xlsform_cht.py

@@ -7,7 +7,7 @@ import pandas as pd
 
 from tricc_oo.models.lang import SingletonLangClass
 from tricc_oo.models.calculate import TriccNodeEnd
-from tricc_oo.serializers.xls_form import SURVEY_MAP, get_input_line
+from tricc_oo.serializers.xls_form import SURVEY_MAP, get_input_line, get_input_calc_line
 from tricc_oo.strategies.output.xlsform_cdss import XLSFormCDSSStrategy
 from tricc_oo.converters.tricc_to_xls_form import get_export_name
 from tricc_oo.converters.utils import clean_name, remove_html

tricc_oo/strategies/output/xlsform_cht_hf.py

@@ -16,7 +16,7 @@ logger = logging.getLogger("default")
 class XLSFormCHTHFStrategy(XLSFormCHTStrategy):
 
    
-    def get_contact_inputs(df_inputs):
+    def get_contact_inputs(self, df_inputs):
        return None
         
     def get_cht_summary(self):

tricc_oo/visitors/tricc.py

@@ -491,8 +491,9 @@ def generate_calculates(node,calculates, used_calculates,processed_nodes):
                 last=True
             )
             node.activity.nodes[calc_node.id]=calc_node
-            node.activity.calculates.append(calc_node)
-            set_last_version_false(calc_node, processed_nodes)
+            last_version = set_last_version_false(calc_node, processed_nodes)
+            if last_version:
+                get_version_inheritance(node, last_version, processed_nodes)
             processed_nodes.add(calc_node)
         logger.debug("generate_save_calculate:{}:{} as {}".format(calc_node.tricc_type, node.name if hasattr(node,'name') else node.id, calculate_name))
         if isinstance(node, TriccNodeSelectYesNo):

{tricc_oo-1.4.21.dist-info → tricc_oo-1.4.23.dist-info}/METADATA

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

@@ -9,7 +9,7 @@ tricc_oo/converters/datadictionnary.py,sha256=WWKcTtKLfc4aduHcDBhr4JSfU2NqRMaslw
 tricc_oo/converters/drawio_type_map.py,sha256=6ZcnQMtBU1dhf_NP_s0iX1DvRf0qS7-3UAe_WAPFVoQ,7027
 tricc_oo/converters/tricc_to_xls_form.py,sha256=TKClvHSi07AxncjS8H_d17eXQIcLX4lNZr2fSj62p4Y,2129
 tricc_oo/converters/utils.py,sha256=UyndDORsDbRV5-gYW-yInK5ztjtYdeCw6K-mrYr1Emk,1688
-tricc_oo/converters/xml_to_tricc.py,sha256=9ujnPrCU0xyxrt06SmVT-2LGbS1XXeYyFkZX785BECg,37236
+tricc_oo/converters/xml_to_tricc.py,sha256=IO6jL1ljhrkWnPTe5EsQCfJ4wUoYitLH2P7TIJm4A9I,37457
 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
@@ -34,13 +34,13 @@ tricc_oo/strategies/output/base_output_strategy.py,sha256=WiJwqm4g_x-rbksrjoE0AB
 tricc_oo/strategies/output/spice.py,sha256=s_COahyYCoc4Xv5TGh_AW9evDOW6GOex0Xwa_JWeLsI,11280
 tricc_oo/strategies/output/xls_form.py,sha256=dsKbAdzjqgJGXNWrMuqzNAsTNO9EXh3g-QJNegz-gpY,30681
 tricc_oo/strategies/output/xlsform_cdss.py,sha256=8oLlgS1Hr6IVvI0O71kIk5oIKXbt2lPVc1SZIjzcSTc,9452
-tricc_oo/strategies/output/xlsform_cht.py,sha256=QLMBjxrCl8USBtZ0YarhU7RgY8gWT_s1WtPgfzBpXwk,19465
-tricc_oo/strategies/output/xlsform_cht_hf.py,sha256=DEc8T62L17FSC-HJaFQacciQdaDa2MPK7lZpSatQIHs,2200
+tricc_oo/strategies/output/xlsform_cht.py,sha256=SWu1GKI5PScSX420RiVVaCNCTINeTeLpCoX-zXQIhUE,19486
+tricc_oo/strategies/output/xlsform_cht_hf.py,sha256=0D_H68a2S7oLKJENEePaRGIocrRIF45BofHlLOtGsKo,2206
 tricc_oo/visitors/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-tricc_oo/visitors/tricc.py,sha256=R9XWBskDAfkA0NbEo0ammkHsDASFgkthPDWOiOaLgbQ,97643
+tricc_oo/visitors/tricc.py,sha256=gv82GPzNUnwQ1t4Xl8IivdEPq5lexcQIsaJH60hXUtA,97709
 tricc_oo/visitors/utils.py,sha256=Gol4JNozPEd30Q1l8IPIPhx5fqVyy9R81GofGVebgD8,484
 tricc_oo/visitors/xform_pd.py,sha256=H8x-72EdyT_-QgHGQN-ZAe-wc7tLtJGCM9waA64mz3M,9424
-tricc_oo-1.4.21.dist-info/METADATA,sha256=vOGzsW7gtsMKnNJx9vY7W5a55tSENg1Vz1vM1hjTZVg,7878
-tricc_oo-1.4.21.dist-info/WHEEL,sha256=Nw36Djuh_5VDukK0H78QzOX-_FQEo6V37m3nkm96gtU,91
-tricc_oo-1.4.21.dist-info/top_level.txt,sha256=NvbfMNAiy9m4b1unBsqpeOQWh4IgA1Xa33BtKA4abxk,15
-tricc_oo-1.4.21.dist-info/RECORD,,
+tricc_oo-1.4.23.dist-info/METADATA,sha256=BKDmuLmPiT0SG-LY1dWtdlXoNLFSMCS3a9UCYlvvqeQ,7878
+tricc_oo-1.4.23.dist-info/WHEEL,sha256=Nw36Djuh_5VDukK0H78QzOX-_FQEo6V37m3nkm96gtU,91
+tricc_oo-1.4.23.dist-info/top_level.txt,sha256=NvbfMNAiy9m4b1unBsqpeOQWh4IgA1Xa33BtKA4abxk,15
+tricc_oo-1.4.23.dist-info/RECORD,,