SORMAS-Foundation#3590 - Fixed filter by responsible surveillance officer in contacts directory

Author: alexcaruntu-vita

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

@@ -4,6 +4,7 @@
 import static de.symeda.sormas.ui.utils.LayoutUtil.loc;
 
 import java.util.Date;
+import java.util.List;
 import java.util.stream.Stream;
 
 import org.apache.commons.lang3.StringUtils;
@@ -38,6 +39,7 @@
 import de.symeda.sormas.api.region.DistrictReferenceDto;
 import de.symeda.sormas.api.region.RegionReferenceDto;
 import de.symeda.sormas.api.user.UserDto;
+import de.symeda.sormas.api.user.UserReferenceDto;
 import de.symeda.sormas.api.user.UserRole;
 import de.symeda.sormas.api.utils.DateFilterOption;
 import de.symeda.sormas.api.utils.DateHelper;
@@ -136,7 +138,7 @@ protected void addFields() {
 	@Override
 	public void addMoreFilters(CustomLayout moreFiltersContainer) {
 
-		UserDto user = UserProvider.getCurrent().getUser();
+		UserDto user = currentUser();
 
 		if (user.getRegion() == null) {
 			ComboBox regionField = addField(
@@ -169,12 +171,13 @@ public void addMoreFilters(CustomLayout moreFiltersContainer) {
 		CssStyles.style(infoLabel, CssStyles.LABEL_XLARGE, CssStyles.LABEL_SECONDARY, AbstractFilterForm.FILTER_ITEM_STYLE);
 		moreFiltersContainer.addComponent(infoLabel, DISTRICT_INFO_LABEL_ID);
 
-		addField(
+		ComboBox officerField = addField(
 			moreFiltersContainer,
 			FieldConfiguration.withCaptionAndPixelSized(
 				ContactCriteria.CONTACT_OFFICER,
 				I18nProperties.getPrefixCaption(ContactIndexDto.I18N_PREFIX, ContactIndexDto.CONTACT_OFFICER_UUID),
 				140));
+		officerField.addItems(fetchSurveillanceOfficersByRegion(currentUser().getRegion()));
 		addField(
 			moreFiltersContainer,
 			FieldConfiguration.withCaptionAndPixelSized(ContactCriteria.REPORTING_USER_ROLE, I18nProperties.getString(Strings.reportedBy), 140));
@@ -313,21 +316,23 @@ protected void applyDependenciesOnFieldChange(String propertyId, Property.ValueC
 		switch (propertyId) {
 		case ContactCriteria.REGION: {
 			RegionReferenceDto region = (RegionReferenceDto) event.getProperty().getValue();
-			if (region == null) {
-				clearAndDisableFields(ContactCriteria.DISTRICT, ContactCriteria.COMMUNITY);
-			} else {
+			if (region != null) {
 				applyRegionFilterDependency(region, ContactCriteria.DISTRICT);
 				clearAndDisableFields(ContactCriteria.COMMUNITY);
+			} else {
+				clearAndDisableFields(ContactCriteria.DISTRICT, ContactCriteria.COMMUNITY);
 			}
+			populateSurveillanceOfficersForRegion(region);
 			break;
 		}
 		case ContactCriteria.DISTRICT: {
 			DistrictReferenceDto district = (DistrictReferenceDto) event.getProperty().getValue();
-			if (district == null) {
-				clearAndDisableFields(ContactCriteria.COMMUNITY);
-			} else {
+			if (district != null) {
 				applyDistrictDependency(district, ContactCriteria.COMMUNITY);
+			} else {
+				clearAndDisableFields(ContactCriteria.COMMUNITY);
 			}
+			populateSurveillanceOfficersForDistrict(district);
 			break;
 		}
 		case ContactCriteria.FOLLOW_UP_UNTIL_TO: {
@@ -353,7 +358,7 @@ protected void applyDependenciesOnNewValue(ContactCriteria newValue) {
 		final DistrictReferenceDto district = newValue.getDistrict();
 		applyRegionAndDistrictFilterDependency(region, ContactCriteria.DISTRICT, district, ContactCriteria.COMMUNITY);
 
-		final UserDto user = UserProvider.getCurrent().getUser();
+		final UserDto user = currentUser();
 
 		ComboBox officerField = getField(ContactCriteria.CONTACT_OFFICER);
 		if (user.getRegion() != null) {
@@ -494,4 +499,34 @@ public void setSearchFieldEnabled(boolean enabled) {
 		this.getField(ContactCriteria.NAME_UUID_CASE_LIKE).setEnabled(enabled);
 		this.getField(ContactCriteria.EVENT_LIKE).setEnabled(enabled);
 	}
+
+	private void populateSurveillanceOfficersForRegion(RegionReferenceDto regionReferenceDto) {
+		List<UserReferenceDto> items = fetchSurveillanceOfficersByRegion(regionReferenceDto != null ? regionReferenceDto : currentUser().getRegion());
+		populateSurveillanceOfficers(items);
+	}
+
+	private void populateSurveillanceOfficersForDistrict(DistrictReferenceDto districtReferenceDto) {
+		if (districtReferenceDto != null) {
+			List<UserReferenceDto> items =
+				FacadeProvider.getUserFacade().getUserRefsByDistrict(districtReferenceDto, false, UserRole.SURVEILLANCE_OFFICER);
+			populateSurveillanceOfficers(items);
+		} else {
+			final ComboBox regionField = getField(ContactCriteria.REGION);
+			populateSurveillanceOfficersForRegion((RegionReferenceDto) regionField.getValue());
+		}
+	}
+
+	private void populateSurveillanceOfficers(List<UserReferenceDto> items) {
+		final ComboBox officerField = getField(ContactCriteria.CONTACT_OFFICER);
+		officerField.removeAllItems();
+		officerField.addItems(items);
+	}
+
+	private List<UserReferenceDto> fetchSurveillanceOfficersByRegion(RegionReferenceDto regionReferenceDto) {
+		return FacadeProvider.getUserFacade().getUsersByRegionAndRoles(regionReferenceDto, UserRole.SURVEILLANCE_OFFICER);
+	}
+
+	private UserDto currentUser() {
+		return UserProvider.getCurrent().getUser();
+	}
 }