Merge remote-tracking branch 'remotes/origin/development' into 2975_full_export_switzerland

# Conflicts:
#	sormas-api/src/main/java/de/symeda/sormas/api/FacadeProvider.java
#	sormas-api/src/main/resources/captions.properties
#	sormas-api/src/main/resources/strings.properties

Author: lgal

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

@@ -61,6 +61,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;
@@ -295,6 +296,10 @@ public static BAGExportFacade getBAGExportFacade() {
 		return get().lookupEjbRemote(BAGExportFacade.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/i18n/Captions.java

@@ -1369,6 +1369,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";

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

@@ -784,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/survnet/SurvnetGatewayFacade.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.survnet;
+
+import java.util.List;
+
+import javax.ejb.Remote;
+
+/**
+ * Gateway to interact with the local SurvNet instance of the health department
+ */
+@Remote
+public interface SurvnetGatewayFacade {
+
+	boolean isFeatureEnabled();
+
+	/**
+	 * Requests the cases to be sent to SurvNet
+	 * 
+	 * @param caseUuids
+	 * @return http response code of the gateway
+	 */
+	int sendCases(List<String> caseUuids);
+}

sormas-api/src/main/resources/captions.properties

@@ -1907,4 +1907,8 @@ sormasToSormasSharedBy=By
 sormasToSormasSharedDate=On
 sormasToSormasSentFrom=Sent from
 
-BAGExport=BAG Export
+BAGExport=BAG Export
+
+# Survnet Gateway
+SurvnetGateway.title=SurvNet
+SurvnetGateway.send=send to own SurvNet instance

sormas-api/src/main/resources/captions_de-DE.properties

@@ -1906,3 +1906,7 @@ sormasToSormasSharedWith=Geteilt mit
 sormasToSormasSharedBy=Von
 sormasToSormasSharedDate=Am
 sormasToSormasSentFrom=Gesendet von
+
+# Survnet Gateway
+SurvnetGateway.title=SurvNet
+SurvnetGateway.send=an eigenes SurvNet senden

sormas-api/src/main/resources/strings.properties

@@ -844,3 +844,8 @@ confirmNetworkDiagramTooManyContacts = Do you really want to update the diagram?
 headingContactTracingFirstContact = First contact with Contact Tracing
 
 infoBAGExport=Full-Export to SEDEX
+
+# Survnet Gateway
+SurvnetGateway.notificationEntrySent = Entry has been sent
+SurvnetGateway.notificationEntryNotSent = Entry could not be sent
+SurvnetGateway.notificationErrorSending = Error when sending entry

sormas-api/src/main/resources/strings_de-DE.properties

@@ -842,3 +842,8 @@ warningNetworkDiagramTooManyContacts = Es gibt %d Kontakte und es ist möglich,
 confirmNetworkDiagramTooManyContacts = Wollen Sie das Diagramm wirklich aktualisieren?
 
 headingContactTracingFirstContact = Erster Kontakt mit Kontaktverfolgung
+
+# Survnet Gateway
+SurvnetGateway.notificationEntrySent = Der Eintrag wurde gesendet
+SurvnetGateway.notificationEntryNotSent = Der Eintrag konnte nicht gesendet werden
+SurvnetGateway.notificationErrorSending = Fehler beim Senden des Eintrags