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

Validate QuestionnaireItem.Group with repeats as repeating group #2755

Merged
merged 8 commits into from
Jan 21, 2025
Merged

Validate QuestionnaireItem.Group with repeats as repeating group #2755

Changes from 1 commit
Commits
Show all changes
8 commits
Select commit Hold shift + click to select a range
0ce839b
Validate QuestionnaireItem.Group with repeats as repeating group
LZRS Dec 10, 2024
a1638ae
Merge remote-tracking branch 'upstream/master' into 2752-fix-repeat-g…
LZRS Dec 17, 2024
1c86cae
Add tests for repeating groups in QuestionnaireResponseValidatorTest
LZRS Dec 17, 2024
f667e06
Merge branch 'master' into 2752-fix-repeat-group-response-validation
LZRS Dec 18, 2024
21bda2e
Merge branch 'master' into 2752-fix-repeat-group-response-validation
LZRS Jan 8, 2025
fe369d5
Update licence year to fix spotless
LZRS Jan 8, 2025
58656d0
Merge branch 'master' into 2752-fix-repeat-group-response-validation
LZRS Jan 15, 2025
ceed6a4
Merge branch 'master' into 2752-fix-repeat-group-response-validation
jingtang10 Jan 21, 2025
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
21 changes: 13 additions & 8 deletions ...ain/java/com/google/android/fhir/datacapture/validation/QuestionnaireResponseValidator.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -151,10 +151,12 @@ object QuestionnaireResponseValidator {
questionnaireResponseItemValidator: QuestionnaireResponseItemValidator,
linkIdToValidationResultMap: MutableMap<String, MutableList<ValidationResult>>,
): Map<String, List<ValidationResult>> {
when (checkNotNull(questionnaireItem.type) { "Questionnaire item must have type" }) {
Questionnaire.QuestionnaireItemType.DISPLAY,
Questionnaire.QuestionnaireItemType.NULL, -> Unit
Questionnaire.QuestionnaireItemType.GROUP ->
checkNotNull(questionnaireItem.type) { "Questionnaire item must have type" }
when {
questionnaireItem.type == Questionnaire.QuestionnaireItemType.DISPLAY ||
questionnaireItem.type == Questionnaire.QuestionnaireItemType.NULL -> Unit
questionnaireItem.type == Questionnaire.QuestionnaireItemType.GROUP &&
!questionnaireItem.repeats ->
// Nested items under group
// http://www.hl7.org/fhir/questionnaireresponse-definitions.html#QuestionnaireResponse.item.item
validateQuestionnaireResponseItems(
Expand Down Expand Up @@ -262,10 +264,13 @@ object QuestionnaireResponseValidator {
questionnaireItem: Questionnaire.QuestionnaireItemComponent,
questionnaireResponseItem: QuestionnaireResponse.QuestionnaireResponseItemComponent,
) {
when (checkNotNull(questionnaireItem.type) { "Questionnaire item must have type" }) {
Questionnaire.QuestionnaireItemType.DISPLAY,
Questionnaire.QuestionnaireItemType.NULL, -> Unit
Questionnaire.QuestionnaireItemType.GROUP ->
checkNotNull(questionnaireItem.type) { "Questionnaire item must have type" }

when {
questionnaireItem.type == Questionnaire.QuestionnaireItemType.DISPLAY ||
questionnaireItem.type == Questionnaire.QuestionnaireItemType.NULL -> Unit
questionnaireItem.type == Questionnaire.QuestionnaireItemType.GROUP &&
!questionnaireItem.repeats ->
// Nested items under group
// http://www.hl7.org/fhir/questionnaireresponse-definitions.html#QuestionnaireResponse.item.item
checkQuestionnaireResponseItems(questionnaireItem.item, questionnaireResponseItem.item)
Expand Down
Loading