Flyover text added for open choice view (#1625)

* Flyover text added for open choice view * Flyover text added for Modal Component * test case added * Flyover text added for open choice view * Flyover text added for Modal Component * test case added * review comment addressed * spotless check applied
google · Oct 12, 2022 · da1b5b3 · da1b5b3
1 parent c4cea20
commit da1b5b3
Show file tree

Hide file tree

Showing 6 changed files with 143 additions and 15 deletions.
diff --git a/catalog/src/main/assets/component_modal.json b/catalog/src/main/assets/component_modal.json
@@ -6,6 +6,26 @@
       "type": "choice",
       "repeats": true,
       "text": "Specific health concern for today’s visit",
+      "item": [
+        {
+          "linkId": "1.2",
+          "text": "Health concern",
+          "type": "display",
+          "extension": [
+            {
+              "url": "http://hl7.org/fhir/StructureDefinition/questionnaire-itemControl",
+              "valueCodeableConcept": {
+                "coding": [
+                  {
+                    "system": "http://hl7.org/fhir/questionnaire-item-control",
+                    "code": "flyover"
+                  }
+                ]
+              }
+            }
+          ]
+        }
+      ],
       "answerOption": [
         {
           "valueCoding": {

diff --git a/catalog/src/main/assets/component_modal_with_validation.json b/catalog/src/main/assets/component_modal_with_validation.json
@@ -7,6 +7,26 @@
       "repeats": true,
       "text": "Specific health concern for today’s visit",
       "required": true,
+      "item": [
+        {
+          "linkId": "1.2",
+          "text": "Health concern",
+          "type": "display",
+          "extension": [
+            {
+              "url": "http://hl7.org/fhir/StructureDefinition/questionnaire-itemControl",
+              "valueCodeableConcept": {
+                "coding": [
+                  {
+                    "system": "http://hl7.org/fhir/questionnaire-item-control",
+                    "code": "flyover"
+                  }
+                ]
+              }
+            }
+          ]
+        }
+      ],
       "answerOption": [
         {
           "valueCoding": {

diff --git a/catalog/src/main/assets/component_open_choice.json b/catalog/src/main/assets/component_open_choice.json
@@ -2,6 +2,7 @@
   "resourceType": "Questionnaire",
   "item": [
     {
+      "linkId": "1",
       "type": "choice",
       "repeats": true,
       "extension": [
@@ -19,8 +20,27 @@
           }
         }
       ],
-      "linkId": "1",
       "text": "Do you have any pre-existing health conditions?",
+      "item": [
+        {
+          "linkId": "1.1",
+          "text": "Health conditions",
+          "type": "display",
+          "extension": [
+            {
+              "url": "http://hl7.org/fhir/StructureDefinition/questionnaire-itemControl",
+              "valueCodeableConcept": {
+                "coding": [
+                  {
+                    "system": "http://hl7.org/fhir/questionnaire-item-control",
+                    "code": "flyover"
+                  }
+                ]
+              }
+            }
+          ]
+        }
+      ],
       "answerOption": [
         {
           "valueCoding": {

diff --git a/catalog/src/main/assets/component_open_choice_with_validation.json b/catalog/src/main/assets/component_open_choice_with_validation.json
@@ -11,17 +11,35 @@
             "coding": [
               {
                 "system": "http://hl7.org/fhir/questionnaire-item-control",
-                "code": "open-choice",
-                "display": "Open choice"
+                "code": "open-choice"
               }
-            ],
-            "text": "Open choice"
+            ]
           }
         }
       ],
       "linkId": "1",
       "text": "Do you have any pre-existing health conditions?",
       "required": true,
+      "item": [
+        {
+          "linkId": "1.1",
+          "text": "Health conditions",
+          "type": "display",
+          "extension": [
+            {
+              "url": "http://hl7.org/fhir/StructureDefinition/questionnaire-itemControl",
+              "valueCodeableConcept": {
+                "coding": [
+                  {
+                    "system": "http://hl7.org/fhir/questionnaire-item-control",
+                    "code": "flyover"
+                  }
+                ]
+              }
+            }
+          ]
+        }
+      ],
       "answerOption": [
         {
           "valueCoding": {

diff --git a/...fhir/datacapture/views/QuestionnaireItemDialogMultiSelectViewHolderFactoryEspressoTest.kt b/...fhir/datacapture/views/QuestionnaireItemDialogMultiSelectViewHolderFactoryEspressoTest.kt
@@ -21,16 +21,22 @@ import android.widget.FrameLayout
 import android.widget.TextView
 import androidx.test.ext.junit.rules.ActivityScenarioRule
 import androidx.test.platform.app.InstrumentationRegistry
+import com.google.android.fhir.datacapture.DisplayItemControlType
+import com.google.android.fhir.datacapture.EXTENSION_ITEM_CONTROL_SYSTEM
+import com.google.android.fhir.datacapture.EXTENSION_ITEM_CONTROL_URL
 import com.google.android.fhir.datacapture.R
 import com.google.android.fhir.datacapture.TestActivity
 import com.google.android.fhir.datacapture.utilities.assertQuestionnaireResponseAtIndex
 import com.google.android.fhir.datacapture.utilities.clickOnText
 import com.google.android.fhir.datacapture.utilities.clickOnTextInDialog
 import com.google.android.fhir.datacapture.utilities.endIconClickInTextInputLayout
 import com.google.android.fhir.datacapture.validation.NotValidated
+import com.google.android.material.textfield.TextInputLayout
 import com.google.common.truth.StringSubject
 import com.google.common.truth.Truth.assertThat
+import org.hl7.fhir.r4.model.CodeableConcept
 import org.hl7.fhir.r4.model.Coding
+import org.hl7.fhir.r4.model.Extension
 import org.hl7.fhir.r4.model.Questionnaire
 import org.hl7.fhir.r4.model.QuestionnaireResponse
 import org.junit.Before
@@ -180,6 +186,44 @@ class QuestionnaireItemDialogMultiSelectViewHolderFactoryEspressoTest {
     assertThat(questionnaireItemViewItem.answers).isEmpty()
   }
 
+  @Test
+  fun bindView_setHintText() {
+    val questionnaireItemViewItem =
+      QuestionnaireItemViewItem(
+        answerOptions(false, "Coding 1", "Coding 2", "Coding 3", "Coding 4", "Coding 5")
+          .addItem(
+            Questionnaire.QuestionnaireItemComponent().apply {
+              linkId = "1.1"
+              text = "Select code"
+              type = Questionnaire.QuestionnaireItemType.DISPLAY
+              addExtension(
+                Extension()
+                  .setUrl(EXTENSION_ITEM_CONTROL_URL)
+                  .setValue(
+                    CodeableConcept()
+                      .addCoding(
+                        Coding()
+                          .setCode(DisplayItemControlType.FLYOVER.extensionCode)
+                          .setSystem(EXTENSION_ITEM_CONTROL_SYSTEM)
+                      )
+                  )
+              )
+            }
+          ),
+        responseOptions(),
+        validationResult = NotValidated,
+        answersChangedCallback = { _, _, _ -> },
+      )
+    runOnUI { viewHolder.bind(questionnaireItemViewItem) }
+
+    assertThat(
+        viewHolder.itemView
+          .findViewById<TextInputLayout>(R.id.multi_select_summary_holder)
+          .hint.toString()
+      )
+      .isEqualTo("Select code")
+  }
+
   @Test
   fun singleOption_select_clickCancel_shouldSaveNothing() {
     val questionnaireItemViewItem =

diff --git a/...m/google/android/fhir/datacapture/views/QuestionnaireItemDialogSelectViewHolderFactory.kt b/...m/google/android/fhir/datacapture/views/QuestionnaireItemDialogSelectViewHolderFactory.kt
@@ -28,6 +28,7 @@ import com.google.android.fhir.datacapture.R
 import com.google.android.fhir.datacapture.common.datatype.asStringValue
 import com.google.android.fhir.datacapture.displayString
 import com.google.android.fhir.datacapture.itemControl
+import com.google.android.fhir.datacapture.localizedFlyoverSpanned
 import com.google.android.fhir.datacapture.localizedTextSpanned
 import com.google.android.fhir.datacapture.validation.Invalid
 import com.google.android.fhir.datacapture.validation.NotValidated
@@ -57,6 +58,8 @@ internal object QuestionnaireItemDialogSelectViewHolderFactory :
 
       override fun bind(questionnaireItemViewItem: QuestionnaireItemViewItem) {
         cleanupOldState()
+        holder.summaryHolder.hint =
+          questionnaireItemViewItem.questionnaireItem.localizedFlyoverSpanned
         val activity =
           requireNotNull(holder.header.context.tryUnwrapContext()) {
             "Can only use dialog select in an AppCompatActivity context"
@@ -108,7 +111,8 @@ internal object QuestionnaireItemDialogSelectViewHolderFactory :
       override fun displayValidationResult(validationResult: ValidationResult) {
         holder.summaryHolder.error =
           when (validationResult) {
-            is NotValidated, Valid -> null
+            is NotValidated,
+            Valid -> null
             is Invalid -> validationResult.getSingleStringValidationMessage()
           }
       }
@@ -123,17 +127,19 @@ internal object QuestionnaireItemDialogSelectViewHolderFactory :
 
       private fun updateAnswers(selectedOptions: SelectedOptions) {
         questionnaireItemViewItem.clearAnswer()
-        selectedOptions.options.filter { it.selected }.map { option ->
-          val answer =
-            QuestionnaireResponse.QuestionnaireResponseItemAnswerComponent().apply {
-              value = option.item.value
+        selectedOptions.options
+          .filter { it.selected }
+          .map { option ->
+            val answer =
+              QuestionnaireResponse.QuestionnaireResponseItemAnswerComponent().apply {
+                value = option.item.value
+              }
+            if (questionnaireItemViewItem.questionnaireItem.repeats) {
+              questionnaireItemViewItem.addAnswer(answer)
+            } else {
+              questionnaireItemViewItem.setAnswer(answer)
             }
-          if (questionnaireItemViewItem.questionnaireItem.repeats) {
-            questionnaireItemViewItem.addAnswer(answer)
-          } else {
-            questionnaireItemViewItem.setAnswer(answer)
           }
-        }
         selectedOptions.otherOptions.map { otherOption ->
           val otherAnswer =
             QuestionnaireResponse.QuestionnaireResponseItemAnswerComponent().apply {