New Engage Custom PR

android/engine/src/main/res/values/dimens.xml

@@ -0,0 +1,19 @@
+<?xml version="1.0" encoding="utf-8" ?>
+<!--
+ 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.
+-->
+<resources>
+    <dimen name="help_header_margin_top">0dp</dimen>
+</resources>

android/engine/src/main/res/values/strings.xml

@@ -151,4 +151,5 @@
     <string name="unsynced_resources">Unsynced Resources</string>
     <string name="all_data_synced">All data synced</string>
     <string name="invalid_offline_login_state">User set up required. Enable your internet connection </string>
+    <string name="help"></string>
 </resources>

android/engine/src/main/res/values/styles.xml

@@ -61,6 +61,13 @@
         <item name="android:textColorSecondary">@color/white</item>
         <item name="questionnaireSubmitButtonStyle">@style/Quest.Questionnaire.SubmitButtonStyle
         </item>
+        <item name="questionnaireGroupTypeQuestionTextStyle">
+            @style/TextAppearance.Material3.HeadlineMedium
+        </item>
+        <item name="questionnaireQuestionTextStyle">
+            @style/TextAppearance.Material3.BodyLarge
+        </item>
+        <item name="questionnaireHelpHeaderStyle">@style/Quest.Questionnaire.HelpHeaderStyle</item>
     </style>
     <style name="Quest.Questionnaire.SubmitButtonStyle" parent="Questionnaire.SubmitButtonStyle">
         <item name="android:text">@string/str_save</item>
@@ -76,4 +83,8 @@
         <item name="android:layout_gravity">bottom|start</item>
     </style>
 
+    <style name="Quest.Questionnaire.HelpHeaderStyle" parent="TextAppearance.Material3.TitleSmall">
+        <item name="android:visibility">invisible</item>
+    </style>
+
 </resources>

android/gradle/libs.versions.toml

@@ -19,7 +19,7 @@ cql-engine = "2.4.0"
 cql-evaluator = "2.4.0"
 cql-to-elm = "2.4.0"
 dagger-hilt-compiler = "2.42"
-data-capture = "1.0.0-preview11-SNAPSHOT"
+data-capture = "1.0.0-preview14.3-SNAPSHOT"
 desugar-jdk-libs = "1.1.5"
 easy-rules-jexl = "4.1.0"
 espresso-core = "3.5.0"

android/quest/src/main/java/org/smartregister/fhircore/quest/data/QuestXFhirQueryResolver.kt

@@ -16,16 +16,80 @@
 
 package org.smartregister.fhircore.quest.data
 
+import android.util.Log
 import com.google.android.fhir.FhirEngine
 import com.google.android.fhir.datacapture.XFhirQueryResolver
+import com.google.android.fhir.search.Search
 import com.google.android.fhir.search.search
+import org.hl7.fhir.r4.model.QuestionnaireResponse
 import javax.inject.Inject
 import javax.inject.Singleton
 import org.hl7.fhir.r4.model.Resource
+import org.hl7.fhir.r4.model.ResourceType
 
 @Singleton
 class QuestXFhirQueryResolver @Inject constructor(val fhirEngine: FhirEngine) : XFhirQueryResolver {
   override suspend fun resolve(xFhirQuery: String): List<Resource> {
-    return fhirEngine.search(xFhirQuery)
+    Log.d("FIKRI XFHIRQUERY", xFhirQuery)
+
+
+    if (xFhirQuery.contains("QuestionnaireResponse")) {
+      val strParams = xFhirQuery.removePrefix("QuestionnaireResponse?")
+      val params = strParams.split("&")
+      val search = Search(ResourceType.QuestionnaireResponse).apply {
+//        filter(QuestionnaireResponse.SUBJECT, { value = "Patient/970fcf90-0383-45e1-acfa-1e3f0b7d0797" })
+//        filter(QuestionnaireResponse.QUESTIONNAIRE, { value = "Questionnaire/$questionnaireId" })
+        params.forEach {
+          val paramType = it.split("=").first()
+          val paramValue = it.split("=").last()
+          Log.d("FIKRI PARAM", "$paramType $paramValue")
+
+          if (paramType == QuestionnaireResponse.SP_SUBJECT) {
+            this.filter(QuestionnaireResponse.SUBJECT, { value = paramValue })
+          }
+
+//          if (paramType == QuestionnaireResponse.SP_PATIENT) {
+//            Log.d("FIKRI PARAM 2", "$paramType $paramValue")
+//            this.filter(QuestionnaireResponse.PATIENT, { value = paramValue })
+//          }
+
+          if (paramType == QuestionnaireResponse.SP_QUESTIONNAIRE) {
+            this.filter(QuestionnaireResponse.QUESTIONNAIRE, { value = paramValue })
+          }
+        }
+      }
+
+//      val lists = fhirEngine.search<QuestionnaireResponse> {
+//        params.forEach {
+//          val paramType = it.split("=").first()
+//          val paramValue = it.split("=").last()
+//          Log.d("FIKRI PARAM", "$paramType $paramValue")
+//
+//          if (paramType == QuestionnaireResponse.SP_SUBJECT) {
+//            Log.d("FIKRI PARAM 1", "$paramType $paramValue")
+//            this.filter(QuestionnaireResponse.SUBJECT, { value = paramValue })
+//          }
+//
+//          if (paramType == QuestionnaireResponse.SP_PATIENT) {
+//            Log.d("FIKRI PARAM 2", "$paramType $paramValue")
+//            this.filter(QuestionnaireResponse.PATIENT, { value = paramValue })
+//          }
+//
+//          if (paramType == QuestionnaireResponse.SP_QUESTIONNAIRE) {
+//            Log.d("FIKRI PARAM 3", "$paramType $paramValue")
+//            this.filter(QuestionnaireResponse.QUESTIONNAIRE, { value = paramValue })
+//          }
+//        }
+//        filter(QuestionnaireResponse.SUBJECT, { value = "Patient/970fcf90-0383-45e1-acfa-1e3f0b7d0797" })
+//        filter(QuestionnaireResponse.QUESTIONNAIRE, { value = "Questionnaire/$questionnaireId" })
+//      }
+
+      val lists = fhirEngine.search<QuestionnaireResponse>(search)
+      Log.d("FIKRI TOTAL RES", lists.size.toString())
+
+      return lists
+    } else {
+      return fhirEngine.search(xFhirQuery)
+    }
   }
 }