Merge branch 'development' into feature-2753-CampaignDiagram

# Conflicts:
#	sormas-backend/src/main/resources/sql/sormas_schema.sql

Author: barnabartha

DEVELOPMENT_ENVIRONMENT.md

@@ -2,7 +2,8 @@
 # SORMAS Development Environment
 
 ## Server
-- Install [your local server](SERVER_SETUP.md) or [a more dev specific one](SERVER_DEV_SETUP.md) (Docker is needed to run Postgresql image)
+- Install [your local server](SERVER_SETUP.md).
+- Alternatively [SERVER_DEV_SETUP.md](SERVER_DEV_SETUP.md) could be used (at this time not recommended)
 
 ## Git
 - Install [Git for your OS](https://git-scm.com/downloads)

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

@@ -68,6 +68,10 @@ public interface ConfigFacade {
 
 	String getCustomBrandingLogoPath();
 
+	boolean isUseLoginSidebar();
+
+	String getLoginBackgroundPath();
+
 	String getSormasInstanceName();
 
 	double getNameSimilarityThreshold();

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

@@ -0,0 +1,23 @@
+/*
+ * 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;
+
+public final class CountryHelper {
+
+	public static final String COUNTRY_CODE_GERMANY = "de";
+	public static final String COUNTRY_CODE_SWITZERLAND = "ch";
+
+}

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

@@ -13,6 +13,7 @@ public enum Language {
 	EN(new Locale("en"), "M/d/yyyy", "M/d/yyyy h:mm a", "M/d"),
 	EN_NG(new Locale("en", "NG"), "dd/MM/yyyy", "dd/MM/yyyy h:mm a", "dd/MM"),
 	EN_GH(new Locale("en", "GH"), "dd/MM/yyyy", "dd/MM/yyyy h:mm a", "dd/MM"),
+	EN_AF(new Locale("en", "AF"), "dd/MM/yyyy", "dd/MM/yyyy h:mm a", "dd/MM"),
 	FR(new Locale("fr", "FR"), "dd/MM/yyyy", "dd/MM/yyyy HH:mm", "dd/MM"),
 	FR_CH(new Locale("fr", "CH"), "dd/MM/yyyy", "dd/MM/yyyy HH:mm", "dd/MM"),
 	DE(new Locale("de", "DE"), "dd.MM.yyyy", "dd.MM.yyyy HH:mm", "dd.MM"),

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

@@ -17,14 +17,7 @@
  *******************************************************************************/
 package de.symeda.sormas.api.caze;
 
-import java.beans.IntrospectionException;
-import java.beans.Introspector;
-import java.beans.PropertyDescriptor;
-import java.lang.reflect.InvocationTargetException;
-import java.util.Date;
-
 import de.symeda.sormas.api.Disease;
-import de.symeda.sormas.api.EntityDto;
 import de.symeda.sormas.api.ImportIgnore;
 import de.symeda.sormas.api.PseudonymizableDto;
 import de.symeda.sormas.api.caze.maternalhistory.MaternalHistoryDto;
@@ -56,7 +49,8 @@
 import de.symeda.sormas.api.utils.Required;
 import de.symeda.sormas.api.utils.SensitiveData;
 import de.symeda.sormas.api.utils.YesNoUnknown;
-import de.symeda.sormas.api.visit.VisitDto;
+
+import java.util.Date;
 
 public class CaseDataDto extends PseudonymizableDto {
 
@@ -139,6 +133,8 @@ public class CaseDataDto extends PseudonymizableDto {
 	public static final String QUARANTINE_HOME_SUPPLY_ENSURED = "quarantineHomeSupplyEnsured";
 	public static final String QUARANTINE_HOME_SUPPLY_ENSURED_COMMENT = "quarantineHomeSupplyEnsuredComment";
 	public static final String QUARANTINE_EXTENDED = "quarantineExtended";
+	public static final String QUARANTINE_OFFICIAL_ORDER_SENT = "quarantineOfficialOrderSent";
+	public static final String QUARANTINE_OFFICIAL_ORDER_SENT_DATE = "quarantineOfficialOrderSentDate";
 	public static final String REPORTING_TYPE = "reportingType";
 	public static final String POSTPARTUM = "postpartum";
 	public static final String TRIMESTER = "trimester";
@@ -349,9 +345,21 @@ public class CaseDataDto extends PseudonymizableDto {
 	private Date quarantineTo;
 	@SensitiveData
 	private String quarantineHelpNeeded;
+	@HideForCountriesExcept(countries = {
+		"de",
+		"ch" })
 	private boolean quarantineOrderedVerbally;
+	@HideForCountriesExcept(countries = {
+		"de",
+		"ch" })
 	private boolean quarantineOrderedOfficialDocument;
+	@HideForCountriesExcept(countries = {
+		"de",
+		"ch" })
 	private Date quarantineOrderedVerballyDate;
+	@HideForCountriesExcept(countries = {
+		"de",
+		"ch" })
 	private Date quarantineOrderedOfficialDocumentDate;
 	@HideForCountriesExcept
 	private YesNoUnknown quarantineHomePossible;
@@ -364,6 +372,14 @@ public class CaseDataDto extends PseudonymizableDto {
 	@SensitiveData
 	private String quarantineHomeSupplyEnsuredComment;
 	private boolean quarantineExtended;
+	@HideForCountriesExcept(countries = {
+		"de",
+		"ch" })
+	private boolean quarantineOfficialOrderSent;
+	@HideForCountriesExcept(countries = {
+		"de",
+		"ch" })
+	private Date quarantineOfficialOrderSentDate;
 	private ReportingType reportingType;
 	private YesNoUnknown postpartum;
 	private Trimester trimester;
@@ -401,43 +417,22 @@ public static CaseDataDto build(PersonReferenceDto person, Disease disease, Heal
 		return caze;
 	}
 
-	public static CaseDataDto buildFromContact(ContactDto contact, VisitDto lastVisit) {
+	public static CaseDataDto buildFromContact(ContactDto contact) {
 
 		CaseDataDto cazeData = CaseDataDto.build(contact.getPerson(), contact.getDisease(), contact.getHealthConditions());
-		migratesAttributes(contact, cazeData, lastVisit);
+		migratesAttributes(contact, cazeData);
 		return cazeData;
 	}
 
-	public static CaseDataDto buildFromUnrelatedContact(ContactDto contact, VisitDto lastVisit, Disease disease) {
+	public static CaseDataDto buildFromUnrelatedContact(ContactDto contact, Disease disease) {
 
 		CaseDataDto cazeData = CaseDataDto.build(contact.getPerson(), disease);
-		migratesAttributes(contact, cazeData, lastVisit);
+		migratesAttributes(contact, cazeData);
 		return cazeData;
 	}
 
-	private static void migratesAttributes(ContactDto contact, CaseDataDto cazeData, VisitDto lastVisit) {
+	private static void migratesAttributes(ContactDto contact, CaseDataDto cazeData) {
 		cazeData.setEpiData(contact.getEpiData());
-		SymptomsDto newSymptoms = cazeData.getSymptoms();
-		if (lastVisit != null) {
-			SymptomsDto oldSymptoms = lastVisit.getSymptoms();
-
-			try {
-				// reflection to call the setters of the new symptoms object with the getters
-				// from the one in the visit
-				for (PropertyDescriptor pd : Introspector.getBeanInfo(SymptomsDto.class, EntityDto.class).getPropertyDescriptors()) {
-					if (pd.getWriteMethod() != null) {
-						try {
-							pd.getWriteMethod().invoke(newSymptoms, pd.getReadMethod().invoke(oldSymptoms));
-						} catch (IllegalAccessException | IllegalArgumentException | InvocationTargetException e) {
-							throw new RuntimeException(e);
-						}
-					}
-				}
-			} catch (IntrospectionException e) {
-				throw new RuntimeException(e);
-			}
-		}
-		cazeData.setSymptoms(newSymptoms);
 	}
 
 	public static CaseDataDto buildFromEventParticipant(EventParticipantDto eventParticipant, Disease eventDisease) {
@@ -1069,6 +1064,22 @@ public void setQuarantineExtended(boolean quarantineExtended) {
 		this.quarantineExtended = quarantineExtended;
 	}
 
+	public boolean isQuarantineOfficialOrderSent() {
+		return quarantineOfficialOrderSent;
+	}
+
+	public void setQuarantineOfficialOrderSent(boolean quarantineOfficialOrderSent) {
+		this.quarantineOfficialOrderSent = quarantineOfficialOrderSent;
+	}
+
+	public Date getQuarantineOfficialOrderSentDate() {
+		return quarantineOfficialOrderSentDate;
+	}
+
+	public void setQuarantineOfficialOrderSentDate(Date quarantineOfficialOrderSentDate) {
+		this.quarantineOfficialOrderSentDate = quarantineOfficialOrderSentDate;
+	}
+
 	public ReportingType getReportingType() {
 		return reportingType;
 	}

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

@@ -17,11 +17,6 @@
  *******************************************************************************/
 package de.symeda.sormas.api.caze;
 
-import java.io.Serializable;
-import java.util.ArrayList;
-import java.util.Date;
-import java.util.List;
-
 import de.symeda.sormas.api.Disease;
 import de.symeda.sormas.api.DiseaseHelper;
 import de.symeda.sormas.api.clinicalcourse.ClinicalCourseDto;
@@ -59,6 +54,11 @@
 import de.symeda.sormas.api.utils.pseudonymization.Pseudonymizer;
 import de.symeda.sormas.api.utils.pseudonymization.valuepseudonymizers.PostalCodePseudonymizer;
 
+import java.io.Serializable;
+import java.util.ArrayList;
+import java.util.Date;
+import java.util.List;
+
 /**
  * A DTO class that contains the properties that are exported during a detailed case export. These
  * properties are also those that users can select when creating a custom export configuration.
@@ -202,6 +202,8 @@ public class CaseExportDto implements Serializable {
 	private Date quarantineOrderedVerballyDate;
 	private Date quarantineOrderedOfficialDocumentDate;
 	private boolean quarantineExtended;
+	private boolean quarantineOfficialOrderSent;
+	private Date quarantineOfficialOrderSentDate;
 
 	private YesNoUnknown postpartum;
 	private Trimester trimester;
@@ -230,6 +232,7 @@ public CaseExportDto(long id, long personId, long personAddressId, long epiDataI
 						 QuarantineType quarantine, String quarantineTypeDetails, Date quarantineFrom, Date quarantineTo,
 						 boolean quarantineOrderedVerbally, boolean quarantineOrderedOfficialDocument, Date quarantineOrderedVerballyDate,
 						 Date quarantineOrderedOfficialDocumentDate, boolean quarantineExtended,
+						 boolean quarantineOfficialOrderSent, Date quarantineOfficialOrderSentDate,
 						 YesNoUnknown admittedToHealthFacility, Date admissionDate, Date dischargeDate, YesNoUnknown leftAgainstAdvice, PresentCondition presentCondition,
 						 Date deathDate, Date burialDate, BurialConductor burialConductor, String burialPlaceDescription,
 						 String addressRegion, String addressDistrict, String city, String street, String houseNumber, String additionalInformation, String postalCode,
@@ -277,6 +280,8 @@ public CaseExportDto(long id, long personId, long personAddressId, long epiDataI
 		this.quarantineOrderedVerballyDate = quarantineOrderedVerballyDate;
 		this.quarantineOrderedOfficialDocumentDate = quarantineOrderedOfficialDocumentDate;
 		this.quarantineExtended = quarantineExtended;
+		this.quarantineOfficialOrderSent = quarantineOfficialOrderSent;
+		this.quarantineOfficialOrderSentDate = quarantineOfficialOrderSentDate;
 		this.healthFacility = FacilityHelper.buildFacilityString(healthFacilityUuid, healthFacility, healthFacilityDetails);
 		this.pointOfEntry = InfrastructureHelper.buildPointOfEntryString(pointOfEntryUuid, pointOfEntry, pointOfEntryDetails);
 		this.admittedToHealthFacility = admittedToHealthFacility;
@@ -633,7 +638,9 @@ public Date getQuarantineTo() {
 		CaseExportType.CASE_MANAGEMENT })
 	@ExportProperty(value = QUARANTINE_INFORMATION, combined = true)
 	@ExportGroup(ExportGroupType.ADDITIONAL)
-	@HideForCountriesExcept
+	@HideForCountriesExcept(countries = {
+		"de",
+		"ch" })
 	public boolean isQuarantineOrderedVerbally() {
 		return quarantineOrderedVerbally;
 	}
@@ -644,7 +651,9 @@ public boolean isQuarantineOrderedVerbally() {
 		CaseExportType.CASE_MANAGEMENT })
 	@ExportProperty(value = QUARANTINE_INFORMATION, combined = true)
 	@ExportGroup(ExportGroupType.ADDITIONAL)
-	@HideForCountriesExcept
+	@HideForCountriesExcept(countries = {
+		"de",
+		"ch" })
 	public boolean isQuarantineOrderedOfficialDocument() {
 		return quarantineOrderedOfficialDocument;
 	}
@@ -655,7 +664,9 @@ public boolean isQuarantineOrderedOfficialDocument() {
 		CaseExportType.CASE_MANAGEMENT })
 	@ExportProperty(value = QUARANTINE_INFORMATION, combined = true)
 	@ExportGroup(ExportGroupType.ADDITIONAL)
-	@HideForCountriesExcept
+	@HideForCountriesExcept(countries = {
+		"de",
+		"ch" })
 	public Date getQuarantineOrderedVerballyDate() {
 		return quarantineOrderedVerballyDate;
 	}
@@ -666,7 +677,9 @@ public Date getQuarantineOrderedVerballyDate() {
 		CaseExportType.CASE_MANAGEMENT })
 	@ExportProperty(value = QUARANTINE_INFORMATION, combined = true)
 	@ExportGroup(ExportGroupType.ADDITIONAL)
-	@HideForCountriesExcept
+	@HideForCountriesExcept(countries = {
+		"de",
+		"ch" })
 	public Date getQuarantineOrderedOfficialDocumentDate() {
 		return quarantineOrderedOfficialDocumentDate;
 	}
@@ -677,11 +690,37 @@ public Date getQuarantineOrderedOfficialDocumentDate() {
 		CaseExportType.CASE_MANAGEMENT })
 	@ExportProperty(value = QUARANTINE_INFORMATION, combined = true)
 	@ExportGroup(ExportGroupType.ADDITIONAL)
+	@HideForCountriesExcept(countries = {
+		"de",
+		"ch" })
+	public boolean isQuarantineOfficialOrderSent() {
+		return quarantineOfficialOrderSent;
+	}
+
+	@Order(42)
+	@ExportTarget(caseExportTypes = {
+		CaseExportType.CASE_SURVEILLANCE,
+		CaseExportType.CASE_MANAGEMENT })
+	@ExportProperty(value = QUARANTINE_INFORMATION, combined = true)
+	@ExportGroup(ExportGroupType.ADDITIONAL)
+	@HideForCountriesExcept(countries = {
+		"de",
+		"ch" })
+	public Date getQuarantineOfficialOrderSentDate() {
+		return quarantineOfficialOrderSentDate;
+	}
+
+	@Order(43)
+	@ExportTarget(caseExportTypes = {
+		CaseExportType.CASE_SURVEILLANCE,
+		CaseExportType.CASE_MANAGEMENT })
+	@ExportProperty(value = QUARANTINE_INFORMATION, combined = true)
+	@ExportGroup(ExportGroupType.ADDITIONAL)
 	public boolean isQuarantineExtended() {
 		return quarantineExtended;
 	}
 
-	@Order(42)
+	@Order(44)
 	@ExportTarget(caseExportTypes = {
 		CaseExportType.CASE_SURVEILLANCE })
 	@ExportProperty(MAX_SOURCE_CASE_CLASSIFICATION)
@@ -690,7 +729,7 @@ public CaseClassification getMaxSourceCaseClassification() {
 		return maxSourceCaseClassification;
 	}
 
-	@Order(43)
+	@Order(45)
 	@ExportTarget(caseExportTypes = {
 		CaseExportType.CASE_SURVEILLANCE })
 	@ExportProperty(ASSOCIATED_WITH_OUTBREAK)
@@ -703,7 +742,7 @@ public void setMaxSourceCaseClassification(CaseClassification maxSourceCaseClass
 		this.maxSourceCaseClassification = maxSourceCaseClassification;
 	}
 
-	@Order(44)
+	@Order(46)
 	@ExportTarget(caseExportTypes = {
 		CaseExportType.CASE_SURVEILLANCE,
 		CaseExportType.CASE_MANAGEMENT })
@@ -713,7 +752,7 @@ public YesNoUnknown getAdmittedToHealthFacility() {
 		return admittedToHealthFacility;
 	}
 
-	@Order(45)
+	@Order(47)
 	@ExportTarget(caseExportTypes = {
 		CaseExportType.CASE_SURVEILLANCE,
 		CaseExportType.CASE_MANAGEMENT })
@@ -723,7 +762,7 @@ public Date getAdmissionDate() {
 		return admissionDate;
 	}
 
-	@Order(46)
+	@Order(48)
 	@ExportTarget(caseExportTypes = {
 		CaseExportType.CASE_SURVEILLANCE,
 		CaseExportType.CASE_MANAGEMENT })
@@ -737,7 +776,7 @@ public void setDischargeDate(Date dischargeDate) {
 		this.dischargeDate = dischargeDate;
 	}
 
-	@Order(47)
+	@Order(49)
 	@ExportTarget(caseExportTypes = {
 		CaseExportType.CASE_SURVEILLANCE,
 		CaseExportType.CASE_MANAGEMENT })

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

@@ -70,6 +70,8 @@ List<CaseExportDto> getExportList(
 
 	void setSampleAssociations(EventParticipantReferenceDto sourceEventParticipant, CaseReferenceDto cazeRef);
 
+	void setSampleAssociationsUnrelatedDisease(EventParticipantReferenceDto sourceEventParticipant, CaseReferenceDto cazeRef);
+
 	void validate(CaseDataDto dto) throws ValidationRuntimeException;
 
 	CaseReferenceDto getReferenceByUuid(String uuid);