Skip to content
This repository was archived by the owner on May 5, 2021. It is now read-only.

Commit 8dc3f0b

Browse files
sergiupacurariusergiupacurariu
authored
SORMAS-Foundation#4036 - [SurvNet Interface] Change title of role field in exposures a… (SORMAS-Foundation#4213)
* SORMAS-Foundation#4036 - [SurvNet Interface] Change title of role field in exposures and add new field * SORMAS-Foundation#4036 - [SurvNet Interface] Change title of role field in exposures and add new field * SORMAS-Foundation#4036 - [SurvNet Interface] Change title of role field in exposures and add new field * SORMAS-Foundation#4036 - [SurvNet Interface] Change title of role field in exposures and add new field * SORMAS-Foundation#4036 - [SurvNet Interface] Change title of role field in exposures and add new field * SORMAS-Foundation#4036 - [SurvNet Interface] Change title of role field in exposures and add new field * SORMAS-Foundation#4036 - [SurvNet Interface] Change title of role field in exposures and add new field
1 parent e8aa4b8 commit 8dc3f0b

51 files changed

Lines changed: 103 additions & 83 deletions

File tree

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

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

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -89,7 +89,7 @@ public class ExposureDto extends PseudonymizableDto {
8989
public static final String DECEASED_PERSON_ILL = "deceasedPersonIll";
9090
public static final String DECEASED_PERSON_NAME = "deceasedPersonName";
9191
public static final String DECEASED_PERSON_RELATION = "deceasedPersonRelation";
92-
public static final String PATIENT_EXPOSITION_ROLE = "patientExpositionRole";
92+
public static final String EXPOSURE_ROLE = "exposureRole";
9393

9494
@SensitiveData
9595
private UserReferenceDto reportingUser;
@@ -103,7 +103,7 @@ public class ExposureDto extends PseudonymizableDto {
103103
private String exposureTypeDetails;
104104
private LocationDto location;
105105
@HideForCountriesExcept
106-
private PatientExpositionRole patientExpositionRole;
106+
private ExposureRole exposureRole;
107107

108108
// Type of Place
109109
private TypeOfPlace typeOfPlace;
@@ -306,12 +306,12 @@ public void setLocation(LocationDto location) {
306306
this.location = location;
307307
}
308308

309-
public PatientExpositionRole getPatientExpositionRole() {
310-
return patientExpositionRole;
309+
public ExposureRole getExposureRole() {
310+
return exposureRole;
311311
}
312312

313-
public void setPatientExpositionRole(PatientExpositionRole patientExpositionRole) {
314-
this.patientExpositionRole = patientExpositionRole;
313+
public void setExposureRole(ExposureRole exposureRole) {
314+
this.exposureRole = exposureRole;
315315
}
316316

317317
public YesNoUnknown getIndoors() {

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

Lines changed: 16 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -17,13 +17,24 @@
1717

1818
import de.symeda.sormas.api.i18n.I18nProperties;
1919

20-
public enum PatientExpositionRole {
20+
public enum ExposureRole {
2121

22-
NOT_COLLECTED,
22+
PASSENGER,
23+
STAFF,
24+
NURSING_STAFF,
25+
MEDICAL_STAFF,
26+
VISITOR,
27+
GUEST,
28+
CUSTOMER,
29+
CONSERVATEE,
30+
PATIENT,
31+
EDUCATOR,
32+
TRAINEE_TEACHER,
33+
PUPIL,
34+
STUDENT,
35+
PARENT,
36+
TEACHER,
2337
UNKNOWN,
24-
WORKING_AT,
25-
ACCOMMODATED_IN,
26-
CARED_FOR,
2738
OTHER;
2839

2940
public String toString() {

‎sormas-api/src/main/java/de/symeda/sormas/api/exposure/ExposureType.java‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,8 @@ public enum ExposureType {
2828
PERSONAL_SERVICES,
2929
BURIAL,
3030
ANIMAL_CONTACT,
31-
OTHER;
31+
OTHER,
32+
UNKNOWN;
3233

3334
public String toString() {
3435
return I18nProperties.getEnumCaption(this);

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -967,6 +967,7 @@ public interface Captions {
967967
String Exposure_eatingRawAnimalProducts = "Exposure.eatingRawAnimalProducts";
968968
String Exposure_endDate = "Exposure.endDate";
969969
String Exposure_exposureDate = "Exposure.exposureDate";
970+
String Exposure_exposureRole = "Exposure.exposureRole";
970971
String Exposure_exposureType = "Exposure.exposureType";
971972
String Exposure_exposureTypeDetails = "Exposure.exposureTypeDetails";
972973
String Exposure_gatheringDetails = "Exposure.gatheringDetails";
@@ -982,7 +983,6 @@ public interface Captions {
982983
String Exposure_meansOfTransportDetails = "Exposure.meansOfTransportDetails";
983984
String Exposure_otherProtectiveMeasures = "Exposure.otherProtectiveMeasures";
984985
String Exposure_outdoors = "Exposure.outdoors";
985-
String Exposure_patientExpositionRole = "Exposure.patientExpositionRole";
986986
String Exposure_percutaneous = "Exposure.percutaneous";
987987
String Exposure_physicalContactDuringPreparation = "Exposure.physicalContactDuringPreparation";
988988
String Exposure_physicalContactWithBody = "Exposure.physicalContactWithBody";

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1105,7 +1105,7 @@ Exposure.prophylaxis=Post-exposure prophylaxis
11051105
Exposure.prophylaxisDate=Date of prophylaxis
11061106
Exposure.riskArea=Risk area as defined by public health institution
11071107
Exposure.exposureDate=Exposure date
1108-
Exposure.patientExpositionRole=In the role of
1108+
Exposure.exposureRole=Role
11091109

11101110
# Facility
11111111
facilityActiveFacilities=Active facilities

‎sormas-api/src/main/resources/captions_de-CH.properties‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1102,7 +1102,6 @@ Exposure.prophylaxis=Postexpositionelle Prophylaxe
11021102
Exposure.prophylaxisDate=Datum der Prophylaxe
11031103
Exposure.riskArea=Risikogebiet, wie von der öffentlichen Gesundheitsinstitution definiert
11041104
Exposure.exposureDate=Datum der Exposition
1105-
Exposure.patientExpositionRole=Rolle als
11061105

11071106
# Facility
11081107
facilityActiveFacilities=Aktive Einrichtungen

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

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1102,7 +1102,6 @@ Exposure.prophylaxis=Postexpositionelle Prophylaxe
11021102
Exposure.prophylaxisDate=Datum der Prophylaxe
11031103
Exposure.riskArea=Risikogebiet, wie von der öffentlichen Gesundheitsinstitution definiert
11041104
Exposure.exposureDate=Datum der Exposition
1105-
Exposure.patientExpositionRole=Rolle als
11061105

11071106
# Facility
11081107
facilityActiveFacilities=Aktive Einrichtungen

‎sormas-api/src/main/resources/captions_en-AF.properties‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1102,7 +1102,6 @@ Exposure.prophylaxis=Post-exposure prophylaxis
11021102
Exposure.prophylaxisDate=Date of prophylaxis
11031103
Exposure.riskArea=Risk area as defined by public health institution
11041104
Exposure.exposureDate=Exposure date
1105-
Exposure.patientExpositionRole=In the role of
11061105

11071106
# Facility
11081107
facilityActiveFacilities=Active facilities

‎sormas-api/src/main/resources/captions_es-CU.properties‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1102,7 +1102,6 @@ Exposure.prophylaxis=Profilaxis post-exposición
11021102
Exposure.prophylaxisDate=Fecha de la profilaxis
11031103
Exposure.riskArea=Zona de riesgo definida por la institución de salud pública
11041104
Exposure.exposureDate=Fecha de exposición
1105-
Exposure.patientExpositionRole=En el rol de
11061105

11071106
# Facility
11081107
facilityActiveFacilities=Instalaciones activas

‎sormas-api/src/main/resources/captions_es-EC.properties‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1102,7 +1102,6 @@ Exposure.prophylaxis=Post-exposure prophylaxis
11021102
Exposure.prophylaxisDate=Date of prophylaxis
11031103
Exposure.riskArea=Risk area as defined by public health institution
11041104
Exposure.exposureDate=Exposure date
1105-
Exposure.patientExpositionRole=In the role of
11061105

11071106
# Facility
11081107
facilityActiveFacilities=Active facilities

0 commit comments

Comments
 (0)