fix: [ANDROAPP-6667] display warning/error on complete

Signed-off-by: Manu Muñoz <[email protected]>
dhis2 · Dec 11, 2024 · ca60a04 · ca60a04
1 parent 6a70824
commit ca60a04
Show file tree

Hide file tree

Showing 3 changed files with 56 additions and 38 deletions.
diff --git a/form/src/main/java/org/dhis2/form/data/FormRepositoryImpl.kt b/form/src/main/java/org/dhis2/form/data/FormRepositoryImpl.kt
@@ -285,7 +285,7 @@ class FormRepositoryImpl(
             EventStatus.COMPLETED -> {
                 FieldsWithWarningResult(
                     fieldUidWarningList = itemsWithWarning,
-                    canComplete = false,
+                    canComplete = ruleEffectsResult?.canComplete ?: false,
                     onCompleteMessage = ruleEffectsResult?.messageOnComplete,
                     eventResultDetails = EventResultDetails(
                         formValueStore.eventState(),
@@ -443,7 +443,7 @@ class FormRepositoryImpl(
 
             EventStatus.COMPLETED -> {
                 SuccessfulResult(
-                    canComplete = false,
+                    canComplete = ruleEffectsResult?.canComplete ?: true,
                     onCompleteMessage = ruleEffectsResult?.messageOnComplete,
                     eventResultDetails = EventResultDetails(
                         formValueStore.eventState(),

diff --git a/form/src/main/java/org/dhis2/form/ui/provider/FormResultDialogProvider.kt b/form/src/main/java/org/dhis2/form/ui/provider/FormResultDialogProvider.kt
@@ -33,11 +33,15 @@ class FormResultDialogProvider(
         eventState: EventStatus?,
         result: DataIntegrityCheckResult,
     ): Pair<BottomSheetDialogUiModel, List<FieldWithIssue>> {
+        val onCompleteMessages = getOnCompleteMessage(
+            canComplete,
+            onCompleteMessage,
+        )
         val dialogType = getDialogType(
             errorFields,
             emptyMandatoryFields,
             warningFields,
-            !canComplete && onCompleteMessage != null,
+            onCompleteMessages,
         )
         val showSkipButton = when {
             dialogType == DialogType.WARNING || dialogType == DialogType.SUCCESSFUL -> true
@@ -74,12 +78,14 @@ class FormResultDialogProvider(
                     result.fieldUidErrorList,
                     result.mandatoryFields.keys.toList(),
                     result.warningFields,
+                    onCompleteMessages,
                 )
                 Pair(model, fieldsWithIssues)
             }
             is FieldsWithWarningResult -> {
                 val fieldsWithIssues = getFieldsWithIssues(
                     warningFields = result.fieldUidWarningList,
+                    onCompleteFields = onCompleteMessages,
                 )
                 return Pair(model, fieldsWithIssues)
             }
@@ -101,7 +107,7 @@ class FormResultDialogProvider(
                 Pair(notSavedModel, emptyList())
             }
             is SuccessfulResult -> {
-                Pair(model, emptyList())
+                Pair(model, onCompleteMessages)
             }
         }
     }
@@ -166,44 +172,54 @@ class FormResultDialogProvider(
         errorFields: List<FieldWithIssue> = emptyList(),
         mandatoryFields: List<String> = emptyList(),
         warningFields: List<FieldWithIssue> = emptyList(),
+        onCompleteFields: List<FieldWithIssue> = emptyList(),
     ): List<FieldWithIssue> {
-        return errorFields.plus(
-            mandatoryFields.map {
-                FieldWithIssue(
-                    "uid",
-                    it,
-                    IssueType.MANDATORY,
-                    provider.provideMandatoryField(),
-                )
-            },
-        ).plus(warningFields)
+        return onCompleteFields
+            .plus(errorFields)
+            .plus(
+                mandatoryFields.map {
+                    FieldWithIssue(
+                        "uid",
+                        it,
+                        IssueType.MANDATORY,
+                        provider.provideMandatoryField(),
+                    )
+                },
+            ).plus(warningFields)
+    }
+
+    private fun getOnCompleteMessage(
+        canComplete: Boolean,
+        onCompleteMessage: String?,
+    ): List<FieldWithIssue> {
+        val issueOnComplete = onCompleteMessage?.let {
+            FieldWithIssue(
+                fieldUid = "",
+                fieldName = it,
+                issueType = when (canComplete) {
+                    false -> IssueType.ERROR_ON_COMPLETE
+                    else -> IssueType.WARNING_ON_COMPLETE
+                },
+                message = "",
+            )
+        }
+        return issueOnComplete?.let { listOf(it) } ?: emptyList()
     }
 
     private fun getDialogType(
         errorFields: List<FieldWithIssue>,
         mandatoryFields: Map<String, String>,
         warningFields: List<FieldWithIssue>,
-        errorOnComplete: Boolean,
+        onCompleteFields: List<FieldWithIssue>,
     ) = when {
-        errorOnComplete -> {
+        onCompleteFields.any { it.issueType == IssueType.ERROR_ON_COMPLETE } ->
             DialogType.COMPLETE_ERROR
-        }
-
-        errorFields.isNotEmpty() -> {
-            DialogType.ERROR
-        }
-
-        mandatoryFields.isNotEmpty() -> {
-            DialogType.MANDATORY
-        }
-
-        warningFields.isNotEmpty() -> {
+        errorFields.isNotEmpty() -> DialogType.ERROR
+        mandatoryFields.isNotEmpty() -> DialogType.MANDATORY
+        warningFields.isNotEmpty() ||
+            onCompleteFields.any { it.issueType == IssueType.WARNING_ON_COMPLETE } ->
             DialogType.WARNING
-        }
-
-        else -> {
-            DialogType.SUCCESSFUL
-        }
+        else -> DialogType.SUCCESSFUL
     }
     enum class DialogType { ERROR, MANDATORY, WARNING, SUCCESSFUL, COMPLETE_ERROR }
 }
diff --git a/ui-components/src/main/java/org/dhis2/ui/dialogs/bottomsheet/BottomSheetDialogContent.kt b/ui-components/src/main/java/org/dhis2/ui/dialogs/bottomsheet/BottomSheetDialogContent.kt
@@ -243,11 +243,13 @@ fun IssueItem(fieldWithIssue: FieldWithIssue, onClick: () -> Unit) {
                 color = textPrimary,
                 fontSize = 14.sp,
             )
-            Text(
-                text = fieldWithIssue.message,
-                color = textSecondary,
-                fontSize = 14.sp,
-            )
+            if (fieldWithIssue.message.isNotEmpty()) {
+                Text(
+                    text = fieldWithIssue.message,
+                    color = textSecondary,
+                    fontSize = 14.sp,
+                )
+            }
         }
     }
 }
@@ -308,7 +310,7 @@ fun DialogPreview3() {
 fun DialogPreview4() {
     val fieldsWithIssues = listOf(
         FieldWithIssue("Uid", "Age", IssueType.ERROR, ERROR_MESSAGE),
-        FieldWithIssue("Uid", DATE_BIRTH, IssueType.ERROR, ERROR_MESSAGE),
+        FieldWithIssue("Uid", DATE_BIRTH, IssueType.ERROR, ""),
         FieldWithIssue("Uid", DATE_BIRTH, IssueType.ERROR, ERROR_MESSAGE),
         FieldWithIssue("Uid", DATE_BIRTH, IssueType.ERROR, ERROR_MESSAGE),
         FieldWithIssue("Uid", DATE_BIRTH, IssueType.ERROR, ERROR_MESSAGE),