tricc-oo 1.4.21__tar.gz → 1.4.23__tar.gz

{tricc_oo-1.4.21 → tricc_oo-1.4.23}/PKG-INFO

@@ -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 → tricc_oo-1.4.23}/pyproject.toml

@@ -4,10 +4,9 @@ build-backend = "setuptools.build_meta"
 
 [project]
 name = "tricc-oo"
-version = "1.4.21"
+version = "1.4.23"
 description = "Python library that converts CDSS L2 in L3"
 readme = "README.md"
-
 requires-python = ">=3.8"
 classifiers = [
     "Programming Language :: Python :: 3",

{tricc_oo-1.4.21 → tricc_oo-1.4.23}/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-1.4.21 → tricc_oo-1.4.23}/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-1.4.21 → tricc_oo-1.4.23}/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-1.4.21 → tricc_oo-1.4.23}/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 → tricc_oo-1.4.23}/tricc_oo.egg-info/PKG-INFO

@@ -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