diff --git a/build.gradle.kts b/build.gradle.kts
index 3c205711c1..add5c84a6d 100644
--- a/build.gradle.kts
+++ b/build.gradle.kts
@@ -23,7 +23,13 @@ allprojects {
configureSpotless()
}
-subprojects { configureLicensee() }
+subprojects {
+ // We have some empty folders like the :contrib root folder, which Gradle recognizes as projects.
+ // Don't configure plugins for those folders.
+ if (project.buildFile.exists()) {
+ configureLicensee()
+ }
+}
// Create a CI repository and also change versions to include the build number
afterEvaluate {
diff --git a/buildSrc/src/main/kotlin/Dependencies.kt b/buildSrc/src/main/kotlin/Dependencies.kt
index aad5f596e1..8adf2ab719 100644
--- a/buildSrc/src/main/kotlin/Dependencies.kt
+++ b/buildSrc/src/main/kotlin/Dependencies.kt
@@ -92,13 +92,18 @@ object Dependencies {
const val runtime = "androidx.room:room-runtime:${Versions.Androidx.room}"
}
+ object Mlkit {
+ const val barcodeScanning =
+ "com.google.mlkit:barcode-scanning:${Versions.Mlkit.barcodeScanning}"
+ const val objectDetection =
+ "com.google.mlkit:object-detection:${Versions.Mlkit.objectDetection}"
+ const val objectDetectionCustom =
+ "com.google.mlkit:object-detection-custom:${Versions.Mlkit.objectDetectionCustom}"
+ }
+
const val androidFhirCommon = "com.google.android.fhir:common:${Versions.androidFhirCommon}"
- const val barcodeScanning = "com.google.mlkit:barcode-scanning:${Versions.Mlkit.barcodeScanning}"
const val lifecycleExtensions =
"androidx.lifecycle:lifecycle-extensions:${Versions.Androidx.lifecycle}"
- const val objectDetection = "com.google.mlkit:object-detection:${Versions.Mlkit.objectDetection}"
- const val objectDetectionCustom =
- "com.google.mlkit:object-detection-custom:${Versions.Mlkit.objectDetectionCustom}"
const val desugarJdkLibs = "com.android.tools:desugar_jdk_libs:${Versions.desugarJdkLibs}"
const val fhirUcum = "org.fhir:ucum:${Versions.fhirUcum}"
const val guava = "com.google.guava:guava:${Versions.guava}"
diff --git a/buildSrc/src/main/kotlin/Releases.kt b/buildSrc/src/main/kotlin/Releases.kt
index 2a14ea98b4..ba7fc9de93 100644
--- a/buildSrc/src/main/kotlin/Releases.kt
+++ b/buildSrc/src/main/kotlin/Releases.kt
@@ -63,6 +63,14 @@ object Releases {
override val name = "Android FHIR Workflow Library"
}
+ object Contrib {
+ object Barcode : LibraryArtifact {
+ override val artifactId = "contrib-barcode"
+ override val version = "0.1.0-beta3"
+ override val name = "Android FHIR Structured Data Capture - Barcode Extensions (contrib)"
+ }
+ }
+
// Demo apps
object Demo {
diff --git a/catalog/build.gradle.kts b/catalog/build.gradle.kts
index 4898f6b715..279c2411b7 100644
--- a/catalog/build.gradle.kts
+++ b/catalog/build.gradle.kts
@@ -61,6 +61,7 @@ dependencies {
implementation(Dependencies.Navigation.navUiKtx)
implementation(project(path = ":datacapture"))
+ implementation(project(path = ":contrib:barcode"))
testImplementation(Dependencies.junit)
}
diff --git a/catalog/src/main/assets/paginated_layout_questionnaire.json b/catalog/src/main/assets/paginated_layout_questionnaire.json
index 511a9ea2c2..29c6b50e62 100644
--- a/catalog/src/main/assets/paginated_layout_questionnaire.json
+++ b/catalog/src/main/assets/paginated_layout_questionnaire.json
@@ -21,33 +21,117 @@
],
"item": [
{
- "linkId": "1",
+ "linkId": "1.1",
"type": "display",
"text": "Personal information",
"prefix": "1."
},
{
- "linkId": "2",
+ "linkId": "1.2",
"type": "string",
- "text": "First Name"
+ "item": [
+ {
+ "linkId": "1.2.1",
+ "text": "First Name",
+ "type": "display",
+ "extension": [
+ {
+ "url": "http://hl7.org/fhir/StructureDefinition/questionnaire-itemControl",
+ "valueCodeableConcept": {
+ "coding": [
+ {
+ "system": "http://hl7.org/fhir/questionnaire-item-control",
+ "code": "flyover",
+ "display": "Fly-over"
+ }
+ ],
+ "text": "Flyover"
+ }
+ }
+ ]
+ }
+ ]
},
{
- "linkId": "3",
+ "linkId": "1.3",
"type": "string",
- "text": "Family Name"
+ "item": [
+ {
+ "linkId": "1.3.1",
+ "text": "Family Name",
+ "type": "display",
+ "extension": [
+ {
+ "url": "http://hl7.org/fhir/StructureDefinition/questionnaire-itemControl",
+ "valueCodeableConcept": {
+ "coding": [
+ {
+ "system": "http://hl7.org/fhir/questionnaire-item-control",
+ "code": "flyover",
+ "display": "Fly-over"
+ }
+ ],
+ "text": "Flyover"
+ }
+ }
+ ]
+ }
+ ]
},
{
- "linkId": "4",
+ "linkId": "1.4",
"type": "integer",
- "text": "ID number"
+ "item": [
+ {
+ "linkId": "1.4.1",
+ "text": "ID number",
+ "type": "display",
+ "extension": [
+ {
+ "url": "http://hl7.org/fhir/StructureDefinition/questionnaire-itemControl",
+ "valueCodeableConcept": {
+ "coding": [
+ {
+ "system": "http://hl7.org/fhir/questionnaire-item-control",
+ "code": "flyover",
+ "display": "Fly-over"
+ }
+ ],
+ "text": "Flyover"
+ }
+ }
+ ]
+ }
+ ]
},
{
- "linkId": "5",
+ "linkId": "1.5",
"type": "integer",
- "text": "Mobile number"
+ "item": [
+ {
+ "linkId": "1.5.1",
+ "text": "Mobile number",
+ "type": "display",
+ "extension": [
+ {
+ "url": "http://hl7.org/fhir/StructureDefinition/questionnaire-itemControl",
+ "valueCodeableConcept": {
+ "coding": [
+ {
+ "system": "http://hl7.org/fhir/questionnaire-item-control",
+ "code": "flyover",
+ "display": "Fly-over"
+ }
+ ],
+ "text": "Flyover"
+ }
+ }
+ ]
+ }
+ ]
},
{
- "linkId": "6",
+ "linkId": "1.6",
"type": "choice",
"repeats": true,
"extension": [
@@ -77,7 +161,7 @@
]
},
{
- "linkId": "1",
+ "linkId": "2",
"type": "group",
"extension": [
{
@@ -96,13 +180,13 @@
],
"item": [
{
- "linkId": "7",
+ "linkId": "2.1",
"type": "date",
"text": "Date of birth",
"prefix": "2."
},
{
- "linkId": "9",
+ "linkId": "2.2",
"type": "choice",
"repeats": true,
"extension": [
@@ -132,7 +216,7 @@
]
},
{
- "linkId": "1",
+ "linkId": "3",
"type": "group",
"extension": [
{
@@ -151,40 +235,145 @@
],
"item": [
{
- "linkId": "10",
+ "linkId": "3.1",
"type": "display",
"text": "Address",
- "prefix": "3."
+ "prefix":"3."
},
{
- "linkId": "11",
+ "linkId": "3.2",
"type": "string",
- "text": "House number and street"
+ "item": [
+ {
+ "linkId": "10.1",
+ "text": "House number and street",
+ "type": "display",
+ "extension": [
+ {
+ "url": "http://hl7.org/fhir/StructureDefinition/questionnaire-itemControl",
+ "valueCodeableConcept": {
+ "coding": [
+ {
+ "system": "http://hl7.org/fhir/questionnaire-item-control",
+ "code": "flyover",
+ "display": "Fly-over"
+ }
+ ],
+ "text": "Flyover"
+ }
+ }
+ ]
+ }
+ ]
},
{
- "linkId": "12",
+ "linkId": "3.3",
"type": "string",
- "text": "Apartment, unit"
+ "item": [
+ {
+ "linkId": "11.1",
+ "text": "Apartment, unit",
+ "type": "display",
+ "extension": [
+ {
+ "url": "http://hl7.org/fhir/StructureDefinition/questionnaire-itemControl",
+ "valueCodeableConcept": {
+ "coding": [
+ {
+ "system": "http://hl7.org/fhir/questionnaire-item-control",
+ "code": "flyover",
+ "display": "Fly-over"
+ }
+ ],
+ "text": "Flyover"
+ }
+ }
+ ]
+ }
+ ]
},
{
- "linkId": "13",
+ "linkId": "3.4",
"type": "string",
- "text": "City, town or village"
+ "item": [
+ {
+ "linkId": "12.1",
+ "text": "City, town or village",
+ "type": "display",
+ "extension": [
+ {
+ "url": "http://hl7.org/fhir/StructureDefinition/questionnaire-itemControl",
+ "valueCodeableConcept": {
+ "coding": [
+ {
+ "system": "http://hl7.org/fhir/questionnaire-item-control",
+ "code": "flyover",
+ "display": "Fly-over"
+ }
+ ],
+ "text": "Flyover"
+ }
+ }
+ ]
+ }
+ ]
},
{
- "linkId": "14",
+ "linkId": "3.5",
"type": "string",
- "text": "County"
+ "item": [
+ {
+ "linkId": "13.1",
+ "text": "County",
+ "type": "display",
+ "extension": [
+ {
+ "url": "http://hl7.org/fhir/StructureDefinition/questionnaire-itemControl",
+ "valueCodeableConcept": {
+ "coding": [
+ {
+ "system": "http://hl7.org/fhir/questionnaire-item-control",
+ "code": "flyover",
+ "display": "Fly-over"
+ }
+ ],
+ "text": "Flyover"
+ }
+ }
+ ]
+ }
+ ]
},
{
- "linkId": "15",
+ "linkId": "3.6",
"type": "string",
- "text": "Postal Code"
+ "item": [
+ {
+ "linkId": "14.1",
+ "text": "Postal Code",
+ "type": "display",
+ "extension": [
+ {
+ "url": "http://hl7.org/fhir/StructureDefinition/questionnaire-itemControl",
+ "valueCodeableConcept": {
+ "coding": [
+ {
+ "system": "http://hl7.org/fhir/questionnaire-item-control",
+ "code": "flyover",
+ "display": "Fly-over"
+ }
+ ],
+ "text": "Flyover"
+ }
+ }
+ ]
+ }
+ ]
}
]
},
{
- "linkId": "1",
+ "linkId": "4",
"type": "group",
"extension": [
{
@@ -203,20 +392,47 @@
],
"item": [
{
- "linkId": "16",
+ "linkId": "4.1",
"type": "display",
"text": "Alternative contact person",
- "prefix": "4."
+ "prefix":"4.",
+ "item": [
+ {
+ "linkId": "15.1",
+ "text": "The alternative contact would be used in the case of an emergency situation and could be next of kin (e.g. partner, mother, sibling.)",
+ "type": "display"
+ }
+ ]
},
{
- "linkId": "18",
+ "linkId": "4.2",
"type": "string",
- "text": "Name"
+ "item": [
+ {
+ "linkId": "16.1",
+ "text": "Name",
+ "type": "display",
+ "extension": [
+ {
+ "url": "http://hl7.org/fhir/StructureDefinition/questionnaire-itemControl",
+ "valueCodeableConcept": {
+ "coding": [
+ {
+ "system": "http://hl7.org/fhir/questionnaire-item-control",
+ "code": "flyover",
+ "display": "Fly-over"
+ }
+ ],
+ "text": "Flyover"
+ }
+ }
+ ]
+ }
+ ]
},
{
- "linkId": "19",
+ "linkId": "4.3",
"type": "choice",
- "text": "Relationship",
"extension": [
{
"url": "http://hl7.org/fhir/StructureDefinition/questionnaire-itemControl",
@@ -232,6 +448,28 @@
}
}
],
+ "item": [
+ {
+ "linkId": "17.1",
+ "text": "Relationship",
+ "type": "display",
+ "extension": [
+ {
+ "url": "http://hl7.org/fhir/StructureDefinition/questionnaire-itemControl",
+ "valueCodeableConcept": {
+ "coding": [
+ {
+ "system": "http://hl7.org/fhir/questionnaire-item-control",
+ "code": "flyover",
+ "display": "Fly-over"
+ }
+ ],
+ "text": "Flyover"
+ }
+ }
+ ]
+ }
+ ],
"answerOption": [
{
"valueCoding": {
@@ -266,14 +504,35 @@
]
},
{
- "linkId": "20",
+ "linkId": "4.4",
"type": "string",
- "text": "Phone number"
+ "item": [
+ {
+ "linkId": "18.1",
+ "text": "Phone number",
+ "type": "display",
+ "extension": [
+ {
+ "url": "http://hl7.org/fhir/StructureDefinition/questionnaire-itemControl",
+ "valueCodeableConcept": {
+ "coding": [
+ {
+ "system": "http://hl7.org/fhir/questionnaire-item-control",
+ "code": "flyover",
+ "display": "Fly-over"
+ }
+ ],
+ "text": "Flyover"
+ }
+ }
+ ]
+ }
+ ]
}
]
},
{
- "linkId": "1",
+ "linkId": "5",
"type": "group",
"extension": [
{
@@ -292,7 +551,7 @@
],
"item": [
{
- "linkId": "20",
+ "linkId": "5.1",
"type": "choice",
"text": "What is the highest level of education achieved?",
"prefix": "5.",
@@ -341,7 +600,7 @@
]
},
{
- "linkId": "1",
+ "linkId": "6",
"type": "group",
"extension": [
{
@@ -360,7 +619,7 @@
],
"item": [
{
- "linkId": "21",
+ "linkId": "6.1",
"type": "choice",
"repeats": true,
"text": "Who does the client live with?",
@@ -422,7 +681,7 @@
]
},
{
- "linkId": "1",
+ "linkId": "7",
"type": "group",
"extension": [
{
@@ -441,7 +700,7 @@
],
"item": [
{
- "linkId": "22",
+ "linkId": "7.1",
"type": "choice",
"text": "Has the client received this year’s seasonal flu vaccine?",
"prefix": "7.",
@@ -484,7 +743,7 @@
]
},
{
- "linkId": "1",
+ "linkId": "8",
"type": "group",
"extension": [
{
@@ -503,7 +762,7 @@
],
"item": [
{
- "linkId": "23",
+ "linkId": "8.1",
"type": "date",
"text": "When was their last menstrual period? (LMP)",
"prefix": "8."
@@ -511,7 +770,7 @@
]
},
{
- "linkId": "1",
+ "linkId": "9",
"type": "group",
"extension": [
{
@@ -530,7 +789,7 @@
],
"item": [
{
- "linkId": "24",
+ "linkId": "9.1",
"type": "integer",
"text": "How many times have they been pregnant?",
"prefix": "9.",
@@ -553,7 +812,7 @@
]
},
{
- "linkId": "1",
+ "linkId": "10",
"type": "group",
"extension": [
{
@@ -572,7 +831,7 @@
],
"item": [
{
- "linkId": "25",
+ "linkId": "10.1",
"type": "dateTime",
"text": "What was the date and time of the ultrasound?",
"prefix": "10."
diff --git a/catalog/src/main/java/com/google/android/fhir/catalog/DemoQuestionnaireFragment.kt b/catalog/src/main/java/com/google/android/fhir/catalog/DemoQuestionnaireFragment.kt
index 80741f2e0c..8ecb35cf39 100644
--- a/catalog/src/main/java/com/google/android/fhir/catalog/DemoQuestionnaireFragment.kt
+++ b/catalog/src/main/java/com/google/android/fhir/catalog/DemoQuestionnaireFragment.kt
@@ -19,8 +19,6 @@ package com.google.android.fhir.catalog
import android.os.Bundle
import android.view.Gravity
import android.view.LayoutInflater
-import android.view.Menu
-import android.view.MenuInflater
import android.view.MenuItem
import android.view.View
import android.view.ViewGroup
@@ -38,6 +36,7 @@ import androidx.navigation.fragment.navArgs
import com.google.android.fhir.catalog.ModalBottomSheetFragment.Companion.BUNDLE_ERROR_KEY
import com.google.android.fhir.catalog.ModalBottomSheetFragment.Companion.REQUEST_ERROR_KEY
import com.google.android.fhir.datacapture.QuestionnaireFragment
+import com.google.android.fhir.datacapture.QuestionnaireFragment.Companion.SUBMIT_REQUEST_KEY
import kotlinx.coroutines.launch
class DemoQuestionnaireFragment : Fragment() {
@@ -59,6 +58,9 @@ class DemoQuestionnaireFragment : Fragment() {
setFragmentResultListener(REQUEST_ERROR_KEY) { _, bundle ->
isErrorState = bundle.getBoolean(BUNDLE_ERROR_KEY)
}
+ childFragmentManager.setFragmentResultListener(SUBMIT_REQUEST_KEY, viewLifecycleOwner) { _, _ ->
+ onSubmitQuestionnaireClick()
+ }
updateArguments()
if (savedInstanceState == null) {
addQuestionnaireFragment()
@@ -90,11 +92,6 @@ class DemoQuestionnaireFragment : Fragment() {
}
}
- override fun onCreateOptionsMenu(menu: Menu, inflater: MenuInflater) {
- super.onCreateOptionsMenu(menu, inflater)
- inflater.inflate(getMenu(), menu)
- }
-
private fun setUpActionBar() {
(requireActivity() as AppCompatActivity).supportActionBar?.apply {
setDisplayHomeAsUpEnabled(true)
@@ -146,7 +143,6 @@ class DemoQuestionnaireFragment : Fragment() {
}
private fun onSubmitQuestionnaireClick() {
- // TODO https://github.com/google/android-fhir/issues/1088
val questionnaireFragment =
childFragmentManager.findFragmentByTag(
QuestionnaireContainerFragment.QUESTIONNAIRE_FRAGMENT_TAG
diff --git a/catalog/src/main/res/layout/activity_main.xml b/catalog/src/main/res/layout/activity_main.xml
index a9109b4595..a394ba0677 100644
--- a/catalog/src/main/res/layout/activity_main.xml
+++ b/catalog/src/main/res/layout/activity_main.xml
@@ -32,11 +32,11 @@
>
diff --git a/catalog/src/main/res/layout/fragment_modal_bottom_sheet.xml b/catalog/src/main/res/layout/fragment_modal_bottom_sheet.xml
index 5a0c034a93..1fefa98520 100644
--- a/catalog/src/main/res/layout/fragment_modal_bottom_sheet.xml
+++ b/catalog/src/main/res/layout/fragment_modal_bottom_sheet.xml
@@ -9,12 +9,12 @@
>
@@ -43,11 +43,11 @@
app:layout_constraintTop_toBottomOf="@id/subTitle_tv"
/>
diff --git a/catalog/src/main/res/values-night/themes.xml b/catalog/src/main/res/values-night/themes.xml
index d465b36eef..71f2205cf1 100644
--- a/catalog/src/main/res/values-night/themes.xml
+++ b/catalog/src/main/res/values-night/themes.xml
@@ -19,20 +19,50 @@
name="Theme.Androidfhir"
parent="Theme.Material3.DayNight.NoActionBar"
>
- - @color/blue_300
- - @color/blue_300_38
- - @color/grey_900
- - @color/red_300
- - @color/grey_900
- - @color/grey_900
-
- - @color/grey_900
- - @color/blue_100
- - @color/grey_200
- - @color/grey_200
-
- - @color/purple_700
- - @color/teal_700
+ - @color/primary_blue_80
+ - @color/onPrimary_blue_20
+ - @color/primaryContainer_blue_30
+ - @color/onPrimaryContainer_blue_90
+
+ - @color/secondary_blue_80
+ - @color/onSecondary_blue_20
+ - @color/secondaryContainer_blue_30
+ - @color/onSecondaryContainer_blue_90
+
+ - @color/tertiary_green_80
+ - @color/onTertiary_green_20
+ - @color/tertiaryContainer_green_30
+ - @color/onTertiaryContainer_green_90
+
+ - @color/error_red_80
+ - @color/errorContainer_red_20
+ - @color/onError_red_30
+ - @color/onErrorContainer_red_90
+
+ - @color/background_neutral_10
+ - @color/onBackground_neutral_90
+
+ - @color/surface_neutral_10
+ - @color/onSurface_neutral_90
+
+ - @color/surfaceVariant_neutral_variant_30
+ - @color/onSurfaceVariant_neutral_variant_80
+
+ - @color/outline_neutral_variant_60
-
-
-
-
-
-
-
-
diff --git a/catalog/src/main/res/values/colors.xml b/catalog/src/main/res/values/colors.xml
index d9bf7b9ed9..8a1561f3da 100644
--- a/catalog/src/main/res/values/colors.xml
+++ b/catalog/src/main/res/values/colors.xml
@@ -40,4 +40,66 @@
#F28B82
#5F6368
#DADCE0
+
+ #0B57D0
+ #FFFFFF
+ #D3E3FD
+ #041E49
+
+ #00639B
+ #FFFFFF
+ #C2E7FF
+ #001D35
+
+ #146C2E
+ #FFFFFF
+ #C4EED0
+ #072711
+
+ #B3261E
+ #FFFFFF
+ #F9DEDC
+ #410E0B
+
+ #FFFFFF
+ #1F1F1F
+
+ #FFFFFF
+ #1F1F1F
+
+ #E1E3E1
+ #444746
+
+ #747775
+
+ #A8C7FA
+ #062E6F
+ #0842A0
+ #D3E3FD
+
+ #7FCFFF
+ #003355
+ #004A77
+ #C2E7FF
+
+ #146C2E
+ #0A3818
+ #0F5223
+ #C4EED0
+
+ #F2B8B5
+ #601410
+ #8C1D18
+ #F9DEDC
+
+ #1F1F1F
+ #E3E3E3
+
+ #1F1F1F
+ #E3E3E3
+
+ #444746
+ #C4C7C5
+
+ #8E918F
diff --git a/catalog/src/main/res/values/styles.xml b/catalog/src/main/res/values/styles.xml
index 60b2d62aef..8a3e17d219 100644
--- a/catalog/src/main/res/values/styles.xml
+++ b/catalog/src/main/res/values/styles.xml
@@ -18,33 +18,65 @@
-
-
-
-
-
-
-
-
-
+
+
-
+
diff --git a/catalog/src/main/res/values/themes.xml b/catalog/src/main/res/values/themes.xml
index a6d0a30770..0071ffc58d 100644
--- a/catalog/src/main/res/values/themes.xml
+++ b/catalog/src/main/res/values/themes.xml
@@ -19,20 +19,54 @@
name="Theme.Androidfhir"
parent="Theme.Material3.DayNight.NoActionBar"
>
-
- @color/blue_600
- - @color/blue_50
- - @color/white
- - @color/red_600
- - @color/white
+ - @color/primary_blue_40
+ - @color/onPrimary_blue_100
+ - @color/primaryContainer_blue_90
+ - @color/onPrimaryContainer_blue_10
+
+ - @color/secondary_blue_40
+ - @color/onSecondary_blue_100
+ - @color/secondaryContainer_blue_90
+ - @color/onSecondaryContainer_blue_10
+
+ - @color/tertiary_green_40
+ - @color/onTertiary_green_100
+ - @color/tertiaryContainer_green_90
+ - @color/onTertiaryContainer_green_10
+
+ - @color/error_red_40
+ - @color/errorContainer_red_100
+ - @color/onError_red_90
+ - @color/onErrorContainer_red_10
+
+ - @color/background_neutral_100
+ - @color/onBackground_neutral_10
- - @color/white
- - @color/blue_700
- - @color/grey_900
- - @color/grey_800
- - @color/white
+ - @color/surface_neutral_100
+ - @color/onSurface_neutral_10
+
+ - @color/surfaceVariant_neutral_variant_90
+ - @color/onSurfaceVariant_neutral_variant_30
- - @color/teal_700
- - @color/purple_700
+ - @color/outline_neutral_variant_50
- layout > activity\_main.xml**).
+2. Find the options for Code, Split, and Design views in the upper right of the
+ Layout Editor.
+3. Select the Code view.\
+ 
+4. You don't need the `TextView`, so delete it. Be sure to delete everything
+ from the ``.
+5. Add a `FragmentContainerView` inside the `ConstraintLayout`. Your
+ `activity_main.xml` file should look like this:
+
+ ```xml
+
+
+
+
+
+
+ ```
+
+### Step 2: Configure a QuestionnaireFragment
+
+`QuestionnaireFragment` requires a JSON encoded FHIR Questionnaire for it to
+render. Since the questionnaire is small (<512 KB), you will include it as a
+`String` in a `Bundle` of arguments that will be used to create the fragment.
+Larger questionnaires should be provided as a `URI` for performance reasons.
+
+You can look at the `questionnaire.json` file if you want, but one of the
+benefits of the Structured Data Capture Library is that you don't need to know
+the structure of the FHIR Questionnaire (or anything about FHIR) to get it to
+render it! You'll look more closely at this file later in the codelab.
+
+Open `MainActivity.kt` and add the following code to the `MainActivity` class:
+
+```kotlin
+// Step 2: Configure a QuestionnaireFragment
+val questionnaireJsonString = getStringFromAssets("questionnaire.json")
+
+val questionnaireParams = bundleOf(
+QuestionnaireFragment.EXTRA_QUESTIONNAIRE_JSON_STRING to questionnaireJsonString
+)
+```
+
+### Step 3: Add the QuestionnaireFragment to the FragmentContainerView
+
+To display the `QuestionnaireFragment` within the layout container, use the
+`FragmentManager` to create a `FragmentTransaction`. The `FragmentManager`
+handles instantiation using the previously created `questionnaireParams`.
+
+Add the following code to the `MainActivity` class:
+
+```kotlin
+// Step 3: Add the QuestionnaireFragment to the FragmentContainerView
+if (savedInstanceState == null) {
+ supportFragmentManager.commit {
+ setReorderingAllowed(true)
+ add(R.id.fragment_container_view, args = questionnaireParams)
+ }
+}
+```
+
+Learn more about
+[how to use fragments](https://developer.android.com/guide/fragments).
+
+Let's run the codelab by clicking Run
+() in the Android Studio toolbar.
+You should see something similar to this:
+
+TODO: Screenshot showing questionnaire rendered in an emulator
+
+Navigate through the questionnaire and try entering some answers. There are a
+few different answer widgets used, including booleans, text, and dates, which
+were automatically rendered based on the underlying type in the original FHIR
+questionnaire.
+
+*Technically, that's all you need to do to render a questionnaire!
+Congratulations!*
+
+A questionnaire isn't very helpful if you can't see the answers that users input
+though. Let's go on to the next step of getting a Questionnaire Response!
+
+## 6. Get a Questionnaire Response
+
+In the previous steps, you rendered a FHIR questionnaire in your app.
+
+In this section, you'll get the answers from the questionnaire as a
+QuestionnaireResponse.
+
+Find the `submitQuestionnaire()` method and add the following code:
+
+```kotlin
+// Get a questionnaire response
+val fragment = supportFragmentManager.findFragmentById(R.id.fragment_container_view)
+ as QuestionnaireFragment
+val questionnaireResponse = fragment.getQuestionnaireResponse()
+
+// Print the response to the log
+val jsonParser = FhirContext.forCached(FhirVersionEnum.R4).newJsonParser()
+val questionnaireResponseString =
+ jsonParser.encodeResourceToString(questionnaireResponse)
+Log.d("response", questionnaireResponseString)
+```
+
+To get the questionnaire response, you retrieve the questionnaire fragment
+created earlier then use the `getQuestionnaireResponse()` method. This returns a
+HAPI FHIR
+
[QuestionnaireResponse](https://hapifhir.io/hapi-fhir/apidocs/hapi-fhir-structures-r4/org/hl7/fhir/r4/model/QuestionnaireResponse.html)
+which you can use directly or with other parts of the Android FHIR SDK. This
+codelab uses other HAPI FHIR libraries to convert it to a JSON string to view in
+the log.
+
+## 7. Extract FHIR Resources from a QuestionnaireResponse
+
+The questionnaire included with the starter project is for a simple patient
+registration flow, so you may ultimately want to use the questionnaire responses
+to create a [FHIR Patient resource](https://www.hl7.org/fhir/patient.html) based
+on them. This conversion from a questionnaire response to FHIR resources is
+called [data extraction](http://hl7.org/fhir/uv/sdc/extraction.html). We can do
+this with the `ResourceMapper` class of the Structured Data Capture Library.
+
+To perform data extraction, your questionnaire must be authored to include
+information on how to perform the data extraction. Luckily, the sample
+questionnaire is already set up for
+[Definition-based extraction](http://hl7.org/fhir/uv/sdc/extraction.html#definition-based-extraction).
+
+Find the `submitQuestionnaire()` method and add the following code:
+
+```kotlin
+lifecycleScope.launch {
+ val questionnaire =
+ jsonParser.parseResource(questionnaireJsonString) as Questionnaire
+ val bundle = ResourceMapper.extract(questionnaire, questionnaireResponse)
+ Log.d("extraction result", jsonParser.encodeResourceToString(bundle))
+}
+```
+
+`ResourceMapper.extract()` requires a HAPI FHIR Questionnaire, which you can
+create by parsing the questionnaire JSON string from earlier, and a
+QuestionnaireResponse, which we already got earlier. It returns a HAPI FHIR
+transaction
+[Bundle](https://hapifhir.io/hapi-fhir/apidocs/hapi-fhir-structures-r4/org/hl7/fhir/r4/model/Bundle.html)
+containing one or more extracted resources–in this case a single Patient
+resource.
+
+## 8. Congratulations!
+
+You have used the Structured Data Capture Library to process FHIR questionnaires
+and responses in your app:
+
+* Display a Questionnaire
+* Get a Questionnaire Response
+* Extract FHIR Resources from a QuestionnaireResponse
+
+That is all you need to get it up and running!
+
+As you proceed, you might like to work with FHIR resources in more ways
+throughout your application. Check out the
+[FHIR Engine Library](https://github.com/google/android-fhir/wiki/FHIR-Engine-Library)
+of the Android FHIR SDK to learn how to store and manage FHIR resources locally
+in your application and synchronize data with a remote FHIR server.
+
+### What we've covered
+
+* How to add Structured Data Capture Library to your Android app
+* How to use `QuestionnaireFragment` and `ResourceMapper` to work with FHIR
+ questionnaires
+
+### Next Steps
+
+* Explore the documentation for the Structured Data Capture Library
+* Customize the look and feel of rendered questionnaires
+* Apply the Structured Data Capture Library in your own Android app
+
+### Learn More
+
+https://github.com/google/android-fhir/wiki/Structured-Data-Capture-Library
\ No newline at end of file
diff --git a/codelabs/datacapture/app/.gitignore b/codelabs/datacapture/app/.gitignore
new file mode 100644
index 0000000000..796b96d1c4
--- /dev/null
+++ b/codelabs/datacapture/app/.gitignore
@@ -0,0 +1 @@
+/build
diff --git a/codelabs/datacapture/app/build.gradle.kts b/codelabs/datacapture/app/build.gradle.kts
new file mode 100644
index 0000000000..cee7197741
--- /dev/null
+++ b/codelabs/datacapture/app/build.gradle.kts
@@ -0,0 +1,45 @@
+plugins {
+ id("com.android.application")
+ id("kotlin-android")
+}
+
+android {
+ compileSdk = 31
+
+ defaultConfig {
+ applicationId = "com.google.android.fhir.codelabs.datacapture"
+ minSdk = 21
+ targetSdk = 31
+ versionCode = 1
+ versionName = "1.0"
+
+ testInstrumentationRunner = "androidx.test.runner.AndroidJUnitRunner"
+ }
+
+ buildTypes {
+ release {
+ isMinifyEnabled = false
+ proguardFiles(getDefaultProguardFile("proguard-android-optimize.txt"), "proguard-rules.pro")
+ }
+ }
+ compileOptions {
+ sourceCompatibility = JavaVersion.VERSION_1_8
+ targetCompatibility = JavaVersion.VERSION_1_8
+ }
+ kotlinOptions {
+ jvmTarget = "1.8"
+ }
+}
+
+dependencies {
+ implementation("androidx.core:core-ktx:1.7.0")
+ implementation("androidx.appcompat:appcompat:1.4.0")
+ implementation("com.google.android.material:material:1.4.0")
+ implementation("androidx.constraintlayout:constraintlayout:2.1.2")
+
+ testImplementation("junit:junit:4.+")
+ androidTestImplementation("androidx.test.ext:junit:1.1.3")
+ androidTestImplementation("androidx.test.espresso:espresso-core:3.4.0")
+
+ // 3 Add dependencies for Structured Data Capture Library and Fragment KTX
+}
diff --git a/codelabs/datacapture/app/proguard-rules.pro b/codelabs/datacapture/app/proguard-rules.pro
new file mode 100644
index 0000000000..2f9dc5a47e
--- /dev/null
+++ b/codelabs/datacapture/app/proguard-rules.pro
@@ -0,0 +1,21 @@
+# Add project specific ProGuard rules here.
+# You can control the set of applied configuration files using the
+# proguardFiles setting in build.gradle.kts.
+#
+# For more details, see
+# http://developer.android.com/guide/developing/tools/proguard.html
+
+# If your project uses WebView with JS, uncomment the following
+# and specify the fully qualified class name to the JavaScript interface
+# class:
+#-keepclassmembers class fqcn.of.javascript.interface.for.webview {
+# public *;
+#}
+
+# Uncomment this to preserve the line number information for
+# debugging stack traces.
+#-keepattributes SourceFile,LineNumberTable
+
+# If you keep the line number information, uncomment this to
+# hide the original source file name.
+#-renamesourcefileattribute SourceFile
diff --git a/codelabs/datacapture/app/src/main/AndroidManifest.xml b/codelabs/datacapture/app/src/main/AndroidManifest.xml
new file mode 100644
index 0000000000..acac9f4c0e
--- /dev/null
+++ b/codelabs/datacapture/app/src/main/AndroidManifest.xml
@@ -0,0 +1,24 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/codelabs/datacapture/app/src/main/assets/questionnaire.json b/codelabs/datacapture/app/src/main/assets/questionnaire.json
new file mode 100644
index 0000000000..27ca746f5f
--- /dev/null
+++ b/codelabs/datacapture/app/src/main/assets/questionnaire.json
@@ -0,0 +1,78 @@
+{
+ "resourceType": "Questionnaire",
+ "status": "draft",
+ "extension": [
+ {
+ "url": "http://hl7.org/fhir/uv/sdc/StructureDefinition/sdc-questionnaire-itemExtractionContext",
+ "valueExpression": {
+ "language": "application/x-fhir-query",
+ "expression": "Patient",
+ "name": "patient"
+ }
+ }
+ ],
+ "item": [
+ {
+ "linkId": "PR",
+ "type": "group",
+ "text": "Patient information",
+ "item": [
+ {
+ "linkId": "PR-name",
+ "type": "group",
+ "text": "Name",
+ "definition": "http://hl7.org/fhir/StructureDefinition/Patient#Patient.name",
+ "item": [
+ {
+ "linkId": "PR-name-given",
+ "definition": "http://hl7.org/fhir/StructureDefinition/Patient#Patient.name.given",
+ "type": "string",
+ "text": "First Name"
+ },
+ {
+ "linkId": "PR-name-family",
+ "definition": "http://hl7.org/fhir/StructureDefinition/Patient#Patient.name.family",
+ "type": "string",
+ "text": "Family Name"
+ }
+ ]
+ },
+ {
+ "linkId": "PR-birthdate",
+ "definition": "http://hl7.org/fhir/StructureDefinition/Patient#Patient.birthDate",
+ "type": "date",
+ "text": "Date of Birth"
+ },
+ {
+ "linkId": "PR-id",
+ "type": "group",
+ "text": "Identifying information",
+ "definition": "http://hl7.org/fhir/StructureDefinition/Patient#Patient.identifier",
+ "item": [
+ {
+ "extension" : [
+ {
+ "url" : "http://hl7.org/fhir/StructureDefinition/questionnaire-hidden",
+ "valueBoolean" : true
+ },
+ {
+ "url" : "http://hl7.org/fhir/uv/sdc/StructureDefinition/sdc-questionnaire-initialExpression",
+ "valueString" : "http://example.org/mrn"
+ }
+ ],
+ "linkId": "PR-name-id-url",
+ "definition": "http://hl7.org/fhir/StructureDefinition/Patient#Patient.identifier.system",
+ "type": "string"
+ },
+ {
+ "linkId": "PR-name-id",
+ "definition": "http://hl7.org/fhir/StructureDefinition/Patient#Patient.identifier.value",
+ "type": "string",
+ "text": "Patient Id"
+ }
+ ]
+ }
+ ]
+ }
+ ]
+}
\ No newline at end of file
diff --git a/codelabs/datacapture/app/src/main/java/com/example/foodallergy/MainActivity.kt b/codelabs/datacapture/app/src/main/java/com/example/foodallergy/MainActivity.kt
new file mode 100644
index 0000000000..1e2b99c8a9
--- /dev/null
+++ b/codelabs/datacapture/app/src/main/java/com/example/foodallergy/MainActivity.kt
@@ -0,0 +1,61 @@
+/*
+ * Copyright 2021 Google LLC
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package com.google.codelab.sdclibrary
+
+import android.os.Bundle
+import android.view.Menu
+import android.view.MenuItem
+import androidx.appcompat.app.AppCompatActivity
+import com.example.foodallergy.R
+
+class MainActivity : AppCompatActivity() {
+
+ var questionnaireJsonString: String? = null
+
+ override fun onCreate(savedInstanceState: Bundle?) {
+ super.onCreate(savedInstanceState)
+ setContentView(R.layout.activity_main)
+
+ // 5.2 Replace with code from the codelab to configure a questionnaire fragment.
+
+ // 5.3 Replace with code from the codelab to add the questionnaire to the FragmentContainerView.
+ }
+
+ private fun submitQuestionnaire() {
+
+ // 6 Replace with code from the codelab to get a questionnaire response.
+
+ // 7 Replace with code from the codelab to extract FHIR resources from QuestionnaireResponse.
+ }
+
+ override fun onCreateOptionsMenu(menu: Menu): Boolean {
+ menuInflater.inflate(R.menu.submit_menu, menu)
+ return super.onCreateOptionsMenu(menu)
+ }
+
+ override fun onOptionsItemSelected(item: MenuItem): Boolean {
+ if (item.itemId == R.id.submit) {
+ submitQuestionnaire()
+ return true
+ }
+ return super.onOptionsItemSelected(item)
+ }
+
+ private fun getStringFromAssets(fileName: String): String {
+ return assets.open(fileName).bufferedReader().use { it.readText() }
+ }
+}
diff --git a/codelabs/datacapture/app/src/main/res/drawable-v24/ic_launcher_foreground.xml b/codelabs/datacapture/app/src/main/res/drawable-v24/ic_launcher_foreground.xml
new file mode 100644
index 0000000000..fcafc1db6e
--- /dev/null
+++ b/codelabs/datacapture/app/src/main/res/drawable-v24/ic_launcher_foreground.xml
@@ -0,0 +1,32 @@
+
+
+
+
+
- @style/Questionnaire.TextAppearance.MaterialComponents.Body2
+ >@style/Questionnaire.TextAppearance.MaterialComponents.BodyMedium
- @style/Questionnaire.Widget.MaterialComponents.CompoundButton.CheckBox
@@ -56,23 +52,23 @@
>@style/Questionnaire.Widget.MaterialComponents.CompoundButton.RadioButton
- @style/TextAppearance.MaterialComponents.Subtitle1
+ >@style/TextAppearance.Material3.BodyLarge
- @style/TextAppearance.MaterialComponents.Subtitle1
+ >@style/TextAppearance.Material3.BodyLarge
- @style/Widget.MaterialComponents.TextInputLayout.OutlinedBox.ExposedDropdownMenu
+ >@style/Widget.Material3.TextInputLayout.OutlinedBox.ExposedDropdownMenu
- @style/TextAppearance.MaterialComponents.Subtitle1
+ >@style/TextAppearance.Material3.BodyLarge
- @style/Widget.MaterialComponents.TextInputLayout.OutlinedBox
+ >@style/Widget.Material3.TextInputLayout.OutlinedBox
- @style/Widget.MaterialComponents.Chip.Entry
- - @style/Widget.AppCompat.Button
+
- @style/Widget.Material3.Button
-
@style/Questionnaire.TextAppearance.Error
@@ -92,10 +88,11 @@
name="submitButtonStyleQuestionnaire"
>@style/Questionnaire.SubmitButtonStyle
- -
- @style/Questionnaire.Widget.MaterialComponents.TextButton
-
+ -
+ @style/Widget.Material3.Button.TextButton.Dialog
+
-
+ @style/TextAppearance.Material3.TitleMedium
@@ -109,7 +106,7 @@
+
-
-
+ - 12dp
+ - 12dp
+
-
diff --git a/datacapture/src/test/java/com/google/android/fhir/datacapture/mapping/ResourceMapperTest.kt b/datacapture/src/test/java/com/google/android/fhir/datacapture/mapping/ResourceMapperTest.kt
index c4e9e14e2a..cd459efab2 100644
--- a/datacapture/src/test/java/com/google/android/fhir/datacapture/mapping/ResourceMapperTest.kt
+++ b/datacapture/src/test/java/com/google/android/fhir/datacapture/mapping/ResourceMapperTest.kt
@@ -27,6 +27,7 @@ import java.math.BigDecimal
import java.text.SimpleDateFormat
import java.util.Date
import java.util.UUID
+import kotlin.test.assertFailsWith
import kotlinx.coroutines.runBlocking
import org.hl7.fhir.exceptions.FHIRException
import org.hl7.fhir.r4.model.Address
@@ -869,6 +870,106 @@ class ResourceMapperTest {
assertThat(patient.name.first().family).isEqualTo("Crawford")
}
+ @Test
+ fun `extract_updateIntegerObservationForDecimalDefination_shouldUpdateAsDecimal() `() =
+ runBlocking {
+ @Language("JSON")
+ val questionnaireJson =
+ """{
+ "resourceType": "Questionnaire",
+ "subjectType": [
+ "Encounter"
+ ],
+ "item": [
+ {
+ "text": "Pulse Oximetry",
+ "linkId": "6.0.0",
+ "type": "group",
+ "extension": [
+ {
+ "url": "http://hl7.org/fhir/uv/sdc/StructureDefinition/sdc-questionnaire-itemExtractionContext",
+ "valueExpression": {
+ "language": "application/x-fhir-query",
+ "expression": "Observation",
+ "name": "pulse"
+ }
+ }
+ ],
+ "item": [
+ {
+ "linkId": "6.2.0",
+ "type": "group",
+ "definition": "http://hl7.org/fhir/StructureDefinition/Observation#Observation.valueQuantity",
+ "item": [
+ {
+ "text": "Pulse oximetry reading",
+ "type": "integer",
+ "linkId": "6.2.1",
+ "definition": "http://hl7.org/fhir/StructureDefinition/Observation#Observation.valueQuantity.value",
+ "extension": [
+ {
+ "url": "http://hl7.org/fhir/StructureDefinition/minValue",
+ "valueInteger": 60
+ },
+ {
+ "url": "http://hl7.org/fhir/StructureDefinition/maxValue",
+ "valueInteger": 100
+ }
+ ]
+ }
+ ]
+ }
+ ]
+ }
+ ]
+}
+ """.trimIndent()
+ @Language("JSON")
+ val questionnaireResponseJson =
+ """
+ {
+ "resourceType": "QuestionnaireResponse",
+ "item": [
+ {
+ "linkId": "6.0.0",
+ "item": [
+ {
+ "linkId": "6.2.0",
+ "item": [
+ {
+ "linkId": "6.2.1",
+ "answer": [
+ {
+ "valueInteger": 90
+ }
+ ]
+ }
+ ]
+ }
+ ]
+ }
+ ]
+}
+ """.trimIndent()
+
+ val iParser: IParser = FhirContext.forR4().newJsonParser()
+
+ val pulseOximetryQuestionnaire =
+ iParser.parseResource(Questionnaire::class.java, questionnaireJson) as Questionnaire
+
+ val pulseOximetryQuestionnaireResponse =
+ iParser.parseResource(QuestionnaireResponse::class.java, questionnaireResponseJson) as
+ QuestionnaireResponse
+
+ val observation =
+ ResourceMapper.extract(pulseOximetryQuestionnaire, pulseOximetryQuestionnaireResponse).entry[
+ 0]
+ .resource as
+ Observation
+
+ assertThat(observation.valueQuantity.value).isEqualTo(BigDecimal(90))
+ }
+
@Test
fun `populate() should fill QuestionnaireResponse with values when given a single Resource`() =
runBlocking {
@@ -956,11 +1057,6 @@ class ResourceMapperTest {
}
],
"definition": "http://hl7.org/fhir/StructureDefinition/Patient#Patient.gender",
- "initial": [
- {
- "valueString": "female"
- }
- ],
"type": "string",
"text": "Gender"
},
@@ -2247,6 +2343,39 @@ class ResourceMapperTest {
assertThat((extension2.value as Coding).display).isEqualTo("Option I")
}
+ @Test
+ fun `populate() should fail with IllegalStateException when QuestionnaireItem has both initial value and initialExpression`():
+ Unit = runBlocking {
+ val questionnaire =
+ Questionnaire()
+ .addItem(
+ Questionnaire.QuestionnaireItemComponent().apply {
+ linkId = "patient-gender"
+ type = Questionnaire.QuestionnaireItemType.CHOICE
+ extension =
+ listOf(
+ Extension(
+ ITEM_INITIAL_EXPRESSION_URL,
+ Expression().apply {
+ language = "text/fhirpath"
+ expression = "Patient.gender"
+ }
+ )
+ )
+ initial = listOf(Questionnaire.QuestionnaireItemInitialComponent(StringType("female")))
+ }
+ )
+
+ val patient = Patient().apply { gender = Enumerations.AdministrativeGender.MALE }
+ val errorMessage =
+ assertFailsWith { ResourceMapper.populate(questionnaire, patient) }
+ .localizedMessage
+ assertThat(errorMessage)
+ .isEqualTo(
+ "QuestionnaireItem item is not allowed to have both initial.value and initial expression. See rule at http://build.fhir.org/ig/HL7/sdc/expressions.html#initialExpression."
+ )
+ }
+
private fun String.toDateFromFormatYyyyMmDd(): Date? = SimpleDateFormat("yyyy-MM-dd").parse(this)
class TransformSupportServices(private val outputs: MutableList) :
diff --git a/demo/src/main/java/com/google/android/fhir/demo/EditPatientFragment.kt b/demo/src/main/java/com/google/android/fhir/demo/EditPatientFragment.kt
index 6346e2ae60..61faee2096 100644
--- a/demo/src/main/java/com/google/android/fhir/demo/EditPatientFragment.kt
+++ b/demo/src/main/java/com/google/android/fhir/demo/EditPatientFragment.kt
@@ -33,6 +33,7 @@ import com.google.android.fhir.datacapture.QuestionnaireFragment
/** A fragment representing Edit Patient screen. This fragment is contained in a [MainActivity]. */
class EditPatientFragment : Fragment(R.layout.add_patient_fragment) {
private val viewModel: EditPatientViewModel by viewModels()
+ var submitMenuItem: MenuItem? = null
override fun onCreate(savedInstanceState: Bundle?) {
super.onCreate(savedInstanceState)
@@ -47,7 +48,12 @@ class EditPatientFragment : Fragment(R.layout.add_patient_fragment) {
requireArguments()
.putString(QUESTIONNAIRE_FILE_PATH_KEY, "new-patient-registration-paginated.json")
- viewModel.livePatientData.observe(viewLifecycleOwner) { addQuestionnaireFragment(it) }
+ viewModel.livePatientData.observe(viewLifecycleOwner) {
+ addQuestionnaireFragment(it)
+ if (!it.toList().isNullOrEmpty()) {
+ submitMenuItem?.setEnabled(true)
+ }
+ }
viewModel.isPatientSaved.observe(viewLifecycleOwner) {
if (!it) {
Toast.makeText(requireContext(), R.string.message_input_missing, Toast.LENGTH_SHORT).show()
@@ -60,7 +66,8 @@ class EditPatientFragment : Fragment(R.layout.add_patient_fragment) {
}
override fun onCreateOptionsMenu(menu: Menu, inflater: MenuInflater) {
- inflater.inflate(R.menu.add_patient_fragment_menu, menu)
+ inflater.inflate(R.menu.edit_patient_fragment_menu, menu)
+ submitMenuItem = menu.findItem(R.id.action_edit_patient_submit)
}
override fun onOptionsItemSelected(item: MenuItem): Boolean {
@@ -69,7 +76,7 @@ class EditPatientFragment : Fragment(R.layout.add_patient_fragment) {
NavHostFragment.findNavController(this).navigateUp()
true
}
- R.id.action_add_patient_submit -> {
+ R.id.action_edit_patient_submit -> {
onSubmitAction()
true
}
diff --git a/demo/src/main/java/com/google/android/fhir/demo/PatientDetailsFragment.kt b/demo/src/main/java/com/google/android/fhir/demo/PatientDetailsFragment.kt
index d2251d5e9f..1304c5da00 100644
--- a/demo/src/main/java/com/google/android/fhir/demo/PatientDetailsFragment.kt
+++ b/demo/src/main/java/com/google/android/fhir/demo/PatientDetailsFragment.kt
@@ -43,7 +43,7 @@ class PatientDetailsFragment : Fragment() {
private var _binding: PatientDetailBinding? = null
private val binding
get() = _binding!!
-
+ var editMenuItem: MenuItem? = null
override fun onCreate(savedInstanceState: Bundle?) {
super.onCreate(savedInstanceState)
setHasOptionsMenu(true)
@@ -73,7 +73,12 @@ class PatientDetailsFragment : Fragment() {
title = "Patient Card"
setDisplayHomeAsUpEnabled(true)
}
- patientDetailsViewModel.livePatientData.observe(viewLifecycleOwner) { adapter.submitList(it) }
+ patientDetailsViewModel.livePatientData.observe(viewLifecycleOwner) {
+ adapter.submitList(it)
+ if (!it.isNullOrEmpty()) {
+ editMenuItem?.setEnabled(true)
+ }
+ }
patientDetailsViewModel.getPatientDetailData()
(activity as MainActivity).setDrawerEnabled(false)
}
@@ -89,6 +94,7 @@ class PatientDetailsFragment : Fragment() {
override fun onCreateOptionsMenu(menu: Menu, inflater: MenuInflater) {
inflater.inflate(R.menu.details_options_menu, menu)
+ editMenuItem = menu.findItem(R.id.menu_patient_edit)
}
override fun onOptionsItemSelected(item: MenuItem): Boolean {
diff --git a/demo/src/main/res/color/edit_menu_color.xml b/demo/src/main/res/color/edit_menu_color.xml
new file mode 100644
index 0000000000..b544bdf00f
--- /dev/null
+++ b/demo/src/main/res/color/edit_menu_color.xml
@@ -0,0 +1,11 @@
+
+
+ -
-
+ />
diff --git a/demo/src/main/res/menu/details_options_menu.xml b/demo/src/main/res/menu/details_options_menu.xml
index 256a386089..aa3bd7ea58 100644
--- a/demo/src/main/res/menu/details_options_menu.xml
+++ b/demo/src/main/res/menu/details_options_menu.xml
@@ -15,14 +15,15 @@
limitations under the License.
-->
diff --git a/demo/src/main/res/menu/edit_patient_fragment_menu.xml b/demo/src/main/res/menu/edit_patient_fragment_menu.xml
new file mode 100644
index 0000000000..3321c9f524
--- /dev/null
+++ b/demo/src/main/res/menu/edit_patient_fragment_menu.xml
@@ -0,0 +1,12 @@
+
+
diff --git a/demo/src/main/res/values/attrs.xml b/demo/src/main/res/values/attrs.xml
new file mode 100644
index 0000000000..251cf09719
--- /dev/null
+++ b/demo/src/main/res/values/attrs.xml
@@ -0,0 +1,5 @@
+
+
+
+
+
diff --git a/demo/src/main/res/values/colors.xml b/demo/src/main/res/values/colors.xml
index c99ffa5568..da576e2095 100644
--- a/demo/src/main/res/values/colors.xml
+++ b/demo/src/main/res/values/colors.xml
@@ -27,4 +27,6 @@
#ffebee
#10156125
#ffffff
+ #FFFFFFFF
+ #9AFFFFFF
diff --git a/demo/src/main/res/values/styles.xml b/demo/src/main/res/values/styles.xml
index c6ed64b82a..90c77bed96 100644
--- a/demo/src/main/res/values/styles.xml
+++ b/demo/src/main/res/values/styles.xml
@@ -21,6 +21,8 @@
- @color/colorPrimaryDark
- @color/colorAccent
- @color/colorStatusBar
+ - @color/white
+ - @color/disable_state
+
+
+
+
diff --git a/engine/src/androidTest/java/com/google/android/fhir/db/impl/DatabaseImplTest.kt b/engine/src/androidTest/java/com/google/android/fhir/db/impl/DatabaseImplTest.kt
index 8e577e7114..934d0101f5 100644
--- a/engine/src/androidTest/java/com/google/android/fhir/db/impl/DatabaseImplTest.kt
+++ b/engine/src/androidTest/java/com/google/android/fhir/db/impl/DatabaseImplTest.kt
@@ -134,6 +134,37 @@ class DatabaseImplTest {
)
}
+ @Test
+ fun update_existentResourceWithNoChange_shouldNotUpdateResource() = runBlocking {
+ val patient: Patient = testingUtils.readFromFile(Patient::class.java, "/date_test_patient.json")
+ database.insert(patient)
+ patient.gender = Enumerations.AdministrativeGender.FEMALE
+ database.update(patient)
+ patient.name[0].family = "TestPatient"
+ database.update(patient)
+ val patientString = services.parser.encodeResourceToString(patient)
+ val squashedLocalChange =
+ database.getAllLocalChanges().single { it.localChange.resourceId.equals(patient.logicalId) }
+ assertThat(squashedLocalChange.token.ids.size).isEqualTo(3)
+ with(squashedLocalChange.localChange) {
+ assertThat(resourceId).isEqualTo(patient.logicalId)
+ assertThat(resourceType).isEqualTo(patient.resourceType.name)
+ assertThat(type).isEqualTo(LocalChangeEntity.Type.INSERT)
+ assertThat(payload).isEqualTo(patientString)
+ }
+ // update patient with no local change
+ database.update(patient)
+ val squashedLocalChangeWithNoFurtherUpdate =
+ database.getAllLocalChanges().single { it.localChange.resourceId.equals(patient.logicalId) }
+ assertThat(squashedLocalChangeWithNoFurtherUpdate.token.ids.size).isEqualTo(3)
+ with(squashedLocalChangeWithNoFurtherUpdate.localChange) {
+ assertThat(resourceId).isEqualTo(patient.logicalId)
+ assertThat(resourceType).isEqualTo(patient.resourceType.name)
+ assertThat(type).isEqualTo(LocalChangeEntity.Type.INSERT)
+ assertThat(payload).isEqualTo(patientString)
+ }
+ }
+
@Test
fun update_nonExistingResource_shouldNotInsertResource() {
val resourceNotFoundException =
@@ -1516,6 +1547,7 @@ class DatabaseImplTest {
)
assertThat(result.single().id).isEqualTo("Patient/1")
}
+
@Test
fun search_date_greater_or_equal_noMatch() = runBlocking {
val patient =
diff --git a/engine/src/main/java/com/google/android/fhir/FhirEngineProvider.kt b/engine/src/main/java/com/google/android/fhir/FhirEngineProvider.kt
index d72ac0a7b6..85fc89cf99 100644
--- a/engine/src/main/java/com/google/android/fhir/FhirEngineProvider.kt
+++ b/engine/src/main/java/com/google/android/fhir/FhirEngineProvider.kt
@@ -90,6 +90,7 @@ object FhirEngineProvider {
fhirEngineConfiguration = null
}
}
+
/**
* A configuration which describes the database setup and error recovery.
*
@@ -126,4 +127,18 @@ enum class DatabaseErrorStrategy {
* A configuration to provide the remote FHIR server url and an [Authenticator] for supplying any
* auth token that may be necessary to communicate with the server.
*/
-data class ServerConfiguration(val baseUrl: String, val authenticator: Authenticator? = null)
+data class ServerConfiguration(
+ val baseUrl: String,
+ val networkConfiguration: NetworkConfiguration = NetworkConfiguration(),
+ val authenticator: Authenticator? = null
+)
+
+/** A configuration to provide the network connection parameters. */
+data class NetworkConfiguration(
+ /** Connection timeout (in seconds). The default is 10 seconds. */
+ val connectionTimeOut: Long = 10,
+ /** Read timeout (in seconds) for network connection. The default is 10 seconds. */
+ val readTimeOut: Long = 10,
+ /** Write timeout (in seconds) for network connection. The default is 10 seconds. */
+ val writeTimeOut: Long = 10
+)
diff --git a/engine/src/main/java/com/google/android/fhir/FhirServices.kt b/engine/src/main/java/com/google/android/fhir/FhirServices.kt
index fbd8a72d68..85d1bf21af 100644
--- a/engine/src/main/java/com/google/android/fhir/FhirServices.kt
+++ b/engine/src/main/java/com/google/android/fhir/FhirServices.kt
@@ -70,7 +70,9 @@ internal data class FhirServices(
val engine = FhirEngineImpl(database = db, context = context)
val remoteDataSource =
serverConfiguration?.let {
- RemoteFhirService.builder(it.baseUrl).apply { setAuthenticator(it.authenticator) }.build()
+ RemoteFhirService.builder(it.baseUrl, it.networkConfiguration)
+ .apply { setAuthenticator(it.authenticator) }
+ .build()
}
return FhirServices(
fhirEngine = engine,
diff --git a/engine/src/main/java/com/google/android/fhir/sync/remote/RemoteFhirService.kt b/engine/src/main/java/com/google/android/fhir/sync/remote/RemoteFhirService.kt
index 1c70e398c9..dbde30caa2 100644
--- a/engine/src/main/java/com/google/android/fhir/sync/remote/RemoteFhirService.kt
+++ b/engine/src/main/java/com/google/android/fhir/sync/remote/RemoteFhirService.kt
@@ -17,8 +17,10 @@
package com.google.android.fhir.sync.remote
import com.google.android.fhir.BuildConfig
+import com.google.android.fhir.NetworkConfiguration
import com.google.android.fhir.sync.Authenticator
import com.google.android.fhir.sync.DataSource
+import java.util.concurrent.TimeUnit
import okhttp3.Interceptor
import okhttp3.OkHttpClient
import okhttp3.logging.HttpLoggingInterceptor
@@ -38,7 +40,10 @@ internal interface RemoteFhirService : DataSource {
@POST(".") override suspend fun upload(@Body bundle: Bundle): Resource
- class Builder(private val baseUrl: String) {
+ class Builder(
+ private val baseUrl: String,
+ private val networkConfiguration: NetworkConfiguration
+ ) {
private var authenticator: Authenticator? = null
fun setAuthenticator(authenticator: Authenticator?) {
@@ -53,6 +58,9 @@ internal interface RemoteFhirService : DataSource {
val client =
OkHttpClient.Builder()
.apply {
+ connectTimeout(networkConfiguration.connectionTimeOut, TimeUnit.SECONDS)
+ readTimeout(networkConfiguration.readTimeOut, TimeUnit.SECONDS)
+ writeTimeout(networkConfiguration.writeTimeOut, TimeUnit.SECONDS)
addInterceptor(logger)
authenticator?.let {
addInterceptor(
@@ -81,6 +89,7 @@ internal interface RemoteFhirService : DataSource {
}
companion object {
- fun builder(baseUrl: String) = Builder(baseUrl)
+ fun builder(baseUrl: String, networkConfiguration: NetworkConfiguration) =
+ Builder(baseUrl, networkConfiguration)
}
}
diff --git a/engine/src/test/java/com/google/android/fhir/FhirEngineProviderTest.kt b/engine/src/test/java/com/google/android/fhir/FhirEngineProviderTest.kt
index ec2f52a602..6a6c75c6de 100644
--- a/engine/src/test/java/com/google/android/fhir/FhirEngineProviderTest.kt
+++ b/engine/src/test/java/com/google/android/fhir/FhirEngineProviderTest.kt
@@ -68,4 +68,31 @@ class FhirEngineProviderTest {
assertThat(runCatching { provider.cleanup() }.exceptionOrNull())
.isInstanceOf(IllegalStateException::class.java)
}
+
+ @Test
+ fun createFhirEngineConfiguration_withDefaultNetworkConfig_shouldHaveDefaultTimeout() {
+ val config = FhirEngineConfiguration(serverConfiguration = ServerConfiguration(""))
+ with(config.serverConfiguration!!.networkConfiguration) {
+ assertThat(this.connectionTimeOut).isEqualTo(10L)
+ assertThat(this.readTimeOut).isEqualTo(10L)
+ assertThat(this.writeTimeOut).isEqualTo(10L)
+ }
+ }
+
+ @Test
+ fun createFhirEngineConfiguration_configureNetworkTimeouts_shouldHaveconfiguredTimeout() {
+ val config =
+ FhirEngineConfiguration(
+ serverConfiguration =
+ ServerConfiguration(
+ "",
+ NetworkConfiguration(connectionTimeOut = 5, readTimeOut = 4, writeTimeOut = 6)
+ )
+ )
+ with(config.serverConfiguration!!.networkConfiguration) {
+ assertThat(this.connectionTimeOut).isEqualTo(5)
+ assertThat(this.readTimeOut).isEqualTo(4)
+ assertThat(this.writeTimeOut).isEqualTo(6)
+ }
+ }
}
diff --git a/engine/src/test/java/com/google/android/fhir/search/NumberSearchParameterizedTest.kt b/engine/src/test/java/com/google/android/fhir/search/NumberSearchParameterizedTest.kt
new file mode 100644
index 0000000000..06e2ec01b5
--- /dev/null
+++ b/engine/src/test/java/com/google/android/fhir/search/NumberSearchParameterizedTest.kt
@@ -0,0 +1,399 @@
+/*
+ * Copyright 2021 Google LLC
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package com.google.android.fhir.search
+
+import android.os.Build
+import ca.uhn.fhir.rest.param.ParamPrefixEnum
+import com.google.common.truth.Truth.assertThat
+import java.lang.IllegalArgumentException
+import java.math.BigDecimal
+import org.hl7.fhir.r4.model.ResourceType
+import org.hl7.fhir.r4.model.RiskAssessment
+import org.junit.Assert
+import org.junit.Test
+import org.junit.runner.RunWith
+import org.robolectric.ParameterizedRobolectricTestRunner
+import org.robolectric.annotation.Config
+
+/** Unit tests for when [NumberParamFilterCriterion] used in [MoreSearch]. */
+@RunWith(ParameterizedRobolectricTestRunner::class)
+@Config(sdk = [Build.VERSION_CODES.P])
+class NumberSearchParameterizedTest(
+ private val num: BigDecimal,
+ private val lowerBound: BigDecimal,
+ private val upperBound: BigDecimal
+) {
+ companion object {
+ @JvmStatic
+ @ParameterizedRobolectricTestRunner.Parameters
+ fun params(): Collection> {
+ return listOf(
+ arrayOf(BigDecimal("100.00"), BigDecimal("99.995"), BigDecimal("100.005")),
+ arrayOf(BigDecimal("100.0"), BigDecimal("99.95"), BigDecimal("100.05")),
+ arrayOf(BigDecimal("1e-1"), BigDecimal("0.5e-1"), BigDecimal("1.5e-1")),
+ )
+ }
+ }
+
+ private val baseQuery: String =
+ """
+ SELECT a.serializedResource
+ FROM ResourceEntity a
+ WHERE a.resourceType = ?
+ AND a.resourceUuid IN (
+ SELECT resourceUuid FROM NumberIndexEntity
+ """.trimIndent()
+
+ @Test
+ fun `should search equal values`() {
+ val search =
+ Search(ResourceType.RiskAssessment)
+ .apply {
+ filter(
+ RiskAssessment.PROBABILITY,
+ {
+ prefix = ParamPrefixEnum.EQUAL
+ value = num
+ }
+ )
+ }
+ .getQuery()
+ assertThat(search.query)
+ .isEqualTo(
+ """
+ |$baseQuery
+ |WHERE resourceType = ? AND index_name = ? AND (index_value >= ? AND index_value < ?)
+ |)""".trimMargin()
+ )
+
+ assertThat(search.args)
+ .isEqualTo(
+ listOf(
+ ResourceType.RiskAssessment.name,
+ ResourceType.RiskAssessment.name,
+ RiskAssessment.PROBABILITY.paramName,
+ lowerBound.toDouble(),
+ upperBound.toDouble()
+ )
+ )
+ }
+
+ @Test
+ fun `should search unequal values`() {
+ val search =
+ Search(ResourceType.RiskAssessment)
+ .apply {
+ filter(
+ RiskAssessment.PROBABILITY,
+ {
+ prefix = ParamPrefixEnum.NOT_EQUAL
+ value = num
+ }
+ )
+ }
+ .getQuery()
+ assertThat(search.query)
+ .isEqualTo(
+ """
+ |$baseQuery
+ |WHERE resourceType = ? AND index_name = ? AND (index_value < ? OR index_value >= ?)
+ |)""".trimMargin()
+ )
+
+ assertThat(search.args)
+ .isEqualTo(
+ listOf(
+ ResourceType.RiskAssessment.name,
+ ResourceType.RiskAssessment.name,
+ RiskAssessment.PROBABILITY.paramName,
+ lowerBound.toDouble(),
+ upperBound.toDouble()
+ )
+ )
+ }
+
+ @Test
+ fun `should search values greater than a number`() {
+ val search =
+ Search(ResourceType.RiskAssessment)
+ .apply {
+ filter(
+ RiskAssessment.PROBABILITY,
+ {
+ prefix = ParamPrefixEnum.GREATERTHAN
+ value = num
+ }
+ )
+ }
+ .getQuery()
+ assertThat(search.query)
+ .isEqualTo(
+ """
+ |$baseQuery
+ |WHERE resourceType = ? AND index_name = ? AND index_value > ?
+ |)""".trimMargin()
+ )
+
+ assertThat(search.args)
+ .isEqualTo(
+ listOf(
+ ResourceType.RiskAssessment.name,
+ ResourceType.RiskAssessment.name,
+ RiskAssessment.PROBABILITY.paramName,
+ num.toDouble()
+ )
+ )
+ }
+
+ @Test
+ fun `should search values greater than or equal to a number`() {
+ val search =
+ Search(ResourceType.RiskAssessment)
+ .apply {
+ filter(
+ RiskAssessment.PROBABILITY,
+ {
+ prefix = ParamPrefixEnum.GREATERTHAN_OR_EQUALS
+ value = num
+ }
+ )
+ }
+ .getQuery()
+ assertThat(search.query)
+ .isEqualTo(
+ """
+ |$baseQuery
+ |WHERE resourceType = ? AND index_name = ? AND index_value >= ?
+ |)""".trimMargin()
+ )
+
+ assertThat(search.args)
+ .isEqualTo(
+ listOf(
+ ResourceType.RiskAssessment.name,
+ ResourceType.RiskAssessment.name,
+ RiskAssessment.PROBABILITY.paramName,
+ num.toDouble()
+ )
+ )
+ }
+
+ @Test
+ fun `should search values less than a number`() {
+ val search =
+ Search(ResourceType.RiskAssessment)
+ .apply {
+ filter(
+ RiskAssessment.PROBABILITY,
+ {
+ prefix = ParamPrefixEnum.LESSTHAN
+ value = num
+ }
+ )
+ }
+ .getQuery()
+ assertThat(search.query)
+ .isEqualTo(
+ """
+ |$baseQuery
+ |WHERE resourceType = ? AND index_name = ? AND index_value < ?
+ |)""".trimMargin()
+ )
+
+ assertThat(search.args)
+ .isEqualTo(
+ listOf(
+ ResourceType.RiskAssessment.name,
+ ResourceType.RiskAssessment.name,
+ RiskAssessment.PROBABILITY.paramName,
+ num.toDouble()
+ )
+ )
+ }
+
+ @Test
+ fun `should search values less than or equal to a number`() {
+ val search =
+ Search(ResourceType.RiskAssessment)
+ .apply {
+ filter(
+ RiskAssessment.PROBABILITY,
+ {
+ prefix = ParamPrefixEnum.LESSTHAN_OR_EQUALS
+ value = num
+ }
+ )
+ }
+ .getQuery()
+ assertThat(search.query)
+ .isEqualTo(
+ """
+ |$baseQuery
+ |WHERE resourceType = ? AND index_name = ? AND index_value <= ?
+ |)""".trimMargin()
+ )
+ assertThat(search.args)
+ .isEqualTo(
+ listOf(
+ ResourceType.RiskAssessment.name,
+ ResourceType.RiskAssessment.name,
+ RiskAssessment.PROBABILITY.paramName,
+ num.toDouble()
+ )
+ )
+ }
+
+ @Test
+ fun `should throw error when ENDS_BEFORE prefix given with integer value`() {
+ val illegalArgumentException =
+ Assert.assertThrows(IllegalArgumentException::class.java) {
+ Search(ResourceType.RiskAssessment)
+ .apply {
+ filter(
+ RiskAssessment.PROBABILITY,
+ {
+ prefix = ParamPrefixEnum.ENDS_BEFORE
+ value = BigDecimal("100")
+ }
+ )
+ }
+ .getQuery()
+ }
+ assertThat(illegalArgumentException.message)
+ .isEqualTo("Prefix ENDS_BEFORE not allowed for Integer type")
+ }
+
+ @Test
+ fun `should search value when ENDS_BEFORE prefix given with decimal value`() {
+ val search =
+ Search(ResourceType.RiskAssessment)
+ .apply {
+ filter(
+ RiskAssessment.PROBABILITY,
+ {
+ prefix = ParamPrefixEnum.ENDS_BEFORE
+ value = num
+ }
+ )
+ }
+ .getQuery()
+ assertThat(search.query)
+ .isEqualTo(
+ """
+ |$baseQuery
+ |WHERE resourceType = ? AND index_name = ? AND index_value < ?
+ |)""".trimMargin()
+ )
+
+ assertThat(search.args)
+ .isEqualTo(
+ listOf(
+ ResourceType.RiskAssessment.name,
+ ResourceType.RiskAssessment.name,
+ RiskAssessment.PROBABILITY.paramName,
+ num.toDouble()
+ )
+ )
+ }
+
+ @Test
+ fun `should throw error when STARTS_AFTER prefix given with integer value`() {
+ val illegalArgumentException =
+ Assert.assertThrows(IllegalArgumentException::class.java) {
+ Search(ResourceType.RiskAssessment)
+ .apply {
+ filter(
+ RiskAssessment.PROBABILITY,
+ {
+ prefix = ParamPrefixEnum.STARTS_AFTER
+ value = BigDecimal(100)
+ }
+ )
+ }
+ .getQuery()
+ }
+ assertThat(illegalArgumentException.message)
+ .isEqualTo("Prefix STARTS_AFTER not allowed for Integer type")
+ }
+
+ @Test
+ fun `should search value when STARTS_AFTER prefix given with decimal value`() {
+ val search =
+ Search(ResourceType.RiskAssessment)
+ .apply {
+ filter(
+ RiskAssessment.PROBABILITY,
+ {
+ prefix = ParamPrefixEnum.STARTS_AFTER
+ value = num
+ }
+ )
+ }
+ .getQuery()
+ assertThat(search.query)
+ .isEqualTo(
+ """
+ |$baseQuery
+ |WHERE resourceType = ? AND index_name = ? AND index_value > ?
+ |)""".trimMargin()
+ )
+
+ assertThat(search.args)
+ .isEqualTo(
+ listOf(
+ ResourceType.RiskAssessment.name,
+ ResourceType.RiskAssessment.name,
+ RiskAssessment.PROBABILITY.paramName,
+ num.toDouble()
+ )
+ )
+ }
+
+ @Test
+ fun `should search approximate values`() {
+ val search =
+ Search(ResourceType.RiskAssessment)
+ .apply {
+ filter(
+ RiskAssessment.PROBABILITY,
+ {
+ prefix = ParamPrefixEnum.APPROXIMATE
+ value = BigDecimal("1e-1")
+ }
+ )
+ }
+ .getQuery()
+ assertThat(search.query)
+ .isEqualTo(
+ """
+ |$baseQuery
+ |WHERE resourceType = ? AND index_name = ? AND (index_value >= ? AND index_value <= ?)
+ |)""".trimMargin()
+ )
+
+ assertThat(search.args)
+ .isEqualTo(
+ listOf(
+ ResourceType.RiskAssessment.name,
+ ResourceType.RiskAssessment.name,
+ RiskAssessment.PROBABILITY.paramName,
+ 0.09,
+ 0.11
+ )
+ )
+ }
+}
diff --git a/engine/src/test/java/com/google/android/fhir/search/SearchTest.kt b/engine/src/test/java/com/google/android/fhir/search/SearchTest.kt
index 91ae1f4281..8873b89b89 100644
--- a/engine/src/test/java/com/google/android/fhir/search/SearchTest.kt
+++ b/engine/src/test/java/com/google/android/fhir/search/SearchTest.kt
@@ -43,7 +43,6 @@ import org.hl7.fhir.r4.model.Patient
import org.hl7.fhir.r4.model.ResourceType
import org.hl7.fhir.r4.model.RiskAssessment
import org.hl7.fhir.r4.model.UriType
-import org.junit.Assert.assertThrows
import org.junit.Test
import org.junit.runner.RunWith
import org.robolectric.RobolectricTestRunner
@@ -122,395 +121,6 @@ class SearchTest {
assertThat(query.args).isEqualTo(listOf(ResourceType.Patient.name, 10, 20))
}
- @Test
- fun search_filter_number_equals() {
- /* x contains pairs of values and their corresponding range (see BigDecimal.getRange() in
- MoreSearch.KT) */
- for (x in
- listOf(
- BigDecimal("100") to BigDecimal("0.5"),
- BigDecimal("100.00") to BigDecimal("0.005"),
- BigDecimal("1e3") to BigDecimal("5")
- )) {
- val query =
- Search(ResourceType.RiskAssessment)
- .apply {
- filter(
- RiskAssessment.PROBABILITY,
- {
- prefix = ParamPrefixEnum.EQUAL
- value = x.first
- }
- )
- }
- .getQuery()
- assertThat(query.query)
- .isEqualTo(
- """
- SELECT a.serializedResource
- FROM ResourceEntity a
- WHERE a.resourceType = ?
- AND a.resourceUuid IN (
- SELECT resourceUuid FROM NumberIndexEntity
- WHERE resourceType = ? AND index_name = ? AND (index_value >= ? AND index_value < ?)
- )
- """.trimIndent()
- )
-
- assertThat(query.args)
- .isEqualTo(
- listOf(
- ResourceType.RiskAssessment.name,
- ResourceType.RiskAssessment.name,
- RiskAssessment.PROBABILITY.paramName,
- (x.first - x.second).toDouble(),
- (x.first + x.second).toDouble()
- )
- )
- }
- }
-
- @Test
- fun search_filter_number_notEquals() {
- val query =
- Search(ResourceType.RiskAssessment)
- .apply {
- filter(
- RiskAssessment.PROBABILITY,
- {
- prefix = ParamPrefixEnum.NOT_EQUAL
- value = BigDecimal("100.00")
- }
- )
- }
- .getQuery()
- assertThat(query.query)
- .isEqualTo(
- """
- SELECT a.serializedResource
- FROM ResourceEntity a
- WHERE a.resourceType = ?
- AND a.resourceUuid IN (
- SELECT resourceUuid FROM NumberIndexEntity
- WHERE resourceType = ? AND index_name = ? AND (index_value < ? OR index_value >= ?)
- )
- """.trimIndent()
- )
-
- assertThat(query.args)
- .isEqualTo(
- listOf(
- ResourceType.RiskAssessment.name,
- ResourceType.RiskAssessment.name,
- RiskAssessment.PROBABILITY.paramName,
- BigDecimal.valueOf(99.995).toDouble(),
- BigDecimal.valueOf(100.005).toDouble()
- )
- )
- }
-
- @Test
- fun search_filter_number_greater() {
- val query =
- Search(ResourceType.RiskAssessment)
- .apply {
- filter(
- RiskAssessment.PROBABILITY,
- {
- prefix = ParamPrefixEnum.GREATERTHAN
- value = BigDecimal("100.00")
- }
- )
- }
- .getQuery()
- assertThat(query.query)
- .isEqualTo(
- """
- SELECT a.serializedResource
- FROM ResourceEntity a
- WHERE a.resourceType = ?
- AND a.resourceUuid IN (
- SELECT resourceUuid FROM NumberIndexEntity
- WHERE resourceType = ? AND index_name = ? AND index_value > ?
- )
- """.trimIndent()
- )
-
- assertThat(query.args)
- .isEqualTo(
- listOf(
- ResourceType.RiskAssessment.name,
- ResourceType.RiskAssessment.name,
- RiskAssessment.PROBABILITY.paramName,
- BigDecimal("100.00").toDouble()
- )
- )
- }
- @Test
- fun search_filter_number_greaterThanEqual() {
- val query =
- Search(ResourceType.RiskAssessment)
- .apply {
- filter(
- RiskAssessment.PROBABILITY,
- {
- prefix = ParamPrefixEnum.GREATERTHAN_OR_EQUALS
- value = BigDecimal("100.00")
- }
- )
- }
- .getQuery()
- assertThat(query.query)
- .isEqualTo(
- """
- SELECT a.serializedResource
- FROM ResourceEntity a
- WHERE a.resourceType = ?
- AND a.resourceUuid IN (
- SELECT resourceUuid FROM NumberIndexEntity
- WHERE resourceType = ? AND index_name = ? AND index_value >= ?
- )
- """.trimIndent()
- )
-
- assertThat(query.args)
- .isEqualTo(
- listOf(
- ResourceType.RiskAssessment.name,
- ResourceType.RiskAssessment.name,
- RiskAssessment.PROBABILITY.paramName,
- BigDecimal("100.00").toDouble()
- )
- )
- }
- @Test
- fun search_filter_number_less() {
- val query =
- Search(ResourceType.RiskAssessment)
- .apply {
- filter(
- RiskAssessment.PROBABILITY,
- {
- prefix = ParamPrefixEnum.LESSTHAN
- value = BigDecimal("100.00")
- }
- )
- }
- .getQuery()
- assertThat(query.query)
- .isEqualTo(
- """
- SELECT a.serializedResource
- FROM ResourceEntity a
- WHERE a.resourceType = ?
- AND a.resourceUuid IN (
- SELECT resourceUuid FROM NumberIndexEntity
- WHERE resourceType = ? AND index_name = ? AND index_value < ?
- )
- """.trimIndent()
- )
-
- assertThat(query.args)
- .isEqualTo(
- listOf(
- ResourceType.RiskAssessment.name,
- ResourceType.RiskAssessment.name,
- RiskAssessment.PROBABILITY.paramName,
- BigDecimal("100.00").toDouble()
- )
- )
- }
- @Test
- fun search_filter_number_lessThanEquals() {
- val query =
- Search(ResourceType.RiskAssessment)
- .apply {
- filter(
- RiskAssessment.PROBABILITY,
- {
- prefix = ParamPrefixEnum.LESSTHAN_OR_EQUALS
- value = BigDecimal("100.00")
- }
- )
- }
- .getQuery()
- assertThat(query.query)
- .isEqualTo(
- """
- SELECT a.serializedResource
- FROM ResourceEntity a
- WHERE a.resourceType = ?
- AND a.resourceUuid IN (
- SELECT resourceUuid FROM NumberIndexEntity
- WHERE resourceType = ? AND index_name = ? AND index_value <= ?
- )
- """.trimIndent()
- )
-
- assertThat(query.args)
- .isEqualTo(
- listOf(
- ResourceType.RiskAssessment.name,
- ResourceType.RiskAssessment.name,
- RiskAssessment.PROBABILITY.paramName,
- BigDecimal("100.00").toDouble()
- )
- )
- }
-
- @Test
- fun search_filter_integer_endsBefore_error() {
- val illegalArgumentException =
- assertThrows(java.lang.IllegalArgumentException::class.java) {
- Search(ResourceType.RiskAssessment)
- .apply {
- filter(
- RiskAssessment.PROBABILITY,
- {
- prefix = ParamPrefixEnum.ENDS_BEFORE
- value = BigDecimal("100")
- }
- )
- }
- .getQuery()
- }
- assertThat(illegalArgumentException.message)
- .isEqualTo("Prefix ENDS_BEFORE not allowed for Integer type")
- }
- @Test
- fun search_filter_decimal_endsBefore() {
- val query =
- Search(ResourceType.RiskAssessment)
- .apply {
- filter(
- RiskAssessment.PROBABILITY,
- {
- prefix = ParamPrefixEnum.ENDS_BEFORE
- value = BigDecimal("100.00")
- }
- )
- }
- .getQuery()
- assertThat(query.query)
- .isEqualTo(
- """
- SELECT a.serializedResource
- FROM ResourceEntity a
- WHERE a.resourceType = ?
- AND a.resourceUuid IN (
- SELECT resourceUuid FROM NumberIndexEntity
- WHERE resourceType = ? AND index_name = ? AND index_value < ?
- )
- """.trimIndent()
- )
-
- assertThat(query.args)
- .isEqualTo(
- listOf(
- ResourceType.RiskAssessment.name,
- ResourceType.RiskAssessment.name,
- RiskAssessment.PROBABILITY.paramName,
- BigDecimal("100.00").toDouble()
- )
- )
- }
-
- @Test
- fun search_filter_integer_startsAfter_error() {
- val illegalArgumentException =
- assertThrows(java.lang.IllegalArgumentException::class.java) {
- Search(ResourceType.RiskAssessment)
- .apply {
- filter(
- RiskAssessment.PROBABILITY,
- {
- prefix = ParamPrefixEnum.STARTS_AFTER
- value = BigDecimal("100")
- }
- )
- }
- .getQuery()
- }
- assertThat(illegalArgumentException.message)
- .isEqualTo("Prefix STARTS_AFTER not allowed for Integer type")
- }
-
- @Test
- fun search_filter_decimal_startsAfter() {
- val query =
- Search(ResourceType.RiskAssessment)
- .apply {
- filter(
- RiskAssessment.PROBABILITY,
- {
- prefix = ParamPrefixEnum.STARTS_AFTER
- value = BigDecimal("100.00")
- }
- )
- }
- .getQuery()
- assertThat(query.query)
- .isEqualTo(
- """
- SELECT a.serializedResource
- FROM ResourceEntity a
- WHERE a.resourceType = ?
- AND a.resourceUuid IN (
- SELECT resourceUuid FROM NumberIndexEntity
- WHERE resourceType = ? AND index_name = ? AND index_value > ?
- )
- """.trimIndent()
- )
-
- assertThat(query.args)
- .isEqualTo(
- listOf(
- ResourceType.RiskAssessment.name,
- ResourceType.RiskAssessment.name,
- RiskAssessment.PROBABILITY.paramName,
- BigDecimal("100.00").toDouble()
- )
- )
- }
- @Test
- fun search_filter_number_approximate() {
- val query =
- Search(ResourceType.RiskAssessment)
- .apply {
- filter(
- RiskAssessment.PROBABILITY,
- {
- prefix = ParamPrefixEnum.APPROXIMATE
- value = BigDecimal("100.00")
- }
- )
- }
- .getQuery()
- assertThat(query.query)
- .isEqualTo(
- """
- SELECT a.serializedResource
- FROM ResourceEntity a
- WHERE a.resourceType = ?
- AND a.resourceUuid IN (
- SELECT resourceUuid FROM NumberIndexEntity
- WHERE resourceType = ? AND index_name = ? AND (index_value >= ? AND index_value <= ?)
- )
- """.trimIndent()
- )
-
- assertThat(query.args)
- .isEqualTo(
- listOf(
- ResourceType.RiskAssessment.name,
- ResourceType.RiskAssessment.name,
- RiskAssessment.PROBABILITY.paramName,
- BigDecimal("90.00").toDouble(),
- BigDecimal("110.00").toDouble()
- )
- )
- }
-
@Test
fun search_filter_date_approximate() {
val mockDateType = DateType(Date(mockEpochTimeStamp), TemporalPrecisionEnum.DAY)
diff --git a/engine/src/test/java/com/google/android/fhir/sync/SyncJobTest.kt b/engine/src/test/java/com/google/android/fhir/sync/SyncJobTest.kt
index 80f51fe7d0..1308fc9452 100644
--- a/engine/src/test/java/com/google/android/fhir/sync/SyncJobTest.kt
+++ b/engine/src/test/java/com/google/android/fhir/sync/SyncJobTest.kt
@@ -213,7 +213,7 @@ class SyncJobTest {
}
@Test
- @Ignore("https://github.com/google/android-fhir/issues/1357")
+ @Ignore("https://github.com/google/android-fhir/issues/1464")
fun `sync time should update on every sync call`() = runBlockingTest {
val worker1 = PeriodicWorkRequestBuilder(15, TimeUnit.MINUTES).build()
@@ -234,7 +234,7 @@ class SyncJobTest {
)
.result
.get()
- Thread.sleep(1000)
+ Thread.sleep(5000)
val firstSyncResult = (stateList1[stateList1.size - 1] as State.Finished).result
assertThat(firstSyncResult.timestamp).isGreaterThan(currentTimeStamp)
assertThat(datastoreUtil.readLastSyncTimestamp()!!).isGreaterThan(currentTimeStamp)
@@ -253,7 +253,7 @@ class SyncJobTest {
)
.result
.get()
- Thread.sleep(1000)
+ Thread.sleep(5000)
val secondSyncResult = (stateList2[stateList2.size - 1] as State.Finished).result
assertThat(secondSyncResult.timestamp).isGreaterThan(firstSyncResult.timestamp)
assertThat(datastoreUtil.readLastSyncTimestamp()!!).isGreaterThan(firstSyncResult.timestamp)
diff --git a/settings.gradle.kts b/settings.gradle.kts
index 8d8f60791b..20ac8b33b8 100644
--- a/settings.gradle.kts
+++ b/settings.gradle.kts
@@ -4,6 +4,8 @@ include(":codegen")
include(":common")
+include(":contrib:barcode")
+
include(":datacapture")
include(":demo")