Merge pull request #13232 from SORMAS-Foundation/bugfix-13231_birthdate_filter_issues

#13231 - Birthdate filter does not hold the selected values

Author: leventegal-she

sormas-ui/src/main/java/de/symeda/sormas/ui/caze/CaseFilterForm.java

@@ -783,6 +783,14 @@ protected void applyDependenciesOnNewValue(CaseCriteria criteria) {
 				weekAndDateFilter.getDateToFilter().setValue(criteria.getNewCaseDateTo());
 			}
 		}
+
+		//Birthdate Filter
+		HorizontalLayout birthdateFilterForm = (HorizontalLayout) getMoreFiltersContainer().getComponent(BIRTHDATE_RANGE_FILTER);
+		BirthdateRangeFilterComponent birtdateFilter = (BirthdateRangeFilterComponent) birthdateFilterForm.getComponent(0);
+		birtdateFilter.getDateFromFilter().setValue(criteria.getBirthdateFrom());
+		birtdateFilter.getDateToFilter().setValue(criteria.getBirthdateTo());
+		birtdateFilter.getIncludePartialMatch().setValue(criteria.isIncludePartialMatch());
+
 		ComboBox birthDateDD = getField(CaseCriteria.BIRTHDATE_DD);
 		if (getField(CaseCriteria.BIRTHDATE_YYYY).getValue() != null && getField(CaseCriteria.BIRTHDATE_MM).getValue() != null) {
 			birthDateDD.addItems(

sormas-ui/src/main/java/de/symeda/sormas/ui/contact/ContactsFilterForm.java

@@ -475,6 +475,13 @@ protected void applyDependenciesOnNewValue(ContactCriteria newValue) {
 			weekAndDateFilter.getDateToFilter().setValue(dateTo);
 		}
 
+		//Birthdate Filter
+		HorizontalLayout birthdateFilterForm = (HorizontalLayout) getMoreFiltersContainer().getComponent(BIRTHDATE_RANGE_FILTER);
+		BirthdateRangeFilterComponent birtdateFilter = (BirthdateRangeFilterComponent) birthdateFilterForm.getComponent(0);
+		birtdateFilter.getDateFromFilter().setValue(newValue.getBirthdateFrom());
+		birtdateFilter.getDateToFilter().setValue(newValue.getBirthdateTo());
+		birtdateFilter.getIncludePartialMatch().setValue(newValue.isIncludePartialMatch());
+
 		if (StringUtils.isBlank(newValue.getEventLike())) {
 			clearAndDisableFields(ContactCriteria.ONLY_CONTACTS_SHARING_EVENT_WITH_SOURCE_CASE);
 		} else {

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

@@ -226,5 +226,12 @@ protected void applyDependenciesOnNewValue(PersonCriteria criteria) {
 			birthDateDD.clear();
 			birthDateDD.setEnabled(false);
 		}
+
+		//Birthdate Filter
+		HorizontalLayout birthdateFilterForm = (HorizontalLayout) getMoreFiltersContainer().getComponent(BIRTHDATE_RANGE_FILTER);
+		BirthdateRangeFilterComponent birtdateFilter = (BirthdateRangeFilterComponent) birthdateFilterForm.getComponent(0);
+		birtdateFilter.getDateFromFilter().setValue(criteria.getBirthdateFrom());
+		birtdateFilter.getDateToFilter().setValue(criteria.getBirthdateTo());
+		birtdateFilter.getIncludePartialMatch().setValue(criteria.isIncludePartialMatch());
 	}
 }