tricc-oo 1.5.24__py3-none-any.whl → 1.5.25__py3-none-any.whl

tests/build.py

@@ -1,20 +1,17 @@
-from tricc_oo.strategies.output.spice import SpiceStrategy
-from tricc_oo.strategies.output.xlsform_cht_hf import XLSFormCHTHFStrategy
-from tricc_oo.strategies.output.xlsform_cht import XLSFormCHTStrategy
-from tricc_oo.strategies.output.xlsform_cdss import XLSFormCDSSStrategy
-from tricc_oo.strategies.output.xls_form import XLSFormStrategy
-from tricc_oo.strategies.output.openmrs_form import OpenMRSStrategy
-from tricc_oo.strategies.output.fhir_form import FHIRStrategy
-from tricc_oo.strategies.output.html_form import HTMLStrategy
-
-from tricc_oo.strategies.input.drawio import DrawioStrategy
+from tricc_oo.strategies.output.spice import SpiceStrategy  # noqa: F401
+from tricc_oo.strategies.output.xlsform_cht_hf import XLSFormCHTHFStrategy  # noqa: F401
+from tricc_oo.strategies.output.xlsform_cht import XLSFormCHTStrategy  # noqa: F401
+from tricc_oo.strategies.output.xlsform_cdss import XLSFormCDSSStrategy  # noqa: F401
+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.input.drawio import DrawioStrategy  # noqa: F401
 import getopt
-import gettext
 import logging
 import os
 import sys
 import gc
-import shutil
 from pathlib import Path
 
 # set up logging to file
@@ -43,15 +40,15 @@ def setup_logger(
     level=logging.INFO,
     formatting="[%(asctime)s] {%(pathname)s:%(lineno)d} %(levelname)s - %(message)s",
 ):
-    l = logging.getLogger(logger_name)
+    logger = logging.getLogger(logger_name)
     formatter = logging.Formatter(formatting)
     file_handler = logging.FileHandler(log_file, mode="w+")
     file_handler.setFormatter(formatter)
     stream_handler = logging.StreamHandler()
     stream_handler.setFormatter(formatter)
 
-    l.setLevel(level)
-    l.addHandler(file_handler)
+    logger.setLevel(level)
+    logger.addHandler(file_handler)
 
 
 class ColorFormatter(logging.Formatter):

tests/test_cql.py

@@ -53,9 +53,9 @@ class TestCql(unittest.TestCase):
 
     def test_case(self):
         case_cql = """
-        case AgeInMonths() 
-        when 0 then 'newborn' 
-        when 1 then 'newborn' 
+        case AgeInMonths()
+        when 0 then 'newborn'
+        when 1 then 'newborn'
         else 'child' end
         """
         case_operation = transform_cql_to_operation(case_cql)
@@ -72,7 +72,7 @@ class TestCql(unittest.TestCase):
 
     def test_ifs(self):
         case_cql = """
-        case 
+        case
         when AgeInMonths() <= 2 then true
         when AgeInYears() > 5 then true
         else false end

tricc_oo/converters/tricc_to_xls_form.py

@@ -1,8 +1,9 @@
 import logging
-from tricc_oo.converters.utils import clean_name
-from tricc_oo.models.tricc import TriccNodeSelectOption
+from tricc_oo.converters.utils import clean_name, clean_str
+from tricc_oo.models.tricc import TriccNodeSelectOption, TRICC_TRUE_VALUE, TRICC_FALSE_VALUE
 from tricc_oo.models.calculate import TriccNodeInput
-from tricc_oo.models.base import TriccNodeBaseModel
+from tricc_oo.models.base import TriccNodeBaseModel, TriccStatic, TriccReference
+
 # from babel import _
 
 # TRICC_SELECT_MULTIPLE_CALC_EXPRESSION = "count-selected(${{{0}}}) - number(selected(${{{0}}},'opt_none'))"
@@ -18,6 +19,10 @@ TRICC_NEGATE = "not({})"
 # TRICC_AND_EXPRESSION = '{0} and {1}'
 VERSION_SEPARATOR = "_Vv_"
 INSTANCE_SEPARATOR = "_Ii_"
+BOOLEAN_MAP = {
+    str(TRICC_TRUE_VALUE): 1,
+    str(TRICC_FALSE_VALUE): 0,
+}
 
 
 logger = logging.getLogger("default")
@@ -26,9 +31,36 @@ logger = logging.getLogger("default")
 
 
 def get_export_name(node, replace_dots=True):
-    if isinstance(node, str):
-        return clean_name(node, replace_dots=replace_dots)
-    if node.export_name is None:
+    if hasattr(node, 'export_name') and node.export_name is not None:
+        return node.export_name
+    elif isinstance(node, bool):
+        return BOOLEAN_MAP[str(TRICC_TRUE_VALUE)] if node else BOOLEAN_MAP[str(TRICC_FALSE_VALUE)]
+    elif isinstance(node, TriccReference):
+        logger.warning(f"Reference {node.value} use in export, bad serialiuation probable")
+        return str(node.value)
+    elif isinstance(node, (str, TriccStatic, TriccNodeSelectOption)):
+        if isinstance(node, TriccNodeSelectOption):
+            value = node.name
+        elif isinstance(node, TriccStatic):
+            value = node.value
+        else:
+            value = node
+        if isinstance(value, bool):  # or r.value in ('true', 'false')
+            export_name = BOOLEAN_MAP[str(TRICC_TRUE_VALUE)] if value else BOOLEAN_MAP[str(TRICC_FALSE_VALUE)]
+        elif value == TRICC_TRUE_VALUE:
+            export_name = BOOLEAN_MAP[str(TRICC_TRUE_VALUE)]
+        elif value == TRICC_FALSE_VALUE:
+            export_name = BOOLEAN_MAP[str(TRICC_FALSE_VALUE)]
+        elif isinstance(value, str):
+            export_name = f"'{clean_str(value, replace_dots=replace_dots)}'"
+        else:
+            export_name = str(value)
+        if hasattr(node, 'export_name'):
+            node.export_name = export_name
+        return export_name
+    elif not hasattr(node, 'export_name'):
+        return node
+    else:
         node.gen_name()
         if isinstance(node, TriccNodeSelectOption):
             node.export_name = node.name
@@ -41,8 +73,7 @@ def get_export_name(node, replace_dots=True):
             node.export_name = clean_name("load." + node.name, replace_dots=replace_dots)
         else:
             node.export_name = clean_name(node.name, replace_dots=replace_dots)
-
-    return node.export_name
+        return node.export_name
 
 
 def get_list_names(list):

tricc_oo/converters/utils.py

@@ -23,7 +23,7 @@ def clean_str(name, replace_dots=False):
 
 def clean_name(name, prefix="", replace_dots=False):
     name = clean_str(name, replace_dots)
-    if name[0].isdigit():
+    if name and name[0].isdigit():
         name = "id_" + name
     elif name[0].isdigit() == "_":
         name = name[1:]

tricc_oo/models/tricc.py

@@ -15,6 +15,8 @@ import logging
 
 
 logger = logging.getLogger(__name__)
+TRICC_TRUE_VALUE = "true"
+TRICC_FALSE_VALUE = "false"
 
 
 class TriccNodeCalculateBase(TriccNodeBaseModel):

tricc_oo/serializers/xls_form.py

@@ -3,7 +3,7 @@ import hashlib
 
 # from bs4 import BeautifulSoup
 from tricc_oo.converters.tricc_to_xls_form import (
-    get_export_name,
+    get_export_name, BOOLEAN_MAP
 )
 from tricc_oo.models.lang import SingletonLangClass
 from tricc_oo.converters.utils import clean_name, remove_html
@@ -13,7 +13,6 @@ from tricc_oo.models.base import (
 )
 from tricc_oo.models.calculate import (
     TriccNodeDisplayCalculateBase,
-
 )
 from tricc_oo.models.tricc import (
     TriccNodeActivity, TriccNodeBaseModel, TriccNodeSelectMultiple, TriccNodeSelectOption,
@@ -29,8 +28,6 @@ from tricc_oo.visitors.tricc import (
     is_ready_to_process,
     process_reference,
     add_calculate,
-    TRICC_TRUE_VALUE,
-    TRICC_FALSE_VALUE,
     get_applicability_expression,
     get_prev_instance_skip_expression,
     get_process_skip_expression,
@@ -41,11 +38,6 @@ logger = logging.getLogger("default")
 langs = SingletonLangClass()
 TRICC_CALC_EXPRESSION = "${{{0}}}>0"
 
-BOOLEAN_MAP = {
-    str(TRICC_TRUE_VALUE): 1,
-    str(TRICC_FALSE_VALUE): 0,
-}
-
 
 def start_group(
     strategy,

tricc_oo/strategies/output/openmrs_form.py

@@ -22,8 +22,7 @@ from tricc_oo.models.tricc import (
     TriccNodeInputModel,
     TriccNodeBaseModel,
     TriccNodeDisplayModel,
-    TriccNodeSelectYesNo
-    )
+)
 
 from tricc_oo.models.calculate import TriccNodeDisplayCalculateBase, TriccNodeDiagnosis
 from tricc_oo.models.ordered_set import OrderedSet
@@ -36,6 +35,7 @@ UUID_NAMESPACE = uuid.UUID('12345678-1234-5678-9abc-def012345678')
 CIEL_YES = "1065AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA"
 CIEL_NO = "1066AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA"
 
+
 class OpenMRSStrategy(BaseOutPutStrategy):
     processes = ["main"]
     project = None
@@ -193,8 +193,8 @@ class OpenMRSStrategy(BaseOutPutStrategy):
             if node.hint:
                 question["questionInfo"] = node.hint
             if node.tricc_type in ['select_one', 'select_multiple']:
-                labelTrue = None
-                labelFalse = None
+                # labelTrue = None
+                # labelFalse = None
                 # Add answers if options
                 if hasattr(node, 'options'):
                     answers = []
@@ -204,10 +204,10 @@ class OpenMRSStrategy(BaseOutPutStrategy):
                         concept_val = self.get_option_value(opt.name)
                         if concept_val == TriccStatic(False):
                             concept_val = CIEL_NO
-                            labelFalse = display
+                            # labelFalse = display
                         if concept_val == TriccStatic(True):
                             concept_val = CIEL_YES
-                            labelTrue = display
+                            # labelTrue = display
                         answers.append({
                             "label": display,
                             "concept": concept_val,
@@ -241,7 +241,7 @@ class OpenMRSStrategy(BaseOutPutStrategy):
                     "id": self.get_export_name(node),
                     "type": "obs" if isinstance(node, TriccNodeDiagnosis) else "control",
                     "label": getattr(node, 'label', '').replace('\u00a0', ' ').strip(),
-                    "hide":{
+                    "hide": {
                         "hideWhenExpression": "true"
                     },
                     "questionOptions": {
@@ -414,16 +414,16 @@ class OpenMRSStrategy(BaseOutPutStrategy):
 
     # Operation methods similar, but for string expressions
     def tricc_operation_equal(self, ref_expressions):
-        if ref_expressions[1] == TriccStatic(True) or ref_expressions[1] == True or ref_expressions[1] == 'true':
+        if ref_expressions[1] == TriccStatic(True) or ref_expressions[1] is True or ref_expressions[1] == 'true':
             return f"{self._boolean(ref_expressions, '===', CIEL_YES, 'true')}"
-        elif ref_expressions[1] == TriccStatic(False) or ref_expressions[1] == False or ref_expressions[1] == 'false':
+        elif ref_expressions[1] == TriccStatic(False) or ref_expressions[1] is False or ref_expressions[1] == 'false':
             return f"{self._boolean(ref_expressions, '===', CIEL_NO, 'false')}"
         return f"{ref_expressions[0]} === {ref_expressions[1]}"
 
     def tricc_operation_not_equal(self, ref_expressions):
-        if ref_expressions[1] == TriccStatic(True) or ref_expressions[1] == True or ref_expressions[1] == 'true':
+        if ref_expressions[1] == TriccStatic(True) or ref_expressions[1] is True or ref_expressions[1] == 'true':
             return f"!{self._boolean(ref_expressions, '===', CIEL_YES, 'true')}"
-        elif ref_expressions[1] == TriccStatic(False) or ref_expressions[1] == False or ref_expressions[1] == 'false':
+        elif ref_expressions[1] == TriccStatic(False) or ref_expressions[1] is False or ref_expressions[1] == 'false':
             return f"!{self._boolean(ref_expressions, '===', CIEL_NO, 'false')}"
         return f"{ref_expressions[0]} !== {ref_expressions[1]}"
 
@@ -494,11 +494,11 @@ class OpenMRSStrategy(BaseOutPutStrategy):
             return f"{ref_expressions[0]}({','.join(ref_expressions[1:])})"
 
     def tricc_operation_istrue(self, ref_expressions):
-        #return f"{ref_expressions[0]} === true"
+        # return f"{ref_expressions[0]} === true"
         return f"{self._boolean(ref_expressions, '===', CIEL_YES, 'true')}"
 
     def tricc_operation_isfalse(self, ref_expressions):
-        #return f"{ref_expressions[0]} === false"
+        # return f"{ref_expressions[0]} === false"
         return f"{self._boolean(ref_expressions, '===', CIEL_NO, 'false')}"
 
     def tricc_operation_parenthesis(self, ref_expressions):
@@ -514,11 +514,11 @@ class OpenMRSStrategy(BaseOutPutStrategy):
         return f"!isEmpty{ref_expressions[0]})"
 
     def tricc_operation_isnottrue(self, ref_expressions):
-        #return f"{ref_expressions[0]} !== true"
+        # return f"{ref_expressions[0]} !== true"
         return f"!{self._boolean(ref_expressions, '===', CIEL_YES, 'true')}"
 
     def tricc_operation_isnotfalse(self, ref_expressions):
-        #return f"{ref_expressions[0]} !== false"
+        # return f"{ref_expressions[0]} !== false"
         return f"!{self._boolean(ref_expressions, '===', CIEL_NO, 'false')}"
 
     def _boolean(self, ref_expressions, operator, answer_uuid, bool_val='false'):

tricc_oo/strategies/output/xls_form.py

@@ -25,9 +25,11 @@ from tricc_oo.models.tricc import (
     TriccNodeBaseModel,
     TriccNodeSelectOption,
     TriccNodeInputModel,
-    TriccNodeDisplayModel
+    TriccNodeDisplayModel,
+    TRICC_FALSE_VALUE,
+    TRICC_TRUE_VALUE,
 )
-from tricc_oo.converters.tricc_to_xls_form import get_export_name
+from tricc_oo.converters.tricc_to_xls_form import get_export_name, BOOLEAN_MAP
 
 from tricc_oo.models.lang import SingletonLangClass
 
@@ -37,8 +39,6 @@ from tricc_oo.visitors.tricc import (
     is_ready_to_process,
     process_reference,
     get_node_expressions,
-    TRICC_TRUE_VALUE,
-    TRICC_FALSE_VALUE,
     set_last_version_false,
     generate_calculate,
     generate_base,
@@ -49,7 +49,6 @@ from tricc_oo.serializers.xls_form import (
     end_group,
     generate_xls_form_export,
     start_group,
-    BOOLEAN_MAP,
 )
 from tricc_oo.strategies.output.base_output_strategy import BaseOutPutStrategy
 
@@ -722,23 +721,21 @@ class XLSFormStrategy(BaseOutPutStrategy):
             logger.warning(f"reference `{r.value}` still used in a calculate")
             return f"${{{get_export_name(r.value)}}}"
         elif isinstance(r, TriccStatic):
-            if isinstance(r.value, bool):  # or r.value in ('true', 'false')
-                return BOOLEAN_MAP[str(TRICC_TRUE_VALUE)] if r.value else BOOLEAN_MAP[str(TRICC_FALSE_VALUE)]
-            if r.value == TRICC_TRUE_VALUE:
+            return get_export_name(r)
+        elif isinstance(r, str):
+            if r == TRICC_TRUE_VALUE:
                 return BOOLEAN_MAP[str(TRICC_TRUE_VALUE)]
-            if r.value == TRICC_FALSE_VALUE:
+            elif r == TRICC_FALSE_VALUE:
                 return BOOLEAN_MAP[str(TRICC_FALSE_VALUE)]
-            if isinstance(r.value, str):
-                return f"'{r.value}'"
+            elif isinstance(r, str):
+                return f"'{r}'"
             else:
-                return str(r.value)
-        elif isinstance(r, str):
-            return f"{r}"
+                return str(r)
         elif isinstance(r, (int, float)):
             return str(r)
         elif isinstance(r, TriccNodeSelectOption):
-            logger.warning(f"select option {r.get_name()} from {r.select.get_name()} was used as a reference")
-            return f"'{r.name}'"
+            logger.debug(f"select option {r.get_name()} from {r.select.get_name()} was used as a reference")
+            return get_export_name(r)
         elif issubclass(r.__class__, TriccNodeInputModel):
             return f"coalesce(${{{get_export_name(r)}}},{coalesce_fallback})"
         elif issubclass(r.__class__, TriccNodeBaseModel):

tricc_oo/strategies/output/xlsform_cht.py

@@ -33,7 +33,6 @@ class XLSFormCHTStrategy(XLSFormCDSSStrategy):
 
         self.inject_version()
 
-
     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

@@ -44,6 +44,8 @@ from tricc_oo.models.tricc import (
     TriccNodeDisplayModel,
     TriccNodeMainStart,
     TriccNodeAcceptDiagnostic,
+    TRICC_FALSE_VALUE,
+    TRICC_TRUE_VALUE,
 )
 from tricc_oo.visitors.utils import PROCESSES
 from tricc_oo.converters.cql_to_operation import transform_cql_to_operation
@@ -53,9 +55,6 @@ from tricc_oo.converters.tricc_to_xls_form import get_list_names, get_export_nam
 logger = logging.getLogger("default")
 ONE_QUESTION_AT_A_TIME = False
 
-TRICC_TRUE_VALUE = "true"
-TRICC_FALSE_VALUE = "false"
-
 
 def merge_node(from_node, to_node):
     if from_node.activity != to_node.activity:

{tricc_oo-1.5.24.dist-info → tricc_oo-1.5.25.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: tricc-oo
-Version: 1.5.24
+Version: 1.5.25
 Summary: Python library that converts CDSS L2 in L3
 Project-URL: Homepage, https://github.com/SwissTPH/tricc
 Project-URL: Issues, https://github.com/SwissTPH/tricc/issues

{tricc_oo-1.5.24.dist-info → tricc_oo-1.5.25.dist-info}/RECORD

@@ -1,5 +1,5 @@
-tests/build.py,sha256=hyfl88bkNdqSqp9U5TKm6jpH6YdKMrCAB29Yr8ZONVk,6559
-tests/test_cql.py,sha256=R6rLrkw4587vvR38XwI3XnuTTYI1ft1XNmBPCxyOif4,5252
+tests/build.py,sha256=rAYR6cSsNtQLH5vvrh_FNSBwWh_AynF3jG28jC-tiGs,6670
+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
 tricc_oo/converters/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
@@ -7,8 +7,8 @@ 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=NwBOBy_tuEWd6d0ig9XzIm84dGDmRj-bATPB_D7HcHQ,1999
-tricc_oo/converters/utils.py,sha256=Lc9oOgkuiAHA95rb9s-RCbguhPfkinNcsuwQ1cxKvSc,1675
+tricc_oo/converters/tricc_to_xls_form.py,sha256=Aor4Tfnz_Q-qUM9QVR2gzQln0zRoMfD1eHK7YkO-a9Y,3438
+tricc_oo/converters/utils.py,sha256=JZrtrvvOfXwdkw49pKauzinOcauWwsy-CVcw36TjyLo,1684
 tricc_oo/converters/xml_to_tricc.py,sha256=cDoLTwIMHIqyyNqZGwQte9YdX4y5j1Ac6r7M-zuKWZc,39403
 tricc_oo/converters/cql/cqlLexer.py,sha256=8HArbRphcrpnAG4uogJ2rHv4tc1WLzjN0B1uFeYILAc,49141
 tricc_oo/converters/cql/cqlListener.py,sha256=fA7-8DcS2Q69ckwjdg57-OfFHBxjTZFdoSKrtw7Hffc,57538
@@ -20,12 +20,12 @@ tricc_oo/models/calculate.py,sha256=uNP0IDUqPQcJq9Co05H8eX5wbR_DikSxuOHxfVE5Dxg,
 tricc_oo/models/lang.py,sha256=ZMRwdoPWe01wEDhOM0uRk-6rt3BkoAAZM8mZ61--s3A,2265
 tricc_oo/models/ocl.py,sha256=MybSeB6fgCOUVJ4aektff0vrrTZsyfwZ2Gt_pPBu_FY,8728
 tricc_oo/models/ordered_set.py,sha256=BpXLW8plRAy4te25PIUPvVXPnLPcypvKg3iNPhtPulA,3833
-tricc_oo/models/tricc.py,sha256=R7MtjoTJXc3gtL4sZmFdobcxaWfh4pdVyP_2g-3uMPs,17421
+tricc_oo/models/tricc.py,sha256=lQ1xguJjhbRQ8wFt2rwefw_756aq_y4rWxf8Gj9zhas,17475
 tricc_oo/parsers/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 tricc_oo/parsers/xml.py,sha256=uzkb1y18MHfqVFmZqVh0sKT4cx6u0-NcAT_lV_gHBt8,4208
 tricc_oo/serializers/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 tricc_oo/serializers/planuml.py,sha256=t57587-6L3aDncpHh58lS77Zft8yxDE9DPtXx2BeUSU,132
-tricc_oo/serializers/xls_form.py,sha256=iPF-Is8EAGkgwi-I_1Opxr59KM1mhw0kihO9b2KY3U4,21750
+tricc_oo/serializers/xls_form.py,sha256=9nUcdT2YVzJ2Hu7WLNmphxpXg3GU-yvY6j4ua3i_FCo,21636
 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
@@ -33,18 +33,18 @@ tricc_oo/strategies/input/drawio.py,sha256=uXAUPhXOeg0Uk_BNqlCqFBW4cWNox4VfH559b
 tricc_oo/strategies/output/base_output_strategy.py,sha256=M9UFR67-_CFoW681bPAeBS1OUGuFtmUbM_rltACI0hk,8798
 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=I0K6hc-ffodnSPJQa3Dr6FbsRVlJw6EfbHge8GawC5U,27190
+tricc_oo/strategies/output/openmrs_form.py,sha256=aiHUi_lDm48yaKqZGWyFMVPIj6OhQGcAADFDoYJteW0,27175
 tricc_oo/strategies/output/spice.py,sha256=QMeoismVC3PdbvwTK0PtUjWX9jl9780fbQIXn76fMXw,10761
-tricc_oo/strategies/output/xls_form.py,sha256=ofEg6oZlhEytfdLRRWqQKCaewDIKedZ-uVpQl9OiyYw,29787
+tricc_oo/strategies/output/xls_form.py,sha256=sq0IXYtUgkUvzQtjXLfWoqOhsyRrFdGu3r8GCKaNr14,29586
 tricc_oo/strategies/output/xlsform_cdss.py,sha256=X00Lt5MzV8TX14dR4dFI1MqllI5S1e13bKbeysWM9uA,17435
-tricc_oo/strategies/output/xlsform_cht.py,sha256=jXrgUxs8aKiEE3o7ujABcFqPs12AHrG6HAtOsaNoXgA,22966
+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=Ndg5tnOH3JXYDSlxJwa2FgPVnPeJE4YWmOOFW-FcULQ,107105
+tricc_oo/visitors/tricc.py,sha256=RtE1oY6pWBasOmx_njexBg4qlHwPZd08QR45St5fPW0,107095
 tricc_oo/visitors/utils.py,sha256=j83aAq5s5atXi3OC0jc_uJd54a8XrHHmizeeEbWZQJg,421
 tricc_oo/visitors/xform_pd.py,sha256=ryAnI3V9x3eTmJ2LNsUZfvl0_yfCqo6oBgeSu-WPqaE,9613
-tricc_oo-1.5.24.dist-info/licenses/LICENSE,sha256=Pz2eACSxkhsGfW9_iN60pgy-enjnbGTj8df8O3ebnQQ,16726
-tricc_oo-1.5.24.dist-info/METADATA,sha256=PWTak1ccZ0K_e4CZUOUgw51JHJ8gMQmr7cKiOwhqAys,8577
-tricc_oo-1.5.24.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
-tricc_oo-1.5.24.dist-info/top_level.txt,sha256=NvbfMNAiy9m4b1unBsqpeOQWh4IgA1Xa33BtKA4abxk,15
-tricc_oo-1.5.24.dist-info/RECORD,,
+tricc_oo-1.5.25.dist-info/licenses/LICENSE,sha256=Pz2eACSxkhsGfW9_iN60pgy-enjnbGTj8df8O3ebnQQ,16726
+tricc_oo-1.5.25.dist-info/METADATA,sha256=JLxo_H_NO_4ldytDF35wcSW-Jq8w3ahiWnaxEPJzFDk,8577
+tricc_oo-1.5.25.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
+tricc_oo-1.5.25.dist-info/top_level.txt,sha256=NvbfMNAiy9m4b1unBsqpeOQWh4IgA1Xa33BtKA4abxk,15
+tricc_oo-1.5.25.dist-info/RECORD,,