Merge branch 'main' into improve-sync-progress-ux

Signed-off-by: Elly Kitoto <[email protected]>

CHANGELOG.md

@@ -12,7 +12,9 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
   1. Added a new class (PdfGenerator) for generating PDF documents from HTML content using Android's WebView and PrintManager
   2. Introduced a new class (HtmlPopulator) to populate HTML templates with data from a Questionnaire Response
   3. Implemented functionality to launch PDF generation using a configuration setup
-- Added Save draft MVP functionality  
+- Added Save draft MVP functionality
+- Added Delete saved draft feature
+- Add configurable confirmation dialog on form submission
 
 ## [1.1.0] - 2024-02-15
 

android/engine/src/main/java/org/smartregister/fhircore/engine/configuration/QuestionnaireConfig.kt

@@ -67,6 +67,7 @@ data class QuestionnaireConfig(
   val uniqueIdAssignment: UniqueIdAssignmentConfig? = null,
   val linkIds: List<LinkIdConfig>? = null,
   val showSubmitAnywayButton: String = "false",
+  val showSubmissionConfirmationDialog: String = "false",
 ) : java.io.Serializable, Parcelable {
 
   fun interpolate(computedValuesMap: Map<String, Any>) =
@@ -102,6 +103,8 @@ data class QuestionnaireConfig(
       linkIds = linkIds?.onEach { it.linkId.interpolate(computedValuesMap) },
       saveButtonText = saveButtonText?.interpolate(computedValuesMap),
       showSubmitAnywayButton = showSubmitAnywayButton.interpolate(computedValuesMap),
+      showSubmissionConfirmationDialog =
+        showSubmissionConfirmationDialog.interpolate(computedValuesMap),
     )
 }
 

android/engine/src/main/java/org/smartregister/fhircore/engine/configuration/migration/MigrationConfig.kt

@@ -25,7 +25,7 @@ import org.smartregister.fhircore.engine.domain.model.RuleConfig
 data class MigrationConfig(
   val updateValues: List<UpdateValueConfig>,
   val resourceConfig: FhirResourceConfig,
-  val rules: List<RuleConfig>,
+  val rules: List<RuleConfig> = emptyList(),
   val version: Int,
   val purgeAffectedResources: Boolean = false,
   val createLocalChangeEntitiesAfterPurge: Boolean = true,

android/engine/src/main/java/org/smartregister/fhircore/engine/configuration/register/RegisterConfiguration.kt

@@ -39,7 +39,7 @@ data class RegisterConfiguration(
   val registerCard: RegisterCardConfig = RegisterCardConfig(),
   val fabActions: List<NavigationMenuConfig> = emptyList(),
   val noResults: NoResultsConfig? = null,
-  val pageSize: Int = 10,
+  val pageSize: Int = 20,
   val activeResourceFilters: List<ActiveResourceFilterConfig> =
     listOf(
       ActiveResourceFilterConfig(resourceType = ResourceType.Patient, active = true),

android/engine/src/main/java/org/smartregister/fhircore/engine/configuration/register/RegisterContentConfig.kt

@@ -24,7 +24,7 @@ data class RegisterContentConfig(
   val separator: String? = null,
   val display: String? = null,
   val placeholderColor: String? = null,
-  val rules: List<RuleConfig>? = null,
+  val rules: List<RuleConfig> = emptyList(),
   val visible: Boolean? = null,
   val computedRules: List<String>? = null,
   val searchByQrCode: Boolean? = null,

android/engine/src/main/java/org/smartregister/fhircore/engine/configuration/workflow/ApplicationWorkflow.kt

@@ -62,4 +62,7 @@ enum class ApplicationWorkflow {
 
   /** A workflow to launch pdf generation */
   LAUNCH_PDF_GENERATION,
+
+  /** A workflow to launch delete draft questionnaires */
+  DELETE_DRAFT_QUESTIONNAIRE,
 }