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

Commit f784135

Browse files
lgallgal
lgal
authored and
lgal
committed
Merge remote-tracking branch 'origin/development' into 3412_SurvNet-person-country-of-birth
# Conflicts: # sormas-api/src/main/java/de/symeda/sormas/api/event/EventParticipantExportDto.java # sormas-api/src/main/resources/captions.properties # sormas-api/src/main/resources/captions_de-DE.properties # sormas-app/app/src/main/java/de/symeda/sormas/app/backend/common/DatabaseHelper.java # sormas-app/app/src/main/java/de/symeda/sormas/app/backend/person/Person.java # sormas-app/app/src/main/java/de/symeda/sormas/app/backend/person/PersonDtoHelper.java # sormas-app/app/src/main/java/de/symeda/sormas/app/person/read/PersonReadFragment.java # sormas-backend/src/main/java/de/symeda/sormas/backend/person/Person.java # sormas-backend/src/main/resources/sql/sormas_schema.sql # sormas-ui/src/main/java/de/symeda/sormas/ui/person/PersonEditForm.java
2 parents 39aca11 + f00035f commit f784135

56 files changed

Lines changed: 1028 additions & 326 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/caze/CaseExportDto.java‎

Lines changed: 46 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -42,15 +42,18 @@
4242
import de.symeda.sormas.api.location.LocationDto;
4343
import de.symeda.sormas.api.person.ApproximateAgeType;
4444
import de.symeda.sormas.api.person.ApproximateAgeType.ApproximateAgeHelper;
45+
import de.symeda.sormas.api.person.ArmedForcesRelationType;
4546
import de.symeda.sormas.api.person.BurialConductor;
4647
import de.symeda.sormas.api.person.EducationType;
4748
import de.symeda.sormas.api.person.OccupationType;
4849
import de.symeda.sormas.api.person.PersonDto;
4950
import de.symeda.sormas.api.person.PersonHelper;
5051
import de.symeda.sormas.api.person.PresentCondition;
52+
import de.symeda.sormas.api.person.Salutation;
5153
import de.symeda.sormas.api.person.Sex;
5254
import de.symeda.sormas.api.sample.PathogenTestResultType;
5355
import de.symeda.sormas.api.symptoms.SymptomsDto;
56+
import de.symeda.sormas.api.utils.EnumHelper;
5457
import de.symeda.sormas.api.utils.HideForCountriesExcept;
5558
import de.symeda.sormas.api.utils.Order;
5659
import de.symeda.sormas.api.utils.PersonalData;
@@ -122,6 +125,8 @@ public class CaseExportDto implements Serializable {
122125
@PersonalData
123126
@SensitiveData
124127
private String lastName;
128+
@SensitiveData
129+
private String salutation;
125130
private Sex sex;
126131
private YesNoUnknown pregnant;
127132
private String approximateAge;
@@ -185,6 +190,7 @@ public class CaseExportDto implements Serializable {
185190
@SensitiveData
186191
private String emailAddress;
187192
private String occupationType;
193+
private ArmedForcesRelationType armedForcesRelationType;
188194
private String educationType;
189195
private String travelHistory;
190196
private boolean traveled;
@@ -251,7 +257,7 @@ public class CaseExportDto implements Serializable {
251257
//@formatter:off
252258
public CaseExportDto(long id, long personId, long personAddressId, long epiDataId, long symptomsId,
253259
long hospitalizationId, long districtId, long healthConditionsId, String uuid, String epidNumber,
254-
Disease disease, String diseaseDetails, String firstName, String lastName, Sex sex, YesNoUnknown pregnant,
260+
Disease disease, String diseaseDetails, String firstName, String lastName, Salutation salutation, String otherSalutation, Sex sex, YesNoUnknown pregnant,
255261
Integer approximateAge, ApproximateAgeType approximateAgeType, Integer birthdateDD, Integer birthdateMM,
256262
Integer birthdateYYYY, Date reportDate, String reportingUserUuid, String regionUuid, String region,
257263
String districtUuid, String district, String communityUuid, String community,
@@ -270,7 +276,7 @@ public CaseExportDto(long id, long personId, long personAddressId, long epiDataI
270276
String addressRegion, String addressDistrict, String addressCommunity, String city, String street, String houseNumber, String additionalInformation, String postalCode,
271277
String facility, String facilityUuid, String facilityDetails,
272278
String phone, String phoneOwner, String emailAddress, EducationType educationType, String educationDetails,
273-
OccupationType occupationType, String occupationDetails, YesNoUnknown contactWithSourceCaseKnown,
279+
OccupationType occupationType, String occupationDetails, ArmedForcesRelationType ArmedForcesRelationType, YesNoUnknown contactWithSourceCaseKnown,
274280
//Date onsetDate,
275281
Vaccination vaccination, String vaccinationDoses, Date vaccinationDate,
276282
VaccinationInfoSource vaccinationInfoSource, YesNoUnknown postpartum, Trimester trimester,
@@ -288,10 +294,12 @@ public CaseExportDto(long id, long personId, long personAddressId, long epiDataI
288294
this.healthConditionsId = healthConditionsId;
289295
this.uuid = uuid;
290296
this.epidNumber = epidNumber;
297+
this.armedForcesRelationType = ArmedForcesRelationType;
291298
this.diseaseFormatted = DiseaseHelper.toString(disease, diseaseDetails);
292299
this.disease = disease;
293300
this.firstName = firstName;
294301
this.lastName = lastName;
302+
this.salutation = EnumHelper.toString(salutation, otherSalutation, Salutation.OTHER);
295303
this.sex = sex;
296304
this.pregnant = pregnant;
297305
this.approximateAge = ApproximateAgeHelper.formatApproximateAge(approximateAge, approximateAgeType);
@@ -472,6 +480,17 @@ public String getLastName() {
472480
}
473481

474482
@Order(12)
483+
@ExportTarget(caseExportTypes = {
484+
CaseExportType.CASE_SURVEILLANCE,
485+
CaseExportType.CASE_MANAGEMENT })
486+
@ExportProperty(PersonDto.SALUTATION)
487+
@ExportGroup(ExportGroupType.SENSITIVE)
488+
@HideForCountriesExcept
489+
public String getSalutation() {
490+
return salutation;
491+
}
492+
493+
@Order(13)
475494
@ExportTarget(caseExportTypes = {
476495
CaseExportType.CASE_SURVEILLANCE,
477496
CaseExportType.CASE_MANAGEMENT })
@@ -481,7 +500,7 @@ public Sex getSex() {
481500
return sex;
482501
}
483502

484-
@Order(13)
503+
@Order(14)
485504
@ExportTarget(caseExportTypes = {
486505
CaseExportType.CASE_SURVEILLANCE,
487506
CaseExportType.CASE_MANAGEMENT })
@@ -491,7 +510,7 @@ public YesNoUnknown getPregnant() {
491510
return pregnant;
492511
}
493512

494-
@Order(14)
513+
@Order(15)
495514
@ExportTarget(caseExportTypes = {
496515
CaseExportType.CASE_SURVEILLANCE,
497516
CaseExportType.CASE_MANAGEMENT })
@@ -501,7 +520,7 @@ public Trimester getTrimester() {
501520
return trimester;
502521
}
503522

504-
@Order(15)
523+
@Order(16)
505524
@ExportTarget(caseExportTypes = {
506525
CaseExportType.CASE_SURVEILLANCE,
507526
CaseExportType.CASE_MANAGEMENT })
@@ -511,7 +530,7 @@ public YesNoUnknown getPostpartum() {
511530
return postpartum;
512531
}
513532

514-
@Order(16)
533+
@Order(17)
515534
@ExportTarget(caseExportTypes = {
516535
CaseExportType.CASE_SURVEILLANCE,
517536
CaseExportType.CASE_MANAGEMENT })
@@ -521,7 +540,7 @@ public String getApproximateAge() {
521540
return approximateAge;
522541
}
523542

524-
@Order(17)
543+
@Order(18)
525544
@ExportTarget(caseExportTypes = {
526545
CaseExportType.CASE_SURVEILLANCE,
527546
CaseExportType.CASE_MANAGEMENT })
@@ -531,7 +550,7 @@ public String getAgeGroup() {
531550
return ageGroup;
532551
}
533552

534-
@Order(18)
553+
@Order(19)
535554
@ExportTarget(caseExportTypes = {
536555
CaseExportType.CASE_SURVEILLANCE,
537556
CaseExportType.CASE_MANAGEMENT })
@@ -1009,8 +1028,8 @@ public String getPhone() {
10091028

10101029
@Order(75)
10111030
@ExportTarget(caseExportTypes = {
1012-
CaseExportType.CASE_SURVEILLANCE,
1013-
CaseExportType.CASE_MANAGEMENT })
1031+
CaseExportType.CASE_SURVEILLANCE,
1032+
CaseExportType.CASE_MANAGEMENT })
10141033
@ExportProperty(PersonDto.EMAIL_ADDRESS)
10151034
@ExportGroup(ExportGroupType.SENSITIVE)
10161035
public String getEmailAddress() {
@@ -1042,6 +1061,16 @@ public String getOccupationType() {
10421061
}
10431062

10441063
@Order(78)
1064+
@ExportTarget(caseExportTypes = {
1065+
CaseExportType.CASE_SURVEILLANCE,
1066+
CaseExportType.CASE_MANAGEMENT })
1067+
@ExportProperty(PersonDto.ARMED_FORCES_RELATION_TYPE)
1068+
@ExportGroup(ExportGroupType.PERSON)
1069+
public ArmedForcesRelationType getArmedForcesRelationType() {
1070+
return armedForcesRelationType;
1071+
}
1072+
1073+
@Order(79)
10451074
@ExportTarget(caseExportTypes = {
10461075
CaseExportType.CASE_SURVEILLANCE })
10471076
@ExportProperty(TRAVELED)
@@ -1054,7 +1083,7 @@ public void setTraveled(boolean traveled) {
10541083
this.traveled = traveled;
10551084
}
10561085

1057-
@Order(79)
1086+
@Order(80)
10581087
@ExportTarget(caseExportTypes = {
10591088
CaseExportType.CASE_SURVEILLANCE })
10601089
@ExportProperty(TRAVEL_HISTORY)
@@ -1063,7 +1092,7 @@ public String getTravelHistory() {
10631092
return travelHistory;
10641093
}
10651094

1066-
@Order(80)
1095+
@Order(81)
10671096
@ExportTarget(caseExportTypes = {
10681097
CaseExportType.CASE_SURVEILLANCE })
10691098
@ExportProperty(BURIAL_ATTENDED)
@@ -1076,7 +1105,7 @@ public void setBurialAttended(boolean burialAttended) {
10761105
this.burialAttended = burialAttended;
10771106
}
10781107

1079-
@Order(81)
1108+
@Order(82)
10801109
@ExportTarget(caseExportTypes = {
10811110
CaseExportType.CASE_SURVEILLANCE })
10821111
@ExportProperty(EpiDataDto.CONTACT_WITH_SOURCE_CASE_KNOWN)
@@ -1561,6 +1590,10 @@ public void setOccupationType(String occupationType) {
15611590
this.occupationType = occupationType;
15621591
}
15631592

1593+
public void setArmedForcesRelationType(ArmedForcesRelationType armedForcesRelationType) {
1594+
this.armedForcesRelationType = armedForcesRelationType;
1595+
}
1596+
15641597
public void setTravelHistory(String travelHistory) {
15651598
this.travelHistory = travelHistory;
15661599
}

‎sormas-api/src/main/java/de/symeda/sormas/api/contact/ContactExportDto.java‎

Lines changed: 39 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -29,10 +29,13 @@
2929
import de.symeda.sormas.api.i18n.I18nProperties;
3030
import de.symeda.sormas.api.person.ApproximateAgeType;
3131
import de.symeda.sormas.api.person.ApproximateAgeType.ApproximateAgeHelper;
32+
import de.symeda.sormas.api.person.ArmedForcesRelationType;
3233
import de.symeda.sormas.api.person.OccupationType;
3334
import de.symeda.sormas.api.person.PersonHelper;
3435
import de.symeda.sormas.api.person.PresentCondition;
36+
import de.symeda.sormas.api.person.Salutation;
3537
import de.symeda.sormas.api.person.Sex;
38+
import de.symeda.sormas.api.utils.EnumHelper;
3639
import de.symeda.sormas.api.utils.HideForCountriesExcept;
3740
import de.symeda.sormas.api.utils.Order;
3841
import de.symeda.sormas.api.utils.PersonalData;
@@ -60,6 +63,8 @@ public class ContactExportDto implements Serializable {
6063
private String firstName;
6164
@PersonalData
6265
private String lastName;
66+
@SensitiveData
67+
private String salutation;
6368
private Sex sex;
6469
private BirthDateDto birthdate;
6570
private String approximateAge;
@@ -105,6 +110,7 @@ public class ContactExportDto implements Serializable {
105110
@SensitiveData
106111
private String emailAddress;
107112
private String occupationType;
113+
private ArmedForcesRelationType armedForcesRelationType;
108114
private int numberOfVisits;
109115
private YesNoUnknown lastCooperativeVisitSymptomatic;
110116
private Date lastCooperativeVisitDate;
@@ -150,7 +156,8 @@ public class ContactExportDto implements Serializable {
150156

151157
//@formatter:off
152158
public ContactExportDto(long id, long personId, String uuid, String sourceCaseUuid, CaseClassification caseClassification, Disease disease, String diseaseDetails,
153-
ContactClassification contactClassification, Date lastContactDate, String firstName, String lastName, Sex sex,
159+
ContactClassification contactClassification, Date lastContactDate, String firstName, String lastName,
160+
Salutation salutation, String otherSalutation, Sex sex,
154161
Integer birthdateDD, Integer birthdateMM, Integer birthdateYYYY,
155162
Integer approximateAge, ApproximateAgeType approximateAgeType, Date reportDate, ContactIdentificationSource contactIdentificationSource,
156163
String contactIdentificationSourceDetails, TracingApp tracingApp, String tracingAppDetails, ContactProximity contactProximity,
@@ -161,7 +168,7 @@ public ContactExportDto(long id, long personId, String uuid, String sourceCaseUu
161168
PresentCondition presentCondition, Date deathDate,
162169
String addressRegion, String addressDistrict, String addressCommunity, String city, String street, String houseNumber, String additionalInformation, String postalCode,
163170
String facility, String facilityUuid, String facilityDetails,
164-
String phone, String phoneOwner, String emailAddress, OccupationType occupationType, String occupationDetails,
171+
String phone, String phoneOwner, String emailAddress, OccupationType occupationType, String occupationDetails, ArmedForcesRelationType armedForcesRelationType,
165172
String region, String district, String community,
166173
long epiDataId, YesNoUnknown contactWithSourceCaseKnown, YesNoUnknown returningTraveler, String externalID,
167174
String birthName, String birthCountryIsoCode, String birthCountryName, String citizenshipIsoCode, String citizenshipCountryName,
@@ -181,6 +188,7 @@ public ContactExportDto(long id, long personId, String uuid, String sourceCaseUu
181188
this.lastContactDate = lastContactDate;
182189
this.firstName = firstName;
183190
this.lastName = lastName;
191+
this.salutation = EnumHelper.toString(salutation, otherSalutation, Salutation.OTHER);
184192
this.sex = sex;
185193
this.birthdate = new BirthDateDto(birthdateDD, birthdateMM, birthdateYYYY);
186194
this.approximateAge = ApproximateAgeHelper.formatApproximateAge(approximateAge, approximateAgeType);
@@ -220,6 +228,7 @@ public ContactExportDto(long id, long personId, String uuid, String sourceCaseUu
220228
this.phone = PersonHelper.buildPhoneString(phone, phoneOwner);
221229
this.emailAddress = emailAddress;
222230
this.occupationType = PersonHelper.buildOccupationString(occupationType, occupationDetails);
231+
this.armedForcesRelationType = armedForcesRelationType;
223232
this.region = region;
224233
this.district = district;
225234
this.community = community;
@@ -309,36 +318,42 @@ public String getLastName() {
309318
}
310319

311320
@Order(12)
321+
@HideForCountriesExcept
322+
public String getSalutation() {
323+
return salutation;
324+
}
325+
326+
@Order(13)
312327
public Sex getSex() {
313328
return sex;
314329
}
315330

316-
@Order(13)
331+
@Order(14)
317332
public BirthDateDto getBirthdate() {
318333
return birthdate;
319334
}
320335

321-
@Order(14)
336+
@Order(15)
322337
public String getApproximateAge() {
323338
return approximateAge;
324339
}
325340

326-
@Order(15)
341+
@Order(16)
327342
public Date getReportDate() {
328343
return reportDate;
329344
}
330345

331-
@Order(16)
346+
@Order(17)
332347
public String getRegion() {
333348
return region;
334349
}
335350

336-
@Order(17)
351+
@Order(18)
337352
public String getDistrict() {
338353
return district;
339354
}
340355

341-
@Order(18)
356+
@Order(19)
342357
public String getCommunity() {
343358
return community;
344359
}
@@ -537,26 +552,31 @@ public String getOccupationType() {
537552
}
538553

539554
@Order(61)
555+
public ArmedForcesRelationType getArmedForcesRelationType() {
556+
return armedForcesRelationType;
557+
}
558+
559+
@Order(62)
540560
public int getNumberOfVisits() {
541561
return numberOfVisits;
542562
}
543563

544-
@Order(62)
564+
@Order(63)
545565
public YesNoUnknown getLastCooperativeVisitSymptomatic() {
546566
return lastCooperativeVisitSymptomatic;
547567
}
548568

549-
@Order(63)
569+
@Order(64)
550570
public Date getLastCooperativeVisitDate() {
551571
return lastCooperativeVisitDate;
552572
}
553573

554-
@Order(64)
574+
@Order(65)
555575
public String getLastCooperativeVisitSymptoms() {
556576
return lastCooperativeVisitSymptoms;
557577
}
558578

559-
@Order(65)
579+
@Order(66)
560580
public boolean isTraveled() {
561581
return traveled;
562582
}
@@ -565,7 +585,7 @@ public void setTraveled(boolean traveled) {
565585
this.traveled = traveled;
566586
}
567587

568-
@Order(66)
588+
@Order(67)
569589
public String getTravelHistory() {
570590
return travelHistory;
571591
}
@@ -574,7 +594,7 @@ public void setTravelHistory(String travelHistory) {
574594
this.travelHistory = travelHistory;
575595
}
576596

577-
@Order(67)
597+
@Order(68)
578598
public boolean isBurialAttended() {
579599
return burialAttended;
580600
}
@@ -583,7 +603,7 @@ public void setBurialAttended(boolean burialAttended) {
583603
this.burialAttended = burialAttended;
584604
}
585605

586-
@Order(68)
606+
@Order(69)
587607
public YesNoUnknown getContactWithSourceCaseKnown() {
588608
return contactWithSourceCaseKnown;
589609
}
@@ -754,6 +774,10 @@ public void setOccupationType(String occupationType) {
754774
this.occupationType = occupationType;
755775
}
756776

777+
public void setArmedForcesRelationType(ArmedForcesRelationType armedForcesRelationType) {
778+
this.armedForcesRelationType = armedForcesRelationType;
779+
}
780+
757781
public void setLastCooperativeVisitSymptomatic(YesNoUnknown lastCooperativeVisitSymptomatic) {
758782
this.lastCooperativeVisitSymptomatic = lastCooperativeVisitSymptomatic;
759783
}

0 commit comments

Comments
 (0)