Merge branch 'development' into 2972-place-of-stay-in-bulk-case-edit

# Conflicts:
#	sormas-api/src/main/resources/strings.properties

Author: danRosca

README.md

@@ -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?
-Have a look at 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!
+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.
 
 #### How Can I Report a Bug or Request a Feature?
 Please [create a new issue](https://github.com/hzi-braunschweig/SORMAS-Project/issues/new/choose) and read the [*Submitting an Issue*](CONTRIBUTING.md#submitting-an-issue) guide for more detailed instructions. We appreciate your help!

sormas-api/src/main/java/de/symeda/sormas/api/ConfigFacade.java

@@ -106,5 +106,7 @@ public interface ConfigFacade {
 
 	SormasToSormasConfig getSormasToSormasConfig();
 
+	String getSurvnetGatewayUrl();
+
 	String getAuthenticationProvider();
 }

sormas-api/src/main/java/de/symeda/sormas/api/FacadeProvider.java

@@ -60,6 +60,7 @@
 import de.symeda.sormas.api.sample.PathogenTestFacade;
 import de.symeda.sormas.api.sample.SampleFacade;
 import de.symeda.sormas.api.sormastosormas.SormasToSormasFacade;
+import de.symeda.sormas.api.survnet.SurvnetGatewayFacade;
 import de.symeda.sormas.api.symptoms.SymptomsFacade;
 import de.symeda.sormas.api.task.TaskFacade;
 import de.symeda.sormas.api.therapy.PrescriptionFacade;
@@ -290,6 +291,10 @@ public static SormasToSormasFacade getSormasToSormasFacade() {
 		return get().lookupEjbRemote(SormasToSormasFacade.class);
 	}
 
+	public static SurvnetGatewayFacade getSurvnetGatewayFacade() {
+		return get().lookupEjbRemote(SurvnetGatewayFacade.class);
+	}
+
 	public static AreaFacade getAreaFacade() {
 		return get().lookupEjbRemote(AreaFacade.class);
 	}

sormas-api/src/main/java/de/symeda/sormas/api/ResourceBundle.java

@@ -1,7 +1,5 @@
 package de.symeda.sormas.api;
 
-import org.apache.commons.text.StringEscapeUtils;
-
 public class ResourceBundle {
 
 	private java.util.ResourceBundle resourceBundle;

sormas-api/src/main/java/de/symeda/sormas/api/campaign/data/CampaignFormDataDto.java

@@ -143,4 +143,6 @@ public UserReferenceDto getCreatingUser() {
 	public void setCreatingUser(UserReferenceDto creatingUser) {
 		this.creatingUser = creatingUser;
 	}
+
+
 }

sormas-api/src/main/java/de/symeda/sormas/api/i18n/Captions.java

@@ -151,6 +151,7 @@ public interface Captions {
 	String campaignDashboardChartWidth = "campaignDashboardChartWidth";
 	String campaignDashboardOrder = "campaignDashboardOrder";
 	String campaignDashboardTabName = "campaignDashboardTabName";
+	String CampaignFormData_area = "CampaignFormData.area";
 	String CampaignFormData_campaign = "CampaignFormData.campaign";
 	String CampaignFormData_campaignFormMeta = "CampaignFormData.campaignFormMeta";
 	String CampaignFormData_formDate = "CampaignFormData.formDate";
@@ -1367,6 +1368,8 @@ public interface Captions {
 	String statisticsSpecifySelection = "statisticsSpecifySelection";
 	String statisticsStatistics = "statisticsStatistics";
 	String statisticsVisualizationType = "statisticsVisualizationType";
+	String SurvnetGateway_send = "SurvnetGateway.send";
+	String SurvnetGateway_title = "SurvnetGateway.title";
 	String Symptoms = "Symptoms";
 	String Symptoms_abdominalPain = "Symptoms.abdominalPain";
 	String Symptoms_abnormalLungXrayFindings = "Symptoms.abnormalLungXrayFindings";
@@ -1606,6 +1609,7 @@ public interface Captions {
 	String User_active = "User.active";
 	String User_address = "User.address";
 	String User_associatedOfficer = "User.associatedOfficer";
+	String User_hasConsentedToGdpr = "User.hasConsentedToGdpr";
 	String User_healthFacility = "User.healthFacility";
 	String User_laboratory = "User.laboratory";
 	String User_limitedDisease = "User.limitedDisease";

sormas-api/src/main/java/de/symeda/sormas/api/i18n/Descriptions.java

@@ -28,4 +28,5 @@ public interface Descriptions {
 	String descCaseFilterRelatedToEvent = "descCaseFilterRelatedToEvent";
 	String descContactOnlyWithExtendedQuarantine = "descContactOnlyWithExtendedQuarantine";
 	String descContactOnlyWithReducedQuarantine = "descContactOnlyWithReducedQuarantine";
+	String descGdpr = "descGdpr";
 }

sormas-api/src/main/java/de/symeda/sormas/api/i18n/Strings.java

@@ -594,6 +594,8 @@ public interface Strings {
 	String messageFollowUpCanceled = "messageFollowUpCanceled";
 	String messageFollowUpStatusChanged = "messageFollowUpStatusChanged";
 	String messageFormHasErrorsPathogenTest = "messageFormHasErrorsPathogenTest";
+	String messageGdpr = "messageGdpr";
+	String messageGdprCheck = "messageGdprCheck";
 	String messageImportCanceled = "messageImportCanceled";
 	String messageImportCanceledErrors = "messageImportCanceledErrors";
 	String messageImportError = "messageImportError";
@@ -782,6 +784,9 @@ public interface Strings {
 	String reportedBy = "reportedBy";
 	String reportedOn = "reportedOn";
 	String step = "step";
+	String SurvnetGateway_notificationEntryNotSent = "SurvnetGateway.notificationEntryNotSent";
+	String SurvnetGateway_notificationEntrySent = "SurvnetGateway.notificationEntrySent";
+	String SurvnetGateway_notificationErrorSending = "SurvnetGateway.notificationErrorSending";
 	String text = "text";
 	String toCase = "toCase";
 	String total = "total";

sormas-api/src/main/java/de/symeda/sormas/api/i18n/Validations.java

@@ -94,9 +94,11 @@ public interface Validations {
 	String validCommunity = "validCommunity";
 	String validDisease = "validDisease";
 	String validDistrict = "validDistrict";
+	String validEmailAddress = "validEmailAddress";
 	String validFacility = "validFacility";
 	String validFacilityType = "validFacilityType";
 	String validPerson = "validPerson";
+	String validPhoneNumber = "validPhoneNumber";
 	String validPointOfEntry = "validPointOfEntry";
 	String validRegion = "validRegion";
 	String validReportDateTime = "validReportDateTime";

sormas-api/src/main/java/de/symeda/sormas/api/region/AreaFacade.java

@@ -27,5 +27,4 @@ public interface AreaFacade {
 	void deArchive(String areaUuid);
 
 	List<AreaReferenceDto> getByName(String name, boolean includeArchivedAreas);
-
 }