Merge branch 'main' into feature/fix_java_heap_error

opensrp · Dec 16, 2024 · 1325652 · 1325652
2 parents 04552d1 + 8402be9
commit 1325652
Show file tree

Hide file tree

Showing 2 changed files with 34 additions and 28 deletions.
diff --git a/.../src/main/java/org/smartregister/fhircore/quest/ui/questionnaire/QuestionnaireActivity.kt b/.../src/main/java/org/smartregister/fhircore/quest/ui/questionnaire/QuestionnaireActivity.kt
@@ -387,6 +387,14 @@ class QuestionnaireActivity : BaseMultiLanguageActivity() {
               lifecycleScope.launch {
                 retrieveQuestionnaireResponse()?.let { questionnaireResponse ->
                   viewModel.saveDraftQuestionnaire(questionnaireResponse, questionnaireConfig)
+                  setResult(
+                    Activity.RESULT_OK,
+                    Intent().apply {
+                      putExtra(QUESTIONNAIRE_RESPONSE, questionnaireResponse as Serializable)
+                      putExtra(QUESTIONNAIRE_CONFIG, questionnaireConfig as Parcelable)
+                      putExtra(ON_RESULT_TYPE, ActivityOnResultType.QUESTIONNAIRE.name)
+                    },
+                  )
                   finish()
                 }
               }

diff --git a/...src/main/java/org/smartregister/fhircore/quest/ui/questionnaire/QuestionnaireViewModel.kt b/...src/main/java/org/smartregister/fhircore/quest/ui/questionnaire/QuestionnaireViewModel.kt
@@ -706,42 +706,40 @@ constructor(
    * This function saves [QuestionnaireResponse] as draft if any of the [QuestionnaireResponse.item]
    * has an answer.
    */
-  fun saveDraftQuestionnaire(
+  suspend fun saveDraftQuestionnaire(
     questionnaireResponse: QuestionnaireResponse,
     questionnaireConfig: QuestionnaireConfig,
   ) {
-    viewModelScope.launch {
-      val hasPages = questionnaireResponse.item.any { it.hasItem() }
-      val questionnaireHasAnswer =
-        questionnaireResponse.item.any {
-          if (!hasPages) {
-            it.answer.any { answerComponent -> answerComponent.hasValue() }
-          } else {
-            questionnaireResponse.item.any { page ->
-              page.item.any { pageItem ->
-                pageItem.answer.any { answerComponent -> answerComponent.hasValue() }
-              }
+    val hasPages = questionnaireResponse.item.any { it.hasItem() }
+    val questionnaireHasAnswer =
+      questionnaireResponse.item.any {
+        if (!hasPages) {
+          it.answer.any { answerComponent -> answerComponent.hasValue() }
+        } else {
+          questionnaireResponse.item.any { page ->
+            page.item.any { pageItem ->
+              pageItem.answer.any { answerComponent -> answerComponent.hasValue() }
             }
           }
         }
-      questionnaireResponse.questionnaire =
-        questionnaireConfig.id.asReference(ResourceType.Questionnaire).reference
-      if (
-        !questionnaireConfig.resourceIdentifier.isNullOrBlank() &&
-          questionnaireConfig.resourceType != null
-      ) {
-        questionnaireResponse.subject =
-          questionnaireConfig.resourceIdentifier!!.asReference(
-            questionnaireConfig.resourceType!!,
-          )
       }
-      if (questionnaireHasAnswer) {
-        questionnaireResponse.status = QuestionnaireResponse.QuestionnaireResponseStatus.INPROGRESS
-        defaultRepository.addOrUpdate(
-          addMandatoryTags = true,
-          resource = questionnaireResponse,
+    questionnaireResponse.questionnaire =
+      questionnaireConfig.id.asReference(ResourceType.Questionnaire).reference
+    if (
+      !questionnaireConfig.resourceIdentifier.isNullOrBlank() &&
+        questionnaireConfig.resourceType != null
+    ) {
+      questionnaireResponse.subject =
+        questionnaireConfig.resourceIdentifier!!.asReference(
+          questionnaireConfig.resourceType!!,
         )
-      }
+    }
+    if (questionnaireHasAnswer) {
+      questionnaireResponse.status = QuestionnaireResponse.QuestionnaireResponseStatus.INPROGRESS
+      defaultRepository.addOrUpdate(
+        addMandatoryTags = true,
+        resource = questionnaireResponse,
+      )
     }
   }