tricc-oo 1.6.21__py3-none-any.whl → 1.6.22__py3-none-any.whl

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
Files changed (6) hide show
  1. tricc_oo/strategies/output/xls_form.py +4 -1
  2. {tricc_oo-1.6.21.dist-info → tricc_oo-1.6.22.dist-info}/METADATA +1 -1
  3. {tricc_oo-1.6.21.dist-info → tricc_oo-1.6.22.dist-info}/RECORD +6 -6
  4. {tricc_oo-1.6.21.dist-info → tricc_oo-1.6.22.dist-info}/WHEEL +0 -0
  5. {tricc_oo-1.6.21.dist-info → tricc_oo-1.6.22.dist-info}/licenses/LICENSE +0 -0
  6. {tricc_oo-1.6.21.dist-info → tricc_oo-1.6.22.dist-info}/top_level.txt +0 -0
tricc_oo/strategies/output/xls_form.py CHANGED
@@ -25,6 +25,7 @@ from tricc_oo.models.tricc import (
25
25
  TriccNodeCalculateBase,
26
26
  TriccNodeBaseModel,
27
27
  TriccNodeSelectOption,
28
+ TriccNodeSelect,
28
29
  TriccNodeInputModel,
29
30
  TriccNodeDisplayModel,
30
31
  TRICC_FALSE_VALUE,
@@ -87,6 +88,8 @@ OPERATOR_COALESCE_FALLBACK = {
87
88
  TriccOperator.MORE_OR_EQUAL: -2147483648,
88
89
  TriccOperator.LESS: 2147483647,
89
90
  TriccOperator.LESS_OR_EQUAL: 2147483647,
91
+ TriccOperator.CONTAINS: "''",
92
+ TriccOperator.SELECTED: "''",
90
93
  }
91
94
 
92
95
 
@@ -742,7 +745,7 @@ class XLSFormStrategy(BaseOutPutStrategy):
742
745
  elif isinstance(r, TriccNodeSelectOption):
743
746
  logger.debug(f"select option {r.get_name()} from {r.select.get_name()} was used as a reference")
744
747
  return get_export_name(r)
745
- elif issubclass(r.__class__, TriccNodeInputModel):
748
+ elif issubclass(r.__class__, (TriccNodeInputModel, TriccNodeSelect)):
746
749
  return f"coalesce(${{{get_export_name(r)}}},{coalesce_fallback})"
747
750
  elif issubclass(r.__class__, TriccNodeBaseModel):
748
751
  return f"${{{get_export_name(r)}}}"
{tricc_oo-1.6.21.dist-info → tricc_oo-1.6.22.dist-info}/METADATA RENAMED
@@ -1,6 +1,6 @@
1
1
  Metadata-Version: 2.4
2
2
  Name: tricc-oo
3
- Version: 1.6.21
3
+ Version: 1.6.22
4
4
  Summary: Python library that converts CDSS L2 in L3
5
5
  Project-URL: Homepage, https://github.com/SwissTPH/tricc
6
6
  Project-URL: Issues, https://github.com/SwissTPH/tricc/issues
{tricc_oo-1.6.21.dist-info → tricc_oo-1.6.22.dist-info}/RECORD RENAMED
@@ -36,7 +36,7 @@ tricc_oo/strategies/output/fhir_form.py,sha256=hbL921pe1Doun4IQrJuZ_Sq2fCh98G3gr
36
36
  tricc_oo/strategies/output/html_form.py,sha256=qSleEZOMV_-Z04y-i-ucyd5rgAYWAyjPwMrw0IHtCRM,8604
37
37
  tricc_oo/strategies/output/openmrs_form.py,sha256=ne6TwAyhafR-WDs27QTKKFl85VD5sij_VEJtK6ZjOIE,28996
38
38
  tricc_oo/strategies/output/spice.py,sha256=QMeoismVC3PdbvwTK0PtUjWX9jl9780fbQIXn76fMXw,10761
39
- tricc_oo/strategies/output/xls_form.py,sha256=MgmJsQOyxsOC9QuZaNxdUKcbwmLCv4cpILl_Y60jjnk,33326
39
+ tricc_oo/strategies/output/xls_form.py,sha256=ISpZEjPHiKV9TEDwQnGf0hf2eLSw4RXP_SVbiMEBIEY,33434
40
40
  tricc_oo/strategies/output/xlsform_cdss.py,sha256=X00Lt5MzV8TX14dR4dFI1MqllI5S1e13bKbeysWM9uA,17435
41
41
  tricc_oo/strategies/output/xlsform_cht.py,sha256=lY1xIDxqYxl_lYNVCl3msXZL88No49yEVCpahcHGOn0,28675
42
42
  tricc_oo/strategies/output/xlsform_cht_hf.py,sha256=xm6SKirV3nMZvM2w54_zJcXAeAgAkq-EEqGEjnOWv6c,988
@@ -44,8 +44,8 @@ tricc_oo/visitors/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU
44
44
  tricc_oo/visitors/tricc.py,sha256=f66dadGtQittZvSyJNPi21pXL2HVOczLOVsJDmD2i6w,112456
45
45
  tricc_oo/visitors/utils.py,sha256=j83aAq5s5atXi3OC0jc_uJd54a8XrHHmizeeEbWZQJg,421
46
46
  tricc_oo/visitors/xform_pd.py,sha256=ryAnI3V9x3eTmJ2LNsUZfvl0_yfCqo6oBgeSu-WPqaE,9613
47
- tricc_oo-1.6.21.dist-info/licenses/LICENSE,sha256=Pz2eACSxkhsGfW9_iN60pgy-enjnbGTj8df8O3ebnQQ,16726
48
- tricc_oo-1.6.21.dist-info/METADATA,sha256=of9s3USYps0YTE5dGXiZDoCo9TdfIgMUl7oYlir3Jqc,8600
49
- tricc_oo-1.6.21.dist-info/WHEEL,sha256=wUyA8OaulRlbfwMtmQsvNngGrxQHAvkKcvRmdizlJi0,92
50
- tricc_oo-1.6.21.dist-info/top_level.txt,sha256=NvbfMNAiy9m4b1unBsqpeOQWh4IgA1Xa33BtKA4abxk,15
51
- tricc_oo-1.6.21.dist-info/RECORD,,
47
+ tricc_oo-1.6.22.dist-info/licenses/LICENSE,sha256=Pz2eACSxkhsGfW9_iN60pgy-enjnbGTj8df8O3ebnQQ,16726
48
+ tricc_oo-1.6.22.dist-info/METADATA,sha256=At70THgAUro2_V5Oz8mx8_Q_GqqR78d8rPmwu57DCHA,8600
49
+ tricc_oo-1.6.22.dist-info/WHEEL,sha256=wUyA8OaulRlbfwMtmQsvNngGrxQHAvkKcvRmdizlJi0,92
50
+ tricc_oo-1.6.22.dist-info/top_level.txt,sha256=NvbfMNAiy9m4b1unBsqpeOQWh4IgA1Xa33BtKA4abxk,15
51
+ tricc_oo-1.6.22.dist-info/RECORD,,