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

Commit 5e4b43b

Browse files
author
barnabartha
committed
Merge branch 'development' into feature-3253-SendSMSToCases
# Conflicts: # sormas-backend/src/main/resources/sql/sormas_schema.sql
2 parents 067da83 + abc4802 commit 5e4b43b

86 files changed

Lines changed: 1275 additions & 299 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/CaseDataDto.java‎

Lines changed: 35 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -167,6 +167,10 @@ public class CaseDataDto extends PseudonymizableDto {
167167
public static final String END_OF_ISOLATION_REASON = "endOfIsolationReason";
168168
public static final String END_OF_ISOLATION_REASON_DETAILS = "endOfIsolationReasonDetails";
169169

170+
public static final String PROHIBITION_TO_WORK = "prohibitionToWork";
171+
public static final String PROHIBITION_TO_WORK_FROM = "prohibitionToWorkFrom";
172+
public static final String PROHIBITION_TO_WORK_UNTIL = "prohibitionToWorkUntil";
173+
170174
// Fields are declared in the order they should appear in the import template
171175

172176
@Outbreaks
@@ -450,6 +454,13 @@ public class CaseDataDto extends PseudonymizableDto {
450454
@SensitiveData
451455
private String endOfIsolationReasonDetails;
452456

457+
@HideForCountriesExcept
458+
private YesNoUnknown prohibitionToWork;
459+
@HideForCountriesExcept
460+
private Date prohibitionToWorkFrom;
461+
@HideForCountriesExcept
462+
private Date prohibitionToWorkUntil;
463+
453464
public static CaseDataDto build(PersonReferenceDto person, Disease disease) {
454465
return build(person, disease, null);
455466
}
@@ -1318,6 +1329,30 @@ public void setSormasToSormasOriginInfo(SormasToSormasOriginInfoDto sormasToSorm
13181329
this.sormasToSormasOriginInfo = sormasToSormasOriginInfo;
13191330
}
13201331

1332+
public YesNoUnknown getProhibitionToWork() {
1333+
return prohibitionToWork;
1334+
}
1335+
1336+
public void setProhibitionToWork(YesNoUnknown prohibitionToWork) {
1337+
this.prohibitionToWork = prohibitionToWork;
1338+
}
1339+
1340+
public Date getProhibitionToWorkFrom() {
1341+
return prohibitionToWorkFrom;
1342+
}
1343+
1344+
public void setProhibitionToWorkFrom(Date prohibitionToWorkFrom) {
1345+
this.prohibitionToWorkFrom = prohibitionToWorkFrom;
1346+
}
1347+
1348+
public Date getProhibitionToWorkUntil() {
1349+
return prohibitionToWorkUntil;
1350+
}
1351+
1352+
public void setProhibitionToWorkUntil(Date prohibitionToWorkUntil) {
1353+
this.prohibitionToWorkUntil = prohibitionToWorkUntil;
1354+
}
1355+
13211356
public boolean isOwnershipHandedOver() {
13221357
return ownershipHandedOver;
13231358
}

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

Lines changed: 6 additions & 24 deletions
Original file line numberDiff line numberDiff line change
@@ -42,7 +42,6 @@
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;
4645
import de.symeda.sormas.api.person.BurialConductor;
4746
import de.symeda.sormas.api.person.EducationType;
4847
import de.symeda.sormas.api.person.OccupationType;
@@ -186,7 +185,6 @@ public class CaseExportDto implements Serializable {
186185
@SensitiveData
187186
private String emailAddress;
188187
private String occupationType;
189-
private ArmedForcesRelationType armedForcesRelationType;
190188
private String educationType;
191189
private String travelHistory;
192190
private boolean traveled;
@@ -266,7 +264,7 @@ public CaseExportDto(long id, long personId, long personAddressId, long epiDataI
266264
String addressRegion, String addressDistrict, String addressCommunity, String city, String street, String houseNumber, String additionalInformation, String postalCode,
267265
String facility, String facilityUuid, String facilityDetails,
268266
String phone, String phoneOwner, String emailAddress, EducationType educationType, String educationDetails,
269-
OccupationType occupationType, String occupationDetails, ArmedForcesRelationType ArmedForcesRelationType, YesNoUnknown contactWithSourceCaseKnown,
267+
OccupationType occupationType, String occupationDetails, YesNoUnknown contactWithSourceCaseKnown,
270268
//Date onsetDate,
271269
Vaccination vaccination, String vaccinationDoses, Date vaccinationDate,
272270
VaccinationInfoSource vaccinationInfoSource, YesNoUnknown postpartum, Trimester trimester,
@@ -283,7 +281,6 @@ public CaseExportDto(long id, long personId, long personAddressId, long epiDataI
283281
this.healthConditionsId = healthConditionsId;
284282
this.uuid = uuid;
285283
this.epidNumber = epidNumber;
286-
this.armedForcesRelationType = ArmedForcesRelationType;
287284
this.diseaseFormatted = DiseaseHelper.toString(disease, diseaseDetails);
288285
this.disease = disease;
289286
this.firstName = firstName;
@@ -336,7 +333,6 @@ public CaseExportDto(long id, long personId, long personAddressId, long epiDataI
336333
this.emailAddress = emailAddress;
337334
this.educationType = PersonHelper.buildEducationString(educationType, educationDetails);
338335
this.occupationType = PersonHelper.buildOccupationString(occupationType, occupationDetails);
339-
this.armedForcesRelationType = armedForcesRelationType;
340336
this.contactWithSourceCaseKnown = contactWithSourceCaseKnown;
341337
// this.onsetDate = onsetDate;
342338
this.vaccination = vaccination;
@@ -1003,8 +999,8 @@ public String getPhone() {
1003999

10041000
@Order(75)
10051001
@ExportTarget(caseExportTypes = {
1006-
CaseExportType.CASE_SURVEILLANCE,
1007-
CaseExportType.CASE_MANAGEMENT })
1002+
CaseExportType.CASE_SURVEILLANCE,
1003+
CaseExportType.CASE_MANAGEMENT })
10081004
@ExportProperty(PersonDto.EMAIL_ADDRESS)
10091005
@ExportGroup(ExportGroupType.SENSITIVE)
10101006
public String getEmailAddress() {
@@ -1036,16 +1032,6 @@ public String getOccupationType() {
10361032
}
10371033

10381034
@Order(78)
1039-
@ExportTarget(caseExportTypes = {
1040-
CaseExportType.CASE_SURVEILLANCE,
1041-
CaseExportType.CASE_MANAGEMENT })
1042-
@ExportProperty(PersonDto.ARMED_FORCES_RELATION_TYPE)
1043-
@ExportGroup(ExportGroupType.PERSON)
1044-
public ArmedForcesRelationType getArmedForcesRelationType() {
1045-
return armedForcesRelationType;
1046-
}
1047-
1048-
@Order(79)
10491035
@ExportTarget(caseExportTypes = {
10501036
CaseExportType.CASE_SURVEILLANCE })
10511037
@ExportProperty(TRAVELED)
@@ -1058,7 +1044,7 @@ public void setTraveled(boolean traveled) {
10581044
this.traveled = traveled;
10591045
}
10601046

1061-
@Order(80)
1047+
@Order(79)
10621048
@ExportTarget(caseExportTypes = {
10631049
CaseExportType.CASE_SURVEILLANCE })
10641050
@ExportProperty(TRAVEL_HISTORY)
@@ -1067,7 +1053,7 @@ public String getTravelHistory() {
10671053
return travelHistory;
10681054
}
10691055

1070-
@Order(81)
1056+
@Order(80)
10711057
@ExportTarget(caseExportTypes = {
10721058
CaseExportType.CASE_SURVEILLANCE })
10731059
@ExportProperty(BURIAL_ATTENDED)
@@ -1080,7 +1066,7 @@ public void setBurialAttended(boolean burialAttended) {
10801066
this.burialAttended = burialAttended;
10811067
}
10821068

1083-
@Order(82)
1069+
@Order(81)
10841070
@ExportTarget(caseExportTypes = {
10851071
CaseExportType.CASE_SURVEILLANCE })
10861072
@ExportProperty(EpiDataDto.CONTACT_WITH_SOURCE_CASE_KNOWN)
@@ -1532,10 +1518,6 @@ public void setOccupationType(String occupationType) {
15321518
this.occupationType = occupationType;
15331519
}
15341520

1535-
public void setArmedForcesRelationType(ArmedForcesRelationType armedForcesRelationType) {
1536-
this.armedForcesRelationType = armedForcesRelationType;
1537-
}
1538-
15391521
public void setTravelHistory(String travelHistory) {
15401522
this.travelHistory = travelHistory;
15411523
}

‎sormas-api/src/main/java/de/symeda/sormas/api/caze/CaseIndexDetailedDto.java‎

Lines changed: 23 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -30,6 +30,9 @@ public class CaseIndexDetailedDto extends CaseIndexDto {
3030
public static final String LATEST_EVENT_ID = "latestEventId";
3131
public static final String LATEST_EVENT_STATUS = "latestEventStatus";
3232
public static final String LATEST_EVENT_TITLE = "latestEventTitle";
33+
public static final String LATEST_SAMPLE_DATE_TIME = "latestSampleDateTime";
34+
public static final String SAMPLE_COUNT = "sampleCount";
35+
public static final String SYMPTOM_ONSET_DATE = "symptomOnsetDate";
3336

3437
@PersonalData
3538
@SensitiveData
@@ -53,6 +56,9 @@ public class CaseIndexDetailedDto extends CaseIndexDto {
5356
private String latestEventId;
5457
private String latestEventTitle;
5558
private EventStatus latestEventStatus;
59+
private Date latestSampleDateTime;
60+
private Long sampleCount;
61+
private Date symptomOnsetDate;
5662

5763
private UserReferenceDto reportingUser;
5864

@@ -66,7 +72,8 @@ public CaseIndexDetailedDto(long id, String uuid, String epidNumber, String exte
6672
Integer age, ApproximateAgeType ageType, Integer birthdateDD, Integer birthdateMM, Integer birthdateYYYY, Sex sex,
6773
Date quarantineTo, Float completeness, FollowUpStatus followUpStatus, Date followUpUntil, Date changeDate, Long facilityId,
6874
String city, String street, String houseNumber, String additionalInformation, String postalCode, String phone,
69-
String reportingUserFirstName, String reportingUserLastName, int visitCount, long eventCount) {
75+
String reportingUserFirstName, String reportingUserLastName, Date symptomOnsetDate,
76+
int visitCount, long eventCount, Date latestSampleDateTime, long sampleCount) {
7077

7178
super(id, uuid, epidNumber, externalID, personFirstName, personLastName, disease, diseaseDetails, caseClassification, investigationStatus,
7279
presentCondition, reportDate, reportingUserUuid, creationDate, regionUuid, districtUuid, districtName, communityUuid,
@@ -83,6 +90,9 @@ public CaseIndexDetailedDto(long id, String uuid, String epidNumber, String exte
8390
this.phone = phone;
8491
this.reportingUser = new UserReferenceDto(reportingUserUuid, reportingUserFirstName, reportingUserLastName, null);
8592
this.eventCount = eventCount;
93+
this.latestSampleDateTime = latestSampleDateTime;
94+
this.sampleCount = sampleCount;
95+
this.symptomOnsetDate = symptomOnsetDate;
8696
}
8797

8898
public String getCity() {
@@ -144,4 +154,16 @@ public EventStatus getLatestEventStatus() {
144154
public void setLatestEventStatus(EventStatus latestEventStatus) {
145155
this.latestEventStatus = latestEventStatus;
146156
}
157+
158+
public Date getLatestSampleDateTime() {
159+
return latestSampleDateTime;
160+
}
161+
162+
public Long getSampleCount() {
163+
return sampleCount;
164+
}
165+
166+
public Date getSymptomOnsetDate() {
167+
return symptomOnsetDate;
168+
}
147169
}

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

Lines changed: 41 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -116,6 +116,10 @@ public class ContactDto extends PseudonymizableDto {
116116
public static final String END_OF_QUARANTINE_REASON_DETAILS = "endOfQuarantineReasonDetails";
117117
public static final String RETURNING_TRAVELER = "returningTraveler";
118118

119+
public static final String PROHIBITION_TO_WORK = "prohibitionToWork";
120+
public static final String PROHIBITION_TO_WORK_FROM = "prohibitionToWorkFrom";
121+
public static final String PROHIBITION_TO_WORK_UNTIL = "prohibitionToWorkUntil";
122+
119123
private CaseReferenceDto caze;
120124
private String caseIdExternalSystem;
121125
@SensitiveData
@@ -252,6 +256,13 @@ public class ContactDto extends PseudonymizableDto {
252256
@SensitiveData
253257
private String endOfQuarantineReasonDetails;
254258

259+
@HideForCountriesExcept
260+
private YesNoUnknown prohibitionToWork;
261+
@HideForCountriesExcept
262+
private Date prohibitionToWorkFrom;
263+
@HideForCountriesExcept
264+
private Date prohibitionToWorkUntil;
265+
255266
public static ContactDto build() {
256267
final ContactDto contact = new ContactDto();
257268
contact.setUuid(DataHelper.createUuid());
@@ -494,7 +505,12 @@ public void setReportLatLonAccuracy(Float reportLatLonAccuracy) {
494505
}
495506

496507
public ContactReferenceDto toReference() {
497-
return new ContactReferenceDto(getUuid());
508+
return new ContactReferenceDto(
509+
getUuid(),
510+
getPerson().getFirstName(),
511+
getPerson().getLastName(),
512+
getCaze() != null ? getCaze().getFirstName() : null,
513+
getCaze() != null ? getCaze().getLastName() : null);
498514
}
499515

500516
public UserReferenceDto getResultingCaseUser() {
@@ -817,6 +833,30 @@ public void setEndOfQuarantineReasonDetails(String endOfQuarantineReasonDetails)
817833
this.endOfQuarantineReasonDetails = endOfQuarantineReasonDetails;
818834
}
819835

836+
public YesNoUnknown getProhibitionToWork() {
837+
return prohibitionToWork;
838+
}
839+
840+
public void setProhibitionToWork(YesNoUnknown prohibitionToWork) {
841+
this.prohibitionToWork = prohibitionToWork;
842+
}
843+
844+
public Date getProhibitionToWorkFrom() {
845+
return prohibitionToWorkFrom;
846+
}
847+
848+
public void setProhibitionToWorkFrom(Date prohibitionToWorkFrom) {
849+
this.prohibitionToWorkFrom = prohibitionToWorkFrom;
850+
}
851+
852+
public Date getProhibitionToWorkUntil() {
853+
return prohibitionToWorkUntil;
854+
}
855+
856+
public void setProhibitionToWorkUntil(Date prohibitionToWorkUntil) {
857+
this.prohibitionToWorkUntil = prohibitionToWorkUntil;
858+
}
859+
820860
public YesNoUnknown getReturningTraveler() {
821861
return returningTraveler;
822862
}

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

Lines changed: 8 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,6 @@
2828
import de.symeda.sormas.api.facility.FacilityHelper;
2929
import de.symeda.sormas.api.person.ApproximateAgeType;
3030
import de.symeda.sormas.api.person.ApproximateAgeType.ApproximateAgeHelper;
31-
import de.symeda.sormas.api.person.ArmedForcesRelationType;
3231
import de.symeda.sormas.api.person.OccupationType;
3332
import de.symeda.sormas.api.person.PersonHelper;
3433
import de.symeda.sormas.api.person.PresentCondition;
@@ -105,7 +104,6 @@ public class ContactExportDto implements Serializable {
105104
@SensitiveData
106105
private String emailAddress;
107106
private String occupationType;
108-
private ArmedForcesRelationType armedForcesRelationType;
109107
private int numberOfVisits;
110108
private YesNoUnknown lastCooperativeVisitSymptomatic;
111109
private Date lastCooperativeVisitDate;
@@ -156,7 +154,7 @@ public ContactExportDto(long id, long personId, String uuid, String sourceCaseUu
156154
PresentCondition presentCondition, Date deathDate,
157155
String addressRegion, String addressDistrict, String addressCommunity, String city, String street, String houseNumber, String additionalInformation, String postalCode,
158156
String facility, String facilityUuid, String facilityDetails,
159-
String phone, String phoneOwner, String emailAddress, OccupationType occupationType, String occupationDetails, ArmedForcesRelationType armedForcesRelationType,
157+
String phone, String phoneOwner, String emailAddress, OccupationType occupationType, String occupationDetails,
160158
String region, String district, String community,
161159
long epiDataId, YesNoUnknown contactWithSourceCaseKnown, YesNoUnknown returningTraveler, String externalID,
162160
String reportingUserUuid, String regionUuid, String districtUuid, String communityUuid,
@@ -214,7 +212,6 @@ public ContactExportDto(long id, long personId, String uuid, String sourceCaseUu
214212
this.phone = PersonHelper.buildPhoneString(phone, phoneOwner);
215213
this.emailAddress = emailAddress;
216214
this.occupationType = PersonHelper.buildOccupationString(occupationType, occupationDetails);
217-
this.armedForcesRelationType = armedForcesRelationType;
218215
this.region = region;
219216
this.district = district;
220217
this.community = community;
@@ -529,31 +526,26 @@ public String getOccupationType() {
529526
}
530527

531528
@Order(61)
532-
public ArmedForcesRelationType getArmedForcesRelationType() {
533-
return armedForcesRelationType;
534-
}
535-
536-
@Order(62)
537529
public int getNumberOfVisits() {
538530
return numberOfVisits;
539531
}
540532

541-
@Order(63)
533+
@Order(62)
542534
public YesNoUnknown getLastCooperativeVisitSymptomatic() {
543535
return lastCooperativeVisitSymptomatic;
544536
}
545537

546-
@Order(64)
538+
@Order(63)
547539
public Date getLastCooperativeVisitDate() {
548540
return lastCooperativeVisitDate;
549541
}
550542

551-
@Order(65)
543+
@Order(64)
552544
public String getLastCooperativeVisitSymptoms() {
553545
return lastCooperativeVisitSymptoms;
554546
}
555547

556-
@Order(66)
548+
@Order(65)
557549
public boolean isTraveled() {
558550
return traveled;
559551
}
@@ -562,7 +554,7 @@ public void setTraveled(boolean traveled) {
562554
this.traveled = traveled;
563555
}
564556

565-
@Order(67)
557+
@Order(66)
566558
public String getTravelHistory() {
567559
return travelHistory;
568560
}
@@ -571,7 +563,7 @@ public void setTravelHistory(String travelHistory) {
571563
this.travelHistory = travelHistory;
572564
}
573565

574-
@Order(68)
566+
@Order(67)
575567
public boolean isBurialAttended() {
576568
return burialAttended;
577569
}
@@ -580,7 +572,7 @@ public void setBurialAttended(boolean burialAttended) {
580572
this.burialAttended = burialAttended;
581573
}
582574

583-
@Order(69)
575+
@Order(68)
584576
public YesNoUnknown getContactWithSourceCaseKnown() {
585577
return contactWithSourceCaseKnown;
586578
}
@@ -733,10 +725,6 @@ public void setOccupationType(String occupationType) {
733725
this.occupationType = occupationType;
734726
}
735727

736-
public void setArmedForcesRelationType(ArmedForcesRelationType armedForcesRelationType) {
737-
this.armedForcesRelationType = armedForcesRelationType;
738-
}
739-
740728
public void setLastCooperativeVisitSymptomatic(YesNoUnknown lastCooperativeVisitSymptomatic) {
741729
this.lastCooperativeVisitSymptomatic = lastCooperativeVisitSymptomatic;
742730
}

0 commit comments

Comments
 (0)