tricc-oo 1.5.26__tar.gz → 1.5.28__tar.gz

{tricc_oo-1.5.26/tricc_oo.egg-info → tricc_oo-1.5.28}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: tricc-oo
-Version: 1.5.26
+Version: 1.5.28
 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.26 → tricc_oo-1.5.28}/pyproject.toml

@@ -4,7 +4,7 @@ build-backend = "setuptools.build_meta"
 
 [project]
 name = "tricc-oo"
-version = "1.5.26"
+version = "1.5.28"
 description = "Python library that converts CDSS L2 in L3"
 readme = "README.md"
 requires-python = ">=3.8"

{tricc_oo-1.5.26 → tricc_oo-1.5.28}/tricc_oo/converters/tricc_to_xls_form.py

@@ -51,10 +51,12 @@ def get_export_name(node, replace_dots=True):
             export_name = BOOLEAN_MAP[str(TRICC_TRUE_VALUE)]
         elif value == TRICC_FALSE_VALUE:
             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)}'"
         else:
-            export_name = str(value)
+            export_name = value
         if hasattr(node, 'export_name'):
             node.export_name = export_name
         return export_name

{tricc_oo-1.5.26 → tricc_oo-1.5.28}/tricc_oo/serializers/xls_form.py

@@ -376,7 +376,7 @@ def get_attr_if_exists(strategy, node, column, map_array):
 
             elif isinstance(value, (TriccOperation, TriccStatic, TriccReference)):
                 expression = strategy.get_tricc_operation_expression(value)
-                return expression.replace("$this", ".") if isinstance(expression, str) else expression
+                return expression
             elif value is not None:
                 return str(value) if not isinstance(value, dict) else value
             else:

{tricc_oo-1.5.26 → tricc_oo-1.5.28}/tricc_oo/strategies/output/openmrs_form.py

@@ -439,7 +439,7 @@ class OpenMRSStrategy(BaseOutPutStrategy):
         if len(ref_expressions) == 1:
             return ref_expressions[0]
         if len(ref_expressions) > 1:
-            return " || ".join(ref_expressions)
+            return "(" + " || ".join(ref_expressions) + ")"
         else:
             return "true"
 
@@ -472,7 +472,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)"
+        return f"({ref_expressions[0]}.length || 0)"
 
     def tricc_operation_multiplied(self, ref_expressions):
         return "*".join(ref_expressions)

{tricc_oo-1.5.26 → tricc_oo-1.5.28}/tricc_oo/strategies/output/xls_form.py

@@ -131,7 +131,7 @@ class XLSFormStrategy(BaseOutPutStrategy):
         return generate_xls_form_export(self, node, **kwargs)
 
     def inject_version(self):
-        # Add hidden version field using ODK's jr:version()
+        # Add hidden version field using ODK's version()
         empty = langs.get_trads("", force_dict=True)
         self.df_survey.loc[len(self.df_survey)] = [
             "hidden",
@@ -148,7 +148,7 @@ class XLSFormStrategy(BaseOutPutStrategy):
             "",  # required
             *list(empty.values()),  # required_message
             "",  # read only
-            "jr:version()",  # calculation
+            "version()",  # calculation
             "",  # trigger
             "",  # repeat_count
             "",  # image
@@ -399,7 +399,7 @@ class XLSFormStrategy(BaseOutPutStrategy):
         # build lower level
         if hasattr(self, f"tricc_operation_{operation.operator}"):
             callable = getattr(self, f"tricc_operation_{operation.operator}")
-            return callable(ref_expressions)
+            return callable(list(map(str, ref_expressions)))
         else:
             raise NotImplementedError(
                 f"This type of opreation '{operation.operator}' is not supported in this strategy"
@@ -460,9 +460,9 @@ class XLSFormStrategy(BaseOutPutStrategy):
             return "1"
 
     def tricc_operation_native(self, ref_expressions):
-    
+
         if len(ref_expressions) > 0:
-            if ref_expressions[0].startswith(("'","`",)):
+            if ref_expressions[0].startswith(("'", "`",)):
                 ref_expressions[0] = ref_expressions[0][1:-1]
             if ref_expressions[0] == "GetChoiceName":
                 return f"""jr:choice-name({
@@ -723,19 +723,8 @@ class XLSFormStrategy(BaseOutPutStrategy):
         elif isinstance(r, TriccReference):
             logger.warning(f"reference `{r.value}` still used in a calculate")
             return f"${{{get_export_name(r.value)}}}"
-        elif isinstance(r, TriccStatic):
+        elif isinstance(r, (TriccStatic, str, int, float)):
             return get_export_name(r)
-        elif isinstance(r, str):
-            if r == TRICC_TRUE_VALUE:
-                return BOOLEAN_MAP[str(TRICC_TRUE_VALUE)]
-            elif r == TRICC_FALSE_VALUE:
-                return BOOLEAN_MAP[str(TRICC_FALSE_VALUE)]
-            elif isinstance(r, str):
-                return f"'{r}'"
-            else:
-                return str(r)
-        elif isinstance(r, (int, float)):
-            return str(r)
         elif isinstance(r, TriccNodeSelectOption):
             logger.debug(f"select option {r.get_name()} from {r.select.get_name()} was used as a reference")
             return get_export_name(r)

{tricc_oo-1.5.26 → tricc_oo-1.5.28}/tricc_oo/visitors/tricc.py

@@ -2613,10 +2613,16 @@ def generate_base(node, processed_nodes, **kwargs):
                     constraints_min = ""
                     constraints_max = ""
                     if node.min is not None and node.min != "":
-                        constraints.append(TriccOperation(TriccOperator.MORE_OR_EQUAL, ["$this", node.min]))
+                        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_min = "The minimun value is {0}.".format(node.min)
                     if node.max is not None and node.max != "":
-                        constraints.append(TriccOperation(TriccOperator.LESS_OR_EQUAL, ["$this", 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_max = "The maximum value is {0}.".format(node.max)
                     if len(constraints) > 1:
                         node.constraint = TriccOperation(TriccOperator.AND, constraints)

{tricc_oo-1.5.26 → tricc_oo-1.5.28/tricc_oo.egg-info}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: tricc-oo
-Version: 1.5.26
+Version: 1.5.28
 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