Merge branch 'development' into 2644-populationDataInCampaignDiagrams

Author: danRosca

sormas-api/src/main/java/de/symeda/sormas/api/bagexport/BAGExportCaseDto.java

@@ -560,6 +560,9 @@ public interface Captions {
 	String Country_externalId = "Country.externalId";
 	String Country_isoCode = "Country.isoCode";
 	String Country_unoCode = "Country.unoCode";
+	String countryActiveCountries = "countryActiveCountries";
+	String countryAllCountries = "countryAllCountries";
+	String countryArchivedCountries = "countryArchivedCountries";
 	String creationDate = "creationDate";
 	String dashboardAlive = "dashboardAlive";
 	String dashboardApplyCustomFilter = "dashboardApplyCustomFilter";
@@ -1372,6 +1375,7 @@ public interface Captions {
 	String SormasToSormasOptions_pseudonymizeSensitiveData = "SormasToSormasOptions.pseudonymizeSensitiveData";
 	String SormasToSormasOptions_withAssociatedContacts = "SormasToSormasOptions.withAssociatedContacts";
 	String SormasToSormasOptions_withSamples = "SormasToSormasOptions.withSamples";
+	String sormasToSormasReturn = "sormasToSormasReturn";
 	String sormasToSormasSentFrom = "sormasToSormasSentFrom";
 	String sormasToSormasShare = "sormasToSormasShare";
 	String sormasToSormasSharedBy = "sormasToSormasSharedBy";

sormas-api/src/main/java/de/symeda/sormas/api/bagexport/BAGExportContactDto.java

@@ -416,7 +416,6 @@ public interface Strings {
 	String headingSetOutbreakStatus = "headingSetOutbreakStatus";
 	String headingSignsAndSymptoms = "headingSignsAndSymptoms";
 	String headingSomeEventsNotDeleted = "headingSomeEventsNotDeleted";
-	String headingSourceContacts = "headingSourceContacts";
 	String headingStoppedFollowUp = "headingStoppedFollowUp";
 	String headingTasksDeleted = "headingTasksDeleted";
 	String headingTemplateNotAvailable = "headingTemplateNotAvailable";

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

@@ -99,6 +99,8 @@ public interface Validations {
 	String sormasToSormasContactCaseNotExists = "sormasToSormasContactCaseNotExists";
 	String sormasToSormasContactExists = "sormasToSormasContactExists";
 	String sormasToSormasOrganizationIdMissing = "sormasToSormasOrganizationIdMissing";
+	String sormasToSormasReturnCaseNotExists = "sormasToSormasReturnCaseNotExists";
+	String sormasToSormasReturnContactNotExists = "sormasToSormasReturnContactNotExists";
 	String sormasToSormasSampleExists = "sormasToSormasSampleExists";
 	String sormasToSormasSenderNameMissing = "sormasToSormasSenderNameMissing";
 	String sormasToSormasShareInfoMissing = "sormasToSormasShareInfoMissing";

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

@@ -5,6 +5,8 @@
 import de.symeda.sormas.api.EntityDto;
 import de.symeda.sormas.api.utils.DataHelper;
 
+import java.util.Date;
+
 public class CountryDto extends EntityDto {
 
 	private static final long serialVersionUID = 8309822957203823162L;
@@ -23,6 +25,27 @@ public class CountryDto extends EntityDto {
 	private String unoCode;
 	private boolean archived;
 
+	public CountryDto(Date creationDate,
+					  Date changeDate,
+					  String uuid,
+					  boolean archived,
+					  String defaultName,
+					  String externalId,
+					  String isoCode,
+					  String unoCode) {
+
+		super(creationDate, changeDate, uuid);
+		this.archived = archived;
+		this.defaultName = defaultName;
+		this.externalId = externalId;
+		this.isoCode = isoCode;
+		this.unoCode = unoCode;
+	}
+
+	public CountryDto() {
+		super();
+	}
+
 	public String getDefaultName() {
 		return defaultName;
 	}

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

@@ -1,5 +1,6 @@
 package de.symeda.sormas.api.region;
 
+import java.util.Date;
 import java.util.List;
 
 import javax.ejb.Remote;
@@ -22,4 +23,10 @@ public interface CountryFacade {
 	void archive(String countryUuid);
 
 	void dearchive(String countryUuid);
+
+    List<CountryDto> getAllAfter(Date date);
+
+	List<CountryDto> getByUuids(List<String> uuids);
+
+	List<String> getAllUuids();
 }

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

@@ -30,6 +30,14 @@ public interface SormasToSormasFacade {
 
 	void shareContacts(List<String> contactUuids, SormasToSormasOptionsDto options) throws SormasToSormasException;
 
+	void returnCase(String caseUuid, SormasToSormasOptionsDto options) throws SormasToSormasException;
+
+	void returnContact(String contactUuid, SormasToSormasOptionsDto options) throws SormasToSormasException;
+
+	void saveReturnedCase(SormasToSormasEncryptedDataDto sharedCase) throws SormasToSormasException, SormasToSormasValidationException;
+
+	void saveReturnedContact(SormasToSormasEncryptedDataDto sharedContact) throws SormasToSormasException, SormasToSormasValidationException;
+
 	List<ServerAccessDataReferenceDto> getAvailableOrganizations();
 
 	ServerAccessDataReferenceDto getOrganizationRef(String id);

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

@@ -0,0 +1,22 @@
+/*
+ * 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.sormastosormas;
+
+import javax.ejb.Remote;
+
+@Remote
+public interface SormasToSormasOriginInfoFacade {
+}

sormas-api/src/main/java/de/symeda/sormas/api/sormastosormas/SormasToSormasFacade.java

@@ -1332,6 +1332,10 @@ PrescriptionExport.caseUuid=Case ID
 PrescriptionExport.caseName=Case name
 
 # Country
+countryActiveCountries=Active countries
+countryArchivedCountries=Archived countries
+countryAllCountries=All countries
+
 Country.archived=Archived
 Country.externalId=External ID
 Country.defaultName=Default name
@@ -1935,6 +1939,7 @@ sormasToSormasDialogTitle=Share with health department
 sormasToSormasErrorDialogTitle=Error while sharing with another health department
 sormasToSormasListTitle=Share
 sormasToSormasShare=Share
+sormasToSormasReturn=Return
 sormasToSormasCaseNotShared=This case is not shared
 sormasToSormasContactNotShared=This contact is not shared
 sormasToSormasSharedWith=Shared with