Merge remote-tracking branch 'origin/development' into 3412_SurvNet-person-country-of-birth

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

Author: lgal

sormas-api/src/main/java/de/symeda/sormas/api/exposure/ExposureDto.java

@@ -27,6 +27,7 @@
 import de.symeda.sormas.api.user.UserReferenceDto;
 import de.symeda.sormas.api.utils.DataHelper;
 import de.symeda.sormas.api.utils.Diseases;
+import de.symeda.sormas.api.utils.HideForCountriesExcept;
 import de.symeda.sormas.api.utils.PersonalData;
 import de.symeda.sormas.api.utils.Required;
 import de.symeda.sormas.api.utils.SensitiveData;
@@ -88,6 +89,7 @@ public class ExposureDto extends PseudonymizableDto {
 	public static final String DECEASED_PERSON_ILL = "deceasedPersonIll";
 	public static final String DECEASED_PERSON_NAME = "deceasedPersonName";
 	public static final String DECEASED_PERSON_RELATION = "deceasedPersonRelation";
+	public static final String PATIENT_EXPOSITION_ROLE = "patientExpositionRole";
 
 	@SensitiveData
 	private UserReferenceDto reportingUser;
@@ -100,6 +102,8 @@ public class ExposureDto extends PseudonymizableDto {
 	@SensitiveData
 	private String exposureTypeDetails;
 	private LocationDto location;
+	@HideForCountriesExcept
+	private PatientExpositionRole patientExpositionRole;
 
 	// Type of Place
 	private TypeOfPlace typeOfPlace;
@@ -302,6 +306,14 @@ public void setLocation(LocationDto location) {
 		this.location = location;
 	}
 
+	public PatientExpositionRole getPatientExpositionRole() {
+		return patientExpositionRole;
+	}
+
+	public void setPatientExpositionRole(PatientExpositionRole patientExpositionRole) {
+		this.patientExpositionRole = patientExpositionRole;
+	}
+
 	public YesNoUnknown getIndoors() {
 		return indoors;
 	}

sormas-api/src/main/java/de/symeda/sormas/api/exposure/PatientExpositionRole.java

@@ -0,0 +1,32 @@
+/*
+ * 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.exposure;
+
+import de.symeda.sormas.api.i18n.I18nProperties;
+
+public enum PatientExpositionRole {
+
+	NOT_COLLECTED,
+	UNKNOWN,
+	WORKING_AT,
+	ACCOMMODATED_IN,
+	CARED_FOR,
+	OTHER;
+
+	public String toString() {
+		return I18nProperties.getEnumCaption(this);
+	}
+}

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

@@ -907,6 +907,7 @@ public interface Captions {
 	String Exposure_meansOfTransportDetails = "Exposure.meansOfTransportDetails";
 	String Exposure_otherProtectiveMeasures = "Exposure.otherProtectiveMeasures";
 	String Exposure_outdoors = "Exposure.outdoors";
+	String Exposure_patientExpositionRole = "Exposure.patientExpositionRole";
 	String Exposure_percutaneous = "Exposure.percutaneous";
 	String Exposure_physicalContactDuringPreparation = "Exposure.physicalContactDuringPreparation";
 	String Exposure_physicalContactWithBody = "Exposure.physicalContactWithBody";

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

@@ -1028,6 +1028,7 @@ Exposure.prophylaxis=Post-exposure prophylaxis
 Exposure.prophylaxisDate=Date of prophylaxis
 Exposure.riskArea=Risk area as defined by public health institution
 Exposure.exposureDate=Exposure date
+Exposure.patientExpositionRole=In the role of
 
 # Facility
 facilityActiveFacilities=Active facilities

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

@@ -1027,6 +1027,7 @@ Exposure.prophylaxis=Postexpositionelle Prophylaxe
 Exposure.prophylaxisDate=Datum der Prophylaxe
 Exposure.riskArea=Risikogebiet, wie von der öffentlichen Gesundheitsinstitution definiert
 Exposure.exposureDate=Datum der Exposition
+Exposure.patientExpositionRole=Rolle als
 
 # Facility
 facilityActiveFacilities=Aktive Einrichtungen

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

@@ -717,6 +717,13 @@ PathogenTestType.LATEX_AGGLUTINATION = Latex Agglutination
 PathogenTestType.CQ_VALUE_DETECTION = CQ Value Detection
 PathogenTestType.SEQUENCING = Sequencing
 
+PatientExpositionRole.NOT_COLLECTED = Not collected
+PatientExpositionRole.UNKNOWN = Unknown
+PatientExpositionRole.WORKING_AT = Working at
+PatientExpositionRole.ACCOMMODATED_IN = Accommodated in
+PatientExpositionRole.CARED_FOR = Cared for
+PatientExpositionRole.OTHER = Other
+
 #SymptomJournalStatus
 SymptomJournalStatus.UNREGISTERED = Unregistered
 SymptomJournalStatus.REGISTERED = Registered

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

@@ -717,6 +717,13 @@ PathogenTestType.LATEX_AGGLUTINATION = Latex-Agglutination
 PathogenTestType.CQ_VALUE_DETECTION = CQ Wert Nachweis
 PathogenTestType.SEQUENCING = Sequenzierung
 
+PatientExpositionRole.NOT_COLLECTED = Nicht erhoben
+PatientExpositionRole.UNKNOWN = Nicht ermittelbar
+PatientExpositionRole.WORKING_AT = Tätig bei
+PatientExpositionRole.ACCOMMODATED_IN = Untergebracht in
+PatientExpositionRole.CARED_FOR = Betreut in
+PatientExpositionRole.OTHER = Andere/sonstige
+
 #SymptomJournalStatus
 SymptomJournalStatus.UNREGISTERED = Nicht registriert
 SymptomJournalStatus.REGISTERED = Registriert

sormas-backend/src/main/java/de/symeda/sormas/backend/epidata/EpiDataFacadeEjb.java

@@ -158,6 +158,7 @@ public Exposure fromExposureDto(ExposureDto source) {
 		target.setProphylaxis(source.getProphylaxis());
 		target.setProphylaxisDate(source.getProphylaxisDate());
 		target.setRiskArea(source.getRiskArea());
+		target.setPatientExpositionRole(source.getPatientExpositionRole());
 
 		return exposure;
 	}
@@ -252,6 +253,7 @@ public static ExposureDto toExposureDto(Exposure source) {
 		target.setProphylaxis(source.getProphylaxis());
 		target.setProphylaxisDate(source.getProphylaxisDate());
 		target.setRiskArea(source.getRiskArea());
+		target.setPatientExpositionRole(source.getPatientExpositionRole());
 
 		return target;
 	}

sormas-backend/src/main/java/de/symeda/sormas/backend/exposure/Exposure.java

@@ -39,6 +39,7 @@
 import de.symeda.sormas.api.exposure.ExposureType;
 import de.symeda.sormas.api.exposure.GatheringType;
 import de.symeda.sormas.api.exposure.HabitationType;
+import de.symeda.sormas.api.exposure.PatientExpositionRole;
 import de.symeda.sormas.api.exposure.TypeOfAnimal;
 import de.symeda.sormas.api.utils.YesNoUnknown;
 import de.symeda.sormas.backend.common.AbstractDomainObject;
@@ -68,6 +69,7 @@ public class Exposure extends AbstractDomainObject {
 	private ExposureType exposureType;
 	private String exposureTypeDetails;
 	private Location location;
+	private PatientExpositionRole patientExpositionRole;
 
 	// Type of Place
 	private TypeOfPlace typeOfPlace;
@@ -198,6 +200,15 @@ public void setLocation(Location location) {
 		this.location = location;
 	}
 
+	@Enumerated(EnumType.STRING)
+	public PatientExpositionRole getPatientExpositionRole() {
+		return patientExpositionRole;
+	}
+
+	public void setPatientExpositionRole(PatientExpositionRole patientExpositionRole) {
+		this.patientExpositionRole = patientExpositionRole;
+	}
+
 	@Enumerated(EnumType.STRING)
 	public YesNoUnknown getIndoors() {
 		return indoors;

sormas-backend/src/main/resources/sql/sormas_schema.sql

@@ -6101,6 +6101,11 @@ ALTER TABLE person_history
 
 INSERT INTO schema_version (version_number, comment) VALUES (293, 'SurvNet Adaptations - Create new field “Salutation” for persons #3411');
 
+-- 2020-12-11 - Add patient exposition role to exposures #3407
+ALTER TABLE exposures ADD COLUMN patientexpositionrole varchar(255);
+ALTER TABLE exposures_history ADD COLUMN patientexpositionrole varchar(255);
+
+INSERT INTO schema_version (version_number, comment) VALUES (294, 'Add patient exposition role to exposures #3407');
 
 -- 2020-12-09 SurvNet Adaptations - Create new fields “Country of birth” and “nationality” for persons #3412
 ALTER TABLE person
@@ -6117,6 +6122,6 @@ ALTER TABLE person_history
     ADD CONSTRAINT fk_person_birthcountry_id FOREIGN KEY (birthcountry_id) REFERENCES country (id),
     ADD CONSTRAINT fk_person_citizenship_id FOREIGN KEY (citizenship_id) REFERENCES country (id);
 
-INSERT INTO schema_version (version_number, comment) VALUES (294, 'SurvNet Adaptations - Create new fields “Country of birth” and “nationality” for persons #3412');
+INSERT INTO schema_version (version_number, comment) VALUES (295, 'SurvNet Adaptations - Create new fields “Country of birth” and “nationality” for persons #3412');
 
 -- *** Insert new sql commands BEFORE this line ***