Merge pull request #13561 from SORMAS-Foundation/bugfix-13550-error_msg_when_entering_age

#13550 - Fixed error message when entering age in person form

Author: KarnaiahPesula

sormas-ui/src/main/java/de/symeda/sormas/ui/person/PersonEditForm.java

@@ -38,8 +38,6 @@
 import java.util.concurrent.atomic.AtomicBoolean;
 import java.util.stream.Collectors;
 
-import com.vaadin.v7.ui.CheckBox;
-import de.symeda.sormas.ui.utils.LayoutUtil;
 import org.apache.commons.lang3.StringUtils;
 
 import com.vaadin.shared.ui.ErrorLevel;
@@ -50,6 +48,7 @@
 import com.vaadin.v7.data.Property;
 import com.vaadin.v7.ui.AbstractSelect;
 import com.vaadin.v7.ui.AbstractSelect.ItemCaptionMode;
+import com.vaadin.v7.ui.CheckBox;
 import com.vaadin.v7.ui.ComboBox;
 import com.vaadin.v7.ui.DateField;
 import com.vaadin.v7.ui.Field;
@@ -95,6 +94,7 @@
 import de.symeda.sormas.ui.utils.DateComparisonValidator;
 import de.symeda.sormas.ui.utils.FieldAccessHelper;
 import de.symeda.sormas.ui.utils.FieldHelper;
+import de.symeda.sormas.ui.utils.LayoutUtil;
 import de.symeda.sormas.ui.utils.OutbreakFieldVisibilityChecker;
 import de.symeda.sormas.ui.utils.ResizableTextAreaWrapper;
 import de.symeda.sormas.ui.utils.SormasFieldGroupFieldFactory;
@@ -405,14 +405,17 @@ protected void addFields() {
 		entryDateDF.setVisible(false);
 		// Entry date is only required for foreigners in Luxembourg with the TB+IMI+IPI diseases only.
 		if (isConfiguredServer(CountryHelper.COUNTRY_CODE_LUXEMBOURG)) {
-			boolean isEntryDateAllowedDisease = Arrays.asList(Disease.INVASIVE_PNEUMOCOCCAL_INFECTION, Disease.INVASIVE_MENINGOCOCCAL_INFECTION, Disease.TUBERCULOSIS).contains(disease);
+			boolean isEntryDateAllowedDisease =
+				Arrays.asList(Disease.INVASIVE_PNEUMOCOCCAL_INFECTION, Disease.INVASIVE_MENINGOCOCCAL_INFECTION, Disease.TUBERCULOSIS)
+					.contains(disease);
 			birthCountryCB.addValueChangeListener(e -> {
 				CountryReferenceDto countryRef = (CountryReferenceDto) e.getProperty().getValue();
 				boolean isForeigner = false;
 				if (countryRef != null) {
 					isForeigner = FacadeProvider.getConfigFacade().isConfiguredCountry(CountryHelper.COUNTRY_CODE_LUXEMBOURG)
-							&& Arrays.asList(CountryHelper.COUNTRY_CODE_LUXEMBOURG, "LUX")
-							.stream().filter(Objects::nonNull)
+						&& Arrays.asList(CountryHelper.COUNTRY_CODE_LUXEMBOURG, "LUX")
+							.stream()
+							.filter(Objects::nonNull)
 							.noneMatch(country -> StringUtils.equalsIgnoreCase(country, countryRef.getIsoCode()));
 				}
 				setVisibleClear(isEntryDateAllowedDisease && isForeigner, PersonDto.ENTRY_DATE);
@@ -699,7 +702,7 @@ private int getApproximateAgeInYears() {
 		Date birthDate = calcBirthDateValue();
 		if (birthDate != null) {
 			Pair<Integer, ApproximateAgeType> pair =
-					ApproximateAgeHelper.getApproximateAge(birthDate, (Date) getFieldGroup().getField(PersonDto.DEATH_DATE).getValue());
+				ApproximateAgeHelper.getApproximateAge(birthDate, (Date) getFieldGroup().getField(PersonDto.DEATH_DATE).getValue());
 			if ((pair.getElement0() != null) && (pair.getElement1() == ApproximateAgeType.YEARS)) {
 				return pair.getElement0();
 			}
@@ -710,7 +713,7 @@ private int getApproximateAgeInYears() {
 	private void onEmancipatedChange() {
 		boolean isEmancipatedChecked = (isEmancipated != null) && (isEmancipated.getValue());
 		hasGuardian.setValue(!isEmancipatedChecked);
-		if(isEmancipatedChecked) {
+		if (isEmancipatedChecked) {
 			nameOfGuardians.setValue("");
 		}
 		updateHasGuardianCheckBox(isEmancipatedChecked);
@@ -723,7 +726,7 @@ private void updateLegalGuardianSection(boolean isInitialized) {
 		boolean canBeEmancipated = personCanBeEmancipated(approximateAge, isEmancipatedChecked);
 		isEmancipated.setVisible(!isIncapacitatedChecked && canBeEmancipated);
 		hasGuardian.setValue(isIncapacitatedChecked || approximateAge < minimumAdultAge);
-		if(getApproximateAgeInYears() < minimumAdultAge) {
+		if (getApproximateAgeInYears() < minimumAdultAge) {
 			nameOfGuardians.setValue(getValue().getNamesOfGuardians());
 		}
 		updateHasGuardianCheckBox(false);
@@ -732,14 +735,14 @@ private void updateLegalGuardianSection(boolean isInitialized) {
 
 	private boolean personCanBeEmancipated(int approximateAge, boolean change) {
 		boolean canBeEmancipated;
-		if(approximateAge == -1 && (approximateAgeField).getValue() != null) {
+		if (approximateAge == -1 && (approximateAgeField).getValue() != null) {
 			canBeEmancipated = false;
 		} else {
 			canBeEmancipated = approximateAge >= minimumEmancipatedAge && approximateAge < minimumAdultAge;
 		}
-		if(!canBeEmancipated && (approximateAgeField).getValue() != null){
-			int age = Integer.parseInt(approximateAgeField.getValue());
-			if(approximateAgeTypeField.getValue() == ApproximateAgeType.YEARS){
+		if (!canBeEmancipated && (approximateAgeField).getValue() != null) {
+			Integer age = parseApproximateAge(approximateAgeField.getValue());
+			if (age != null && approximateAgeTypeField.getValue() == ApproximateAgeType.YEARS) {
 				canBeEmancipated = age >= minimumEmancipatedAge && age < minimumAdultAge;
 				if (change) {
 					isEmancipated.setValue(canBeEmancipated);
@@ -749,6 +752,19 @@ private boolean personCanBeEmancipated(int approximateAge, boolean change) {
 		return canBeEmancipated;
 	}
 
+	private Integer parseApproximateAge(String ageString) {
+		if (ageString == null || ageString.trim().isEmpty()) {
+			return null;
+		}
+		try {
+			// Remove any formatting characters (commas, spaces) and parse only digits
+			String cleanedAge = ageString.replaceAll("[^0-9]", "");
+			return cleanedAge.isEmpty() ? null : Integer.parseInt(cleanedAge);
+		} catch (NumberFormatException e) {
+			return null;
+		}
+	}
+
 	private void hardResetNameOfGuardians(boolean isInitialized) {
 		boolean isIncapacitatedChecked = (isIncapacitated != null) && (isIncapacitated.getValue());
 		if (getApproximateAgeInYears() != -1 && getApproximateAgeInYears() >= minimumAdultAge && !isIncapacitatedChecked && isInitialized) {
@@ -760,12 +776,12 @@ private void updateHasGuardianCheckBox(boolean onEmancipatedChange) {
 		boolean isIncapacitatedChecked = (isIncapacitated != null) && (isIncapacitated.getValue());
 		boolean isEmancipatedChecked = (isEmancipated != null) && (isEmancipated.getValue());
 		boolean canBe = personCanBeEmancipated(getApproximateAgeInYears(), onEmancipatedChange);
-		if((!canBe || isIncapacitatedChecked) && isEmancipatedChecked) {
+		if ((!canBe || isIncapacitatedChecked) && isEmancipatedChecked) {
 			isEmancipatedChecked = false;
 			isEmancipated.setValue(Boolean.FALSE);
 			isIncapacitated.setVisible(true);
 		}
-		if(isEmancipatedChecked){
+		if (isEmancipatedChecked) {
 			hasGuardian.setVisible(false);
 			nameOfGuardians.setVisible(false);
 			isIncapacitated.setVisible(false);
@@ -778,7 +794,7 @@ private void updateHasGuardianCheckBox(boolean onEmancipatedChange) {
 		boolean isChildOrUnknownDate = getApproximateAgeInYears() < minimumAdultAge;
 		nameOfGuardians.setVisible(isChildOrUnknownDate || isIncapacitatedChecked);
 		hasGuardian.setVisible(isChildOrUnknownDate || isIncapacitatedChecked);
-		if((birthDate == null) || isChildOrUnknownDate ){
+		if ((birthDate == null) || isChildOrUnknownDate) {
 			hasGuardian.setValue(Boolean.TRUE);
 		}
 	}