Merge branch 'development' into bugfix-measles-minor-issues

Author: KarnaiahPesula

sormas-backend/src/main/java/de/symeda/sormas/backend/caze/CaseFacadeEjb.java

@@ -2204,6 +2204,26 @@ public void onCaseChanged(CaseDataDto existingCase, Case newCase, boolean syncSh
 			}
 		}
 
+		if (existingCase != null && newCase.getEpiData() != null) {
+			// If contact with source case is known and at least one source case (same disease) is confirmed, set YES.
+			final YesNoUnknown contactKnown = newCase.getEpiData().getContactWithSourceCaseKnown();
+			if (contactKnown == YesNoUnknown.YES) {
+				// Check if at least one source case is confirmed
+				// We only check for contacts that have this case as resulting case
+				final boolean hasConfirmedSourceCase = contactService.getAllByResultingCase(caseService.getByUuid(existingCase.getUuid())).stream()
+						.map(Contact::getCaze)
+						.filter(Objects::nonNull)
+						.anyMatch(src ->
+								src.getDisease() == newCase.getDisease()
+										&& CaseClassification.getConfirmedClassifications().contains(src.getCaseClassification()));
+				newCase.setEpidemiologicalConfirmation(hasConfirmedSourceCase ? YesNoUnknown.YES : YesNoUnknown.NO);
+			} else if (contactKnown == YesNoUnknown.NO) {
+				newCase.setEpidemiologicalConfirmation(YesNoUnknown.NO);
+			} else {
+				newCase.setEpidemiologicalConfirmation(YesNoUnknown.UNKNOWN);
+			}
+		}
+
 		// Update follow-up
 		service.updateFollowUpDetails(newCase, existingCase != null && newCase.getFollowUpStatus() != existingCase.getFollowUpStatus());
 

sormas-ui/src/main/java/de/symeda/sormas/ui/ActivityAsCase/ActivityAsCaseForm.java

@@ -39,6 +39,7 @@
 import com.vaadin.v7.data.util.converter.Converter;
 import com.vaadin.v7.ui.AbstractSelect;
 import com.vaadin.v7.ui.ComboBox;
+import com.vaadin.v7.ui.DateField;
 import com.vaadin.v7.ui.TextArea;
 import com.vaadin.v7.ui.TextField;
 
@@ -59,6 +60,7 @@
 import de.symeda.sormas.api.utils.fieldvisibility.FieldVisibilityCheckers;
 import de.symeda.sormas.ui.location.LocationEditForm;
 import de.symeda.sormas.ui.utils.AbstractEditForm;
+import de.symeda.sormas.ui.utils.DateComparisonValidator;
 import de.symeda.sormas.ui.utils.FieldHelper;
 
 public class ActivityAsCaseForm extends AbstractEditForm<ActivityAsCaseDto> {
@@ -120,7 +122,10 @@ public ActivityAsCaseForm(boolean create, FieldVisibilityCheckers fieldVisibilit
 	protected void addFields() {
 		addHeadingsAndInfoTexts();
 		addBasicFields();
+		DateField startDate = addField(ActivityAsCaseDto.START_DATE);
+		DateField endDate = addField(ActivityAsCaseDto.END_DATE);
 
+		DateComparisonValidator.addStartEndValidators(startDate, endDate);
 		addField(ActivityAsCaseDto.DESCRIPTION, TextArea.class).setRows(5);
 
 		locationForm = addField(ActivityAsCaseDto.LOCATION, LocationEditForm.class);
@@ -155,8 +160,6 @@ private void addBasicFields() {
 		addFields(
 			ActivityAsCaseDto.UUID,
 			ActivityAsCaseDto.REPORTING_USER,
-			ActivityAsCaseDto.START_DATE,
-			ActivityAsCaseDto.END_DATE,
 			ActivityAsCaseDto.ACTIVITY_AS_CASE_TYPE,
 			ActivityAsCaseDto.ACTIVITY_AS_CASE_TYPE_DETAILS,
 			ActivityAsCaseDto.GATHERING_TYPE,

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

@@ -25,6 +25,7 @@
 import com.vaadin.ui.VerticalLayout;
 import com.vaadin.ui.themes.ValoTheme;
 
+import de.symeda.sormas.api.FacadeProvider;
 import de.symeda.sormas.api.ReferenceDto;
 import de.symeda.sormas.api.caze.CaseReferenceDto;
 import de.symeda.sormas.api.contact.ContactReferenceDto;
@@ -76,7 +77,12 @@ private void createSourceContactListComponent(SourceContactList sourceContactLis
 			Button createButton = ButtonHelper.createIconButton(
 				Captions.contactNewContact,
 				VaadinIcons.PLUS_CIRCLE,
-				e -> view.showUnsavedChangesPopup(() -> ControllerProvider.getContactController().create(caseReference, true, SormasUI::refreshView)),
+					e -> view.showUnsavedChangesPopup(() -> ControllerProvider.getContactController().create(caseReference, true, () -> {
+						// For case classification effectiveness, extra save is needed.
+						// Ideally, we should mark the epi case data form as dirty when a contact is created, but we couldn't find a way to do that.
+						FacadeProvider.getCaseFacade().save(FacadeProvider.getCaseFacade().getByUuid(caseReference.getUuid()));
+						SormasUI.refreshView();
+					})),
 				ValoTheme.BUTTON_PRIMARY);
 			componentHeader.addComponent(createButton);
 			componentHeader.setComponentAlignment(createButton, Alignment.MIDDLE_RIGHT);

sormas-ui/src/main/java/de/symeda/sormas/ui/exposure/ExposureForm.java

@@ -63,6 +63,7 @@
 import de.symeda.sormas.ui.utils.AbstractEditForm;
 import de.symeda.sormas.ui.utils.ComboBoxWithPlaceholder;
 import de.symeda.sormas.ui.utils.CssStyles;
+import de.symeda.sormas.ui.utils.DateComparisonValidator;
 import de.symeda.sormas.ui.utils.DateTimeField;
 import de.symeda.sormas.ui.utils.FieldHelper;
 import de.symeda.sormas.ui.utils.NullableOptionGroup;
@@ -219,7 +220,10 @@ private void addHeadingsAndInfoTexts() {
 	private void addBasicFields() {
 		addFields(ExposureDto.UUID, ExposureDto.REPORTING_USER, ExposureDto.PROBABLE_INFECTION_ENVIRONMENT);
 
-		addFields(DateTimeField.class, ExposureDto.START_DATE, ExposureDto.END_DATE);
+		DateTimeField startDate = addField(ExposureDto.START_DATE, DateTimeField.class);
+		DateTimeField endDate = addField(ExposureDto.END_DATE, DateTimeField.class);
+
+		DateComparisonValidator.addStartEndValidators(startDate, endDate);
 
 		addFields(
 			ExposureDto.EXPOSURE_TYPE,