tricc-oo 1.6.23__tar.gz → 1.6.24__tar.gz

{tricc_oo-1.6.23/tricc_oo.egg-info → tricc_oo-1.6.24}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: tricc-oo
-Version: 1.6.23
+Version: 1.6.24
 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.6.23 → tricc_oo-1.6.24}/pyproject.toml

@@ -4,7 +4,7 @@ build-backend = "setuptools.build_meta"
 
 [project]
 name = "tricc-oo"
-version = "1.6.23"
+version = "1.6.24"
 description = "Python library that converts CDSS L2 in L3"
 readme = "README.md"
 requires-python = ">=3.8"

{tricc_oo-1.6.23 → tricc_oo-1.6.24}/tricc_oo/serializers/xls_form.py

@@ -43,6 +43,7 @@ TRICC_CALC_EXPRESSION = "${{{0}}}>0"
 
 def get_export_group_name(in_node): return f"gcalc_{get_export_name(in_node)}"
 
+def get_export_group_required(in_node): return in_node.relevance  and in_node.relevance != TriccStatic(True)
 
 def start_group(
     strategy,
@@ -65,9 +66,9 @@ def start_group(
         groups[name] = 0
     relevance = relevance and cur_group.relevance is not None and cur_group.relevance != ""
     past_instances = len(getattr(cur_group.base_instance, "instances", []))
-    group_calc_required = relevance is not None and (len(str(relevance)) > 100 or past_instances > 1)
+    group_calc_required = get_export_group_required(cur_group)
     calc = None
-    if group_calc_required and getattr(cur_group.relevance, 'operator', None) != TriccOperator.ISTRUE:
+    if group_calc_required and len(df_calculate[df_calculate["name"] == get_export_group_name(cur_group)]) == 0:
 
         calc = TriccNodeCalculate(
             id=generate_id(get_export_group_name(name)),

{tricc_oo-1.6.23 → tricc_oo-1.6.24}/tricc_oo/strategies/output/xls_form.py

@@ -19,7 +19,7 @@ from tricc_oo.models.ordered_set import OrderedSet
 from tricc_oo.models.calculate import (
     TriccNodeEnd,
     TriccNodeDisplayCalculateBase,
-
+    TriccNodeActivityStart,
 )
 from tricc_oo.models.tricc import (
     TriccNodeCalculateBase,
@@ -28,6 +28,7 @@ from tricc_oo.models.tricc import (
     TriccNodeSelect,
     TriccNodeInputModel,
     TriccNodeDisplayModel,
+    TriccNodeMainStart,
     TRICC_FALSE_VALUE,
     TRICC_TRUE_VALUE,
 )
@@ -50,6 +51,8 @@ from tricc_oo.serializers.xls_form import (
     SURVEY_MAP,
     end_group,
     generate_xls_form_export,
+    get_export_group_name,
+    get_export_group_required,
     start_group,
 )
 from tricc_oo.strategies.output.base_output_strategy import BaseOutPutStrategy
@@ -745,6 +748,13 @@ class XLSFormStrategy(BaseOutPutStrategy):
         elif isinstance(r, TriccNodeSelectOption):
             logger.debug(f"select option {r.get_name()} from {r.select.get_name()} was used as a reference")
             return get_export_name(r)
+        elif isinstance(r, TriccNodeActivityStart):
+            if get_export_group_required(r.activity):
+                return f"${{{get_export_group_name(r.activity)}}}"
+            else:
+                return f"({self.get_tricc_operation_expression(r.relevance)})"
+        elif isinstance(r, TriccNodeMainStart):
+            return "1"
         elif issubclass(r.__class__, (TriccNodeInputModel, TriccNodeSelect)):
             return f"coalesce(${{{get_export_name(r)}}},{coalesce_fallback})"
         elif issubclass(r.__class__, TriccNodeBaseModel):

{tricc_oo-1.6.23 → tricc_oo-1.6.24}/tricc_oo/strategies/output/xlsform_cht.py

@@ -811,13 +811,6 @@ class XLSFormCHTStrategy(XLSFormCDSSStrategy):
                 logger.error(f"CHT XLSForm validation error for {os.path.basename(xls_file)}: {str(e)}")
                 all_valid = False
 
-                jar_in_zip = "site-packages/pyxform/validators/odk_validate/bin/ODK_Validate.jar"
-                zip_ref.extract(jar_in_zip, os.path.dirname(__file__))
-
-                # Move to final location
-                extracted_jar = os.path.join(os.path.dirname(__file__), jar_in_zip)
-                shutil.move(extracted_jar, jar_path)
-
             logger.info(f"Extracted ODK Validate JAR to {jar_path}")
             return jar_path
 

{tricc_oo-1.6.23 → tricc_oo-1.6.24}/tricc_oo/visitors/tricc.py

@@ -240,7 +240,7 @@ def merge_all_expressions(expression, all_versions):
     datatype = expression.get_datatype() if expression else "unknown"
     
     if datatype == "boolean":
-        expression = or_join(all_versions)
+        expression = or_join([expression, *all_versions])
     
     else:
         # COALESCE through all previous versions, then the current expression
@@ -2276,15 +2276,15 @@ def get_prev_node_expression(node, processed_nodes, get_overall_exp=False, exclu
                 )
             elif none_sequence_defined_prev_node:
                 # For nodes with is_sequence_defined = False, AND the activity relevance with the prev expression
-                activity_relevance = get_node_expression(
-                    prev_node.activity,
-                    processed_nodes=processed_nodes,
-                    get_overall_exp=get_overall_exp,
-                    is_prev=True,
-                    negate=False,
-                    process=process,
-                )
-                act_sub = and_join([activity_relevance, act_sub])
+                # activity_relevance = get_node_expression(
+                #     prev_node.activity,
+                #     processed_nodes=processed_nodes,
+                #     get_overall_exp=get_overall_exp,
+                #     is_prev=True,
+                #     negate=False,
+                #     process=process,
+                # )
+                act_sub = and_join([ prev_node.activity.root, act_sub])
             add_sub_expression(expression_inputs, act_sub)
             # avoid void is there is not conditions to avoid looping too much itme
     # expression_inputs = clean_or_list(

{tricc_oo-1.6.23 → tricc_oo-1.6.24/tricc_oo.egg-info}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: tricc-oo
-Version: 1.6.23
+Version: 1.6.24
 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.6.23 → tricc_oo-1.6.24}/tricc_oo.egg-info/SOURCES.txt

@@ -2,8 +2,8 @@ LICENSE
 README.md
 pyproject.toml
 tests/build.py
-tests/test_cql.py
 tests/to_ocl.py
+tests/data/test_cql.py
 tricc_oo/__init__.py
 tricc_oo.egg-info/PKG-INFO
 tricc_oo.egg-info/SOURCES.txt