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.

Sign up for GitHub

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

Jump to bottom

enable when expression can access variable #2132

Merged
merged 43 commits into from
Sep 11, 2023
Merged

enable when expression can access variable #2132

Changes from 1 commit
Commits
Show all changes
43 commits
Select commit Hold shift + click to select a range
d73edd2
Provide proper contextMap when evaluating the following:
FikriMilano Aug 14, 2023
4d0d9e9
FOR PR TESTING ONLY
FikriMilano Aug 14, 2023
669aeac
Fix failing test
FikriMilano Aug 15, 2023
3ec78bd
Merge branch 'master' into 2096-variable-for-enable-when-expression
dubdabasoduba Aug 22, 2023
7e1952b
Rename questionnaireResource to questionnaire
FikriMilano Sep 4, 2023
0446d43
Revert component_dropdown.json
FikriMilano Sep 4, 2023
8429ae6
Add skip logic w expression to catalog
FikriMilano Sep 4, 2023
6545f72
Add trailing comas
FikriMilano Sep 4, 2023
cf06b67
Add default parameter value for maps and Questionnaire
FikriMilano Sep 4, 2023
cd974a9
spotlessApply
FikriMilano Sep 4, 2023
f49eb8e
Change method name to avoid conflict with questionnaireJson variable
FikriMilano Sep 4, 2023
c198e67
Refactor evaluators
FikriMilano Sep 6, 2023
035d173
Also tie enablementEvaluator lifecycle to viewmodel
FikriMilano Sep 6, 2023
0f321d6
get latest questionnaire state to see calculated expression result in UI
FikriMilano Sep 6, 2023
518c279
Remove unused log
FikriMilano Sep 6, 2023
17370e3
Fix quantity initial value not showing in catalog app
FikriMilano Sep 6, 2023
e1cfd3f
Update kdoc
FikriMilano Sep 6, 2023
cc95c5d
Remove old evaluateToBoolean
FikriMilano Sep 6, 2023
c44e49b
Address review
FikriMilano Sep 7, 2023
c437af3
Merge branch 'master' of github.com:google/android-fhir into 2096-var…
FikriMilano Sep 7, 2023
fb04421
Revert behavior_calculated_expression.json
FikriMilano Sep 8, 2023
bd0a687
Add named parameter comment
FikriMilano Sep 11, 2023
dbd232f
Merge branch 'master' of github.com:google/android-fhir into 2096-var…
FikriMilano Sep 11, 2023
b5a69ef
Update datacapture/src/main/java/com/google/android/fhir/datacapture/…
jingtang10 Sep 11, 2023
1b52e69
Update datacapture/src/main/java/com/google/android/fhir/datacapture/…
jingtang10 Sep 11, 2023
81de124
Update datacapture/src/test/java/com/google/android/fhir/datacapture/…
jingtang10 Sep 11, 2023
bd67a3c
Update datacapture/src/test/java/com/google/android/fhir/datacapture/…
jingtang10 Sep 11, 2023
e53ee15
Update datacapture/src/test/java/com/google/android/fhir/datacapture/…
jingtang10 Sep 11, 2023
59f2434
Update datacapture/src/test/java/com/google/android/fhir/datacapture/…
jingtang10 Sep 11, 2023
5e39c56
Update datacapture/src/test/java/com/google/android/fhir/datacapture/…
jingtang10 Sep 11, 2023
c572eed
Update datacapture/src/test/java/com/google/android/fhir/datacapture/…
jingtang10 Sep 11, 2023
3b24375
Update datacapture/src/test/java/com/google/android/fhir/datacapture/…
jingtang10 Sep 11, 2023
1ed2ba0
Update datacapture/src/test/java/com/google/android/fhir/datacapture/…
jingtang10 Sep 11, 2023
af9a2f6
Update datacapture/src/test/java/com/google/android/fhir/datacapture/…
jingtang10 Sep 11, 2023
66fa9fe
Update datacapture/src/test/java/com/google/android/fhir/datacapture/…
jingtang10 Sep 11, 2023
36ea59e
Update datacapture/src/test/java/com/google/android/fhir/datacapture/…
jingtang10 Sep 11, 2023
cba10f7
Update datacapture/src/test/java/com/google/android/fhir/datacapture/…
jingtang10 Sep 11, 2023
183e8ed
Update datacapture/src/test/java/com/google/android/fhir/datacapture/…
jingtang10 Sep 11, 2023
6051a58
Update datacapture/src/main/java/com/google/android/fhir/datacapture/…
jingtang10 Sep 11, 2023
92ffe98
Update datacapture/src/main/java/com/google/android/fhir/datacapture/…
jingtang10 Sep 11, 2023
7015953
Update datacapture/src/test/java/com/google/android/fhir/datacapture/…
jingtang10 Sep 11, 2023
bc8b853
Update datacapture/src/test/java/com/google/android/fhir/datacapture/…
jingtang10 Sep 11, 2023
70d2112
Spotless
jingtang10 Sep 11, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Next Next commit
Update datacapture/src/test/java/com/google/android/fhir/datacapture/… 
…fhirpath/ExpressionEvaluatorTest.kt
  • Loading branch information
@jingtang10
jingtang10 committed Sep 11, 2023
commit af9a2f6de92cebd9c9f2d44e04bba11e06231f45
2 changes: 1 addition & 1 deletion ...ure/src/test/java/com/google/android/fhir/datacapture/fhirpath/ExpressionEvaluatorTest.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -864,7 +864,7 @@ class ExpressionEvaluatorTest {
Questionnaire(),
QuestionnaireResponse(),
/* questionnaireItemParentMap= */ mapOf(),
mapOf(
/* questionnaireLaunchContextMap= */ mapOf(
patient.resourceType.name.lowercase() to patient,
location.resourceType.name.lowercase() to location
)
Expand Down
Loading