Nested questionnaireResponseComponent with enableWhen in repeated gro…

…up is missing from questionnaire response. (#1940) * Nested questionnaireResponseComponent with enableWhen in repeated group is missing from questionnaire response. * Add android test. * Address review comments. * Address review comments. --------- Co-authored-by: Santosh Pingle <[email protected]>
google · Apr 7, 2023 · 135feb2 · 135feb2
1 parent 0d00d7e
commit 135feb2
Show file tree

Hide file tree

Showing 3 changed files with 382 additions and 1 deletion.
diff --git a/datacapture/src/main/java/com/google/android/fhir/datacapture/QuestionnaireViewModel.kt b/datacapture/src/main/java/com/google/android/fhir/datacapture/QuestionnaireViewModel.kt
@@ -338,7 +338,14 @@ internal class QuestionnaireViewModel(application: Application, state: SavedStat
  */
  fun getQuestionnaireResponse(): QuestionnaireResponse {
  return questionnaireResponse.copy().apply {
- item = getEnabledResponseItems(this@QuestionnaireViewModel.questionnaire.item, item)
+ // Use the view model's questionnaire and questionnaire response for calculating enabled items
+ // because the calculation relies on references to the questionnaire response items.
+ item =
+ getEnabledResponseItems(
+ this@QuestionnaireViewModel.questionnaire.item,
+ questionnaireResponse.item
+ )
+ .map { it.copy() }
  unpackRepeatedGroups(this@QuestionnaireViewModel.questionnaire)
  }
  }

diff --git a/...pture/src/main/java/com/google/android/fhir/datacapture/enablement/EnablementEvaluator.kt b/...pture/src/main/java/com/google/android/fhir/datacapture/enablement/EnablementEvaluator.kt
@@ -80,6 +80,11 @@ internal class EnablementEvaluator(val questionnaireResponse: QuestionnaireRespo
  questionnaireResponseItemParentMap[child] = item
  buildParentList(child)
  }
+ for (answer in item.answer) {
+ for (nestedItem in answer.item) {
+ buildParentList(nestedItem)
+ }
+ }
  }
 
  for (item in questionnaireResponse.item) {