SORMAS-Foundation#4020 - Event date restrictions, fixed date filter

Author: MateStrysewske

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

@@ -63,4 +63,9 @@ public static String buildMeansOfTransportString(MeansOfTransport meansOfTranspo
 	public static String buildEventActionTitleString(ActionMeasure actionMeasure, String actionTitle) {
 		return actionMeasure == null || actionMeasure == ActionMeasure.OTHER ? actionTitle : actionMeasure.toString();
 	}
+
+	public static Date getStartOrEndDate(Date eventStartDate, Date eventEndDate) {
+		return eventStartDate != null ? eventStartDate : eventEndDate;
+	}
+
 }

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

@@ -539,17 +539,19 @@ public Predicate buildCriteriaFilter(EventCriteria eventCriteria, CriteriaBuilde
 			filter = CriteriaBuilderHelper.and(
 				cb,
 				filter,
-				cb.or(cb.greaterThanOrEqualTo(from.get(Event.START_DATE), eventCriteria.getEventDateFrom())),
-				cb.and(
-					cb.isNotNull(from.get(Event.END_DATE)),
-					cb.lessThan(from.get(Event.START_DATE), eventCriteria.getEventDateFrom()),
-					cb.greaterThanOrEqualTo(from.get(Event.END_DATE), eventCriteria.getEventDateFrom())));
+				cb.or(
+					cb.greaterThanOrEqualTo(from.get(Event.START_DATE), eventCriteria.getEventDateFrom()),
+					cb.and(
+						cb.isNotNull(from.get(Event.END_DATE)),
+						cb.lessThan(from.get(Event.START_DATE), eventCriteria.getEventDateFrom()),
+						cb.greaterThanOrEqualTo(from.get(Event.END_DATE), eventCriteria.getEventDateFrom()))));
 		} else if (eventCriteria.getEventDateTo() != null) {
 			filter = CriteriaBuilderHelper.and(
 				cb,
 				filter,
-				cb.or(cb.and(cb.isNull(from.get(Event.END_DATE)), cb.lessThanOrEqualTo(from.get(Event.START_DATE), eventCriteria.getEventDateTo()))),
-				cb.lessThanOrEqualTo(from.get(Event.END_DATE), eventCriteria.getEventDateTo()));
+				cb.or(
+					cb.and(cb.isNull(from.get(Event.END_DATE)), cb.lessThanOrEqualTo(from.get(Event.START_DATE), eventCriteria.getEventDateTo())),
+					cb.lessThanOrEqualTo(from.get(Event.END_DATE), eventCriteria.getEventDateTo())));
 		}
 		if (eventCriteria.getSurveillanceOfficer() != null) {
 			filter = CriteriaBuilderHelper.and(

sormas-ui/src/main/java/de/symeda/sormas/ui/events/eventLink/EventSelectionField.java

@@ -40,6 +40,7 @@
 import de.symeda.sormas.api.contact.ContactDto;
 import de.symeda.sormas.api.event.EventCriteria;
 import de.symeda.sormas.api.event.EventDto;
+import de.symeda.sormas.api.event.EventHelper;
 import de.symeda.sormas.api.event.EventIndexDto;
 import de.symeda.sormas.api.i18n.Captions;
 import de.symeda.sormas.api.i18n.I18nProperties;
@@ -103,8 +104,11 @@ public EventSelectionField(EventDto event, Set<String> excludedUuids, boolean se
 		criteria.relevanceStatus(EntityRelevanceStatus.ACTIVE);
 
 		if (!selectSuperordinateEvent) {
+			criteria.eventDateFrom(EventHelper.getStartOrEndDate(event.getStartDate(), event.getEndDate()));
 			// Users are not allowed to select a subordinate event that already has a superordinate event
 			criteria.setHasNoSuperordinateEvent(Boolean.TRUE);
+		} else {
+			criteria.eventDateTo(EventHelper.getStartOrEndDate(event.getStartDate(), event.getEndDate()));
 		}
 
 		initializeGrid();