Merge branch 'main' into 3605-feature-delete-draft-form

opensrp · Dec 2, 2024 · 2c1ed85 · 2c1ed85
2 parents d81f079 + 6197f7d
commit 2c1ed85
Show file tree

Hide file tree

Showing 5 changed files with 40 additions and 22 deletions.
diff --git a/.../engine/src/test/java/org/smartregister/fhircore/engine/task/FhirCarePlanGeneratorTest.kt b/.../engine/src/test/java/org/smartregister/fhircore/engine/task/FhirCarePlanGeneratorTest.kt
@@ -1246,15 +1246,31 @@ class FhirCarePlanGeneratorTest : RobolectricTest() {
                         "\$this + 3 'month'",
                       )!!
                       .value
+
+                  val expectedAssertionDates: MutableList<Date> =
+                    mutableListOf(
+                      fhirCarePlanGenerator
+                        .evaluateToDate(
+                          DateTimeType(ancStart),
+                          "\$this + 1 'month'",
+                        )!!
+                        .value,
+                    )
+
+                  for (index in 1 until this.size) {
+                    expectedAssertionDates.add(
+                      fhirCarePlanGenerator
+                        .evaluateToDate(
+                          DateTimeType(expectedAssertionDates.last()),
+                          "\$this + 1 'month'",
+                        )!!
+                        .value,
+                    )
+                  }
+
                   this.forEachIndexed { index, task ->
                     assertEquals(
-                      (fhirCarePlanGenerator
-                          .evaluateToDate(
-                            DateTimeType(ancStart),
-                            "\$this + ${index + 1} 'month'",
-                          )!!
-                          .value)
-                        .asYyyyMmDd(),
+                      expectedAssertionDates[index].asYyyyMmDd(),
                       task.executionPeriod.start.asYyyyMmDd(),
                     )
                   }

diff --git a/android/engine/src/test/resources/plans/anc-visit/plandefinition.json b/android/engine/src/test/resources/plans/anc-visit/plandefinition.json
@@ -1,6 +1,7 @@
 {
   "resourceType": "PlanDefinition",
   "id": "132157",
+  "url": "https://my-opensrp-server.org/my/globally/unique/url/132157",
   "meta": {
     "versionId": "1",
     "lastUpdated": "2022-06-20T22:30:39.217+00:00"

diff --git a/android/gradle.properties b/android/gradle.properties
@@ -21,13 +21,10 @@ android.enableJetifier=true
 android.defaults.buildfeatures.buildconfig=true
 android.suppressUnsupportedCompileSdk=34
 android.jetifier.ignorelist=jackson-core
-org.gradle.warning.mode=all
-
-org.gradle.logging.level=INFO
 
+org.gradle.warning.mode=all
 org.gradle.caching=false
 org.gradle.parallel=true
 org.gradle.configureondemand=true
 
 android.enableR8.fullMode=true
-android.enableR8.verbose=true
diff --git a/android/gradle/libs.versions.toml b/android/gradle/libs.versions.toml
@@ -27,8 +27,8 @@ espresso-core = "3.6.1"
 fhir-sdk-common = "0.1.0-alpha05-preview3-SNAPSHOT"
 fhir-sdk-contrib-barcode = "0.1.0-beta3-preview7-rc1-SNAPSHOT"
 fhir-sdk-contrib-locationwidget = "0.1.0-alpha01-preview2-rc1-SNAPSHOT"
-fhir-sdk-data-capture = "1.2.0-preview4-SNAPSHOT"
-fhir-sdk-engine = "1.0.0-preview16-SNAPSHOT"
+fhir-sdk-data-capture = "1.2.0-preview5-SNAPSHOT"
+fhir-sdk-engine = "1.0.0-preview17-SNAPSHOT"
 fhir-sdk-knowledge = "0.1.0-alpha03-preview5-rc1-SNAPSHOT"
 fhir-sdk-workflow = "0.1.0-alpha04-preview10-rc1-SNAPSHOT"
 fragment-ktx = "1.8.3"

diff --git a/android/quest/src/main/java/org/smartregister/fhircore/quest/ui/profile/ProfileScreen.kt b/android/quest/src/main/java/org/smartregister/fhircore/quest/ui/profile/ProfileScreen.kt
@@ -26,6 +26,7 @@ import androidx.compose.foundation.layout.Row
 import androidx.compose.foundation.layout.Spacer
 import androidx.compose.foundation.layout.fillMaxSize
 import androidx.compose.foundation.layout.fillMaxWidth
+import androidx.compose.foundation.layout.height
 import androidx.compose.foundation.layout.padding
 import androidx.compose.foundation.layout.size
 import androidx.compose.foundation.layout.width
@@ -161,15 +162,6 @@ fun ProfileScreen(
       }
       LazyColumn(
         state = lazyListState,
-        modifier =
-          Modifier.padding(
-            bottom =
-              if (!fabActions.isNullOrEmpty() && fabActions.first().visible) {
-                PADDING_BOTTOM_WITH_FAB.dp
-              } else {
-                PADDING_BOTTOM_WITHOUT_FAB.dp
-              },
-          ),
       ) {
         item(key = profileUiState.resourceData?.baseResourceId) {
           ViewRenderer(
@@ -180,6 +172,18 @@ fun ProfileScreen(
             decodeImage = decodeImage,
           )
         }
+        item {
+          Spacer(
+            modifier =
+              Modifier.height(
+                if (!fabActions.isNullOrEmpty() && fabActions.first().visible) {
+                  PADDING_BOTTOM_WITH_FAB.dp
+                } else {
+                  PADDING_BOTTOM_WITHOUT_FAB.dp
+                },
+              ),
+          )
+        }
       }
     }
   }