Merge branch 'master' into cqf

google · Apr 29, 2024 · 504ab25 · 504ab25
2 parents 569c00d + 56339b4
commit 504ab25
Show file tree

Hide file tree

Showing 19 changed files with 2,530 additions and 66 deletions.
diff --git a/datacapture/build.gradle.kts b/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) ->

diff --git a/datacapture/sampledata/measles-outbreak/MeaslesQuestionnaireToResources.map b/datacapture/sampledata/measles-outbreak/MeaslesQuestionnaireToResources.map
@@ -0,0 +1,14 @@
+map "http:https://worldhealthorganization.github.io/smart-ot/StructureMap/MeaslesQuestionnaireToResources" = "MeaslesQuestionnaireToResources"
+uses "http:https://hl7.org/fhir/StructureDefinition/QuestionnaireResponse" alias QuestionnaireResponse as source
+uses "http:https://hl7.org/fhir/StructureDefinition/Bundle" alias MeaslesCIFBundle as target
+
+imports "http:https://worldhealthorganization.github.io/smart-ot/StructureMap/MeaslesLogicalModelToResources"
+imports "http:https://worldhealthorganization.github.io/smart-ot/StructureMap/MeaslesQuestionnaireToLogicalModel"
+
+
+group MeaslesQuestionnaireToResources(source qr : QuestionnaireResponse, target bundleCif : MeaslesCIFBundle) {
+ qr -> create ("http:https://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";
+}
diff --git a/datacapture/sampledata/measles-outbreak/package.r4.tgz b/datacapture/sampledata/measles-outbreak/package.r4.tgz
diff --git a/datacapture/sampledata/measles-outbreak/package.tgz b/datacapture/sampledata/measles-outbreak/package.tgz
diff --git a/datacapture/sampledata/measles-outbreak/questionnaire_outbreak.json b/datacapture/sampledata/measles-outbreak/questionnaire_outbreak.json