tricc-oo 1.5.28__py3-none-any.whl → 1.6.0__py3-none-any.whl

tests/build.py

@@ -6,6 +6,7 @@ from tricc_oo.strategies.output.xls_form import XLSFormStrategy  # noqa: F401
 from tricc_oo.strategies.output.openmrs_form import OpenMRSStrategy  # noqa: F401
 from tricc_oo.strategies.output.fhir_form import FHIRStrategy  # noqa: F401
 from tricc_oo.strategies.output.html_form import HTMLStrategy  # noqa: F401
+from tricc_oo.strategies.output.dhis2_form import DHIS2Strategy  # noqa: F401
 from tricc_oo.strategies.input.drawio import DrawioStrategy  # noqa: F401
 import getopt
 import logging

tricc_oo/converters/tricc_to_xls_form.py

@@ -53,8 +53,8 @@ def get_export_name(node, replace_dots=True):
             export_name = BOOLEAN_MAP[str(TRICC_FALSE_VALUE)]
         elif value == '$this':
             export_name = '.'
-        elif isinstance(value, str):
-            export_name = f"'{clean_str(value, replace_dots=replace_dots)}'"
+        elif isinstance(value, str) and not isinstance(node, str):
+            export_name = f"'{value}'"
         else:
             export_name = value
         if hasattr(node, 'export_name'):

tricc_oo/converters/xml_to_tricc.py

@@ -101,16 +101,16 @@ def create_activity(diagram, media_path, project):
 
     external_id = diagram.attrib.get("id")
     id = get_id(external_id, diagram.attrib.get("id"))
-    root = create_root_node(diagram)
-    name = diagram.attrib.get("name")
+    root, name = create_root_node(diagram)
+    label = diagram.attrib.get("name")
     form_id = diagram.attrib.get("name", None)
     if root is not None:
         activity = TriccNodeActivity(
             root=root,
-            name=get_rand_name(f"a{id}"),
+            name=name,  #  start node 'name' is saved in label
             id=id,
             external_id=external_id,
-            label=name,
+            label=label,
             form_id=form_id,
         )
         if root.relevance is not None:
@@ -130,7 +130,7 @@ def create_activity(diagram, media_path, project):
             if (
                 issubclass(n.__class__, (TriccNodeDisplayModel, TriccNodeDisplayCalculateBase))
                 and not isinstance(n, (TriccRhombusMixIn, TriccNodeRhombus, TriccNodeDisplayBridge))
-                and not n.name.startswith("label_")
+                and not n.name.startswith("label_")  # FIXME
             ):
                 system = n.name.split(".")[0] if "." in n.name else "tricc"
                 if isinstance(n, TriccNodeSelectOption) and isinstance(n.select, TriccNodeSelectNotAvailable):
@@ -444,17 +444,18 @@ def create_root_node(diagram):
         if elm is not None:
             external_id = elm.attrib.get("id")
             id = get_id(external_id, diagram.attrib.get("id"))
+            name = generate_id("start"+external_id)
             node = TriccNodeActivityStart(
                 id=id,
                 external_id=external_id,
                 # parent=elm.attrib.get("parent"),
-                name="ma" + id,
+                name=name,
                 label=diagram.attrib.get("name"),
                 relevance=elm.attrib.get("relevance"),
                 instance=int(elm.attrib.get("instance") if elm.attrib.get("instance") is not None else 1),
             )
     load_expressions(node)
-    return node
+    return node, elm.attrib.get("name", generate_id("act"+external_id))
 
 
 # converter XML item to object

tricc_oo/models/base.py

@@ -494,6 +494,8 @@ class TriccOperation(BaseModel):
                 return "mixed"
             else:
                 return rtype.pop()
+        else:
+            return self.get_reference_datatype(self.reference)
 
     def get_reference_datatype(self, references):
         rtype = set()

tricc_oo/strategies/output/dhis2_form.py

@@ -0,0 +1,859 @@
+import logging
+import os
+import json
+import uuid
+import string
+from tricc_oo.visitors.tricc import (
+    is_ready_to_process,
+    process_reference,
+    generate_base,
+    generate_calculate,
+    walktrhough_tricc_node_processed_stached,
+    check_stashed_loop,
+)
+from tricc_oo.converters.tricc_to_xls_form import get_export_name
+import datetime
+from tricc_oo.strategies.output.base_output_strategy import BaseOutPutStrategy
+from tricc_oo.models.base import (
+    not_clean, TriccOperation,
+    TriccStatic, TriccReference
+)
+from tricc_oo.models.tricc import (
+    TriccNodeSelectOption,
+    TriccNodeInputModel,
+    TriccNodeBaseModel,
+    TriccNodeDisplayModel,
+    TriccNodeCalculateBase,
+    TriccNodeActivity,
+)
+from tricc_oo.models.calculate import TriccNodeDisplayCalculateBase
+from tricc_oo.models.ordered_set import OrderedSet
+
+logger = logging.getLogger("default")
+
+# Namespace for deterministic UUIDs
+UUID_NAMESPACE = uuid.UUID('87654321-4321-8765-cba9-fed098765432')
+
+
+class DHIS2Strategy(BaseOutPutStrategy):
+    processes = ["main"]
+    project = None
+    output_path = None
+
+    def __init__(self, project, output_path):
+        super().__init__(project, output_path)
+        form_id = getattr(self.project.start_pages["main"], 'form_id', 'dhis2_program')
+        self.program_metadata = {
+            "id": self.generate_id(form_id),
+            "name": form_id,
+            "shortName": form_id[:50],  # DHIS2 shortName limit
+            "programType": "WITHOUT_REGISTRATION",
+            "programStages": [],
+            "programRules": []
+        }
+        self.option_sets = {}
+        self.options = {}
+        self.data_elements = {}
+        self.program_rules = []
+        self.program_rule_actions = []
+        self.program_rule_variables = []
+        self.field_counter = 1
+        self.current_section = None
+        self.concept_map = {}
+        # Track programRuleActions per stage
+        self.stage_rule_actions = {}
+        self.sections = {}
+
+    def get_export_name(self, r):
+        if isinstance(r, TriccNodeSelectOption):
+            return self.get_option_value(r.name)
+        elif isinstance(r, str):
+            return self.get_option_value(r)
+        elif isinstance(r, TriccStatic):
+            if isinstance(r.value, str):
+                return self.get_option_value(r.value)
+            elif isinstance(r.value, bool):
+                return str(r.value).lower()
+            else:
+                return r.value
+        else:
+            return get_export_name(r)
+
+    def generate_id(self, name):
+        """Generate DHIS2-compliant UID: 1 letter + 10 alphanumeric characters"""
+        # Convert UUID to base62-like string and take first 11 chars, ensuring starts with letter
+        # Create DHIS2 UID: start with letter, followed by 10 alphanum chars
+        letters = string.ascii_letters
+        alphanum = string.ascii_letters + string.digits
+
+        # Use hash of the name to get deterministic but varied results
+        import hashlib
+        hash_obj = hashlib.md5(name.encode('utf-8')).digest()
+        hash_int = int.from_bytes(hash_obj, byteorder='big')
+
+        # First character: letter
+        first_char = letters[hash_int % len(letters)]
+
+        # Remaining 10 characters: alphanumeric
+        remaining_chars = ''
+        for i in range(10):
+            remaining_chars += alphanum[(hash_int >> (i * 6)) % len(alphanum)]
+
+        return first_char + remaining_chars
+
+    def get_option_value(self, option_name):
+        if option_name == 'true':
+            return TriccStatic(True)
+        elif option_name == 'false':
+            return TriccStatic(False)
+        return self.concept_map.get(option_name, option_name)
+
+    def get_tricc_operation_expression(self, operation):
+        ref_expressions = []
+        if not hasattr(operation, "reference"):
+            return self.get_tricc_operation_operand(operation)
+        for r in operation.reference:
+            if isinstance(r, list):
+                r_expr = [
+                    (
+                        self.get_tricc_operation_expression(sr)
+                        if isinstance(sr, TriccOperation)
+                        else self.get_tricc_operation_operand(sr)
+                    )
+                    for sr in r
+                ]
+            elif isinstance(r, TriccOperation):
+                r_expr = self.get_tricc_operation_expression(r)
+            else:
+                r_expr = self.get_tricc_operation_operand(r)
+            if isinstance(r_expr, TriccReference):
+                r_expr = self.get_tricc_operation_operand(r_expr)
+            elif isinstance(r_expr, TriccStatic) and isinstance(r_expr.value, bool):
+                r_expr = str(r_expr.value).lower()
+            ref_expressions.append(r_expr)
+
+        if hasattr(self, f"tricc_operation_{operation.operator}"):
+            callable = getattr(self, f"tricc_operation_{operation.operator}")
+            return callable(ref_expressions)
+        else:
+            raise NotImplementedError(
+                f"This type of operation '{operation.operator}' is not supported in this strategy"
+            )
+
+    def execute(self):
+        version = datetime.datetime.now().strftime("%Y%m%d%H%M")
+        logger.info(f"build version: {version}")
+        if "main" in self.project.start_pages:
+            self.process_base(self.project.start_pages, pages=self.project.pages, version=version)
+        else:
+            logger.critical("Main process required")
+
+        logger.info("generate the relevance based on edges")
+        self.process_relevance(self.project.start_pages, pages=self.project.pages)
+
+        logger.info("generate the calculate based on edges")
+        self.process_calculate(self.project.start_pages, pages=self.project.pages)
+
+        logger.info("generate the export format")
+        self.process_export(self.project.start_pages, pages=self.project.pages)
+
+        logger.info("print the export")
+        self.export(self.project.start_pages, version=version)
+
+    def map_tricc_type_to_dhis2_value_type(self, node):
+        mapping = {
+            'text': 'TEXT',
+            'integer': 'INTEGER',
+            'decimal': 'NUMBER',
+            'date': 'DATE',
+            'datetime': 'DATETIME',
+            'select_one': 'TEXT',  # DHIS2 handles options via optionSets
+            'select_multiple': 'TEXT',  # Multiple selections as comma-separated
+            'select_yesno': 'BOOLEAN',
+            'yesno': 'BOOLEAN',
+            'boolean': 'BOOLEAN',
+            'not_available': 'BOOLEAN',
+            'note': 'LONG_TEXT'
+        }
+        return mapping.get(node.tricc_type, 'TEXT')
+
+    def generate_base(self, node, processed_nodes, **kwargs):
+        if generate_base(node, processed_nodes, **kwargs):
+            if getattr(node, 'name', '') not in ('true', 'false'):
+                self.concept_map[node.name] = self.generate_id(self.get_export_name(node))
+            return True
+        return False
+
+    def generate_relevance(self, node, processed_nodes, **kwargs):
+        if not is_ready_to_process(node, processed_nodes, strict=True):
+            return False
+
+        if node not in processed_nodes:
+            relevance = None
+            if hasattr(node, 'relevance') and node.relevance:
+                relevance = node.relevance
+            if hasattr(node, 'expression') and node.expression:
+                relevance = node.expression
+            if relevance:
+                relevance_str = self.convert_expression_to_string(not_clean(relevance))
+                if relevance_str and relevance_str != 'false':
+                    # Create program rule action for hiding/showing based on relevance
+                    rule_id = self.generate_id(f"rule_{node.get_name()}_relevance")
+                    action_id = self.generate_id(f"action_{rule_id}")
+
+                    if isinstance(node, TriccNodeActivity):
+                        # For activities, use HIDESECTION action instead of HIDEFIELD
+                        # Store activity reference for later section ID assignment
+                        program_rule_action = {
+                            "id": action_id,
+                            "programRuleActionType": "HIDESECTION",
+                            "activity_ref": node,  # Temporary reference to be replaced with section ID
+                            "programRule": {"id": rule_id},
+                        }
+                    else:
+                        # For regular nodes, use HIDEFIELD action
+                        program_rule_action = {
+                            "id": action_id,
+                            "programRuleActionType": "HIDEFIELD",
+                            "dataElement": {
+                                "id": self.generate_id(self.get_export_name(node))
+                            },
+                            "programRule": {"id": rule_id}
+                        }
+                    self.program_rule_actions.append(program_rule_action)
+
+                    # Create program rule referencing the action
+                    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
+                        "programRuleActions": [{"id": action_id}]
+                    })
+        return True
+
+    def generate_data_element(self, node):
+        if issubclass(node.__class__, TriccNodeDisplayModel) and not isinstance(node, TriccNodeSelectOption):
+            de_id = self.generate_id(self.get_export_name(node))
+
+            # Check if this is a boolean question (yes/no with boolean options)
+            is_boolean_question = False
+            if hasattr(node, 'options') and node.options:
+                option_names = [
+                    str(self.get_export_name(opt)).lower()
+                    for opt in node.options.values()
+                    if isinstance(opt, TriccNodeSelectOption)]
+                # If options are only true/false or yes/no variants, treat as boolean
+                boolean_options = {'true', 'false', 'yes', 'no', '1', '0'}
+                if all(opt in boolean_options for opt in option_names):
+                    is_boolean_question = True
+
+            # Override valueType for boolean questions
+            value_type = self.map_tricc_type_to_dhis2_value_type(node)
+            if is_boolean_question:
+                value_type = "BOOLEAN"
+
+            data_element = {
+                "id": de_id,
+                "name": self.get_export_name(node),
+                "shortName": node.name[:50],
+                "displayFormName": getattr(node, 'label', node.name).replace('\u00a0', ' ').strip(),
+                "valueType": value_type,
+                "domainType": "TRACKER",
+                "aggregationType": "NONE"
+            }
+
+            # Only create optionSet for non-boolean select questions
+            if node.tricc_type in ['select_one', 'select_multiple'] and not is_boolean_question:
+                # Create optionSet for choices
+                if hasattr(node, 'options') and node.options:
+                    option_set_id = self.generate_id(f"optionset_{node.name}")
+                    data_element["optionSet"] = {"id": option_set_id}
+
+                    # Create the actual optionSet definition
+                    option_set = {
+                        "id": option_set_id,
+                        "name": f"{node.name} Options",
+                        "shortName": f"{node.name}_opts"[:50],
+                        "valueType": "TEXT",
+                        "options": []
+                    }
+
+                    # Add options (node.options is a dict, not a list)
+                    for key, option in node.options.items():
+                        if isinstance(option, TriccNodeSelectOption):
+                            option_id = self.generate_id(f"option_{node.name}_{option.name}")
+                            option_name = self.get_export_name(option)
+                            if isinstance(option_name, str):
+                                option_name = option_name.replace('\u00a0', ' ').strip()
+                            elif isinstance(option_name, TriccStatic):
+                                option_name = str(option_name.value)
+                            # Create separate option entity
+                            option_def = {
+                                "id": option_id,
+                                "name": option_name,
+                                "shortName": option.name[:50],
+                                "code": str(self.get_export_name(option))
+                            }
+                            self.options[option_id] = option_def
+
+                            # Add option reference to optionSet (only ID)
+                            option_set["options"].append({"id": option_id})
+
+                    self.option_sets[option_set_id] = option_set
+
+            self.data_elements[node.name] = data_element
+            return data_element
+        return None
+
+    def generate_calculate(self, node, processed_nodes, **kwargs):
+        if generate_calculate(node, processed_nodes, **kwargs):
+            if issubclass(node.__class__, TriccNodeCalculateBase) and node.expression:
+                # Create program rule variable for the calculate
+                var_id = self.generate_id(self.get_export_name(node))
+                expression_str = self.convert_expression_to_string(node.expression)
+
+                # Determine data type from operation
+                data_type = "TEXT"  # default
+                if hasattr(node.expression, 'get_datatype'):
+                    operation_datatype = node.expression.get_datatype()
+                    if operation_datatype:
+                        # Create a mock node with the datatype to use the mapping function
+                        class MockNode:
+                            def __init__(self, tricc_type):
+                                self.tricc_type = tricc_type
+                        mock_node = MockNode(operation_datatype)
+                        data_type = self.map_tricc_type_to_dhis2_value_type(mock_node)
+
+                program_rule_variable = {
+                    "id": var_id,
+                    "name": self.get_export_name(node.name)[:50],
+                    "programRuleVariableSourceType": "CALCULATED_VALUE",
+                    "calculatedValueScript": expression_str,
+                    "dataType": data_type,
+                    "useCodeForOptionSet": False,
+                    "program": {"id": self.program_metadata["id"]}
+                }
+                self.program_rule_variables.append(program_rule_variable)
+                # Add to concept map for potential referencing
+                self.concept_map[node.name] = var_id
+            return True
+        return False
+
+    def process_export(self, start_pages, **kwargs):
+        self.activity_export(start_pages["main"], **kwargs)
+
+    def activity_export(self, activity, processed_nodes=None, **kwargs):
+        if processed_nodes is None:
+            processed_nodes = OrderedSet()
+        stashed_nodes = OrderedSet()
+        groups = {}
+        groups[activity.id] = 0
+        path_len = 0
+        process = ["main"]
+
+        # Create program stage
+        stage_id = self.generate_id(self.get_export_name(activity))
+        program_stage = {
+            "id": stage_id,
+            "name": getattr(activity.root, 'label', 'Main Stage').replace('\u00a0', ' ').strip(),
+            "programStageDataElements": [],
+            "programStageSections": []
+        }
+        self.program_metadata["programStages"].append(program_stage)
+
+        # Start with the main section for this activity
+        self.start_section(activity, groups, processed_nodes, process, **kwargs)
+
+        walktrhough_tricc_node_processed_stached(
+            activity.root,
+            self.generate_export,
+            processed_nodes,
+            stashed_nodes,
+            path_len,
+            cur_group=activity.root.group,
+            process=process,
+            recursive=False,
+            **kwargs
+        )
+
+        # End the main section
+        self.end_section(activity, groups, **kwargs)
+
+        # Manage stashed nodes similar to other strategies
+        prev_stashed_nodes = stashed_nodes.copy()
+        loop_count = 0
+        len_prev_processed_nodes = 0
+        while len(stashed_nodes) > 0:
+            loop_count = check_stashed_loop(
+                stashed_nodes,
+                prev_stashed_nodes,
+                processed_nodes,
+                len_prev_processed_nodes,
+                loop_count,
+            )
+            prev_stashed_nodes = stashed_nodes.copy()
+            len_prev_processed_nodes = len(processed_nodes)
+            if len(stashed_nodes) > 0:
+                s_node = stashed_nodes.pop()
+                if s_node.group is None:
+                    logger.critical("ERROR group is none for node {}".format(s_node.get_name()))
+
+                # Start section for stashed node if it's a different group
+                self.start_section(s_node.group, groups, processed_nodes, process, relevance=True, **kwargs)
+
+                walktrhough_tricc_node_processed_stached(
+                    s_node,
+                    self.generate_export,
+                    processed_nodes,
+                    stashed_nodes,
+                    path_len,
+                    groups=groups,
+                    cur_group=s_node.group,
+                    recursive=False,
+                    process=process,
+                    **kwargs
+                )
+
+                # End section for stashed node
+                self.end_section(s_node.group, groups, **kwargs)
+
+        return processed_nodes
+
+    def start_section(self, cur_group, groups, processed_nodes, process, relevance=False, **kwargs):
+        name = get_export_name(cur_group)
+
+        if name in groups:
+            groups[name] += 1
+            name = name + "_" + str(groups[name])
+        else:
+            groups[name] = 0
+
+        relevance_expression = (
+            cur_group.relevance if (
+                relevance and
+                cur_group.relevance is not None and
+                cur_group.relevance != ""
+            ) else ""
+        )
+
+        if not relevance:
+            relevance_expression = ""
+        elif isinstance(relevance_expression, (TriccOperation, TriccStatic)):
+            relevance_expression = self.get_tricc_operation_expression(relevance_expression)
+
+        # Create section
+        section_id = self.generate_id(f"section_{name}")
+        section_name = name
+        if cur_group and hasattr(cur_group, 'label') and cur_group.label:
+            section_name = cur_group.label.replace('\u00a0', ' ').strip()
+        section = {
+            "id": section_id,
+            "name": section_name,
+            "sortOrder": len(self.sections),
+            "programStage": {"id": self.program_metadata["programStages"][-1]["id"]},
+            "dataElements": [],
+            "activity_ref": cur_group
+        }
+        # Add section to program stage
+        if self.program_metadata["programStages"]:
+            self.program_metadata["programStages"][-1]["programStageSections"].append({"id": section_id})
+
+        self.sections[section_id] = section
+        self.current_section = section_id
+
+    def end_section(self, cur_group, groups, **kwargs):
+        # In DHIS2, sections don't have explicit end markers like XLSForm groups
+        # The section is already created and added to the program stage
+        pass
+
+    def generate_export(self, node, processed_nodes, **kwargs):
+        if not is_ready_to_process(node, processed_nodes, strict=True):
+            return False
+
+        if not process_reference(
+            node, processed_nodes, {}, replace_reference=False, codesystems=kwargs.get("codesystems", None)
+        ):
+            return False
+
+        if node not in processed_nodes:
+            # Skip creating data elements for calculate nodes - they should only be program rule variables
+            if not issubclass(node.__class__, TriccNodeCalculateBase):
+                data_element = self.generate_data_element(node)
+                if data_element:
+                    # Add to program stage
+                    if self.program_metadata["programStages"]:
+                        psde_id = self.generate_id(f"psde_{node.name}")
+                        psde = {
+                            "id": psde_id,
+                            "dataElement": {"id": data_element["id"]},
+                            "compulsory": bool(getattr(node, 'required', False))
+                        }
+                        self.program_metadata["programStages"][-1]["programStageDataElements"].append(psde)
+
+                        # Add data element to current section
+                        if self.current_section and self.current_section in self.sections:
+                            self.sections[self.current_section]["dataElements"].append({"id": data_element["id"]})
+
+        return True
+
+    def clean_section(self, program_stages_payload):
+        """Clean sections by removing empty ones and merging sections with same activity_ref"""
+        sections_to_remove = set()
+        prev_activity_ref = None
+        prev_section_id = None
+
+        for section in sorted(self.sections.values(), key=lambda x: x["sortOrder"]):
+            section_id = section["id"]
+            activity_ref = section.get("activity_ref")
+            # Remove empty sections
+            if not section.get("dataElements"):
+                sections_to_remove.add(section_id)
+
+            # Check for sections with same activity_ref
+            elif activity_ref == prev_activity_ref:
+                # Merge this section into the existing one
+                existing_section = self.sections[prev_section_id]
+
+                # Move data elements to existing section
+                existing_section["dataElements"].extend(section["dataElements"])
+
+                # Mark this section for removal
+                sections_to_remove.add(section_id)
+            else:
+                prev_activity_ref = activity_ref
+                prev_section_id = section_id
+
+        # Remove sections that should be removed
+        for section_id in sections_to_remove:
+            if section_id in self.sections:
+                del self.sections[section_id]
+
+        # Update stage sections to remove deleted sections
+        for stage in program_stages_payload:
+            stage["programStageSections"][:] = [
+                s for s in stage["programStageSections"]
+                if s["id"] not in sections_to_remove
+            ]
+
+    def export(self, start_pages, version):
+        form_id = start_pages["main"].root.form_id or "dhis2_program"
+        base_path = os.path.join(self.output_path, form_id)
+        if not os.path.exists(base_path):
+            os.makedirs(base_path)
+
+        # Prepare collections for all entities
+        program_rules_payload = []
+        program_rule_actions_payload = []
+        program_stages_payload = []
+        program_rule_variables_payload = []
+
+        if self.program_metadata["programStages"]:
+            # Extract full stage definitions
+            program_stages_payload = [
+                {
+                    **stage,
+                    "program": {"id": self.program_metadata["id"]}
+                }
+                for stage in self.program_metadata["programStages"]
+            ]
+            # Clean sections before processing actions to ensure only valid sections are used
+            self.clean_section(program_stages_payload)
+            # In program, only keep stage ID references
+            self.program_metadata["programStages"] = [
+                {"id": stage["id"]}
+                for stage in program_stages_payload
+            ]
+        else:
+            program_stages_payload = []
+
+        if self.program_rule_actions:
+            # Resolve activity references to section IDs for HIDESECTION actions
+            program_rule_actions_payload = []
+            for action in self.program_rule_actions:
+                if action.get("activity_ref"):
+                    # Find all sections for this activity (after cleaning)
+                    activity = action["activity_ref"]
+                    matching_sections = [
+                        sec_id for sec_id, section in self.sections.items()
+                        if section.get("activity_ref") == activity
+                    ]
+
+                    # Create one action per matching section
+                    for i, section_id in enumerate(matching_sections):
+                        action_copy = dict(action)
+                        action_copy["programStageSection"] = {"id": section_id}
+                        del action_copy["activity_ref"]
+
+                        if i > 0:
+                            # For additional sections, create new IDs for action and corresponding rule
+                            original_rule_id = action["programRule"]["id"]
+                            new_rule_id = self.generate_id(f"{original_rule_id}_section_{i}")
+                            new_action_id = self.generate_id(f"{action['id']}_section_{i}")
+
+                            action_copy["id"] = new_action_id
+                            action_copy["programRule"] = {"id": new_rule_id}
+
+                            # Create duplicate rule with new ID
+                            original_rule = next(
+                                (r for r in self.program_rules if r["id"] == original_rule_id), None
+                            )
+                            if original_rule:
+                                new_rule = dict(original_rule)
+                                new_rule["id"] = new_rule_id
+                                new_rule["name"] = f"{original_rule['name']} (Section {i})"
+                                new_rule["programRuleActions"] = [{"id": new_action_id}]
+                                self.program_rules.append(new_rule)
+
+                        program_rule_actions_payload.append(action_copy)
+                else:
+                    # Non-activity actions (HIDEFIELD) can be added directly
+                    program_rule_actions_payload.append(action)
+
+        if self.program_rules:
+            program_rules_payload = [
+                {
+                    **rule,
+                    "program": {"id": self.program_metadata["id"]}
+                }
+                for rule in self.program_rules
+            ]
+
+        if self.program_rule_variables:
+            program_rule_variables_payload = self.program_rule_variables
+
+        # Build the program with references to other entities
+        program_payload = dict(self.program_metadata)
+        if program_rule_variables_payload:
+            program_payload["programRuleVariables"] = [
+                {"id": var["id"]}
+                for var in program_rule_variables_payload
+            ]
+        if program_rules_payload:
+            program_payload["programRules"] = [
+                {"id": rule["id"]}
+                for rule in program_rules_payload
+            ]
+
+        # Create single comprehensive payload with all entities at root level
+        full_payload = {
+            "programs": [program_payload]
+        }
+
+        if program_stages_payload:
+            full_payload["programStages"] = program_stages_payload
+        if program_rules_payload:
+            full_payload["programRules"] = program_rules_payload
+        if program_rule_actions_payload:
+            full_payload["programRuleActions"] = program_rule_actions_payload
+        if program_rule_variables_payload:
+            full_payload["programRuleVariables"] = program_rule_variables_payload
+        if self.data_elements:
+            full_payload["dataElements"] = list(self.data_elements.values())
+        if self.options:
+            full_payload["options"] = list(self.options.values())
+        if self.option_sets:
+            full_payload["optionSets"] = list(self.option_sets.values())
+        if self.sections:
+            # Remove activity_ref from sections before serialization
+            sections_payload = []
+            for section in self.sections.values():
+                section_copy = dict(section)
+                if "activity_ref" in section_copy:
+                    del section_copy["activity_ref"]
+                sections_payload.append(section_copy)
+            full_payload["programStageSections"] = sections_payload
+
+        # Export everything to a single file
+        metadata_file = os.path.join(base_path, f"{form_id}_metadata.json")
+        with open(metadata_file, 'w') as f:
+            json.dump(full_payload, f, indent=2)
+        logger.info(f"Exported complete DHIS2 metadata to {metadata_file}")
+
+    def get_tricc_operation_operand(self, r):
+        if isinstance(r, TriccOperation):
+            return self.get_tricc_operation_expression(r)
+        elif isinstance(r, TriccReference):
+            # Use DHIS2 ID from concept_map instead of name
+            node_id = self.concept_map.get(r.value.name, self.get_export_name(r.value))
+            return f"#{{{node_id}}}"
+        elif isinstance(r, TriccStatic):
+            if isinstance(r.value, bool):
+                return str(r.value).lower()
+            if isinstance(r.value, str):
+                return f"'{r.value}'"
+            else:
+                return str(r.value)
+        elif isinstance(r, bool):
+            return str(r).lower()
+        elif isinstance(r, str):
+            return f"{r}"
+        elif isinstance(r, (int, float)):
+            return str(r)
+        elif isinstance(r, TriccNodeSelectOption):
+            option = self.get_option_value(r.name)
+            if r.name in ('true', 'false'):
+                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}"
+        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))
+            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))
+            return f"#{{{node_id}}}"
+        else:
+            raise NotImplementedError(f"This type of node {r.__class__.__name__} is not supported within an operation")
+
+    def convert_expression_to_string(self, expression):
+        if isinstance(expression, TriccOperation):
+            return self.get_tricc_operation_expression(expression)
+        else:
+            return self.get_tricc_operation_operand(expression)
+
+    # Operation methods for DHIS2 expressions
+    def tricc_operation_equal(self, ref_expressions):
+        return f"{ref_expressions[0]} == {ref_expressions[1]}"
+
+    def tricc_operation_not_equal(self, ref_expressions):
+        return f"{ref_expressions[0]} != {ref_expressions[1]}"
+
+    def tricc_operation_and(self, ref_expressions):
+        if len(ref_expressions) == 1:
+            return ref_expressions[0]
+        if len(ref_expressions) > 1:
+            return " && ".join(ref_expressions)
+        else:
+            return "true"
+
+    def tricc_operation_or(self, ref_expressions):
+        if len(ref_expressions) == 1:
+            return ref_expressions[0]
+        if len(ref_expressions) > 1:
+            return "(" + " || ".join(ref_expressions) + ")"
+        else:
+            return "true"
+
+    def tricc_operation_not(self, ref_expressions):
+        return f"!({ref_expressions[0]})"
+
+    def tricc_operation_plus(self, ref_expressions):
+        return " + ".join(ref_expressions)
+
+    def tricc_operation_minus(self, ref_expressions):
+        if len(ref_expressions) > 1:
+            return " - ".join(map(str, ref_expressions))
+        elif len(ref_expressions) == 1:
+            return f"-{ref_expressions[0]}"
+
+    def tricc_operation_more(self, ref_expressions):
+        return f"{ref_expressions[0]} > {ref_expressions[1]}"
+
+    def tricc_operation_less(self, ref_expressions):
+        return f"{ref_expressions[0]} < {ref_expressions[1]}"
+
+    def tricc_operation_more_or_equal(self, ref_expressions):
+        return f"{ref_expressions[0]} >= {ref_expressions[1]}"
+
+    def tricc_operation_less_or_equal(self, ref_expressions):
+        return f"{ref_expressions[0]} <= {ref_expressions[1]}"
+
+    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]})"
+
+    def tricc_operation_count(self, ref_expressions):
+        return f"d2:count({ref_expressions[0]})"
+
+    def tricc_operation_multiplied(self, ref_expressions):
+        return "*".join(ref_expressions)
+
+    def tricc_operation_divided(self, ref_expressions):
+        return f"{ref_expressions[0]} / {ref_expressions[1]}"
+
+    def tricc_operation_modulo(self, ref_expressions):
+        return f"{ref_expressions[0]} % {ref_expressions[1]}"
+
+    def tricc_operation_coalesce(self, ref_expressions):
+        return f"d2:coalesce({','.join(ref_expressions)})"
+
+    def tricc_operation_native(self, ref_expressions):
+        if len(ref_expressions) > 0:
+            return f"{ref_expressions[0]}({','.join(ref_expressions[1:])})"
+
+    def tricc_operation_istrue(self, ref_expressions):
+        return f"{ref_expressions[0]} == true"
+
+    def tricc_operation_isfalse(self, ref_expressions):
+        return f"{ref_expressions[0]} == false"
+
+    def tricc_operation_parenthesis(self, ref_expressions):
+        return f"({ref_expressions[0]})"
+
+    def tricc_operation_between(self, ref_expressions):
+        return f"{ref_expressions[0]} >= {ref_expressions[1]} && {ref_expressions[0]} < {ref_expressions[2]}"
+
+    def tricc_operation_isnull(self, ref_expressions):
+        return f"!d2:hasValue({ref_expressions[0]})"
+
+    def tricc_operation_isnotnull(self, ref_expressions):
+        return f"d2:hasValue({ref_expressions[0]})"
+
+    def tricc_operation_isnottrue(self, ref_expressions):
+        return f"{ref_expressions[0]} != true"
+
+    def tricc_operation_isnotfalse(self, ref_expressions):
+        return f"{ref_expressions[0]} != false"
+
+    def tricc_operation_notexist(self, ref_expressions):
+        return f"!d2:hasValue({ref_expressions[0]})"
+
+    def tricc_operation_case(self, ref_expressions):
+        # Simplified case handling
+        parts = []
+        for i in range(0, len(ref_expressions), 2):
+            if i + 1 < len(ref_expressions):
+                parts.append(f"if({ref_expressions[i]}, {ref_expressions[i+1]})")
+        return " || ".join(parts)
+
+    def tricc_operation_ifs(self, ref_expressions):
+        return self.tricc_operation_case(ref_expressions[1:])
+
+    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"d2:contains({ref_expressions[0]}, {ref_expressions[1]})"
+
+    def tricc_operation_exists(self, ref_expressions):
+        parts = []
+        for ref in ref_expressions:
+            parts.append(f"d2:hasValue({ref})")
+        return " && ".join(parts)
+
+    def tricc_operation_cast_number(self, ref_expressions):
+        return f"d2:toNumber({ref_expressions[0]})"
+
+    def tricc_operation_cast_integer(self, ref_expressions):
+        return f"d2:toNumber({ref_expressions[0]})"
+
+    def tricc_operation_zscore(self, ref_expressions):
+        # Placeholder - would need specific implementation
+        return f"zscore({','.join(ref_expressions)})"
+
+    def tricc_operation_datetime_to_decimal(self, ref_expressions):
+        return f"d2:daysBetween({ref_expressions[0]}, '1970-01-01')"
+
+    def tricc_operation_round(self, ref_expressions):
+        return f"d2:round({ref_expressions[0]})"
+
+    def tricc_operation_izscore(self, ref_expressions):
+        return f"izscore({','.join(ref_expressions)})"
+
+    def tricc_operation_concatenate(self, ref_expressions):
+        return f"d2:concatenate({','.join(ref_expressions)})"

tricc_oo/strategies/output/openmrs_form.py

@@ -21,6 +21,7 @@ from tricc_oo.models.tricc import (
     TriccNodeSelectOption,
     TriccNodeInputModel,
     TriccNodeBaseModel,
+    TriccNodeSelect,
     TriccNodeDisplayModel,
 )
 
@@ -69,6 +70,9 @@ class OpenMRSStrategy(BaseOutPutStrategy):
         self.current_segment = None
         self.current_activity = None
         self.concept_map = {}
+        self.calculated_fields = []  # Store calculated fields to add to first section of each page
+        self.calculated_fields_added = set()  # Track which pages have had calculated fields added
+        self.inject_version()
 
     def get_export_name(self, r):
         if isinstance(r, TriccNodeSelectOption):
@@ -146,6 +150,9 @@ class OpenMRSStrategy(BaseOutPutStrategy):
         logger.info("generate the export format")
         self.process_export(self.project.start_pages, pages=self.project.pages)
 
+        logger.info("create calculation page")
+        self.create_calculation_page()
+
         logger.info("print the export")
         self.export(self.project.start_pages, version=version)
 
@@ -160,7 +167,7 @@ class OpenMRSStrategy(BaseOutPutStrategy):
             'select_multiple': 'multiCheckbox',
             'select_yesno': 'select',
             'not_available': 'checkbox',
-            'note': 'text'
+            'note': 'markdown'
         }
 
         # if issubclass(node.__class__, TriccNodeSelectYesNo):
@@ -250,7 +257,9 @@ class OpenMRSStrategy(BaseOutPutStrategy):
                         }
                     }
                 }
-                return question
+                # Collect calculated fields to add to first section of each page
+                self.calculated_fields.append(question)
+                return None  # Don't return the question, it will be added to first section
         return None
 
     def generate_calculate(self, node, processed_nodes, **kwargs):
@@ -400,6 +409,8 @@ class OpenMRSStrategy(BaseOutPutStrategy):
             return f"'{option}'"
         elif issubclass(r.__class__, TriccNodeInputModel):
             return self.get_export_name(r)
+        elif issubclass(r.__class__, TriccNodeSelect):
+            return "(" + self.get_export_name(r) + " ?? [])"       
         elif issubclass(r.__class__, TriccNodeBaseModel):
             return self.get_export_name(r)
         else:
@@ -447,7 +458,7 @@ class OpenMRSStrategy(BaseOutPutStrategy):
         return f"!({ref_expressions[0]})"
 
     def tricc_operation_plus(self, ref_expressions):
-        return " + ".join(ref_expressions)
+        return "(" + " + ".join(ref_expressions) +")" 
 
     def tricc_operation_minus(self, ref_expressions):
         if len(ref_expressions) > 1:
@@ -472,7 +483,7 @@ class OpenMRSStrategy(BaseOutPutStrategy):
         return f"({ref_expressions[0]}.includes({ref_expressions[1]}))"
 
     def tricc_operation_count(self, ref_expressions):
-        return f"({ref_expressions[0]}.length || 0)"
+        return f"{ref_expressions[0]}.length"
 
     def tricc_operation_multiplied(self, ref_expressions):
         return "*".join(ref_expressions)
@@ -638,6 +649,7 @@ class OpenMRSStrategy(BaseOutPutStrategy):
             "label": section_label,
             "questions": []
         })
+
         if group_node.relevance:
             relevance_str = self.convert_expression_to_string(not_clean(group_node.relevance))
             if relevance_str and relevance_str != 'false':
@@ -645,3 +657,38 @@ class OpenMRSStrategy(BaseOutPutStrategy):
                     "hideWhenExpression": f"{relevance_str}"
                 }
         logger.debug(f"Started section: {section_label}")
+
+    def create_calculation_page(self):
+        """Create a dedicated page for all calculated fields"""
+        if self.calculated_fields:
+            self.clean_sections()
+            self.clean_pages()
+            page = {
+                "label": "Calculations",
+                "sections": [
+                    {
+                        "label": "Calculations",
+                        "questions": self.calculated_fields
+                    }
+                ]
+            }
+            self.form_data["pages"].append(page)
+            logger.debug("Created calculation page")
+
+    def inject_version(self):
+        # Add hidden version field using version() function
+        question = {
+            "id": "version",
+            "type": "control",
+            "label": "",
+            "hide": {
+                "hideWhenExpression": "true"
+            },
+            "questionOptions": {
+                "calculate": {
+                    "calculateExpression": "version()"
+                }
+            }
+        }
+        # Collect calculated fields to add to first section of each page
+        self.calculated_fields.append(question)

tricc_oo/visitors/tricc.py

@@ -28,6 +28,7 @@ from tricc_oo.models.calculate import (
     TriccNodeActivityEnd,
     TriccNodeActivityStart,
     TriccNodeEnd,
+    TriccNodeDiagnosis,
     get_node_from_id,
 
 )
@@ -120,27 +121,13 @@ def get_last_version(name, processed_nodes, _list=None):
 # node is the node to calculate
 # processed_nodes are the list of processed nodes
 def get_node_expressions(node, processed_nodes, process=None):
-    get_overall_exp = issubclass(node.__class__, TriccNodeCalculateBase) and not issubclass(
-        node.__class__, (TriccNodeDisplayBridge, TriccNodeBridge)
-    )
+    get_overall_exp = issubclass(node.__class__, (TriccNodeDisplayCalculateBase, TriccNodeProposedDiagnosis, TriccNodeDiagnosis)) and not isinstance(node, (TriccNodeDisplayBridge))
     expression = None
     # in case of recursive call processed_nodes will be None
     if processed_nodes is None or is_ready_to_process(node, processed_nodes=processed_nodes):
         expression = get_node_expression(
             node, processed_nodes=processed_nodes, get_overall_exp=get_overall_exp, process=process
         )
-
-    # if get_overall_exp:
-    #     if expression  and (not isinstance(expression, str) or expression != '')
-    #           and  expression is not TriccStatic(True) :
-    #         num_expression = TriccOperation(
-    #             TriccOperator.CAST_NUMBER,
-    #             [expression]
-    #         )
-    #     elif expression is TriccStatic(True)  or (not expression and get_overall_exp):
-    #         expression = TriccStatic(True)
-    #     else:
-    #         expression = None
     if (
         issubclass(node.__class__, TriccNodeCalculateBase)
         and not isinstance(expression, (TriccStatic, TriccReference, TriccOperation))
@@ -1564,7 +1551,12 @@ def set_prev_next_node(source_node, target_node, replaced_node=None, edge_only=F
         set_next_node(source_node, target_node, replaced_node, edge_only)
 
     if activity and not any([(e.source == source_id) and (e.target == target_id) for e in activity.edges]):
-        label = "continue" if issubclass(source_node.__class__, TriccNodeSelect) else None
+        if issubclass(source_node.__class__, TriccNodeSelect):
+            label = "continue"
+        elif isinstance(source_node, TriccNodeRhombus):
+            label = "yes"
+        else:
+            label = None
         activity.edges.append(TriccEdge(id=generate_id(), source=source_id, target=target_id, value=label))
 
 
@@ -1848,6 +1840,16 @@ def get_node_expression(in_node, processed_nodes, get_overall_exp=False, is_prev
             logger.critical(f"Rhombus without expression {node.get_name()}")
     elif is_prev and issubclass(node.__class__, TriccNodeDisplayCalculateBase):
         expression = TriccOperation(TriccOperator.ISTRUE, [node])
+        prev_exp_overall = get_node_expression(
+            node,
+            processed_nodes=processed_nodes,
+            get_overall_exp=False,
+            is_prev=False,
+            process=process,
+            negate=negate
+        )
+        if prev_exp_overall in [TriccStatic(True), TriccStatic(False)]:
+            expression = prev_exp_overall
     elif hasattr(node, "expression_reference") and isinstance(node.expression_reference, TriccOperation):
         # if issubclass(node.__class__, TriccNodeDisplayCalculateBase):
         #     expression = TriccOperation(
@@ -2141,7 +2143,7 @@ def get_prev_node_expression(node, processed_nodes, get_overall_exp=False, exclu
                     processed_nodes=processed_nodes,
                     get_overall_exp=get_overall_exp,
                     is_prev=True,
-                    process=process,
+                    process=get_overall_exp,
                 )
                 if isinstance(node, TriccNodeActivity) or get_overall_exp:
                     add_sub_expression(act_expression_inputs, sub)
@@ -2150,11 +2152,12 @@ 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(
                     prev_node.activity,
                     processed_nodes=processed_nodes,
-                    get_overall_exp=True,
+                    get_overall_exp=get_overall_exp,
                     is_prev=True,
                     negate=False,
                     process=process,
@@ -2241,7 +2244,7 @@ def get_count_terms_details(prev_node, processed_nodes, get_overall_exp, negate=
                                     get_node_expression(
                                         prev_node,
                                         processed_nodes=processed_nodes,
-                                        get_overall_exp=True,
+                                        get_overall_exp=get_overall_exp,
                                         is_prev=True,
                                         process=process,
                                     )
@@ -2258,7 +2261,7 @@ def get_count_terms_details(prev_node, processed_nodes, get_overall_exp, negate=
                 TriccOperator.CAST_NUMBER,
                 [
                     get_node_expression(
-                        prev_node, processed_nodes=processed_nodes, get_overall_exp=True, is_prev=True, process=process
+                        prev_node, processed_nodes=processed_nodes, get_overall_exp=get_overall_exp, is_prev=True, process=process
                     )
                 ],
             )
@@ -2279,7 +2282,7 @@ def get_add_terms(node, processed_nodes, get_overall_exp=False, negate=False, pr
                         get_node_expression(
                             prev_node,
                             processed_nodes=processed_nodes,
-                            get_overall_exp=True,
+                            get_overall_exp=get_overall_exp,
                             is_prev=True,
                             process=process,
                         )
@@ -2352,7 +2355,11 @@ def get_rhombus_terms(node, processed_nodes, get_overall_exp=False, negate=False
                 TriccOperator.CAST_NUMBER,
                 [
                     get_node_expression(
-                        expression, processed_nodes=processed_nodes, get_overall_exp=True, is_prev=True, process=process
+                        expression,
+                        processed_nodes=processed_nodes,
+                        get_overall_exp=get_overall_exp,
+                        is_prev=True,
+                        process=process
                     )
                 ],
             )
@@ -2390,7 +2397,7 @@ def get_calculation_terms(node, processed_nodes, get_overall_exp=False, negate=F
         return get_count_terms(node, False, negate, process=process)
     elif isinstance(node, TriccNodeRhombus):
         return get_rhombus_terms(
-            node, processed_nodes=processed_nodes, get_overall_exp=False, negate=negate, process=process
+            node, processed_nodes=processed_nodes, get_overall_exp=get_overall_exp, negate=negate, process=process
         )
     elif isinstance(node, (TriccNodeWait)):
         # just use to force order of question
@@ -2407,7 +2414,6 @@ def get_calculation_terms(node, processed_nodes, get_overall_exp=False, negate=F
         )
     elif isinstance(node, (TriccNodeActivityStart, TriccNodeActivityEnd)):
         # the group have the relevance for the activity, not needed to replicate it
-        # return get_prev_node_expression(node.activity, processed_nodes, get_overall_exp=False, excluded_name=None)
         expression = None
     elif isinstance(node, TriccNodeExclusive):
         if len(node.prev_nodes) == 1:
@@ -2420,7 +2426,7 @@ def get_calculation_terms(node, processed_nodes, get_overall_exp=False, negate=F
                 return get_node_expression(
                     node_to_negate,
                     processed_nodes=processed_nodes,
-                    get_overall_exp=True,
+                    get_overall_exp=get_overall_exp,
                     is_prev=True,
                     negate=True,
                     process=process,
@@ -2429,7 +2435,7 @@ def get_calculation_terms(node, processed_nodes, get_overall_exp=False, negate=F
                 return get_node_expression(
                     node_to_negate,
                     processed_nodes=processed_nodes,
-                    get_overall_exp=True,
+                    get_overall_exp=get_overall_exp,
                     is_prev=True,
                     negate=True,
                     process=process,
@@ -2616,13 +2622,17 @@ def generate_base(node, processed_nodes, **kwargs):
                         node.min = float(node.min)
                         if int(node.min) == node.min:
                             node.min = int(node.min)
-                        constraints.append(TriccOperation(TriccOperator.MORE_OR_EQUAL, ["$this", TriccStatic(node.min)]))
+                        constraints.append(
+                            TriccOperation(TriccOperator.MORE_OR_EQUAL, ["$this", TriccStatic(node.min)])
+                        )
                         constraints_min = "The minimun value is {0}.".format(node.min)
                     if node.max is not None and node.max != "":
                         node.max = float(node.max)
                         if int(node.max) == node.max:
                             node.max = int(node.max)
-                        constraints.append(TriccOperation(TriccOperator.LESS_OR_EQUAL, ["$this", TriccStatic(node.max)]))
+                        constraints.append(
+                            TriccOperation(TriccOperator.LESS_OR_EQUAL, ["$this", TriccStatic(node.max)])
+                        )
                         constraints_max = "The maximum value is {0}.".format(node.max)
                     if len(constraints) > 1:
                         node.constraint = TriccOperation(TriccOperator.AND, constraints)

{tricc_oo-1.5.28.dist-info → tricc_oo-1.6.0.dist-info}/METADATA

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

@@ -1,4 +1,4 @@
-tests/build.py,sha256=rAYR6cSsNtQLH5vvrh_FNSBwWh_AynF3jG28jC-tiGs,6670
+tests/build.py,sha256=Qbxvjkj_Wk2nQ-WjaMGiE1FIe3SRmJMRIgeoMoxqlfQ,6748
 tests/test_cql.py,sha256=dAsLMqVaS6qxnq62fg5KqTFu6UG6pHO6Ab3NZ1c9T3Y,5248
 tests/to_ocl.py,sha256=4e-i65K3UM6wHgdVcrZcM9AyL1bahIsXJiZTXhhHgQk,2048
 tricc_oo/__init__.py,sha256=oWCE1ubmC_6iqaWOMgTei4eXVQgV202Ia-tXS1NnW_4,139
@@ -7,15 +7,15 @@ tricc_oo/converters/codesystem_to_ocl.py,sha256=Fh7Vk73OsxljZKu1k6H9uzYwz334tpQT
 tricc_oo/converters/cql_to_operation.py,sha256=PUyV_YpUY98Ox0H_F_CN3UUf_I-BhFZVOcWWKTtwecM,14492
 tricc_oo/converters/datadictionnary.py,sha256=T2HLCBo4Am1p0kFqSH1r0PqbD8AC2IGuWkbvMvSCru0,3658
 tricc_oo/converters/drawio_type_map.py,sha256=UCPiGs7Lw0bigKScmZUnmOhACBz-FiDq92jHkI7RTSQ,9113
-tricc_oo/converters/tricc_to_xls_form.py,sha256=C7oDi1_IA0FLjoK700G9bABQZrGEqJltvBD2rGVjkIA,3494
+tricc_oo/converters/tricc_to_xls_form.py,sha256=HZh0tQoKfRMPshJvEBwCOGqYGA1ZJLJ67bwV79qtlwk,3486
 tricc_oo/converters/utils.py,sha256=JZrtrvvOfXwdkw49pKauzinOcauWwsy-CVcw36TjyLo,1684
-tricc_oo/converters/xml_to_tricc.py,sha256=cDoLTwIMHIqyyNqZGwQte9YdX4y5j1Ac6r7M-zuKWZc,39403
+tricc_oo/converters/xml_to_tricc.py,sha256=YltAT2wo6bPDMLRuKitqStjWW_OmSJhMpAwv2IAscfs,39544
 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
 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=4mkAYAfvtdnTiLpUrttqQgIgfw1q_GkEgbVDKP8Txno,25849
+tricc_oo/models/base.py,sha256=AaeB69vWg3ulBttoezEniUiU8HWh_pvrw7tCHpL27g4,25926
 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
@@ -31,20 +31,21 @@ 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=M9UFR67-_CFoW681bPAeBS1OUGuFtmUbM_rltACI0hk,8798
+tricc_oo/strategies/output/dhis2_form.py,sha256=m23EeZB7uXkNCFJr9hNGevgsA1dQqBrtX5uoy_22QRI,36500
 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=t2I2IKl98dbfTsJrJ4hnQbG8_qROpZmKtyE2M1hnyD4,27192
+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=26pEea0I_owpsz9S8hoHJNzChA5b2Th8KPRIeTEMfqo,29323
 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_hf.py,sha256=xm6SKirV3nMZvM2w54_zJcXAeAgAkq-EEqGEjnOWv6c,988
 tricc_oo/visitors/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-tricc_oo/visitors/tricc.py,sha256=vmOQRocfzjr-MvLNflNxV51w0vhRO53fX8tTIqjNyOU,107437
+tricc_oo/visitors/tricc.py,sha256=cgmiT26pgkmmocqi7vVMtyo9WyvYyR1nMg-cPjmUawQ,107724
 tricc_oo/visitors/utils.py,sha256=j83aAq5s5atXi3OC0jc_uJd54a8XrHHmizeeEbWZQJg,421
 tricc_oo/visitors/xform_pd.py,sha256=ryAnI3V9x3eTmJ2LNsUZfvl0_yfCqo6oBgeSu-WPqaE,9613
-tricc_oo-1.5.28.dist-info/licenses/LICENSE,sha256=Pz2eACSxkhsGfW9_iN60pgy-enjnbGTj8df8O3ebnQQ,16726
-tricc_oo-1.5.28.dist-info/METADATA,sha256=bQmU_Wmm8ki1FHnl51N3l_5uBDUmWJxHo_paTGkYBks,8577
-tricc_oo-1.5.28.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
-tricc_oo-1.5.28.dist-info/top_level.txt,sha256=NvbfMNAiy9m4b1unBsqpeOQWh4IgA1Xa33BtKA4abxk,15
-tricc_oo-1.5.28.dist-info/RECORD,,
+tricc_oo-1.6.0.dist-info/licenses/LICENSE,sha256=Pz2eACSxkhsGfW9_iN60pgy-enjnbGTj8df8O3ebnQQ,16726
+tricc_oo-1.6.0.dist-info/METADATA,sha256=xhuGPgAE0OqK6f_UXRhxWsV2E5PZupPkLQ7QJzGD18k,8576
+tricc_oo-1.6.0.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
+tricc_oo-1.6.0.dist-info/top_level.txt,sha256=NvbfMNAiy9m4b1unBsqpeOQWh4IgA1Xa33BtKA4abxk,15
+tricc_oo-1.6.0.dist-info/RECORD,,