Merge pull request #13504 from SORMAS-Foundation/bugfix-13442_wrongly_asked_save_discard_changes

#13442, #13486 - Fixed dirty state handling in Health Conditions form

Author: raulbob

sormas-ui/src/main/java/de/symeda/sormas/ui/clinicalcourse/HealthConditionsForm.java

@@ -245,7 +245,11 @@ protected String createHtmlLayout() {
 
 	@Override
 	protected <F extends Field> F addFieldToLayout(CustomLayout layout, String propertyId, F field) {
-		field.addValueChangeListener(e -> fireValueChange(false));
+		field.addValueChangeListener(e -> {
+			if (this.isModified()) {
+				fireValueChange(false);
+			}
+		});
 
 		return super.addFieldToLayout(layout, propertyId, field);
 	}

sormas-ui/src/main/java/de/symeda/sormas/ui/utils/CommitDiscardWrapperComponent.java

@@ -73,6 +73,7 @@
 import de.symeda.sormas.api.person.PersonDto;
 import de.symeda.sormas.api.user.UserRight;
 import de.symeda.sormas.ui.UiUtil;
+import de.symeda.sormas.ui.clinicalcourse.HealthConditionsForm;
 import de.symeda.sormas.ui.events.EventDataForm;
 import de.symeda.sormas.ui.location.AccessibleTextField;
 import de.symeda.sormas.ui.location.LocationEditForm;
@@ -300,6 +301,11 @@ protected void addDirtyHandler(FieldGroup[] fieldGroups) {
 						.anyMatch(Buffered::isModified)) {
 						dirty = true;
 					}
+				} else if (source instanceof HealthConditionsForm) {
+					final HealthConditionsForm healthConditionsForm = (HealthConditionsForm) source;
+					if (healthConditionsForm.isModified()) {
+						dirty = true;
+					}
 				} else if (source instanceof AccessibleTextField) {
 					final AccessibleTextField accessibleTextField = (AccessibleTextField) source;
 					if (accessibleTextField.isModified()) {