tricc-oo 1.6.5.dev1__py3-none-any.whl → 1.6.5.dev2__py3-none-any.whl

tricc_oo/models/base.py

@@ -11,7 +11,7 @@ from tricc_oo.models.ordered_set import OrderedSet
 
 logger = logging.getLogger("default")
 
-Expression = Annotated[str, StringConstraints(pattern=r"^[^\\/\:]+$")]
+Expression = Annotated[str, StringConstraints(pattern=r".+")]
 
 triccId = Annotated[str, StringConstraints(pattern=r"^[^\\/\: ]+$")]
 

tricc_oo/serializers/xls_form.py

@@ -123,7 +123,7 @@ def start_group(
                 value = get_export_name(calc)
                 calc_values.append(value)
             elif column == "calculation":
-                calc_values.append(strategy.get_tricc_operation_expression(calc.expression))
+                calc_values.append(f"number({strategy.get_tricc_operation_expression(calc.expression)}")
             elif column == "relevance":
                 calc_values.append("")
             else:
@@ -415,7 +415,7 @@ def get_more_info_select(strategy, node):
         if column == "type":
             values.append("select_one more_info")
         elif column == "label":
-            values.append("NO_LABEL")
+            values.append(strategy.get_empty_label())
         elif column == "name":
             values.append(get_export_name(node) + "_optin")
         elif column == "hint":

tricc_oo/strategies/output/dhis2_form.py

@@ -25,6 +25,8 @@ from tricc_oo.models.tricc import (
     TriccNodeDisplayModel,
     TriccNodeCalculateBase,
     TriccNodeActivity,
+    TriccNodeSelect,
+    TriccNodeSelectYesNo,
 )
 from tricc_oo.models.calculate import TriccNodeDisplayCalculateBase
 from tricc_oo.models.ordered_set import OrderedSet
@@ -66,18 +68,22 @@ class DHIS2Strategy(BaseOutPutStrategy):
 
     def get_export_name(self, r):
         if isinstance(r, TriccNodeSelectOption):
-            return self.get_option_value(r.name)
+            ret = self.get_option_value(r.name)
         elif isinstance(r, str):
-            return self.get_option_value(r)
+            ret = self.get_option_value(r)
         elif isinstance(r, TriccStatic):
             if isinstance(r.value, str):
-                return self.get_option_value(r.value)
+                ret = self.get_option_value(r.value)
             elif isinstance(r.value, bool):
-                return str(r.value).lower()
+                ret = str(r.value).lower()
             else:
-                return r.value
+                ret = r.value
+        else:
+            ret = get_export_name(r)
+        if isinstance(ret, str):
+            return ret[:50]
         else:
-            return get_export_name(r)
+            return ret
 
     def generate_id(self, name):
         """Generate DHIS2-compliant UID: 1 letter + 10 alphanumeric characters"""
@@ -139,7 +145,15 @@ class DHIS2Strategy(BaseOutPutStrategy):
             raise NotImplementedError(
                 f"This type of operation '{operation.operator}' is not supported in this strategy"
             )
-
+    def get_display(self, node):
+        if hasattr(node, 'label') and node.label:
+            ret =  node.label
+        elif hasattr(node, 'name') and node.name:
+            ret = node.name
+        else:
+            ret = str(node.id)
+        return  ret.replace('\u00a0', ' ').strip()
+    
     def execute(self):
         version = datetime.datetime.now().strftime("%Y%m%d%H%M")
         logger.info(f"build version: {version}")
@@ -223,11 +237,13 @@ class DHIS2Strategy(BaseOutPutStrategy):
                     self.program_rule_actions.append(program_rule_action)
 
                     # Create program rule referencing the action
+                    condition = self.simplify_expression(f"!({relevance_str})")  # Negate for hide when true
+                    condition = self.simplify_expression(condition)
                     self.program_rules.append({
                         "id": rule_id,
-                        "name": f"Hide {node.get_name()} when condition met",
-                        "description": f"Hide {node.get_name()} based on relevance",
-                        "condition": f"!({relevance_str})",  # Negate for hide when true
+                        "name": f"Hide `{self.get_export_name(node)}` when condition met",
+                        "description": f"Hide `{self.get_display(node)}` based on relevance",
+                        "condition": condition,
                         "programRuleActions": [{"id": action_id}]
                     })
         return True
@@ -257,11 +273,15 @@ class DHIS2Strategy(BaseOutPutStrategy):
                 "id": de_id,
                 "name": self.get_export_name(node),
                 "shortName": node.name[:50],
-                "displayFormName": getattr(node, 'label', node.name).replace('\u00a0', ' ').strip(),
+                "displayFormName":self.get_display(node),
+                "formName": self.get_display(node),
                 "valueType": value_type,
                 "domainType": "TRACKER",
                 "aggregationType": "NONE"
             }
+            
+            if issubclass(node.__class__, TriccNodeSelect) and not isinstance(node, TriccNodeSelectYesNo):
+                data_element["optionSetValue"] = True
 
             # Only create optionSet for non-boolean select questions
             if node.tricc_type in ['select_one', 'select_multiple'] and not is_boolean_question:
@@ -273,7 +293,7 @@ class DHIS2Strategy(BaseOutPutStrategy):
                     # Create the actual optionSet definition
                     option_set = {
                         "id": option_set_id,
-                        "name": f"{node.name} Options",
+                        "name": f"{self.get_export_name(node)} Options",
                         "shortName": f"{node.name}_opts"[:50],
                         "valueType": "TEXT",
                         "options": []
@@ -288,10 +308,10 @@ class DHIS2Strategy(BaseOutPutStrategy):
                                 option_name = option_name.replace('\u00a0', ' ').strip()
                             elif isinstance(option_name, TriccStatic):
                                 option_name = str(option_name.value)
-                            # Create separate option entity
+                            # Create separate option entityif
                             option_def = {
                                 "id": option_id,
-                                "name": option_name,
+                                "name": self.get_display(option),
                                 "shortName": option.name[:50],
                                 "code": str(self.get_export_name(option))
                             }
@@ -303,6 +323,20 @@ class DHIS2Strategy(BaseOutPutStrategy):
                     self.option_sets[option_set_id] = option_set
 
             self.data_elements[node.name] = data_element
+
+            # Create program rule variable for this data element
+            var_id = self.generate_id(f"var_{node.name}")
+            var_name = self.get_export_name(node)
+            program_rule_variable = {
+                "id": var_id,
+                "name": var_name,
+                "programRuleVariableSourceType": "DATAELEMENT_CURRENT_EVENT",
+                "dataElement": {"id": de_id},
+                "program": {"id": self.program_metadata["id"]}
+            }
+            self.program_rule_variables.append(program_rule_variable)
+            self.concept_map[node.name] = var_name  # Store variable name for #{var_name} references
+
             return data_element
         return None
 
@@ -325,9 +359,10 @@ class DHIS2Strategy(BaseOutPutStrategy):
                         mock_node = MockNode(operation_datatype)
                         data_type = self.map_tricc_type_to_dhis2_value_type(mock_node)
 
+                var_name = self.get_export_name(node)
                 program_rule_variable = {
                     "id": var_id,
-                    "name": self.get_export_name(node.name)[:50],
+                    "name": var_name,
                     "programRuleVariableSourceType": "CALCULATED_VALUE",
                     "calculatedValueScript": expression_str,
                     "dataType": data_type,
@@ -336,7 +371,7 @@ class DHIS2Strategy(BaseOutPutStrategy):
                 }
                 self.program_rule_variables.append(program_rule_variable)
                 # Add to concept map for potential referencing
-                self.concept_map[node.name] = var_id
+                self.concept_map[node.name] = var_name  # Store variable name
             return True
         return False
 
@@ -674,7 +709,7 @@ class DHIS2Strategy(BaseOutPutStrategy):
         if isinstance(r, TriccOperation):
             return self.get_tricc_operation_expression(r)
         elif isinstance(r, TriccReference):
-            # Use DHIS2 ID from concept_map instead of name
+            # Use variable name from concept_map
             node_id = self.concept_map.get(r.value.name, self.get_export_name(r.value))
             return f"#{{{node_id}}}"
         elif isinstance(r, TriccStatic):
@@ -696,25 +731,39 @@ class DHIS2Strategy(BaseOutPutStrategy):
                 return option
             return f"'{option}'"
         elif issubclass(r.__class__, TriccNodeDisplayCalculateBase):
-            # Use DHIS2 ID from concept_map instead of name
-            node_id = self.concept_map.get(r.name, self.get_export_name(r))
-            return f"#{node_id}"
+            # Use variable name from concept_map
+            node_id = self.get_export_name(r)
+            return f"#{{{node_id}}}"
+        elif issubclass(r.__class__, TriccNodeCalculateBase):
+            # Use variable name from concept_map
+            node_id =  self.get_export_name(r)
+            return f"#{{{node_id}}}"
         elif issubclass(r.__class__, TriccNodeInputModel):
-            # Use DHIS2 ID from concept_map instead of name
-            node_id = self.concept_map.get(r.name, self.get_export_name(r))
+            # Use variable name from concept_map
+            node_id =  self.get_export_name(r)
             return f"#{{{node_id}}}"
         elif issubclass(r.__class__, TriccNodeBaseModel):
-            # Use DHIS2 ID from concept_map instead of name
-            node_id = self.concept_map.get(r.name, self.get_export_name(r))
+            # Use variable name from concept_map
+            node_id =  self.get_export_name(r)
             return f"#{{{node_id}}}"
         else:
             raise NotImplementedError(f"This type of node {r.__class__.__name__} is not supported within an operation")
 
+    def simplify_expression(self, expr):
+        while expr.startswith('!(!(') and expr.endswith('))'):
+            expr = expr[4:-2]
+        return expr
+
     def convert_expression_to_string(self, expression):
         if isinstance(expression, TriccOperation):
-            return self.get_tricc_operation_expression(expression)
+            expr = self.get_tricc_operation_expression(expression)
         else:
-            return self.get_tricc_operation_operand(expression)
+            expr = self.get_tricc_operation_operand(expression)
+
+        # Simplify double negations
+        expr = self.simplify_expression(expr)
+
+        return expr
 
     # Operation methods for DHIS2 expressions
     def tricc_operation_equal(self, ref_expressions):
@@ -765,7 +814,7 @@ class DHIS2Strategy(BaseOutPutStrategy):
 
     def tricc_operation_selected(self, ref_expressions):
         # For DHIS2, check if value is selected in multi-select
-        return f"d2:hasValue({ref_expressions[0]}) && d2:contains({ref_expressions[0]}, {ref_expressions[1]})"
+        return f"d2:countIfValue({ref_expressions[0]}, {ref_expressions[1]})>0"
 
     def tricc_operation_count(self, ref_expressions):
         return f"d2:count({ref_expressions[0]})"

tricc_oo/strategies/output/xls_form.py

@@ -589,11 +589,14 @@ class XLSFormStrategy(BaseOutPutStrategy):
             exp += ")"
         return exp
 
+    def get_empty_label(self):
+        return "."
+
     def tricc_operation_if(self, ref_expressions):
         return f"if({ref_expressions[0]},{ref_expressions[1]},{ref_expressions[2]})"
 
     def tricc_operation_contains(self, ref_expressions):
-        return f"contains('{self.clean_coalesce(ref_expressions[0])}', '{self.clean_coalesce(ref_expressions[1])}')"
+        return f"contains({self.clean_coalesce(ref_expressions[0])}, {self.clean_coalesce(ref_expressions[1])})"
 
     def tricc_operation_exists(self, ref_expressions):
         parts = []

tricc_oo/strategies/output/xlsform_cht.py

@@ -33,6 +33,9 @@ class XLSFormCHTStrategy(XLSFormCDSSStrategy):
 
         self.inject_version()
 
+    def get_empty_label(self):
+        return "NO_LABEL"
+
     def get_cht_input(self, start_pages, **kwargs):
         empty = langs.get_trads("", force_dict=True)
         df_input = pd.DataFrame(columns=SURVEY_MAP.keys())

tricc_oo/visitors/tricc.py

@@ -542,6 +542,32 @@ def generate_calculates(node, calculates, used_calculates, processed_nodes, proc
             for calc in list_calc:
                 node.activity.nodes[calc.id] = calc
                 add_calculate(calculates, calc)
+
+    # Add CONTAINS calculations for each option in select multiple (except opt_none)
+    if isinstance(node, TriccNodeSelectMultiple):
+        for option in node.options.values():
+            if not option.name.startswith("opt_"):
+                calc_id = generate_id(f"contains_{node.id}_{option.name}")
+                expression = TriccOperation(TriccOperator.CONTAINS, [node, TriccStatic(option.name)])
+                calc_node = TriccNodeCalculate(
+                    name=option.name,
+                    id=calc_id,
+                    group=node.group,
+                    activity=node.activity,
+                    label=f"contains: {node.get_name()} contains '{option.name}'",
+                    path_len=node.path_len + 1,
+                    last=True,
+                    expression=expression,
+                )
+                node.activity.calculates.append(calc_node)
+                last_version = set_last_version_false(calc_node, processed_nodes)
+                if last_version:
+                    calc_node.expression = merge_expression(calc_node.expression, last_version)
+                processed_nodes.add(calc_node)
+                list_calc.append(calc_node)
+                node.activity.nodes[calc_node.id] = calc_node
+                add_calculate(calculates, calc_node)
+
     return list_calc
 
 

{tricc_oo-1.6.5.dev1.dist-info → tricc_oo-1.6.5.dev2.dist-info}/METADATA

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

@@ -16,7 +16,7 @@ tricc_oo/converters/cql/cqlListener.py,sha256=fA7-8DcS2Q69ckwjdg57-OfFHBxjTZFdoS
 tricc_oo/converters/cql/cqlParser.py,sha256=x3KdrwX9nwENSEJ5Ex7_l5NMnu3kWBO0uLdYu4moTq0,414745
 tricc_oo/converters/cql/cqlVisitor.py,sha256=iHuup2S7OGSVWLEcI4H3oecRqgXztC1sKnew_1P2iGY,33880
 tricc_oo/models/__init__.py,sha256=CgS52LLqdDIaXHvZy08hhu_VaYw80OEdfL_llM9ICBA,108
-tricc_oo/models/base.py,sha256=AaeB69vWg3ulBttoezEniUiU8HWh_pvrw7tCHpL27g4,25926
+tricc_oo/models/base.py,sha256=gqyUkeZlU2NfiR4tTMBtzUYFxKIeY-jtt1HECRomLUw,25917
 tricc_oo/models/calculate.py,sha256=uNP0IDUqPQcJq9Co05H8eX5wbR_DikSxuOHxfVE5Dxg,8018
 tricc_oo/models/lang.py,sha256=ZMRwdoPWe01wEDhOM0uRk-6rt3BkoAAZM8mZ61--s3A,2265
 tricc_oo/models/ocl.py,sha256=MybSeB6fgCOUVJ4aektff0vrrTZsyfwZ2Gt_pPBu_FY,8728
@@ -26,27 +26,27 @@ tricc_oo/parsers/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,
 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=hv8P2Uq-0pzaxZ9fjMr7E0L_0a4oXFUOAuL6NpMrz-o,22208
+tricc_oo/serializers/xls_form.py,sha256=m1IuzIRS2hjjl9mPPio4Dbq6ijg6CQvM7tGcQoMWOxg,22236
 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
 tricc_oo/strategies/input/drawio.py,sha256=uXAUPhXOeg0Uk_BNqlCqFBW4cWNox4VfH559bj1fhC0,12767
 tricc_oo/strategies/output/base_output_strategy.py,sha256=M9UFR67-_CFoW681bPAeBS1OUGuFtmUbM_rltACI0hk,8798
-tricc_oo/strategies/output/dhis2_form.py,sha256=m23EeZB7uXkNCFJr9hNGevgsA1dQqBrtX5uoy_22QRI,36500
+tricc_oo/strategies/output/dhis2_form.py,sha256=BmqFUaM2XFh-NtqxEbe6A6MBYPuBCEugR59pl9rhZw4,38298
 tricc_oo/strategies/output/fhir_form.py,sha256=hbL921pe1Doun4IQrJuZ_Sq2fCh98G3grYie5olC4uc,15740
 tricc_oo/strategies/output/html_form.py,sha256=qSleEZOMV_-Z04y-i-ucyd5rgAYWAyjPwMrw0IHtCRM,8604
 tricc_oo/strategies/output/openmrs_form.py,sha256=zAmDGMmZdIGNpil5MD-huiUvt_Dbhc2vt5qsGaCS2_k,29003
 tricc_oo/strategies/output/spice.py,sha256=QMeoismVC3PdbvwTK0PtUjWX9jl9780fbQIXn76fMXw,10761
-tricc_oo/strategies/output/xls_form.py,sha256=_0xghjaHU50U1fBKekN4BP9oPzRs17_WRJO8VKtokag,29366
+tricc_oo/strategies/output/xls_form.py,sha256=H4vxE7glOdrj83yZo2-eSojLdL8waDcbCne_nxy3GVQ,29413
 tricc_oo/strategies/output/xlsform_cdss.py,sha256=X00Lt5MzV8TX14dR4dFI1MqllI5S1e13bKbeysWM9uA,17435
-tricc_oo/strategies/output/xlsform_cht.py,sha256=RY_mre9j6w2vVnRFSGn5R3CuTWFjIbQyl1uWwz9Ay5E,22965
+tricc_oo/strategies/output/xlsform_cht.py,sha256=Kvs7kFk5LPaGP_vRJuOU-SgZRKO7aS7u52MWoc4mGdU,23023
 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=V4ai-rPjAbLSGdcKRBQiXohe6IqhZNCVyVjJLxYiavQ,107896
+tricc_oo/visitors/tricc.py,sha256=VJ2csuRz4fHM-CjQRMonLVFoPHbVE1I6-85qPO2bWz4,109205
 tricc_oo/visitors/utils.py,sha256=j83aAq5s5atXi3OC0jc_uJd54a8XrHHmizeeEbWZQJg,421
 tricc_oo/visitors/xform_pd.py,sha256=ryAnI3V9x3eTmJ2LNsUZfvl0_yfCqo6oBgeSu-WPqaE,9613
-tricc_oo-1.6.5.dev1.dist-info/licenses/LICENSE,sha256=Pz2eACSxkhsGfW9_iN60pgy-enjnbGTj8df8O3ebnQQ,16726
-tricc_oo-1.6.5.dev1.dist-info/METADATA,sha256=3gCCtuliIQAt7wPxtiRnsHuPIoUmtWXba9Ntg7-SniU,8604
-tricc_oo-1.6.5.dev1.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
-tricc_oo-1.6.5.dev1.dist-info/top_level.txt,sha256=NvbfMNAiy9m4b1unBsqpeOQWh4IgA1Xa33BtKA4abxk,15
-tricc_oo-1.6.5.dev1.dist-info/RECORD,,
+tricc_oo-1.6.5.dev2.dist-info/licenses/LICENSE,sha256=Pz2eACSxkhsGfW9_iN60pgy-enjnbGTj8df8O3ebnQQ,16726
+tricc_oo-1.6.5.dev2.dist-info/METADATA,sha256=swYBDgWAyxOe6G3Y8BQTMX41LeGxJvJrErP0ul2ZvUE,8604
+tricc_oo-1.6.5.dev2.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
+tricc_oo-1.6.5.dev2.dist-info/top_level.txt,sha256=NvbfMNAiy9m4b1unBsqpeOQWh4IgA1Xa33BtKA4abxk,15
+tricc_oo-1.6.5.dev2.dist-info/RECORD,,