[GITFLOW]merging 'hotfix-1.43.1' into 'master'

Author: MateStrysewske

sormas-api/pom.xml

@@ -2,7 +2,7 @@
 	<parent>
 		<groupId>de.symeda.sormas</groupId>
 		<artifactId>sormas-base</artifactId>
-		<version>1.43.0</version>
+		<version>1.43.1</version>
 		<relativePath>../sormas-base</relativePath>
 	</parent>
 	<modelVersion>4.0.0</modelVersion>

sormas-app/app/src/main/java/de/symeda/sormas/app/backend/event/EventDao.java

@@ -74,6 +74,7 @@ public Event build() {
 		event.setReportDateTime(new Date());
 		event.setReportingUser(ConfigProvider.getUser());
 		event.getEventLocation().setRegion(ConfigProvider.getUser().getRegion());
+		event.getEventLocation().setDistrict(ConfigProvider.getUser().getDistrict());
 		event.setEventStatus(EventStatus.POSSIBLE);
 
 		return event;

sormas-app/app/src/main/java/de/symeda/sormas/app/component/dialog/AbstractDialog.java

@@ -58,6 +58,7 @@ public abstract class AbstractDialog implements NotificationContext {
 	private int buttonPanelLayoutResourceId;
 	private DialogViewConfig config;
 	private boolean liveValidationDisabled;
+	private boolean closeOnPositiveButtonClick;
 
 	// Button callbacks
 	private boolean suppressNextDismiss;
@@ -67,19 +68,13 @@ public abstract class AbstractDialog implements NotificationContext {
 
 	// Constructor
 
-	public AbstractDialog(
-		final FragmentActivity activity,
-		int rootLayoutId,
-		int contentLayoutResourceId,
-		int buttonPanelLayoutResourceId,
-		int headingResourceId,
-		int subHeadingResourceId) {
-
+	public AbstractDialog(final FragmentActivity activity, int rootLayoutId, int contentLayoutResourceId, int buttonPanelLayoutResourceId, int headingResourceId, int subHeadingResourceId, boolean closeOnPositiveButtonClick) {
 		this.builder = new AlertDialog.Builder(activity);
 		this.activity = activity;
 		this.rootLayoutId = rootLayoutId;
 		this.contentLayoutResourceId = contentLayoutResourceId;
 		this.buttonPanelLayoutResourceId = buttonPanelLayoutResourceId;
+		this.closeOnPositiveButtonClick = closeOnPositiveButtonClick;
 
 		Resources resources = activity.getResources();
 		String heading = null;
@@ -99,6 +94,16 @@ public AbstractDialog(
 		this.config = new DialogViewConfig(heading, subHeading, positiveLabel, negativeLabel, deleteLabel, positiveIcon, negativeIcon);
 	}
 
+	public AbstractDialog(
+		final FragmentActivity activity,
+		int rootLayoutId,
+		int contentLayoutResourceId,
+		int buttonPanelLayoutResourceId,
+		int headingResourceId,
+		int subHeadingResourceId) {
+		this(activity, rootLayoutId, contentLayoutResourceId, buttonPanelLayoutResourceId, headingResourceId, subHeadingResourceId, true);
+	}
+
 	// Instance methods
 
 	private DialogRootLayoutBinding bindRootLayout(final Context context) {
@@ -225,7 +230,9 @@ protected void onPositiveClick() {
 			positiveCallback.call();
 		}
 
-		dismiss();
+		if (closeOnPositiveButtonClick) {
+			dismiss();
+		}
 	}
 
 	private void onNegativeClick() {

sormas-app/app/src/main/java/de/symeda/sormas/app/component/dialog/LocationDialog.java

@@ -50,13 +50,17 @@ public class LocationDialog extends AbstractDialog {
 	// Constructor
 
 	public LocationDialog(final FragmentActivity activity, Location location, FieldAccessCheckers fieldAccessCheckers) {
+		this(activity, location, true, fieldAccessCheckers);
+	}
+
+	public LocationDialog(final FragmentActivity activity, Location location, boolean closeOnPositiveButtonClick, FieldAccessCheckers fieldAccessCheckers) {
 		super(
 			activity,
 			R.layout.dialog_root_layout,
 			R.layout.dialog_location_layout,
 			R.layout.dialog_root_two_button_panel_layout,
 			R.string.heading_location,
-			-1);
+			-1, closeOnPositiveButtonClick);
 
 		this.data = location;
 		this.fieldAccessCheckers = fieldAccessCheckers;
@@ -120,6 +124,15 @@ protected void initializeContentView(ViewDataBinding rootBinding, ViewDataBindin
 		});
 	}
 
+	public void setRegionAndDistrictRequired(boolean required) {
+		contentBinding.locationRegion.setRequired(required);
+		contentBinding.locationDistrict.setRequired(required);
+	}
+
+	public DialogLocationLayoutBinding getContentBinding() {
+		return contentBinding;
+	}
+
 	@Override
 	public boolean isRounded() {
 		return true;

sormas-app/app/src/main/java/de/symeda/sormas/app/event/edit/EventEditFragment.java

@@ -22,17 +22,23 @@
 import de.symeda.sormas.api.Disease;
 import de.symeda.sormas.api.event.EventStatus;
 import de.symeda.sormas.api.event.TypeOfPlace;
+import de.symeda.sormas.api.utils.ValidationException;
 import de.symeda.sormas.app.BaseActivity;
 import de.symeda.sormas.app.BaseEditFragment;
 import de.symeda.sormas.app.R;
 import de.symeda.sormas.app.backend.event.Event;
 import de.symeda.sormas.app.backend.location.Location;
+import de.symeda.sormas.app.caze.edit.EpiDataBurialDialog;
 import de.symeda.sormas.app.component.Item;
 import de.symeda.sormas.app.component.dialog.LocationDialog;
+import de.symeda.sormas.app.component.validation.FragmentValidator;
+import de.symeda.sormas.app.core.notification.NotificationHelper;
 import de.symeda.sormas.app.databinding.FragmentEventEditLayoutBinding;
 import de.symeda.sormas.app.util.DataUtils;
 import de.symeda.sormas.app.util.DiseaseConfigurationCache;
 
+import static de.symeda.sormas.app.core.notification.NotificationType.ERROR;
+
 public class EventEditFragment extends BaseEditFragment<FragmentEventEditLayoutBinding, Event, Event> {
 
 	private Event record;
@@ -59,12 +65,18 @@ public void onClick(View v) {
 	private void openAddressPopup(final FragmentEventEditLayoutBinding contentBinding) {
 		final Location location = record.getEventLocation();
 		final Location locationClone = (Location) location.clone();
-		final LocationDialog locationDialog = new LocationDialog(BaseActivity.getActiveActivity(), locationClone, null);
+		final LocationDialog locationDialog = new LocationDialog(BaseActivity.getActiveActivity(), locationClone, false,null);
 		locationDialog.show();
-
+		locationDialog.setRegionAndDistrictRequired(true);
 		locationDialog.setPositiveCallback(() -> {
-			contentBinding.eventEventLocation.setValue(locationClone);
-			record.setEventLocation(locationClone);
+			try {
+				FragmentValidator.validate(getContext(), locationDialog.getContentBinding());
+				contentBinding.eventEventLocation.setValue(locationClone);
+				record.setEventLocation(locationClone);
+				locationDialog.dismiss();
+			} catch (ValidationException e) {
+				NotificationHelper.showDialogNotification(locationDialog, ERROR, e.getMessage());
+			}
 		});
 	}
 

sormas-app/pom.xml

@@ -3,7 +3,7 @@
 	<parent>
 		<artifactId>sormas-base</artifactId>
 		<groupId>de.symeda.sormas</groupId>
-		<version>1.43.0</version>
+		<version>1.43.1</version>
 		<relativePath>../sormas-base</relativePath>
 	</parent>
 	<modelVersion>4.0.0</modelVersion>

sormas-backend/pom.xml

@@ -3,7 +3,7 @@
 	<parent>
 		<artifactId>sormas-base</artifactId>
 		<groupId>de.symeda.sormas</groupId>
-		<version>1.43.0</version>
+		<version>1.43.1</version>
 		<relativePath>../sormas-base</relativePath>
 	</parent>
 	<modelVersion>4.0.0</modelVersion>

sormas-backend/src/main/java/de/symeda/sormas/backend/contact/ContactFacadeEjb.java

@@ -385,13 +385,15 @@ public List<ContactExportDto> getExportList(ContactCriteria contactCriteria, int
 					listCriteriaBuilder.getJurisdictionSelections(joins))
 				.collect(Collectors.toList()));
 
+		cq.distinct(true);
+
 		Predicate filter = listCriteriaBuilder.buildContactFilter(contactCriteria, cb, contact, cq);
 
 		if (filter != null) {
 			cq.where(filter);
 		}
 
-		cq.orderBy(cb.desc(contact.get(Contact.REPORT_DATE_TIME)));
+		cq.orderBy(cb.desc(contact.get(Contact.REPORT_DATE_TIME)), cb.desc(contact.get(Contact.ID)));
 
 		List<ContactExportDto> exportContacts = em.createQuery(cq).setFirstResult(first).setMaxResults(max).getResultList();
 

sormas-backend/src/main/java/de/symeda/sormas/backend/sample/SampleFacadeEjb.java

@@ -527,6 +527,8 @@ private List<SampleExportDto> getExportList(SampleCriteria sampleCriteria, CaseC
 				joins.getContact().get(Contact.CONTACT_CLASSIFICATION),
 				joins.getContact().get(Contact.CONTACT_STATUS)));
 
+		cq.distinct(true);
+
 		selections.addAll(getCaseJurisdictionSelections(joins));
 		selections.addAll(getContactJurisdictionSelections(joins));
 
@@ -547,7 +549,7 @@ private List<SampleExportDto> getExportList(SampleCriteria sampleCriteria, CaseC
 			cq.where(filter);
 		}
 
-		cq.orderBy(cb.desc(sample.get(Sample.REPORT_DATE_TIME)));
+		cq.orderBy(cb.desc(sample.get(Sample.REPORT_DATE_TIME)), cb.desc(sample.get(Sample.ID)));
 
 		List<SampleExportDto> resultList = em.createQuery(cq).setFirstResult(first).setMaxResults(max).getResultList();
 

sormas-base/dependencies/serverlibs.pom

@@ -8,7 +8,7 @@
     <parent>
         <artifactId>sormas-base</artifactId>
         <groupId>de.symeda.sormas</groupId>
-        <version>1.43.0</version>
+        <version>1.43.1</version>
         <relativePath>../</relativePath>
     </parent>