Evaluating variables in answerExpressions #2066
Merged
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
FikriMilano
approved these changes
Jul 11, 2023
datacapture/src/main/java/com/google/android/fhir/datacapture/QuestionnaireViewModel.kt
Outdated
Show resolved
Hide resolved
datacapture/src/main/java/com/google/android/fhir/datacapture/fhirpath/ExpressionEvaluator.kt
Show resolved
Hide resolved
datacapture/src/main/java/com/google/android/fhir/datacapture/QuestionnaireViewModel.kt
Outdated
Show resolved
Hide resolved
|
@MJ1998 this looks good to me, it will be nice to also merge this to master. We can perhaps have this enhancement in future PRs?
|
|
@jingtang10 kindly review |
FikriMilano
added a commit
to opensrp/android-fhir
that referenced
this pull request
Jul 18, 2023
7 tasks
datacapture/src/main/java/com/google/android/fhir/datacapture/QuestionnaireViewModel.kt
Show resolved
Hide resolved
datacapture/src/main/java/com/google/android/fhir/datacapture/QuestionnaireViewModel.kt
Outdated
Show resolved
Hide resolved
datacapture/src/main/java/com/google/android/fhir/datacapture/fhirpath/ExpressionEvaluator.kt
Show resolved
Hide resolved
datacapture/src/main/java/com/google/android/fhir/datacapture/fhirpath/ExpressionEvaluator.kt
Outdated
Show resolved
Hide resolved
jingtang10
pushed a commit
that referenced
this pull request
Feb 27, 2024
* Add X-FHIR-Query support for variable extension * Add unit tests * Fix dynamic answerExpression based on #2066 * Address review - Use viewModelScope for calculated-expression - Move the runBlocking to QuestionnaireItemViewItem for cqf-expression - Rename questionnaireVariablesMap to questionnaireVariableMap * Makes sure initial value got emitted to the questionnaireStateFlow Notifies the flow which will update the data stream when updateDependentQuestionnaireResponseItems finished running * Notify to not delay the update of UI - updateDependentQuestionnaireResponseItems can evaluate X-FHIR-Query expression which can delay the update of UI for 1-2 seconds depending on the retrieved resource size. - In the case of clicking next page after selecting an answer that shows the next pages based on skip logic (tapping this and that very quickly). We notify the UI pages immediately, then once the X-FHIR-Query expression is processed (1-2 seconds), we notify the UI again. Without this changes, when the user taps next page, the next pages that is supposed to be shown by skip logic will be shown late enough that the user don't see it, but if the user taps previous page button, user will see the shown pages decided by skip logic. And that looks like a bug. * WIP * Adjust code after major merge conflict * spotlessApply * Fix test * Fix test * Integrate suspend functions Related to enable when expressions. * spotlessApply * Add missing xFhirQueryResolver param * Address review * Address review and refactor to use suspend function * Run suspend for Barcode * Address review * Remove hasMissingParamValue Better alternative is to limit the received resource by using the _count common parameter. Example: Patient?name=&_count=2 * Fix test * Update QuestionnaireViewItemTest * Use runTest in QuestionnaireUiEspressoTest * Add missing import to access child of ChipGroup * spotlessApply * Fix test * Add missing coroutine launch * spotlessApply
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
IMPORTANT: All PRs must be linked to an issue (except for extremely trivial and straightforward changes).
Fixes #2052
Description
There are 2 errors:
Solution here is to
xFhirExpressionStringhas been constructedAlternative(s) considered
Removing caching of answer options but that makes it slow.
Type
Bug fix | Feature
Screenshots (if applicable)
[Used questionnaire json given in the issue linked]
Checklist
./gradlew spotlessApplyand./gradlew spotlessCheckto check my code follows the style guide of this project../gradlew checkand./gradlew connectedCheckto test my changes locally.