#183 added different phone number validations for ebs

ePareto-Information-System · Nov 28, 2024 · ebe33d9 · ebe33d9
1 parent 60721a8
commit ebe33d9
Show file tree

Hide file tree

Showing 2 changed files with 14 additions and 2 deletions.
diff --git a/sormas-app/app/src/main/java/de/symeda/sormas/app/component/validation/ValidationHelper.java b/sormas-app/app/src/main/java/de/symeda/sormas/app/component/validation/ValidationHelper.java
@@ -98,6 +98,18 @@ public static void initPhoneNumberValidator(ControlTextEditField textEditField)
 			return false;
 		});
 	}
+	public static void initEbsPhoneNumberValidator(ControlTextEditField textEditField) {
+		textEditField.setValidationCallback(() -> {
+			String phoneNumber = textEditField.getValue();
+			if (!DataHelper.isValidEbsPhoneNumber(phoneNumber)) {
+				textEditField.enableErrorState(I18nProperties.getValidationError(Validations.validPhoneNumber, textEditField.getCaption()));
+
+				return true;
+			}
+
+			return false;
+		});
+	}
 
 	public static void resetValidator(ControlTextEditField textEditField) {
 		textEditField.disableErrorState();

diff --git a/sormas-app/app/src/main/java/de/symeda/sormas/app/ebs/edit/EbsEditFragment.java b/sormas-app/app/src/main/java/de/symeda/sormas/app/ebs/edit/EbsEditFragment.java
@@ -186,8 +186,8 @@ public void onLayoutBinding(final FragmentEbsEditLayoutBinding contentBinding) {
 		contentBinding.setAutomaticScanningTypeClass(AutomaticScanningType.class);
 		contentBinding.setManualScanningTypeClass(ManualScanningType.class);
 		contentBinding.setMediaScannningTypeClass(MediaScannningType.class);
-		ValidationHelper.initPhoneNumberValidator(contentBinding.ebsInformantTel);
-		ValidationHelper.initPhoneNumberValidator(contentBinding.ebsPersonPhone);
+		ValidationHelper.initEbsPhoneNumberValidator(contentBinding.ebsInformantTel);
+		ValidationHelper.initEbsPhoneNumberValidator(contentBinding.ebsPersonPhone);
 		InfrastructureFieldsDependencyHandler.instance.initializeRegionFields(
 				contentBinding.ebsRegion,
 				initialRegions,