Merge branch 'mwcore-dev' into mwcore-migrate-auth-code

opensrp · Jul 28, 2023 · 49fc301 · 49fc301
2 parents 59d95d4 + 63aedca
commit 49fc301
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 10 deletions.
diff --git a/...rc/main/java/org/smartregister/fhircore/engine/ui/questionnaire/QuestionnaireViewModel.kt b/...rc/main/java/org/smartregister/fhircore/engine/ui/questionnaire/QuestionnaireViewModel.kt
@@ -619,7 +619,7 @@ constructor(
       if (entry.resource is Observation) {
         val code = (entry.resource as Observation).code.coding.first().code.toString()
         if (code.contains(questionnaireLogicalId)) bundle.addEntry(entry)
-      }
+      } else bundle.addEntry(entry)
     }
     return bundle
   }
@@ -631,13 +631,13 @@ constructor(
     val resourcesList = mutableListOf<Resource>()
 
     intent.getStringArrayListExtra(QuestionnaireActivity.QUESTIONNAIRE_POPULATION_RESOURCES)?.run {
-      var bundle = Bundle()
+      val bundle = Bundle()
       forEach {
         val resource = jsonParser.parseResource(it) as Resource
         if (resource !is Bundle) {
           resourcesList.add(jsonParser.parseResource(it) as Resource)
         } else {
-          bundle = extractRelevantObservation(resource, questionnaireLogicalId)
+          bundle.entry.addAll(extractRelevantObservation(resource, questionnaireLogicalId).entry)
         }
       }
       resourcesList.add(bundle)
@@ -664,7 +664,6 @@ constructor(
                 system = QuestionnaireActivity.WHO_IDENTIFIER_SYSTEM
               }
             )
-          Timber.e(jsonParser.encodeResourceToString(this))
         }
 
         resourcesList.add(this)
@@ -715,8 +714,6 @@ constructor(
         loadRelatedPerson(patientId)?.forEach { resourcesList.add(it) }
       }
     }
-    Timber.e(resourcesList.joinToString("\n") { jsonParser.encodeResourceToString(it) })
-
     return resourcesList.toTypedArray()
   }
 

diff --git a/android/quest/build.gradle b/android/quest/build.gradle
@@ -156,15 +156,15 @@ android {
             dimension "apps"
             applicationIdSuffix ".mwcore"
             versionNameSuffix "-mwcore"
-            versionCode 19
-            versionName "0.1.9"
+            versionCode 20
+            versionName "0.1.10"
         }
         mwcoreDev {
             dimension "apps"
             applicationIdSuffix ".mwcoreDev"
             versionNameSuffix "-mwcoreDev"
-            versionCode 19
-            versionName "0.1.9"
+            versionCode 20
+            versionName "0.1.10"
         }
         afyayangu {
             dimension "apps"