Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Support interpolation for conditionalFhirPathExpression to filter resources #3538

Conversation

LZRS
Copy link
Contributor

@LZRS LZRS commented Oct 4, 2024

To pass in evaluated rule variables

IMPORTANT: Where possible all PRs must be linked to a Github issue

Fixes #3537

Engineer Checklist

  • I have written Unit tests for any new feature(s) and edge cases for bug fixes
  • I have added any strings visible on UI components to the strings.xml file
  • I have updated the CHANGELOG.md file for any notable changes to the codebase
  • I have run ./gradlew spotlessApply and ./gradlew spotlessCheck to check my code follows the project's style guide
  • I have built and run the FHIRCore app to verify my change fixes the issue and/or does not break the app
  • I have checked that this PR does NOT introduce breaking changes that require an update to Content and/or Configs? If it does add a sample here or a link to exactly what changes need to be made to the content.

Code Reviewer Checklist

  • I have verified Unit tests have been written for any new feature(s) and edge cases
  • I have verified any strings visible on UI components are in the strings.xml file
  • I have verifed the CHANGELOG.md file has any notable changes to the codebase
  • I have verified the solution has been implemented in a configurable and generic way for reuseable components
  • I have built and run the FHIRCore app to verify the change fixes the issue and/or does not break the app

@LZRS LZRS requested review from ellykits and Rkareko October 4, 2024 13:18
@LZRS LZRS self-assigned this Oct 4, 2024
Copy link

codecov bot commented Oct 4, 2024

Codecov Report

Attention: Patch coverage is 66.66667% with 3 lines in your changes missing coverage. Please review.

Project coverage is 27.3%. Comparing base (8cf03cf) to head (0ade5f3).

Files with missing lines Patch % Lines
...re/engine/rulesengine/ResourceDataRulesExecutor.kt 66.6% 0 Missing and 3 partials ⚠️
Additional details and impacted files

Impacted file tree graph

@@           Coverage Diff           @@
##              main   #3538   +/-   ##
=======================================
  Coverage     27.2%   27.3%           
- Complexity     756     757    +1     
=======================================
  Files          278     278           
  Lines        14219   14223    +4     
  Branches      2581    2583    +2     
=======================================
+ Hits          3880    3883    +3     
  Misses        9801    9801           
- Partials       538     539    +1     
Flag Coverage Δ
engine 63.8% <66.6%> (+<0.1%) ⬆️
geowidget 15.4% <ø> (ø)
quest 5.6% <ø> (ø)

Flags with carried forward coverage won't be shown. Click here to find out more.

Files with missing lines Coverage Δ
...re/engine/rulesengine/ResourceDataRulesExecutor.kt 84.4% <66.6%> (-0.6%) ⬇️

@LZRS LZRS force-pushed the interpolate-conditionalfhirpathexpressions branch from 0ce6f51 to 0ade5f3 Compare October 4, 2024 13:35
@LZRS LZRS changed the base branch from main to fix-loading-nested-list-data October 7, 2024 09:01
@LZRS LZRS force-pushed the interpolate-conditionalfhirpathexpressions branch from d73a26f to a30225b Compare October 8, 2024 14:34
@ellykits ellykits merged commit bebf599 into fix-loading-nested-list-data Oct 15, 2024
@ellykits ellykits deleted the interpolate-conditionalfhirpathexpressions branch October 15, 2024 09:27
ellykits added a commit that referenced this pull request Oct 18, 2024
* Include listRepositoryResourceDataMap to nested list widgets

Signed-off-by: Elly Kitoto <[email protected]>

* Fix loading related resources data for List widget

Signed-off-by: Elly Kitoto <[email protected]>

* Refactor loading bitmap images (#3546)

* Add date service to rules engine facts map (#3519)

* Add summary mode (#3500)

Co-authored-by: Elly Kitoto <[email protected]>

* Refactor PDF config properties in QuestionnaireConfig (#3498)

* Refactor to use PdfConfig

Initially using QuestionnaireConfig for simplicity.

* Process multi QRs in HtmlPopulator

* Add new tag to check if Questionnaire has been submitted

* Remove subjectType since subjectReference is used

* Fix test and spotless

* Address review

* spotless

* Cleanup

* spotless

* Fix test

---------

Co-authored-by: Elly Kitoto <[email protected]>

* Fix error validation highlighting not working when submit button is clicked bug (#3525)

* Change progress bar color to blue (#3428)

* update in-progress color on the map view. (#3529)

      Signed-off-by: Lentumunai-Mark <[email protected]>

* Add medication sort custom search param (#3534)

* Add medication sort custom search param

* Run spotlessApply

* Fix failing time based test

* Pld docs adjustment (#3540)

* sync typo

* correct heading title

* update header definition for p2p

* upgrade packages

* Update Geowidget to only show the Set Location dialog if no Locations to sync by have been selected (#3526)

* Don't show no results dialogue on map when locations selected on multiselect.

Signed-off-by: Lentumunai-Mark <[email protected]>

* Fix failing tests.

Signed-off-by: Lentumunai-Mark <[email protected]>

---------

Signed-off-by: Lentumunai-Mark <[email protected]>

* Add Exit Dialog (#3487)

* Add exit dialog

* Fix a typo

* Show Dialog only when Map or Register is visible

* PR feedback changes

* Fix failing check

* Remove incorrect test

* Refactor dialog condition logic

---------

Co-authored-by: Benjamin Mwalimu <[email protected]>

* Refactor working with bitmap images

Signed-off-by: Elly Kitoto <[email protected]>

* Add the EUSM Burundi flavour and Rename the existing EUSM flavour (#3548)

* - Add the EUSM Burundi flavour
- Rename the exisiting EUSM flavour

* - Update the app naming

* - update the flavour naming

* Configure submit anyway button (#3535)

* Update the Burundi EUSM flavor (#3553)

* - Add the EUSM Burundi flavour
- Rename the exisiting EUSM flavour

* - Update the app naming

* - update the flavour naming

* - Update the flavor naming
- Update the documentation

* - Update the flavors section of the documentation to clarify on the naming convention

* Bum p up data capture version (#3547)

* Map search bug fixes (#3516)

* - Updating the infinite scroll paging
- Updating the behaviour after clearing search bar on the maps

* - spotless apply

* - Fix breaking tests on geo widget module

* - Fix tests

* - Run spotless

* - Import `LazyPagingItems`

* - Adding tests

* - Update the APK naming

* Ignore test to be refactored later

Signed-off-by: Elly Kitoto <[email protected]>

* - Run spotless

* Update kujaku version.

Signed-off-by: Lentumunai-Mark <[email protected]>

---------

Signed-off-by: Elly Kitoto <[email protected]>
Signed-off-by: Lentumunai-Mark <[email protected]>
Co-authored-by: Lentumunai Mark <[email protected]>
Co-authored-by: Elly Kitoto <[email protected]>
Co-authored-by: Lentumunai-Mark <[email protected]>

* Fix loading related resources

Signed-off-by: Elly Kitoto <[email protected]>

---------

Signed-off-by: Lentumunai-Mark <[email protected]>
Signed-off-by: Elly Kitoto <[email protected]>
Co-authored-by: Rkareko <[email protected]>
Co-authored-by: FikriMilano <[email protected]>
Co-authored-by: Lentumunai Mark <[email protected]>
Co-authored-by: Peter Lubell-Doughtie <[email protected]>
Co-authored-by: Hamza Ahmed Khan <[email protected]>
Co-authored-by: Benjamin Mwalimu <[email protected]>
Co-authored-by: Lentumunai-Mark <[email protected]>

* Fix failing UI tests

Signed-off-by: Elly Kitoto <[email protected]>

* Interpolate conditionalFhirPathExpressions in listResource (#3538)

To pass in evaluated rule variables

Signed-off-by: Elly Kitoto <[email protected]>
Co-authored-by: Elly Kitoto <[email protected]>

* Fix apply stack tint.

Signed-off-by: Lentumunai-Mark <[email protected]>

* Apply opacity on view properties. (#3564)

Signed-off-by: Lentumunai-Mark <[email protected]>

* Fix duplication of List view item

Signed-off-by: Elly Kitoto <[email protected]>

---------

Signed-off-by: Elly Kitoto <[email protected]>
Signed-off-by: Lentumunai-Mark <[email protected]>
Co-authored-by: Rkareko <[email protected]>
Co-authored-by: FikriMilano <[email protected]>
Co-authored-by: Lentumunai Mark <[email protected]>
Co-authored-by: Peter Lubell-Doughtie <[email protected]>
Co-authored-by: Hamza Ahmed Khan <[email protected]>
Co-authored-by: Benjamin Mwalimu <[email protected]>
Co-authored-by: Lentumunai-Mark <[email protected]>
Co-authored-by: L≡ZRS <[email protected]>
qiarie pushed a commit that referenced this pull request Jan 15, 2025
* Include listRepositoryResourceDataMap to nested list widgets

Signed-off-by: Elly Kitoto <[email protected]>

* Fix loading related resources data for List widget

Signed-off-by: Elly Kitoto <[email protected]>

* Refactor loading bitmap images (#3546)

* Add date service to rules engine facts map (#3519)

* Add summary mode (#3500)

Co-authored-by: Elly Kitoto <[email protected]>

* Refactor PDF config properties in QuestionnaireConfig (#3498)

* Refactor to use PdfConfig

Initially using QuestionnaireConfig for simplicity.

* Process multi QRs in HtmlPopulator

* Add new tag to check if Questionnaire has been submitted

* Remove subjectType since subjectReference is used

* Fix test and spotless

* Address review

* spotless

* Cleanup

* spotless

* Fix test

---------

Co-authored-by: Elly Kitoto <[email protected]>

* Fix error validation highlighting not working when submit button is clicked bug (#3525)

* Change progress bar color to blue (#3428)

* update in-progress color on the map view. (#3529)

      Signed-off-by: Lentumunai-Mark <[email protected]>

* Add medication sort custom search param (#3534)

* Add medication sort custom search param

* Run spotlessApply

* Fix failing time based test

* Pld docs adjustment (#3540)

* sync typo

* correct heading title

* update header definition for p2p

* upgrade packages

* Update Geowidget to only show the Set Location dialog if no Locations to sync by have been selected (#3526)

* Don't show no results dialogue on map when locations selected on multiselect.

Signed-off-by: Lentumunai-Mark <[email protected]>

* Fix failing tests.

Signed-off-by: Lentumunai-Mark <[email protected]>

---------

Signed-off-by: Lentumunai-Mark <[email protected]>

* Add Exit Dialog (#3487)

* Add exit dialog

* Fix a typo

* Show Dialog only when Map or Register is visible

* PR feedback changes

* Fix failing check

* Remove incorrect test

* Refactor dialog condition logic

---------

Co-authored-by: Benjamin Mwalimu <[email protected]>

* Refactor working with bitmap images

Signed-off-by: Elly Kitoto <[email protected]>

* Add the EUSM Burundi flavour and Rename the existing EUSM flavour (#3548)

* - Add the EUSM Burundi flavour
- Rename the exisiting EUSM flavour

* - Update the app naming

* - update the flavour naming

* Configure submit anyway button (#3535)

* Update the Burundi EUSM flavor (#3553)

* - Add the EUSM Burundi flavour
- Rename the exisiting EUSM flavour

* - Update the app naming

* - update the flavour naming

* - Update the flavor naming
- Update the documentation

* - Update the flavors section of the documentation to clarify on the naming convention

* Bum p up data capture version (#3547)

* Map search bug fixes (#3516)

* - Updating the infinite scroll paging
- Updating the behaviour after clearing search bar on the maps

* - spotless apply

* - Fix breaking tests on geo widget module

* - Fix tests

* - Run spotless

* - Import `LazyPagingItems`

* - Adding tests

* - Update the APK naming

* Ignore test to be refactored later

Signed-off-by: Elly Kitoto <[email protected]>

* - Run spotless

* Update kujaku version.

Signed-off-by: Lentumunai-Mark <[email protected]>

---------

Signed-off-by: Elly Kitoto <[email protected]>
Signed-off-by: Lentumunai-Mark <[email protected]>
Co-authored-by: Lentumunai Mark <[email protected]>
Co-authored-by: Elly Kitoto <[email protected]>
Co-authored-by: Lentumunai-Mark <[email protected]>

* Fix loading related resources

Signed-off-by: Elly Kitoto <[email protected]>

---------

Signed-off-by: Lentumunai-Mark <[email protected]>
Signed-off-by: Elly Kitoto <[email protected]>
Co-authored-by: Rkareko <[email protected]>
Co-authored-by: FikriMilano <[email protected]>
Co-authored-by: Lentumunai Mark <[email protected]>
Co-authored-by: Peter Lubell-Doughtie <[email protected]>
Co-authored-by: Hamza Ahmed Khan <[email protected]>
Co-authored-by: Benjamin Mwalimu <[email protected]>
Co-authored-by: Lentumunai-Mark <[email protected]>

* Fix failing UI tests

Signed-off-by: Elly Kitoto <[email protected]>

* Interpolate conditionalFhirPathExpressions in listResource (#3538)

To pass in evaluated rule variables

Signed-off-by: Elly Kitoto <[email protected]>
Co-authored-by: Elly Kitoto <[email protected]>

* Fix apply stack tint.

Signed-off-by: Lentumunai-Mark <[email protected]>

* Apply opacity on view properties. (#3564)

Signed-off-by: Lentumunai-Mark <[email protected]>

* Fix duplication of List view item

Signed-off-by: Elly Kitoto <[email protected]>

---------

Signed-off-by: Elly Kitoto <[email protected]>
Signed-off-by: Lentumunai-Mark <[email protected]>
Co-authored-by: Rkareko <[email protected]>
Co-authored-by: FikriMilano <[email protected]>
Co-authored-by: Lentumunai Mark <[email protected]>
Co-authored-by: Peter Lubell-Doughtie <[email protected]>
Co-authored-by: Hamza Ahmed Khan <[email protected]>
Co-authored-by: Benjamin Mwalimu <[email protected]>
Co-authored-by: Lentumunai-Mark <[email protected]>
Co-authored-by: L≡ZRS <[email protected]>
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

Support interpolation of rule variables into conditionalFhirPathExpression
2 participants