Location filters and columns in event directory SORMAS-Foundation#2914 (SORMAS-Foundation#3395)

* Allow location filters in the event directory to everyone SORMAS-Foundation#2914

* Split event location column into region, district, community and adress SORMAS-Foundation#2914

* Remove comma between street and house number in LocationReferenceDto's buildCaption SORMAS-Foundation#2914

* Override location filters dependencies in the event directory SORMAS-Foundation#2914

Co-authored-by: nca <[email protected]>

Author: alexandre-gille

sormas-api/src/main/java/de/symeda/sormas/api/event/EventIndexDto.java

@@ -45,6 +45,10 @@ public class EventIndexDto extends PseudonymizableIndexDto implements Serializab
 	public static final String SRC_LAST_NAME = "srcLastName";
 	public static final String SRC_TEL_NO = "srcTelNo";
 	public static final String REPORT_DATE_TIME = "reportDateTime";
+	public static final String REGION = "region";
+	public static final String DISTRICT = "district";
+	public static final String COMMUNITY = "community";
+	public static final String ADDRESS = "address";
 
 	private String uuid;
 	private EventStatus eventStatus;
@@ -247,6 +251,22 @@ public void setParticipantCount(long participantCount) {
 		this.participantCount = participantCount;
 	}
 
+	public String getRegion() {
+		return getEventLocation().getRegion();
+	}
+
+	public String getDistrict() {
+		return getEventLocation().getDistrict();
+	}
+
+	public String getCommunity() {
+		return getEventLocation().getCommunity();
+	}
+
+	public String getAddress() {
+		return getEventLocation().getAddress();
+	}
+
 	public EventReferenceDto toReference() {
 		return new EventReferenceDto(getUuid(), getDisease(), getDiseaseDetails(), getEventStatus(), getEventInvestigationStatus(), getStartDate());
 	}
@@ -302,6 +322,22 @@ public EventIndexLocation(
 			this.additionalInformation = additionalInformation;
 		}
 
+		public String getRegion() {
+			return regionName;
+		}
+
+		public String getDistrict() {
+			return districtName;
+		}
+
+		public String getCommunity() {
+			return communityName;
+		}
+
+		public String getAddress() {
+			return LocationReferenceDto.buildCaption(city, street, houseNumber, additionalInformation);
+		}
+
 		@Override
 		public String toString() {
 			return LocationReferenceDto.buildCaption(regionName, districtName, communityName, city, street, houseNumber, additionalInformation);

sormas-api/src/main/java/de/symeda/sormas/api/location/LocationReferenceDto.java

@@ -87,9 +87,40 @@ public static String buildCaption(
 			stringBuilder.append(street);
 		}
 		if (!DataHelper.isNullOrEmpty(houseNumber)) {
+			if (stringBuilder.length() > 0 && DataHelper.isNullOrEmpty(street)) {
+				stringBuilder.append(", ");
+			}
+			stringBuilder.append(houseNumber);
+		}
+		if (!DataHelper.isNullOrEmpty(additionalInformation)) {
+			if (stringBuilder.length() > 0) {
+				stringBuilder.append(", ");
+			}
+			stringBuilder.append(additionalInformation);
+		}
+		return stringBuilder.toString();
+	}
+
+	public static String buildCaption(String city, String street, String houseNumber, String additionalInformation) {
+
+		StringBuilder stringBuilder = new StringBuilder();
+
+		if (!DataHelper.isNullOrEmpty(city)) {
+			if (stringBuilder.length() > 0) {
+				stringBuilder.append(", ");
+			}
+			stringBuilder.append(city);
+		}
+		if (!DataHelper.isNullOrEmpty(street)) {
 			if (stringBuilder.length() > 0) {
 				stringBuilder.append(", ");
 			}
+			stringBuilder.append(street);
+		}
+		if (!DataHelper.isNullOrEmpty(houseNumber)) {
+			if (stringBuilder.length() > 0 && DataHelper.isNullOrEmpty(street)) {
+				stringBuilder.append(", ");
+			}
 			stringBuilder.append(houseNumber);
 		}
 		if (!DataHelper.isNullOrEmpty(additionalInformation)) {

sormas-backend/src/main/java/de/symeda/sormas/backend/event/EventFacadeEjb.java

@@ -296,6 +296,24 @@ public List<EventIndexDto> getIndexList(EventCriteria eventCriteria, Integer fir
 					order.add(sortProperty.ascending ? cb.asc(expression) : cb.desc(expression));
 					expression = community.get(Community.NAME);
 					break;
+				case EventIndexDto.REGION:
+					expression = region.get(Region.NAME);
+					break;
+				case EventIndexDto.DISTRICT:
+					expression = district.get(District.NAME);
+					break;
+				case EventIndexDto.COMMUNITY:
+					expression = community.get(Community.NAME);
+					break;
+				case EventIndexDto.ADDRESS:
+					expression = location.get(Location.CITY);
+					order.add(sortProperty.ascending ? cb.asc(expression) : cb.desc(expression));
+					expression = location.get(Location.STREET);
+					order.add(sortProperty.ascending ? cb.asc(expression) : cb.desc(expression));
+					expression = location.get(Location.HOUSE_NUMBER);
+					order.add(sortProperty.ascending ? cb.asc(expression) : cb.desc(expression));
+					expression = location.get(Location.ADDITIONAL_INFORMATION);
+					break;
 				default:
 					throw new IllegalArgumentException(sortProperty.propertyName);
 				}

sormas-ui/src/main/java/de/symeda/sormas/ui/events/EventGrid.java

@@ -17,11 +17,18 @@
  *******************************************************************************/
 package de.symeda.sormas.ui.events;
 
+import java.util.ArrayList;
+import java.util.Arrays;
+import java.util.Date;
+import java.util.List;
+import java.util.stream.Collectors;
+
 import com.vaadin.data.provider.DataProvider;
 import com.vaadin.data.provider.ListDataProvider;
 import com.vaadin.navigator.View;
 import com.vaadin.shared.data.sort.SortDirection;
 import com.vaadin.ui.renderers.DateRenderer;
+
 import de.symeda.sormas.api.DiseaseHelper;
 import de.symeda.sormas.api.FacadeProvider;
 import de.symeda.sormas.api.Language;
@@ -45,13 +52,6 @@
 import de.symeda.sormas.ui.utils.UuidRenderer;
 import de.symeda.sormas.ui.utils.ViewConfiguration;
 
-import java.util.ArrayList;
-import java.util.Arrays;
-import java.util.Date;
-import java.util.List;
-import java.util.stream.Collectors;
-import java.util.stream.Stream;
-
 @SuppressWarnings("serial")
 public class EventGrid extends FilteredGrid<EventIndexDto, EventCriteria> {
 
@@ -93,26 +93,30 @@ public <V extends View> EventGrid(EventCriteria criteria, Class<V> viewClass) {
 		boolean tasksFeatureEnabled = FacadeProvider.getFeatureConfigurationFacade().isFeatureEnabled(FeatureType.TASK_MANAGEMENT);
 		if (tasksFeatureEnabled) {
 			Column<EventIndexDto, String> pendingTasksColumn = addColumn(
-					entry -> String.format(
-							I18nProperties.getCaption(Captions.formatSimpleNumberFormat),
-							FacadeProvider.getTaskFacade().getPendingTaskCountByEvent(entry.toReference())));
+				entry -> String.format(
+					I18nProperties.getCaption(Captions.formatSimpleNumberFormat),
+					FacadeProvider.getTaskFacade().getPendingTaskCountByEvent(entry.toReference())));
 			pendingTasksColumn.setId(NUMBER_OF_PENDING_TASKS);
 			pendingTasksColumn.setSortable(false);
 		}
 
-		List<String> columnIds = new ArrayList(Arrays.asList(
-			EventIndexDto.UUID,
-			EventIndexDto.EVENT_STATUS,
-			EventIndexDto.EVENT_INVESTIGATION_STATUS,
-			createEventDateColumn(this, userLanguage),
-			DISEASE_SHORT,
-			EventIndexDto.EVENT_TITLE,
-			EventIndexDto.EVENT_LOCATION,
-			EventIndexDto.SRC_TYPE,
-			INFORMATION_SOURCE,
-			EventIndexDto.REPORT_DATE_TIME,
-			NUMBER_OF_PENDING_TASKS,
-			EventIndexDto.PARTICIPANT_COUNT));
+		List<String> columnIds = new ArrayList(
+			Arrays.asList(
+				EventIndexDto.UUID,
+				EventIndexDto.EVENT_STATUS,
+				EventIndexDto.EVENT_INVESTIGATION_STATUS,
+				createEventDateColumn(this, userLanguage),
+				DISEASE_SHORT,
+				EventIndexDto.EVENT_TITLE,
+				EventIndexDto.REGION,
+				EventIndexDto.DISTRICT,
+				EventIndexDto.COMMUNITY,
+				EventIndexDto.ADDRESS,
+				EventIndexDto.SRC_TYPE,
+				INFORMATION_SOURCE,
+				EventIndexDto.REPORT_DATE_TIME,
+				NUMBER_OF_PENDING_TASKS,
+				EventIndexDto.PARTICIPANT_COUNT));
 
 		if (!tasksFeatureEnabled) {
 			columnIds.remove(NUMBER_OF_PENDING_TASKS);

sormas-ui/src/main/java/de/symeda/sormas/ui/events/EventsFilterForm.java

@@ -28,7 +28,6 @@
 import de.symeda.sormas.api.location.LocationDto;
 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.UserRole;
 import de.symeda.sormas.api.utils.DateFilterOption;
 import de.symeda.sormas.api.utils.DateHelper;
@@ -37,6 +36,7 @@
 import de.symeda.sormas.ui.utils.AbstractFilterForm;
 import de.symeda.sormas.ui.utils.EpiWeekAndDateFilterComponent;
 import de.symeda.sormas.ui.utils.FieldConfiguration;
+import de.symeda.sormas.ui.utils.FieldHelper;
 
 public class EventsFilterForm extends AbstractFilterForm<EventCriteria> {
 
@@ -108,15 +108,11 @@ public void addMoreFilters(CustomLayout moreFiltersContainer) {
 			FieldConfiguration.pixelSized(EventDto.TYPE_OF_PLACE, 140),
 			FieldConfiguration.pixelSized(EventDto.EVENT_INVESTIGATION_STATUS, 140));
 
-		UserDto user = UserProvider.getCurrent().getUser();
-
-		if (user.getRegion() == null) {
-			ComboBox regionField = addField(
-				moreFiltersContainer,
-				FieldConfiguration
-					.withCaptionAndPixelSized(LocationDto.REGION, I18nProperties.getPrefixCaption(LocationDto.I18N_PREFIX, LocationDto.REGION), 140));
-			regionField.addItems(FacadeProvider.getRegionFacade().getAllActiveAsReference());
-		}
+		ComboBox regionField = addField(
+			moreFiltersContainer,
+			FieldConfiguration
+				.withCaptionAndPixelSized(LocationDto.REGION, I18nProperties.getPrefixCaption(LocationDto.I18N_PREFIX, LocationDto.REGION), 140));
+		regionField.addItems(FacadeProvider.getRegionFacade().getAllActiveAsReference());
 
 		ComboBox districtField = addField(
 			moreFiltersContainer,
@@ -242,6 +238,28 @@ protected void applyDependenciesOnFieldChange(String propertyId, Property.ValueC
 		}
 	}
 
+	@Override
+	protected void applyRegionFilterDependency(RegionReferenceDto region, String districtFieldId) {
+		final ComboBox districtField = getField(districtFieldId);
+		if (region != null) {
+			FieldHelper.updateItems(districtField, FacadeProvider.getDistrictFacade().getAllActiveByRegion(region.getUuid()));
+			districtField.setEnabled(true);
+		} else {
+			districtField.setEnabled(false);
+		}
+	}
+
+	@Override
+	protected void applyDistrictDependency(DistrictReferenceDto district, String communityFieldId) {
+		final ComboBox communityField = getField(communityFieldId);
+		if (district != null) {
+			FieldHelper.updateItems(communityField, FacadeProvider.getCommunityFacade().getAllActiveByDistrict(district.getUuid()));
+			communityField.setEnabled(true);
+		} else {
+			communityField.setEnabled(false);
+		}
+	}
+
 	@Override
 	protected void applyDependenciesOnNewValue(EventCriteria criteria) {