Merge branch 'master' into quirks-patches

.devcontainer/devcontainer.json

@@ -0,0 +1,33 @@
+// https://aka.ms/devcontainer.json
+{
+  "name": "Android FHIR, by Google",
+
+  // https://github.com/devcontainers/templates/tree/main/src/java
+  "image": "mcr.microsoft.com/devcontainers/java:1-17-bookworm",
+
+  "features": {
+    // https://github.com/akhildevelops/devcontainer-features/issues/7
+    "ghcr.io/akhildevelops/devcontainer-features/android-cli:0": {}
+
+    // https://github.com/CASL0/devcontainer-features/issues/4
+    // "ghcr.io/casl0/devcontainer-features/android-sdk:1": {}
+
+    // https://github.com/NordcomInc/devcontainer-features/issues/20
+    // "ghcr.io/nordcominc/devcontainer-features/android-sdk:1": {
+    //   "platform": "33",
+    //   "build_tools": "33.0.1"
+    // }
+  }
+
+  // Use 'forwardPorts' to make a list of ports inside the container available locally.
+  // "forwardPorts": [],
+
+  // Use 'postCreateCommand' to run commands after the container is created.
+  // "postCreateCommand": "java -version",
+
+  // Configure tool-specific properties.
+  // "customizations": {},
+
+  // Uncomment to connect as root instead. More info: https://aka.ms/dev-containers-non-root.
+  // "remoteUser": "root"
+}

.github/dependabot.yaml

@@ -15,3 +15,10 @@ updates:
       interval: weekly
       day: monday
       time: "04:00"
+
+  - package-ecosystem: "devcontainers"
+    directory: /
+    schedule:
+      interval: monthly
+      day: monday
+      time: "04:00"

.vscode/extensions.json

@@ -0,0 +1,3 @@
+{
+  "recommendations": ["davidanson.vscode-markdownlint"]
+}

datacapture/build.gradle.kts

@@ -45,7 +45,11 @@ android {
 
   configureJacocoTestOptions()
 
-  sourceSets { getByName("androidTest").apply { resources.setSrcDirs(listOf("sampledata")) } }
+  sourceSets {
+    getByName("androidTest").apply { resources.setSrcDirs(listOf("sampledata")) }
+
+    getByName("test").apply { resources.setSrcDirs(listOf("sampledata")) }
+  }
 
   testOptions { animationsDisabled = true }
   kotlin { jvmToolchain(11) }
@@ -105,6 +109,9 @@ dependencies {
   testImplementation(Dependencies.mockitoKotlin)
   testImplementation(Dependencies.robolectric)
   testImplementation(Dependencies.truth)
+  testImplementation(project(":knowledge")) {
+    exclude(group = Dependencies.androidFhirGroup, module = Dependencies.androidFhirEngineModule)
+  }
 
   constraints {
     Dependencies.hapiFhirConstraints().forEach { (libName, constraints) ->

datacapture/sampledata/measles-outbreak/MeaslesQuestionnaireToResources.map

@@ -0,0 +1,14 @@
+map "http://worldhealthorganization.github.io/smart-ot/StructureMap/MeaslesQuestionnaireToResources" = "MeaslesQuestionnaireToResources"
+uses "http://hl7.org/fhir/StructureDefinition/QuestionnaireResponse" alias QuestionnaireResponse as source
+uses "http://hl7.org/fhir/StructureDefinition/Bundle" alias MeaslesCIFBundle as target
+
+imports "http://worldhealthorganization.github.io/smart-ot/StructureMap/MeaslesLogicalModelToResources"
+imports "http://worldhealthorganization.github.io/smart-ot/StructureMap/MeaslesQuestionnaireToLogicalModel"
+
+
+group MeaslesQuestionnaireToResources(source qr : QuestionnaireResponse, target bundleCif : MeaslesCIFBundle) {
+  qr -> create ("http://worldhealthorganization.github.io/smart-ot/StructureDefinition/SOTMeasles") as model then {
+  qr -> model then MeaslesQuestionnaireToLogicalModel(qr,model) "QRtoLM";
+  qr -> bundleCif then MeaslesLogicalModelToResources (model, bundleCif) "LMtoBundle";
+  } "QRtoBundle";
+}