tricc-oo 1.6.8__py3-none-any.whl → 1.6.9__py3-none-any.whl

tricc_oo/converters/xml_to_tricc.py

@@ -625,6 +625,8 @@ def enrich_node(diagram, media_path, edge, node, activity, help_before=False):
                     name=f"{node.name}.more_info",
                     label=message,
                     parent=node,
+                    group=node.group,
+                    activity=node.activity,
                     required=None,
                 )
                 # node.help = message

tricc_oo/strategies/output/dhis2_form.py

@@ -16,7 +16,7 @@ import datetime
 from tricc_oo.strategies.output.base_output_strategy import BaseOutPutStrategy
 from tricc_oo.models.base import (
     not_clean, TriccOperation,
-    TriccStatic, TriccReference
+    TriccStatic, TriccReference, TriccOperator
 )
 from tricc_oo.models.tricc import (
     TriccNodeSelectOption,
@@ -27,6 +27,8 @@ from tricc_oo.models.tricc import (
     TriccNodeActivity,
     TriccNodeSelect,
     TriccNodeSelectYesNo,
+    TriccNodeNote,
+    TriccNodeMoreInfo,
 )
 from tricc_oo.models.calculate import TriccNodeDisplayCalculateBase
 from tricc_oo.models.ordered_set import OrderedSet
@@ -44,7 +46,7 @@ class DHIS2Strategy(BaseOutPutStrategy):
 
     def __init__(self, project, output_path):
         super().__init__(project, output_path)
-        form_id = getattr(self.project.start_pages["main"], 'form_id', 'dhis2_program')
+        form_id = getattr(self.project.start_pages["main"].root, 'form_id', 'dhis2_program')
         self.program_metadata = {
             "id": self.generate_id(form_id),
             "name": form_id,
@@ -204,6 +206,10 @@ class DHIS2Strategy(BaseOutPutStrategy):
             return False
 
         if node not in processed_nodes:
+            # Skip relevance generation for TriccNodeMoreInfo as they don't create DataElements
+            if isinstance(node, TriccNodeMoreInfo):
+                return True
+
             relevance = None
             if hasattr(node, 'relevance') and node.relevance:
                 relevance = node.relevance
@@ -225,8 +231,10 @@ class DHIS2Strategy(BaseOutPutStrategy):
                             "activity_ref": node,  # Temporary reference to be replaced with section ID
                             "programRule": {"id": rule_id},
                         }
-                    else:
-                        # For regular nodes, use HIDEFIELD action
+                        self.program_rule_actions.append(program_rule_action)
+                    elif not issubclass(node.__class__, TriccNodeCalculateBase) and not isinstance(node, (TriccNodeNote, TriccNodeMoreInfo)):
+                        # For regular nodes that get DataElements, use HIDEFIELD action
+                        # Exclude TriccNodeNote and TriccNodeMoreInfo as they don't get DataElements
                         program_rule_action = {
                             "id": action_id,
                             "programRuleActionType": "HIDEFIELD",
@@ -235,18 +243,45 @@ class DHIS2Strategy(BaseOutPutStrategy):
                             },
                             "programRule": {"id": rule_id}
                         }
-                    self.program_rule_actions.append(program_rule_action)
+                        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(f"({relevance_str})==false")  # Negate for hide when true
                     condition = self.simplify_expression(condition)
                     self.program_rules.append({
                         "id": rule_id,
                         "name": f"Hide `{self.get_export_name(node)}` when condition met",
-                        "description": f"Hide `{self.get_display(node)}` based on relevance",
+                        "description": f"Hide `{self.get_display(node)[:128]}` based on relevance",
                         "condition": condition,
                         "programRuleActions": [{"id": action_id}]
                     })
+
+            # Check if field should be mandatory based on 'required' attribute
+            if bool(getattr(node, 'required', False)):
+                # Create program rule for mandatory field using relevance function
+                mandatory_rule_id = self.generate_id(f"rule_{node.get_name()}_mandatory")
+                mandatory_action_id = self.generate_id(f"action_{mandatory_rule_id}")
+
+                mandatory_program_rule_action = {
+                    "id": mandatory_action_id,
+                    "programRuleActionType": "SETMANDATORYFIELD",
+                    "dataElement": {
+                        "id": self.generate_id(self.get_export_name(node))
+                    },
+                    "programRule": {"id": mandatory_rule_id}
+                }
+                self.program_rule_actions.append(mandatory_program_rule_action)
+
+                # Create program rule for mandatory field - use relevance condition if available
+                mandatory_condition = relevance_str if relevance_str and relevance_str != 'false' else "true"
+                self.program_rules.append({
+                    "id": mandatory_rule_id,
+                    "name": f"Make `{self.get_export_name(node)}` mandatory",
+                    "description": f"Set `{self.get_display(node)[:128]}` as mandatory field",
+                    "condition": mandatory_condition,
+                    "programRuleActions": [{"id": mandatory_action_id}]
+                })
+
         return True
 
     def generate_data_element(self, node):
@@ -512,8 +547,16 @@ class DHIS2Strategy(BaseOutPutStrategy):
             return False
 
         if node not in processed_nodes:
+            logger.debug(f"generate_export processing node: {node.get_name()} type: {type(node)}")
+            # Special handling for TriccNodeNote - transform into section description
+            if isinstance(node, TriccNodeNote):
+                logger.info(f"Found TriccNodeNote: {node.get_name()}")
+                self.handle_note_as_section_description(node, processed_nodes, **kwargs)
+            elif isinstance(node, TriccNodeMoreInfo):
+                logger.info(f"Found TriccNodeMoreInfo: {node.get_name()}")
+                self.handle_note_as_section_description(node, processed_nodes, **kwargs)
             # Skip creating data elements for calculate nodes - they should only be program rule variables
-            if not issubclass(node.__class__, TriccNodeCalculateBase):
+            elif not issubclass(node.__class__, TriccNodeCalculateBase):
                 data_element = self.generate_data_element(node)
                 if data_element:
                     # Add to program stage
@@ -522,7 +565,7 @@ class DHIS2Strategy(BaseOutPutStrategy):
                         psde = {
                             "id": psde_id,
                             "dataElement": {"id": data_element["id"]},
-                            "compulsory": bool(getattr(node, 'required', False))
+                            "compulsory": False
                         }
                         self.program_metadata["programStages"][-1]["programStageDataElements"].append(psde)
 
@@ -532,6 +575,115 @@ class DHIS2Strategy(BaseOutPutStrategy):
 
         return True
 
+    def handle_note_as_section_description(self, node, processed_nodes, **kwargs):
+        """Transform TriccNodeNote into section description and create hide logic with section duplication"""
+        logger.info(f"Processing note {node.get_name()} for section description")
+        if not self.current_section or self.current_section not in self.sections:
+            logger.warning(f"No current section found for note {node.get_name()}")
+            return
+
+        # 1. Duplicate the previous section with incremented ID (like XLS form group numbering)
+        original_section = self.sections[self.current_section]
+        section_name = f"{original_section['name']}_{node.name}"
+        duplicated_section_id = self.generate_id(section_name)
+        duplicated_section = {
+            "id": duplicated_section_id,
+            "name": section_name,  # Use incremented naming pattern
+            "sortOrder": len(self.sections),
+            "programStage": {"id": self.program_metadata["programStages"][-1]["id"]},
+            "dataElements": original_section.get("dataElements", []).copy(),  # Copy data elements
+            "activity_ref": original_section.get("activity_ref")
+        }
+        self.sections[duplicated_section_id] = duplicated_section
+
+        # Add duplicated section to program stage
+        if self.program_metadata["programStages"]:
+            self.program_metadata["programStages"][-1]["programStageSections"].append({"id": duplicated_section_id})
+
+        logger.info(f"Duplicated section {self.current_section} as {duplicated_section_id}")
+
+        # 2. Create a new section for the note/moreinfo with name and ID from the node
+        note_section_id = self.generate_id(self.get_export_name(node))
+        note_section_name = self.get_export_name(node)
+
+        note_section = {
+            "id": note_section_id,
+            "name": note_section_name,
+            "sortOrder": len(self.sections),
+            "programStage": {"id": self.program_metadata["programStages"][-1]["id"]},
+            "dataElements": [],
+            "activity_ref": original_section.get("activity_ref")  # Same activity reference
+        }
+
+        # Set section description to the note's label
+        if hasattr(node, 'label') and node.label:
+            note_section["description"] = node.label.replace('\u00a0', ' ').strip()
+            logger.info(f"Set note section {note_section_id} description to: {note_section['description']}")
+        elif hasattr(node, 'name') and node.name:
+            note_section["description"] = node.name.replace('\u00a0', ' ').strip()
+            logger.info(f"Set note section {note_section_id} description to: {note_section['description']}")
+        else:
+            note_section["description"] = str(node.id)
+            logger.info(f"Set note section {note_section_id} description to: {note_section['description']}")
+
+        self.sections[note_section_id] = note_section
+
+        # Add note section to program stage
+        if self.program_metadata["programStages"]:
+            self.program_metadata["programStages"][-1]["programStageSections"].append({"id": note_section_id})
+
+        logger.info(f"Created note section {note_section_id} with name '{note_section_name}'")
+
+        # 3. Inject the duplicated section as the new current section
+        self.current_section = duplicated_section_id
+        logger.info(f"Set current section to duplicated section {duplicated_section_id}")
+
+        # Create hide logic for the note section based on combined relevance
+        combined_relevance = None
+
+        # Get parent activity relevance from the original section's activity_ref
+        parent_activity = original_section.get("activity_ref")
+        if parent_activity and hasattr(parent_activity, 'relevance') and parent_activity.relevance:
+            combined_relevance = parent_activity.relevance
+
+        # Combine with note relevance if it exists
+        if hasattr(node, 'relevance') and node.relevance:
+            if combined_relevance:
+                # Combine using AND operation
+                combined_relevance = TriccOperation(
+                    TriccOperator.AND,
+                    [combined_relevance, node.relevance]
+                )
+            else:
+                combined_relevance = node.relevance
+
+        # Create hide logic if there's relevance - applied to the note section
+        if combined_relevance:
+            relevance_str = self.convert_expression_to_string(not_clean(combined_relevance))
+            if relevance_str and relevance_str != 'false':
+                # Create program rule action for hiding the note section
+                rule_id = self.generate_id(f"rule_{node.get_name()}_note_hide_section")
+                action_id = self.generate_id(f"action_{rule_id}")
+
+                program_rule_action = {
+                    "id": action_id,
+                    "programRuleActionType": "HIDESECTION",
+                    "activity_ref": parent_activity,  # Use activity reference like other HIDESECTION actions
+                    "programRule": {"id": rule_id},
+                }
+                self.program_rule_actions.append(program_rule_action)
+
+                # Create program rule referencing the action
+                condition = self.simplify_expression(f"({relevance_str})==false")  # Negate for hide when true
+                condition = self.simplify_expression(condition)
+                self.program_rules.append({
+                    "id": rule_id,
+                    "name": f"Hide note section `{note_section_name}` based on relevance",
+                    "description": f"Hide note section `{self.get_display(node)[:128]}` based on combined relevance",
+                    "condition": condition,
+                    "programRuleActions": [{"id": action_id}]
+                })
+
     def clean_section(self, program_stages_payload):
         """Clean sections by removing empty ones and merging sections with same activity_ref"""
         sections_to_remove = set()
@@ -542,11 +694,11 @@ class DHIS2Strategy(BaseOutPutStrategy):
             section_id = section["id"]
             activity_ref = section.get("activity_ref")
             # Remove empty sections
-            if not section.get("dataElements"):
+            if not section.get("dataElements") and not section.get("description"):
                 sections_to_remove.add(section_id)
 
             # Check for sections with same activity_ref
-            elif activity_ref == prev_activity_ref:
+            elif activity_ref == prev_activity_ref and not section.get("description"):
                 # Merge this section into the existing one
                 existing_section = self.sections[prev_section_id]
 
@@ -645,6 +797,8 @@ class DHIS2Strategy(BaseOutPutStrategy):
                     # Non-activity actions (HIDEFIELD) can be added directly
                     program_rule_actions_payload.append(action)
 
+        # Filter out rules that reference non-existent actions
+        valid_action_ids = {action["id"] for action in program_rule_actions_payload}
         if self.program_rules:
             program_rules_payload = [
                 {
@@ -652,6 +806,7 @@ class DHIS2Strategy(BaseOutPutStrategy):
                     "program": {"id": self.program_metadata["id"]}
                 }
                 for rule in self.program_rules
+                if all(action_ref["id"] in valid_action_ids for action_ref in rule["programRuleActions"])
             ]
 
         if self.program_rule_variables:

tricc_oo/strategies/output/fhir_form.py

@@ -97,7 +97,7 @@ class FHIRStrategy(BaseOutPutStrategy):
             "type": self.map_tricc_type_to_fhir(node.tricc_type if hasattr(node, 'tricc_type') else 'text')
         }
         if hasattr(node, 'options') and node.options:
-            item["answerOption"] = [{"valueString": opt.name} for opt in node.options]
+            item["answerOption"] = [{"valueString": opt.name} for opt in node.options.values()]
         self.questionnaires[segment]["item"].append(item)
         return True
 

tricc_oo/visitors/tricc.py

@@ -1758,6 +1758,11 @@ def reorder_node_list(node_list, group, processed_nodes):
         # Check for same group
         if group is not None and node_group and node_group.id == group.id:
             priority += SAME_GROUP_PRIORITY
+        elif (
+            issubclass(node.__class__, TriccNodeDisplayCalculateBase) or
+            isinstance(node, TriccNodeEnd)
+        ) and not isinstance(node, TriccNodeActivityEnd) and hasattr(node, 'prev_nodes') and len(node.prev_nodes) > 0:
+            priority += FLOW_CALCULATE_NODE_PRIORITY
         # Check for parent group
         elif hasattr(group, "group") and group.group and node_group and node_group.id == group.group.id:
             priority += PARENT_GROUP_PRIORITY

{tricc_oo-1.6.8.dist-info → tricc_oo-1.6.9.dist-info}/METADATA

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

@@ -10,7 +10,7 @@ tricc_oo/converters/datadictionnary.py,sha256=T2HLCBo4Am1p0kFqSH1r0PqbD8AC2IGuWk
 tricc_oo/converters/drawio_type_map.py,sha256=UCPiGs7Lw0bigKScmZUnmOhACBz-FiDq92jHkI7RTSQ,9113
 tricc_oo/converters/tricc_to_xls_form.py,sha256=wsWv4aA0QssY7ry9R7KsuuMzVfovj9fwE3i9AtCum0c,3842
 tricc_oo/converters/utils.py,sha256=JZrtrvvOfXwdkw49pKauzinOcauWwsy-CVcw36TjyLo,1684
-tricc_oo/converters/xml_to_tricc.py,sha256=PEBe8N-JIGJMVX2FO3UVxRcy5GrGsMvgcArEwUXmr6o,39572
+tricc_oo/converters/xml_to_tricc.py,sha256=yqnU5xg1SVoQ8vra0gOvIPwoh80pyTI332y9qJCvcRs,39654
 tricc_oo/converters/cql/cqlLexer.py,sha256=8HArbRphcrpnAG4uogJ2rHv4tc1WLzjN0B1uFeYILAc,49141
 tricc_oo/converters/cql/cqlListener.py,sha256=fA7-8DcS2Q69ckwjdg57-OfFHBxjTZFdoSKrtw7Hffc,57538
 tricc_oo/converters/cql/cqlParser.py,sha256=x3KdrwX9nwENSEJ5Ex7_l5NMnu3kWBO0uLdYu4moTq0,414745
@@ -32,8 +32,8 @@ tricc_oo/strategies/input/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJW
 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=i9L5CVUqkEAMNyBsdHJ4xA7Nptr3myHr_fHHveDX1cU,8928
-tricc_oo/strategies/output/dhis2_form.py,sha256=jW9NW72_61ch1bHm8ShIH4xsJH-HMlZGPTT5txJxMUk,38278
-tricc_oo/strategies/output/fhir_form.py,sha256=hbL921pe1Doun4IQrJuZ_Sq2fCh98G3grYie5olC4uc,15740
+tricc_oo/strategies/output/dhis2_form.py,sha256=RFMUrB3TNJJi3kecBVThY6X1GF_TVk8XgXkye8fRkIc,47035
+tricc_oo/strategies/output/fhir_form.py,sha256=yDDJqdkt4PvSDEy4kmgKM8V_o757CDlE7813atyyDHM,15749
 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
@@ -42,11 +42,11 @@ tricc_oo/strategies/output/xlsform_cdss.py,sha256=X00Lt5MzV8TX14dR4dFI1MqllI5S1e
 tricc_oo/strategies/output/xlsform_cht.py,sha256=eKAc6LLDnvdZ5m8a2Vk6eAhvPbUvOfykgYr0ou3an9k,27164
 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=8fULbAxKSeEtPyD5TYTaIG8-20Bjg2iZmzxcJM70n18,110295
+tricc_oo/visitors/tricc.py,sha256=_UzAylSHuAhfXXPUBV_PJIhta5ihbJhLDe3GJAwxQzU,110598
 tricc_oo/visitors/utils.py,sha256=j83aAq5s5atXi3OC0jc_uJd54a8XrHHmizeeEbWZQJg,421
 tricc_oo/visitors/xform_pd.py,sha256=ryAnI3V9x3eTmJ2LNsUZfvl0_yfCqo6oBgeSu-WPqaE,9613
-tricc_oo-1.6.8.dist-info/licenses/LICENSE,sha256=Pz2eACSxkhsGfW9_iN60pgy-enjnbGTj8df8O3ebnQQ,16726
-tricc_oo-1.6.8.dist-info/METADATA,sha256=g9u0_NdvNT8FFgNB3LQzsUADmGqL1PBB1DPdnCBKVuI,8599
-tricc_oo-1.6.8.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
-tricc_oo-1.6.8.dist-info/top_level.txt,sha256=NvbfMNAiy9m4b1unBsqpeOQWh4IgA1Xa33BtKA4abxk,15
-tricc_oo-1.6.8.dist-info/RECORD,,
+tricc_oo-1.6.9.dist-info/licenses/LICENSE,sha256=Pz2eACSxkhsGfW9_iN60pgy-enjnbGTj8df8O3ebnQQ,16726
+tricc_oo-1.6.9.dist-info/METADATA,sha256=qbIz4okrC-eeMx-8mZMt_--MUWzPcZmht_dhO11qovY,8599
+tricc_oo-1.6.9.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
+tricc_oo-1.6.9.dist-info/top_level.txt,sha256=NvbfMNAiy9m4b1unBsqpeOQWh4IgA1Xa33BtKA4abxk,15
+tricc_oo-1.6.9.dist-info/RECORD,,