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

Commit 489cf93

Browse files
leventegal-sheleventegal-she
authored
Merge pull request SORMAS-Foundation#3592 from hzi-braunschweig/3409_prohibition-to-work-fields
SORMAS-Foundation#3409 prohibition to work fields
2 parents 2e9d9c9 + 17f6483 commit 489cf93

43 files changed

Lines changed: 535 additions & 173 deletions

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/contact/ContactDto.java‎

Lines changed: 35 additions & 0 deletions
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());
@@ -822,6 +833,30 @@ public void setEndOfQuarantineReasonDetails(String endOfQuarantineReasonDetails)
822833
this.endOfQuarantineReasonDetails = endOfQuarantineReasonDetails;
823834
}
824835

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+
825860
public YesNoUnknown getReturningTraveler() {
826861
return returningTraveler;
827862
}

‎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
}

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

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -249,6 +249,9 @@ public interface Captions {
249249
String CaseData_portHealthInfo = "CaseData.portHealthInfo";
250250
String CaseData_postpartum = "CaseData.postpartum";
251251
String CaseData_pregnant = "CaseData.pregnant";
252+
String CaseData_prohibitionToWork = "CaseData.prohibitionToWork";
253+
String CaseData_prohibitionToWorkFrom = "CaseData.prohibitionToWorkFrom";
254+
String CaseData_prohibitionToWorkUntil = "CaseData.prohibitionToWorkUntil";
252255
String CaseData_quarantine = "CaseData.quarantine";
253256
String CaseData_quarantineExtended = "CaseData.quarantineExtended";
254257
String CaseData_quarantineFrom = "CaseData.quarantineFrom";
@@ -472,6 +475,9 @@ public interface Captions {
472475
String Contact_numberOfVisits = "Contact.numberOfVisits";
473476
String Contact_overwriteFollowUpUntil = "Contact.overwriteFollowUpUntil";
474477
String Contact_person = "Contact.person";
478+
String Contact_prohibitionToWork = "Contact.prohibitionToWork";
479+
String Contact_prohibitionToWorkFrom = "Contact.prohibitionToWorkFrom";
480+
String Contact_prohibitionToWorkUntil = "Contact.prohibitionToWorkUntil";
475481
String Contact_quarantine = "Contact.quarantine";
476482
String Contact_quarantineExtended = "Contact.quarantineExtended";
477483
String Contact_quarantineFrom = "Contact.quarantineFrom";

‎sormas-api/src/main/java/de/symeda/sormas/api/person/ArmedForcesRelationType.java‎

Lines changed: 0 additions & 17 deletions
This file was deleted.

‎sormas-api/src/main/java/de/symeda/sormas/api/person/PersonDto.java‎

Lines changed: 0 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -83,7 +83,6 @@ public class PersonDto extends PseudonymizableDto {
8383
public static final String EDUCATION_DETAILS = "educationDetails";
8484
public static final String OCCUPATION_TYPE = "occupationType";
8585
public static final String OCCUPATION_DETAILS = "occupationDetails";
86-
public static final String ARMED_FORCES_RELATION_TYPE = "armedForcesRelationType";
8786

8887
public static final String FATHERS_NAME = "fathersName";
8988
public static final String MOTHERS_NAME = "mothersName";
@@ -261,9 +260,6 @@ public class PersonDto extends PseudonymizableDto {
261260
@SensitiveData
262261
private String occupationDetails;
263262
@SensitiveData
264-
@HideForCountriesExcept(countries = CountryHelper.COUNTRY_CODE_GERMANY)
265-
private ArmedForcesRelationType armedForcesRelationType;
266-
@SensitiveData
267263
private String generalPractitionerDetails;
268264
@SensitiveData
269265
private String passportNumber;
@@ -507,14 +503,6 @@ public void setOccupationDetails(String occupationDetails) {
507503
this.occupationDetails = occupationDetails;
508504
}
509505

510-
public ArmedForcesRelationType getArmedForcesRelationType() {
511-
return armedForcesRelationType;
512-
}
513-
514-
public void setArmedForcesRelationType(ArmedForcesRelationType armedForcesRelationType) {
515-
this.armedForcesRelationType = armedForcesRelationType;
516-
}
517-
518506
public String getMothersName() {
519507
return mothersName;
520508
}

0 commit comments

Comments
 (0)