Merge branch 'development' into 3820-demis-testResultText

# Conflicts:
#	sormas-api/src/main/java/de/symeda/sormas/api/event/EventParticipantFacade.java
#	sormas-api/src/main/java/de/symeda/sormas/api/event/SimilarEventParticipantDto.java
#	sormas-api/src/main/java/de/symeda/sormas/api/i18n/Strings.java
#	sormas-api/src/main/java/de/symeda/sormas/api/labmessage/LabMessageFacade.java
#	sormas-api/src/main/java/de/symeda/sormas/api/labmessage/SimilarEntriesDto.java
#	sormas-api/src/main/resources/captions.properties
#	sormas-api/src/main/resources/strings.properties
#	sormas-backend/src/main/java/de/symeda/sormas/backend/labmessage/LabMessageFacadeEjb.java
#	sormas-backend/src/main/java/de/symeda/sormas/backend/labmessage/LabMessageService.java
#	sormas-backend/src/main/resources/sql/sormas_schema.sql
#	sormas-ui/src/main/java/de/symeda/sormas/ui/ControllerProvider.java
#	sormas-ui/src/main/java/de/symeda/sormas/ui/labmessage/EntrySelectionField.java
#	sormas-ui/src/main/java/de/symeda/sormas/ui/labmessage/LabMessageController.java
#	sormas-ui/src/main/java/de/symeda/sormas/ui/labmessage/LabMessageEditForm.java
#	sormas-ui/src/main/java/de/symeda/sormas/ui/labmessage/LabMessageGrid.java
#	sormas-ui/src/main/java/de/symeda/sormas/ui/labmessage/LabMessagesGridComponent.java
#	sormas-ui/src/main/java/de/symeda/sormas/ui/labmessage/LabMessagesView.java
#	sormas-ui/src/main/java/de/symeda/sormas/ui/samples/SampleController.java
#	sormas-ui/src/main/java/de/symeda/sormas/ui/samples/SamplesView.java

Author: FredrikSchäferVitagroup

README.md

@@ -7,7 +7,7 @@
     />
   </a>
   <br/>
-  <a href="https://github.com/hzi-braunschweig/SORMAS-Project/blob/development/LICENSE"><img alt="License" src="https://img.shields.io/badge/license-GPL%20v3-blue"/></a> <a href="https://github.com/hzi-braunschweig/SORMAS-Project/releases/latest"><img alt="Latest Release" src="https://img.shields.io/github/v/release/hzi-braunschweig/SORMAS-Project"/></a> <img alt="Development Build Status" src="https://github.com/hzi-braunschweig/SORMAS-Project/workflows/Java%20CI%20with%20Maven/badge.svg?branch=development"/> <a href="https://gitter.im/SORMAS-Project"><img alt="Gitter" src="https://badges.gitter.im/SORMAS-Project/dev-support.svg"/></a>
+  <a href="https://github.com/hzi-braunschweig/SORMAS-Project/blob/development/LICENSE"><img alt="License" src="https://img.shields.io/badge/license-GPL%20v3-blue"/></a> <a href="https://github.com/hzi-braunschweig/SORMAS-Project/releases/latest"><img alt="Latest Release" src="https://img.shields.io/github/v/release/hzi-braunschweig/SORMAS-Project"/></a> <img alt="Development Build Status" src="https://github.com/hzi-braunschweig/SORMAS-Project/workflows/Java%20CI%20with%20Maven/badge.svg?branch=development"/> <a href="https://gitter.im/SORMAS-Project"><img alt="Gitter" src="https://badges.gitter.im/SORMAS-Project/dev-support.svg"/></a> <a href="https://twitter.com/SORMASDev"><img alt="Twitter" src="https://img.shields.io/twitter/follow/SORMASDev?label=%40SORMASDev&style=social"/></a>
 </p>
 <br/>
 
@@ -17,7 +17,7 @@
 You can give SORMAS a try on our play server at https://sormas.helmholtz-hzi.de!
 
 #### How Can I Get Involved?
-Read through our [*Contributing Readme*](CONTRIBUTING.md) and contact us at [email protected] or join our [developer chat on Gitter](https://gitter.im/SORMAS-Project) to learn how you can help to drive the development of SORMAS forward and to get development support from our core developers. SORMAS is a community-driven project, and we'd love to have you on board! If you want to contribute to the code, please strictly adhere to the [*Development Environment*](DEVELOPMENT_ENVIRONMENT.md) guide to ensure that everything is set up correctly. Please also make sure that you've read the [*Development Contributing Guidelines*](CONTRIBUTING.md#development-contributing-guidelines) before you start to develop.
+Read through our [*Contributing Readme*](CONTRIBUTING.md) and contact us at [email protected] or join our [developer chat on Gitter](https://gitter.im/SORMAS-Project) to learn how you can help to drive the development of SORMAS forward and to get development support from our core developers. SORMAS is a community-driven project, and we'd love to have you on board! If you want to contribute to the code, please strictly adhere to the [*Development Environment*](DEVELOPMENT_ENVIRONMENT.md) guide to ensure that everything is set up correctly. Please also make sure that you've read the [*Development Contributing Guidelines*](CONTRIBUTING.md#development-contributing-guidelines) before you start to develop, and either follow or regularly check our Twitter account <a href="https://twitter.com/SORMASDev" target="_blank">@SORMASDev</a> to stay up to date with our schedule, new releases, guideline changes and other announcements.
 
 #### How Can I Report a Bug or Request a Feature?
 If you want to report a **security issue**, please follow our guideline for [*Responsible Disclosure*](SECURITY.md).  

sormas-api/pom.xml

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

sormas-api/src/main/java/de/symeda/sormas/api/action/ActionDto.java

@@ -41,11 +41,13 @@ public class ActionDto extends EntityDto {
 	public static final String EVENT = "event";
 	public static final String ACTION_CONTEXT = "actionContext";
 	public static final String ACTION_STATUS = "actionStatus";
+	public static final String ACTION_MEASURE = "actionMeasure";
 
 	@Required
 	private ActionContext actionContext;
 	private EventReferenceDto event;
 
+	private ActionMeasure actionMeasure;
 	private ActionPriority priority;
 	@Required
 	private Date date;
@@ -56,15 +58,20 @@ public class ActionDto extends EntityDto {
 	private String title;
 	private String description;
 	private String reply;
-	private UserReferenceDto replyingUser;
+	private UserReferenceDto lastModifiedBy;
 
 	public static ActionDto build(ActionContext context, ReferenceDto entityRef) {
+		return build(context, null, entityRef);
+	}
+
+	public static ActionDto build(ActionContext context, ActionMeasure actionMeasure, ReferenceDto entityRef) {
 
 		ActionDto action = new ActionDto();
 		action.setUuid(DataHelper.createUuid());
 		action.setDate(ActionHelper.getDefaultDate());
 		action.setActionStatus(ActionStatus.PENDING);
 		action.setPriority(ActionPriority.NORMAL);
+		action.setActionMeasure(actionMeasure);
 		action.setActionContext(context);
 		switch (context) {
 		case EVENT:
@@ -146,12 +153,12 @@ public void setReply(String reply) {
 		this.reply = reply;
 	}
 
-	public UserReferenceDto getReplyingUser() {
-		return replyingUser;
+	public UserReferenceDto getLastModifiedBy() {
+		return lastModifiedBy;
 	}
 
-	public void setReplyingUser(UserReferenceDto replyingUser) {
-		this.replyingUser = replyingUser;
+	public void setLastModifiedBy(UserReferenceDto lastModifiedBy) {
+		this.lastModifiedBy = lastModifiedBy;
 	}
 
 	public ActionPriority getPriority() {
@@ -162,6 +169,14 @@ public void setPriority(ActionPriority priority) {
 		this.priority = priority;
 	}
 
+	public ActionMeasure getActionMeasure() {
+		return actionMeasure;
+	}
+
+	public void setActionMeasure(ActionMeasure actionMeasure) {
+		this.actionMeasure = actionMeasure;
+	}
+
 	public ReferenceDto getContextReference() {
 
 		switch (actionContext) {

sormas-api/src/main/java/de/symeda/sormas/api/action/ActionMeasure.java

@@ -0,0 +1,37 @@
+/*
+ * SORMAS® - Surveillance Outbreak Response Management & Analysis System
+ * Copyright © 2016-2020 Helmholtz-Zentrum für Infektionsforschung GmbH (HZI)
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see <https://www.gnu.org/licenses/>.
+ */
+
+package de.symeda.sormas.api.action;
+
+import de.symeda.sormas.api.i18n.I18nProperties;
+
+public enum ActionMeasure {
+
+	PROHIBITION_OF_ENTRY_AND_WORK_CASES,
+	SAMPLE_COLLECTION,
+	FORWARDING_TO_NATIONAL_REFERENCE_CENTER,
+	CONTACT_FOLLOW_UP,
+	VERIFICATION_OF_VACCINATION_IMMUNIZATION,
+	POST_EXPOSURE_PROPHYLAXIS_VACCINATION,
+	CLOSURE_OF_FACILITY,
+	PROHIBITION_OF_ENTRY_AND_WORK_CONTACTS,
+	POPULATION_INFORMATION,
+	OTHER;
+
+	public String toString() {
+		return I18nProperties.getEnumCaption(this);
+	}
+
+}

…eda/sormas/ui/caze/CaseBulkEditData.java …da/sormas/api/caze/CaseBulkEditData.javasormas-ui/src/main/java/de/symeda/sormas/ui/caze/CaseBulkEditData.java renamed to sormas-api/src/main/java/de/symeda/sormas/api/caze/CaseBulkEditData.java sormas-ui/src/main/java/de/symeda/sormas/ui/caze/CaseBulkEditData.java renamed to sormas-api/src/main/java/de/symeda/sormas/api/caze/CaseBulkEditData.java

@@ -1,13 +1,27 @@
-package de.symeda.sormas.ui.caze;
+/*
+ * ******************************************************************************
+ * * SORMAS® - Surveillance Outbreak Response Management & Analysis System
+ * * Copyright © 2016-2021 Helmholtz-Zentrum für Infektionsforschung GmbH (HZI)
+ * *
+ * * This program is free software: you can redistribute it and/or modify
+ * * it under the terms of the GNU General Public License as published by
+ * * the Free Software Foundation, either version 3 of the License, or
+ * * (at your option) any later version.
+ * *
+ * * This program is distributed in the hope that it will be useful,
+ * * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * * GNU General Public License for more details.
+ * *
+ * * You should have received a copy of the GNU General Public License
+ * * along with this program. If not, see <https://www.gnu.org/licenses/>.
+ * ******************************************************************************
+ */
+
+package de.symeda.sormas.api.caze;
 
 import de.symeda.sormas.api.Disease;
 import de.symeda.sormas.api.EntityDto;
-import de.symeda.sormas.api.caze.CaseClassification;
-import de.symeda.sormas.api.caze.CaseOutcome;
-import de.symeda.sormas.api.caze.DengueFeverType;
-import de.symeda.sormas.api.caze.InvestigationStatus;
-import de.symeda.sormas.api.caze.PlagueType;
-import de.symeda.sormas.api.caze.RabiesType;
 import de.symeda.sormas.api.facility.FacilityReferenceDto;
 import de.symeda.sormas.api.facility.FacilityType;
 import de.symeda.sormas.api.region.CommunityReferenceDto;

sormas-api/src/main/java/de/symeda/sormas/api/caze/CaseExportDto.java

@@ -462,7 +462,7 @@ public String getExternalID() {
 	@ExportTarget(caseExportTypes = {
 			CaseExportType.CASE_SURVEILLANCE,
 			CaseExportType.CASE_MANAGEMENT })
-	@ExportProperty(CaseDataDto.EXTERNAL_ID)
+	@ExportProperty(CaseDataDto.EXTERNAL_TOKEN)
 	@ExportGroup(ExportGroupType.CORE)
 	public String getExternalToken() {
 		return externalToken;

sormas-api/src/main/java/de/symeda/sormas/api/caze/CaseFacade.java

@@ -27,12 +27,12 @@
 import de.symeda.sormas.api.CaseMeasure;
 import de.symeda.sormas.api.Disease;
 import de.symeda.sormas.api.Language;
-import de.symeda.sormas.api.messaging.ManualMessageLogDto;
-import de.symeda.sormas.api.messaging.MessageType;
 import de.symeda.sormas.api.contact.ContactReferenceDto;
 import de.symeda.sormas.api.contact.DashboardQuarantineDataDto;
 import de.symeda.sormas.api.event.EventParticipantReferenceDto;
 import de.symeda.sormas.api.importexport.ExportConfigurationDto;
+import de.symeda.sormas.api.messaging.ManualMessageLogDto;
+import de.symeda.sormas.api.messaging.MessageType;
 import de.symeda.sormas.api.person.PresentCondition;
 import de.symeda.sormas.api.region.DistrictDto;
 import de.symeda.sormas.api.region.DistrictReferenceDto;
@@ -183,4 +183,27 @@ List<DashboardQuarantineDataDto> getQuarantineDataForDashBoard(
 	long countCasesWithMissingContactInformation(List<String> caseUuids, MessageType messageType);
 
 	List<ManualMessageLogDto> getMessageLog(String caseUuid, MessageType messageType);
+
+	String getFirstCaseUuidWithOwnershipHandedOver(List<String> caseUuids);
+
+	void saveBulkCase(
+		List<String> caseUuidList,
+		CaseBulkEditData updatedCaseBulkEditData,
+		boolean diseaseChange,
+		boolean classificationChange,
+		boolean investigationStatusChange,
+		boolean outcomeChange,
+		boolean surveillanceOfficerChange);
+
+	void saveBulkEditWithFacilities(
+		List<String> caseUuidList,
+		CaseBulkEditData updatedCaseBulkEditData,
+		boolean diseaseChange,
+		boolean classificationChange,
+		boolean investigationStatusChange,
+		boolean outcomeChange,
+		boolean surveillanceOfficerChange,
+		Boolean doTransfer);
+
+	List<CasePersonDto> getDuplicates(CasePersonDto casePerson);
 }

sormas-api/src/main/java/de/symeda/sormas/api/caze/CasePersonDto.java

@@ -0,0 +1,53 @@
+/*
+ * SORMAS® - Surveillance Outbreak Response Management & Analysis System
+ * Copyright © 2016-2021 Helmholtz-Zentrum für Infektionsforschung GmbH (HZI)
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see <https://www.gnu.org/licenses/>.
+ */
+
+package de.symeda.sormas.api.caze;
+
+import java.io.Serializable;
+
+import de.symeda.sormas.api.person.PersonDto;
+
+public class CasePersonDto implements Serializable {
+
+	private static final long serialVersionUID = 4238365446327936524L;
+
+	private CaseDataDto caze;
+
+	private PersonDto person;
+
+	public CasePersonDto() {
+	}
+
+	public CasePersonDto(CaseDataDto caze, PersonDto person) {
+		this.caze = caze;
+		this.person = person;
+	}
+
+	public CaseDataDto getCaze() {
+		return caze;
+	}
+
+	public void setCaze(CaseDataDto caze) {
+		this.caze = caze;
+	}
+
+	public PersonDto getPerson() {
+		return person;
+	}
+
+	public void setPerson(PersonDto person) {
+		this.person = person;
+	}
+}