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

tricc_oo/converters/tricc_to_xls_form.py

@@ -56,7 +56,7 @@ def get_export_name(node, replace_dots=True):
         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/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/strategies/output/xls_form.py

@@ -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({

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.27.dist-info → tricc_oo-1.5.28.dist-info}/METADATA

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

@@ -7,7 +7,7 @@ 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=LkgRn8gdX7C-xIRypqgMRs3afuMpigzFN1l5RD-Zyg4,3499
+tricc_oo/converters/tricc_to_xls_form.py,sha256=C7oDi1_IA0FLjoK700G9bABQZrGEqJltvBD2rGVjkIA,3494
 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
@@ -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=aiHUi_lDm48yaKqZGWyFMVPIj6OhQGcAADFDoYJteW0,27175
+tricc_oo/strategies/output/openmrs_form.py,sha256=t2I2IKl98dbfTsJrJ4hnQbG8_qROpZmKtyE2M1hnyD4,27192
 tricc_oo/strategies/output/spice.py,sha256=QMeoismVC3PdbvwTK0PtUjWX9jl9780fbQIXn76fMXw,10761
-tricc_oo/strategies/output/xls_form.py,sha256=c4eaQn411W57mTvCH7delAoDrP0IsaCtp-_D25btXg4,29310
+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=RtE1oY6pWBasOmx_njexBg4qlHwPZd08QR45St5fPW0,107095
+tricc_oo/visitors/tricc.py,sha256=vmOQRocfzjr-MvLNflNxV51w0vhRO53fX8tTIqjNyOU,107437
 tricc_oo/visitors/utils.py,sha256=j83aAq5s5atXi3OC0jc_uJd54a8XrHHmizeeEbWZQJg,421
 tricc_oo/visitors/xform_pd.py,sha256=ryAnI3V9x3eTmJ2LNsUZfvl0_yfCqo6oBgeSu-WPqaE,9613
-tricc_oo-1.5.27.dist-info/licenses/LICENSE,sha256=Pz2eACSxkhsGfW9_iN60pgy-enjnbGTj8df8O3ebnQQ,16726
-tricc_oo-1.5.27.dist-info/METADATA,sha256=Ak89Fpv6LVki7GoZYYjwx4on0UB8LflW4QrcBcxjMjI,8577
-tricc_oo-1.5.27.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
-tricc_oo-1.5.27.dist-info/top_level.txt,sha256=NvbfMNAiy9m4b1unBsqpeOQWh4IgA1Xa33BtKA4abxk,15
-tricc_oo-1.5.27.dist-info/RECORD,,
+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,,