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

Hide items if all items they are depending on have also been hidden. #1790

Merged
merged 9 commits into from
Jan 17, 2023
Merged

Hide items if all items they are depending on have also been hidden. #1790

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
9 commits
Select commit Hold shift + click to select a range
c643762
Disable all question items in a dependent chain when top item is disa…
aditya-07 Jan 4, 2023
c0d66b6
Reverted the default layout
aditya-07 Jan 4, 2023
ae136b2
Merge branch 'master' into ak/enablewhen_chain_disable_all_fix
aditya-07 Jan 6, 2023
8de2b0d
Merge branch 'master' into ak/enablewhen_chain_disable_all_fix
aditya-07 Jan 12, 2023
4ee392c
Caching answers for disabled items incase they are enabled again befo…
aditya-07 Jan 13, 2023
823c749
Merge branch 'master' into ak/enablewhen_chain_disable_all_fix
aditya-07 Jan 16, 2023
83b03f7
Updated review comments
aditya-07 Jan 16, 2023
8aaf2e4
Merge branch 'master' into ak/enablewhen_chain_disable_all_fix
aditya-07 Jan 16, 2023
146a394
Review comments: Refactored code and addded testcase to check cache r…
aditya-07 Jan 17, 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
Caching answers for disabled items incase they are enabled again befo… 
…re submitting
  • Loading branch information
@aditya-07
aditya-07 committed Jan 13, 2023
commit 4ee392cb8ec529b22f78cdfabd7ec670b00c6ecc
28 changes: 26 additions & 2 deletions datacapture/src/main/java/com/google/android/fhir/datacapture/QuestionnaireViewModel.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -47,6 +47,7 @@ import org.hl7.fhir.r4.model.Coding
import org.hl7.fhir.r4.model.Expression
import org.hl7.fhir.r4.model.Questionnaire
import org.hl7.fhir.r4.model.QuestionnaireResponse
import org.hl7.fhir.r4.model.QuestionnaireResponse.QuestionnaireResponseItemAnswerComponent
import org.hl7.fhir.r4.model.ResourceType
import org.hl7.fhir.r4.model.ValueSet
import timber.log.Timber
Expand All @@ -62,6 +63,14 @@ internal class QuestionnaireViewModel(application: Application, state: SavedStat
/** The current questionnaire as questions are being answered. */
internal val questionnaire: Questionnaire
private lateinit var currentPageItems: List<QuestionnaireAdapterItem>
/**
* Map of [QuestionnaireResponse.QuestionnaireResponseItemAnswerComponent] for
* [Questionnaire.QuestionnaireItemComponent]s that are disabled now. The answers will be used to
* pre-populate the [QuestionnaireResponse.QuestionnaireResponseItemComponent] once the item is
* enabled again.
*/
private val linkIdToAnswersMapForDisabledQuestionnaireResponseItem =
aditya-07 marked this conversation as resolved.
Show resolved Hide resolved
mutableMapOf<String, List<QuestionnaireResponseItemAnswerComponent>>()

init {
questionnaire =
Expand Down Expand Up @@ -567,18 +576,33 @@ internal class QuestionnaireViewModel(application: Application, state: SavedStat
questionnaireResponseItem: QuestionnaireResponse.QuestionnaireResponseItemComponent,
): List<QuestionnaireAdapterItem> {
// Disabled/hidden questions should not get QuestionnaireItemViewItem instances
aditya-07 marked this conversation as resolved.
Show resolved Hide resolved
if (questionnaireItem.isHidden) return emptyList()
val enabled =
EnablementEvaluator(questionnaireResponse)
.evaluate(questionnaireItem, questionnaireResponseItem)
if (questionnaireItem.isHidden) return emptyList()
if (!enabled) {
// If the item is not enabled, clear the answers that it may have from the previous enabled
// state. This will also prevent any questionnaire item that depends on the answer of this
// questionnaire item to be wrongly evaluated as well.
if (questionnaireResponseItem.hasAnswer()) questionnaireResponseItem.answer = listOf()
if (questionnaireResponseItem.hasAnswer()) {
linkIdToAnswersMapForDisabledQuestionnaireResponseItem[questionnaireResponseItem.linkId] =
questionnaireResponseItem.answer
questionnaireResponseItem.answer = listOf()
}
return emptyList()
}

if (linkIdToAnswersMapForDisabledQuestionnaireResponseItem.contains(
questionnaireResponseItem.linkId
)
) {
questionnaireResponseItem.answer =
linkIdToAnswersMapForDisabledQuestionnaireResponseItem[questionnaireResponseItem.linkId]
linkIdToAnswersMapForDisabledQuestionnaireResponseItem.remove(
questionnaireResponseItem.linkId
)
aditya-07 marked this conversation as resolved.
Show resolved Hide resolved
}

// Determine the validation result, which will be displayed on the item itself
val validationResult =
if (modifiedQuestionnaireResponseItemSet.contains(questionnaireResponseItem) ||
Expand Down
4 changes: 2 additions & 2 deletions datacapture/src/test/java/com/google/android/fhir/datacapture/QuestionnaireViewModelTest.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1191,13 +1191,13 @@ class QuestionnaireViewModelTest {

val viewModel = QuestionnaireViewModel(context, state)
viewModel.runViewModelBlocking {
var items = viewModel.getQuestionnaireItemViewItemList()
var items = viewModel.getQuestionnaireItemViewItemList().map { it.asQuestion() }
assertThat(items.map { it.questionnaireItem.linkId })
.containsExactly("question-1", "question-2", "question-3")

items.first { it.questionnaireItem.linkId == "question-1" }.clearAnswer()

items = viewModel.getQuestionnaireItemViewItemList()
items = viewModel.getQuestionnaireItemViewItemList().map { it.asQuestion() }
assertThat(items.map { it.questionnaireItem.linkId }).containsExactly("question-1")
}
}
Expand Down