tricc-oo 1.6.23__py3-none-any.whl → 1.6.25__py3-none-any.whl

tricc_oo/models/tricc.py

@@ -99,6 +99,7 @@ class TriccNodeActivity(TriccNodeBaseModel):
     # - case definition
     calculates: List[TriccNodeCalculateBase] = []
     applicability: Optional[Union[Expression, TriccOperation]] = None
+    is_sequence_defined: bool = False
 
     # redefine
     def make_instance(self, instance_nb=None, **kwargs):
@@ -294,7 +295,8 @@ class TriccNodeDisplayModel(TriccNodeBaseModel):
     default: Optional[Union[Expression, TriccOperation, TriccReference, TriccStatic]] = None
     trigger: Optional[Union[Expression, TriccOperation, TriccReference]] = None
     priority: Union[float, int, None] = None
-
+    concept_type: str = None
+    datatype: str = None
     # to use the enum value of the TriccNodeType
 
 

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)),
@@ -356,8 +357,7 @@ def generate_choice_filter(strategy, node):
         choice_filter = TriccOperation(TriccOperator.OR, [basic])
         for k, op in relevances.items():
             choice_filter.append(
-                TriccOperation(
-                    TriccOperator.AND,
+                and_join(
                     [
                         TriccOperation(
                             TriccOperator.EQUAL,
@@ -367,7 +367,7 @@ def generate_choice_filter(strategy, node):
                             ],
                         ),
                         op,
-                    ],
+                    ]
                 )
             )
         return strategy.get_tricc_operation_expression(choice_filter)

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/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/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
@@ -2265,8 +2265,7 @@ def get_prev_node_expression(node, processed_nodes, get_overall_exp=False, exclu
         if act_expression_inputs:
             act_sub = or_join(act_expression_inputs)
             # if there is condition fallback on the calling activity condition
-            if act_sub == TriccStatic(True):
-                act_sub = get_node_expression(
+            act_relevance = get_node_expression(
                     prev_node.activity,
                     processed_nodes=processed_nodes,
                     get_overall_exp=get_overall_exp,
@@ -2274,17 +2273,25 @@ def get_prev_node_expression(node, processed_nodes, get_overall_exp=False, exclu
                     negate=False,
                     process=process,
                 )
-            elif none_sequence_defined_prev_node:
+            if act_sub == TriccStatic(True):
+                act_sub = act_relevance
+            elif act_relevance != TriccStatic(True) and 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([
+                    TriccOperation(
+                        TriccOperator.ISTRUE,
+                        [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(
@@ -2661,13 +2668,10 @@ def get_selected_option_expression_multiple(option_node, negate):
     selected = TriccOperation(TriccOperator.SELECTED, [option_node.select, TriccStatic(option_node)])
 
     if negate:
-        return TriccOperation(
-            operator=TriccOperator.AND,
-            resource=[
+        return and_join([
                 TriccOperation(operator=TriccOperator.NOT, resource=[selected]),
                 TriccOperation(operator=TriccOperator.ISNOTNULL, resource=[option_node.select]),
-            ],
-        )
+            ])
 
     else:
         return selected
@@ -2778,7 +2782,7 @@ def generate_base(node, processed_nodes, **kwargs):
                         )
                         constraints_max = "The maximum value is {0}.".format(node.max)
                     if len(constraints) > 1:
-                        node.constraint = TriccOperation(TriccOperator.AND, constraints)
+                        node.constraint = and_join(constraints)
                         node.constraint_message = (constraints_min + " " + constraints_max).strip()
                     elif len(constraints) == 1:
                         node.constraint = constraints[0]

{tricc_oo-1.6.23.dist-info → tricc_oo-1.6.25.dist-info}/METADATA

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

@@ -20,12 +20,12 @@ tricc_oo/models/calculate.py,sha256=uNP0IDUqPQcJq9Co05H8eX5wbR_DikSxuOHxfVE5Dxg,
 tricc_oo/models/lang.py,sha256=ZMRwdoPWe01wEDhOM0uRk-6rt3BkoAAZM8mZ61--s3A,2265
 tricc_oo/models/ocl.py,sha256=MybSeB6fgCOUVJ4aektff0vrrTZsyfwZ2Gt_pPBu_FY,8728
 tricc_oo/models/ordered_set.py,sha256=BpXLW8plRAy4te25PIUPvVXPnLPcypvKg3iNPhtPulA,3833
-tricc_oo/models/tricc.py,sha256=H_HPFzFsS_-fFXCx3vdKsw29DFrlTnAscTJE_lQG_Lk,17549
+tricc_oo/models/tricc.py,sha256=dUh0H9hyzwH4VDFDkKIsEjyV794FYTbpJp8F1JugiOU,17640
 tricc_oo/parsers/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 tricc_oo/parsers/xml.py,sha256=uzkb1y18MHfqVFmZqVh0sKT4cx6u0-NcAT_lV_gHBt8,4208
 tricc_oo/serializers/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 tricc_oo/serializers/planuml.py,sha256=t57587-6L3aDncpHh58lS77Zft8yxDE9DPtXx2BeUSU,132
-tricc_oo/serializers/xls_form.py,sha256=E0VKcAXoVvGfinMZXOmo-90uypjsGAKS2S3-mtvAT7I,24215
+tricc_oo/serializers/xls_form.py,sha256=SZPvZK6y4l_2v3HuGWITHmKd5rTClhHWvbUU3RendFg,24249
 tricc_oo/strategies/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 tricc_oo/strategies/input/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 tricc_oo/strategies/input/base_input_strategy.py,sha256=BEODXS74na1QRRcJVQ4cxiD8F7uRqaLyhE3QzKpGVvk,3891
@@ -36,16 +36,16 @@ tricc_oo/strategies/output/fhir_form.py,sha256=hbL921pe1Doun4IQrJuZ_Sq2fCh98G3gr
 tricc_oo/strategies/output/html_form.py,sha256=qSleEZOMV_-Z04y-i-ucyd5rgAYWAyjPwMrw0IHtCRM,8604
 tricc_oo/strategies/output/openmrs_form.py,sha256=ne6TwAyhafR-WDs27QTKKFl85VD5sij_VEJtK6ZjOIE,28996
 tricc_oo/strategies/output/spice.py,sha256=QMeoismVC3PdbvwTK0PtUjWX9jl9780fbQIXn76fMXw,10761
-tricc_oo/strategies/output/xls_form.py,sha256=ISpZEjPHiKV9TEDwQnGf0hf2eLSw4RXP_SVbiMEBIEY,33434
+tricc_oo/strategies/output/xls_form.py,sha256=yz1G7Mdf4ZpdXaKU6YV8rjNQ288pwUzTh13aI5Up6AI,33884
 tricc_oo/strategies/output/xlsform_cdss.py,sha256=X00Lt5MzV8TX14dR4dFI1MqllI5S1e13bKbeysWM9uA,17435
-tricc_oo/strategies/output/xlsform_cht.py,sha256=lY1xIDxqYxl_lYNVCl3msXZL88No49yEVCpahcHGOn0,28675
+tricc_oo/strategies/output/xlsform_cht.py,sha256=66sTRqVL9ZUL8NpX2f0xCRQ-siUKcKphosR9y7wsbuM,28326
 tricc_oo/strategies/output/xlsform_cht_hf.py,sha256=xm6SKirV3nMZvM2w54_zJcXAeAgAkq-EEqGEjnOWv6c,988
 tricc_oo/visitors/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-tricc_oo/visitors/tricc.py,sha256=uWfPs4yUqTlVBzQcNGLaf635pOz5ClzJ2yj9pieJANY,114090
+tricc_oo/visitors/tricc.py,sha256=VL1Ds4a7gCA0V7Mo2qPipT2uV4dcXDK2_swLdxZavDA,114272
 tricc_oo/visitors/utils.py,sha256=j83aAq5s5atXi3OC0jc_uJd54a8XrHHmizeeEbWZQJg,421
 tricc_oo/visitors/xform_pd.py,sha256=ryAnI3V9x3eTmJ2LNsUZfvl0_yfCqo6oBgeSu-WPqaE,9613
-tricc_oo-1.6.23.dist-info/licenses/LICENSE,sha256=Pz2eACSxkhsGfW9_iN60pgy-enjnbGTj8df8O3ebnQQ,16726
-tricc_oo-1.6.23.dist-info/METADATA,sha256=7_BWo-Qm5UcknB4D9LNIO2Gnit5zdxQWHEL4BUFxlLI,8600
-tricc_oo-1.6.23.dist-info/WHEEL,sha256=wUyA8OaulRlbfwMtmQsvNngGrxQHAvkKcvRmdizlJi0,92
-tricc_oo-1.6.23.dist-info/top_level.txt,sha256=NvbfMNAiy9m4b1unBsqpeOQWh4IgA1Xa33BtKA4abxk,15
-tricc_oo-1.6.23.dist-info/RECORD,,
+tricc_oo-1.6.25.dist-info/licenses/LICENSE,sha256=Pz2eACSxkhsGfW9_iN60pgy-enjnbGTj8df8O3ebnQQ,16726
+tricc_oo-1.6.25.dist-info/METADATA,sha256=If9bVy3gEm3zT0OMh6UPuUJxsFndAk_MtcglJXUH4LQ,8600
+tricc_oo-1.6.25.dist-info/WHEEL,sha256=wUyA8OaulRlbfwMtmQsvNngGrxQHAvkKcvRmdizlJi0,92
+tricc_oo-1.6.25.dist-info/top_level.txt,sha256=NvbfMNAiy9m4b1unBsqpeOQWh4IgA1Xa33BtKA4abxk,15
+tricc_oo-1.6.25.dist-info/RECORD,,