Fix validation message for number fields to consider min and max values

Update validation messages for number fields to consider min and max values from the questionnaire item. * Modify `EditTextDecimalViewHolderFactory.kt` to include min and max values in the validation message for decimal fields. * Modify `EditTextIntegerViewHolderFactory.kt` to include min and max values in the validation message for integer fields.
google · Jan 14, 2025 · 928386e · 928386e
1 parent 2a7e91f
commit 928386e
Show file tree

Hide file tree

Showing 2 changed files with 11 additions and 3 deletions.
diff --git a/...a/com/google/android/fhir/datacapture/views/factories/EditTextDecimalViewHolderFactory.kt b/...a/com/google/android/fhir/datacapture/views/factories/EditTextDecimalViewHolderFactory.kt
@@ -76,8 +76,14 @@ internal object EditTextDecimalViewHolderFactory :
           )
         // Update error message if draft answer present
         if (questionnaireViewItem.draftAnswer != null) {
+          val minValue = questionnaireViewItem.minAnswerValue?.toString() ?: DecimalType(Int.MIN_VALUE).toString()
+          val maxValue = questionnaireViewItem.maxAnswerValue?.toString() ?: DecimalType(Int.MAX_VALUE).toString()
           textInputLayout.error =
-            textInputLayout.context.getString(R.string.decimal_format_validation_error_msg)
+            textInputLayout.context.getString(
+              R.string.decimal_format_validation_error_msg,
+              minValue,
+              maxValue
+            )
         }
       }
     }

diff --git a/...a/com/google/android/fhir/datacapture/views/factories/EditTextIntegerViewHolderFactory.kt b/...a/com/google/android/fhir/datacapture/views/factories/EditTextIntegerViewHolderFactory.kt
@@ -92,11 +92,13 @@ internal object EditTextIntegerViewHolderFactory :
           )
         // Update error message if draft answer present
         if (questionnaireViewItem.draftAnswer != null) {
+          val minValue = questionnaireViewItem.minAnswerValue?.toString() ?: IntegerType(Int.MIN_VALUE).toString()
+          val maxValue = questionnaireViewItem.maxAnswerValue?.toString() ?: IntegerType(Int.MAX_VALUE).toString()
           textInputLayout.error =
             textInputLayout.context.getString(
               R.string.integer_format_validation_error_msg,
-              formatInteger(Int.MIN_VALUE),
-              formatInteger(Int.MAX_VALUE),
+              minValue,
+              maxValue
             )
         }
       }