Merge pull request SORMAS-Foundation#2983 from hzi-braunschweig/2933_fix-filter-dependencies

SORMAS-Foundation#2933 clear dependent fields region/district changed and update combo list instead of adding the new items

Author: MateStrysewske

sormas-ui/src/main/java/de/symeda/sormas/ui/campaign/campaigndata/CampaignFormDataFilterForm.java

@@ -129,6 +129,7 @@ protected void applyDependenciesOnFieldChange(String propertyId, Property.ValueC
 				clearAndDisableFields(CampaignFormDataCriteria.DISTRICT, CampaignFormDataCriteria.COMMUNITY);
 			} else {
 				enableFields(EventCriteria.DISTRICT);
+				clearAndDisableFields(CampaignFormDataCriteria.COMMUNITY);
 				applyRegionFilterDependency(region, EventCriteria.DISTRICT);
 			}
 

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

@@ -9,11 +9,9 @@
 
 import com.vaadin.server.Page;
 import com.vaadin.server.Sizeable;
-import com.vaadin.ui.Button;
 import com.vaadin.ui.CustomLayout;
 import com.vaadin.ui.HorizontalLayout;
 import com.vaadin.ui.Notification;
-import com.vaadin.ui.themes.ValoTheme;
 import com.vaadin.v7.data.Property;
 import com.vaadin.v7.data.util.converter.Converter;
 import com.vaadin.v7.ui.AbstractSelect;
@@ -49,7 +47,6 @@
 import de.symeda.sormas.api.utils.EpiWeek;
 import de.symeda.sormas.ui.UserProvider;
 import de.symeda.sormas.ui.utils.AbstractFilterForm;
-import de.symeda.sormas.ui.utils.ButtonHelper;
 import de.symeda.sormas.ui.utils.CssStyles;
 import de.symeda.sormas.ui.utils.EpiWeekAndDateFilterComponent;
 import de.symeda.sormas.ui.utils.FieldConfiguration;
@@ -289,7 +286,17 @@ protected void applyDependenciesOnFieldChange(String propertyId, Property.ValueC
 			if (!DataHelper.equal(region, criteria.getRegion())) {
 				if (region != null) {
 					enableFields(CaseDataDto.DISTRICT);
-					districtField.addItems(FacadeProvider.getDistrictFacade().getAllActiveByRegion(region.getUuid()));
+					FieldHelper.updateItems(districtField, FacadeProvider.getDistrictFacade().getAllActiveByRegion(region.getUuid()));
+
+					clearAndDisableFields(
+						CaseDataDto.COMMUNITY,
+						CaseCriteria.FACILITY_TYPE_GROUP,
+						CaseCriteria.FACILITY_TYPE,
+						CaseDataDto.HEALTH_FACILITY);
+
+					if (pointOfEntryField != null) {
+						pointOfEntryField.setEnabled(false);
+					}
 				} else {
 					clearAndDisableFields(
 						CaseDataDto.DISTRICT,
@@ -312,13 +319,14 @@ protected void applyDependenciesOnFieldChange(String propertyId, Property.ValueC
 			if (!DataHelper.equal(newDistrict, criteria.getDistrict())) {
 				if (newDistrict != null) {
 					enableFields(CaseDataDto.COMMUNITY, CaseCriteria.FACILITY_TYPE_GROUP);
-					communityField.addItems(FacadeProvider.getCommunityFacade().getAllActiveByDistrict(newDistrict.getUuid()));
+					clearAndDisableFields(CaseCriteria.FACILITY_TYPE, CaseDataDto.HEALTH_FACILITY);
+					FieldHelper.updateItems(communityField, FacadeProvider.getCommunityFacade().getAllActiveByDistrict(newDistrict.getUuid()));
+
 					if (pointOfEntryField != null && currentCaseOrigin == CaseOrigin.POINT_OF_ENTRY) {
 						pointOfEntryField.setEnabled(true);
 						FieldHelper.updateItems(
 							pointOfEntryField,
 							FacadeProvider.getPointOfEntryFacade().getAllActiveByDistrict(newDistrict.getUuid(), true));
-
 					}
 				} else {
 					clearAndDisableFields(

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

@@ -9,12 +9,10 @@
 import com.vaadin.icons.VaadinIcons;
 import com.vaadin.server.Page;
 import com.vaadin.shared.ui.ContentMode;
-import com.vaadin.ui.Button;
 import com.vaadin.ui.CustomLayout;
 import com.vaadin.ui.HorizontalLayout;
 import com.vaadin.ui.Label;
 import com.vaadin.ui.Notification;
-import com.vaadin.ui.themes.ValoTheme;
 import com.vaadin.v7.data.Property;
 import com.vaadin.v7.ui.AbstractSelect;
 import com.vaadin.v7.ui.CheckBox;
@@ -43,7 +41,6 @@
 import de.symeda.sormas.api.utils.EpiWeek;
 import de.symeda.sormas.ui.UserProvider;
 import de.symeda.sormas.ui.utils.AbstractFilterForm;
-import de.symeda.sormas.ui.utils.ButtonHelper;
 import de.symeda.sormas.ui.utils.CssStyles;
 import de.symeda.sormas.ui.utils.EpiWeekAndDateFilterComponent;
 import de.symeda.sormas.ui.utils.FieldConfiguration;
@@ -275,6 +272,7 @@ protected void applyDependenciesOnFieldChange(String propertyId, Property.ValueC
 				clearAndDisableFields(ContactCriteria.DISTRICT, ContactCriteria.COMMUNITY);
 			} else {
 				applyRegionFilterDependency(region, ContactCriteria.DISTRICT);
+				clearAndDisableFields(ContactCriteria.COMMUNITY);
 			}
 			break;
 		}

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

@@ -201,11 +201,11 @@ protected void applyRegionFilterDependency(RegionReferenceDto region, String dis
 		UserDto user = UserProvider.getCurrent().getUser();
 		ComboBox districtField = getField(districtFieldId);
 		if (user.getRegion() != null && user.getDistrict() == null) {
-			districtField.addItems(FacadeProvider.getDistrictFacade().getAllActiveByRegion(user.getRegion().getUuid()));
+			FieldHelper.updateItems(districtField, FacadeProvider.getDistrictFacade().getAllActiveByRegion(user.getRegion().getUuid()));
 			districtField.setEnabled(true);
 		} else {
 			if (region != null) {
-				districtField.addItems(FacadeProvider.getDistrictFacade().getAllActiveByRegion(region.getUuid()));
+				FieldHelper.updateItems(districtField, FacadeProvider.getDistrictFacade().getAllActiveByRegion(region.getUuid()));
 				districtField.setEnabled(true);
 			} else {
 				districtField.setEnabled(false);
@@ -226,11 +226,11 @@ protected void applyDistrictDependency(DistrictReferenceDto district, String com
 		UserDto user = UserProvider.getCurrent().getUser();
 		ComboBox communityField = getField(communityFieldId);
 		if (user.getDistrict() != null && user.getCommunity() == null) {
-			communityField.addItems(FacadeProvider.getCommunityFacade().getAllActiveByDistrict(user.getDistrict().getUuid()));
+			FieldHelper.updateItems(communityField, FacadeProvider.getCommunityFacade().getAllActiveByDistrict(user.getDistrict().getUuid()));
 			communityField.setEnabled(true);
 		} else {
 			if (district != null) {
-				communityField.addItems(FacadeProvider.getCommunityFacade().getAllActiveByDistrict(district.getUuid()));
+				FieldHelper.updateItems(communityField, FacadeProvider.getCommunityFacade().getAllActiveByDistrict(district.getUuid()));
 				communityField.setEnabled(true);
 			} else {
 				communityField.setEnabled(false);