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

Commit 6b015a8

Browse files
FredrikSchaeferFredrikSchaefer
authored
Merge pull request SORMAS-Foundation#3671 from hzi-braunschweig/revert-3636-feature-3418-SurvNet-Adaptations-Create-new-field-“staff-of-armed-forces”-to-case-person-and-contact-person
Revert "Feature 3418 surv net adaptations create new field “staff of armed forces” to case person and contact person"
2 parents 7e5b393 + 4c8092d commit 6b015a8

23 files changed

Lines changed: 32 additions & 176 deletions

File tree

‎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;
@@ -262,7 +260,7 @@ public CaseExportDto(long id, long personId, long personAddressId, long epiDataI
262260
String addressRegion, String addressDistrict, String addressCommunity, String city, String street, String houseNumber, String additionalInformation, String postalCode,
263261
String facility, String facilityUuid, String facilityDetails,
264262
String phone, String phoneOwner, String emailAddress, EducationType educationType, String educationDetails,
265-
OccupationType occupationType, String occupationDetails, ArmedForcesRelationType ArmedForcesRelationType, YesNoUnknown contactWithSourceCaseKnown,
263+
OccupationType occupationType, String occupationDetails, YesNoUnknown contactWithSourceCaseKnown,
266264
//Date onsetDate,
267265
Vaccination vaccination, String vaccinationDoses, Date vaccinationDate,
268266
VaccinationInfoSource vaccinationInfoSource, YesNoUnknown postpartum, Trimester trimester,
@@ -279,7 +277,6 @@ public CaseExportDto(long id, long personId, long personAddressId, long epiDataI
279277
this.healthConditionsId = healthConditionsId;
280278
this.uuid = uuid;
281279
this.epidNumber = epidNumber;
282-
this.armedForcesRelationType = ArmedForcesRelationType;
283280
this.diseaseFormatted = DiseaseHelper.toString(disease, diseaseDetails);
284281
this.disease = disease;
285282
this.firstName = firstName;
@@ -330,7 +327,6 @@ public CaseExportDto(long id, long personId, long personAddressId, long epiDataI
330327
this.emailAddress = emailAddress;
331328
this.educationType = PersonHelper.buildEducationString(educationType, educationDetails);
332329
this.occupationType = PersonHelper.buildOccupationString(occupationType, occupationDetails);
333-
this.armedForcesRelationType = armedForcesRelationType;
334330
this.contactWithSourceCaseKnown = contactWithSourceCaseKnown;
335331
// this.onsetDate = onsetDate;
336332
this.vaccination = vaccination;
@@ -975,8 +971,8 @@ public String getPhone() {
975971

976972
@Order(75)
977973
@ExportTarget(caseExportTypes = {
978-
CaseExportType.CASE_SURVEILLANCE,
979-
CaseExportType.CASE_MANAGEMENT })
974+
CaseExportType.CASE_SURVEILLANCE,
975+
CaseExportType.CASE_MANAGEMENT })
980976
@ExportProperty(PersonDto.EMAIL_ADDRESS)
981977
@ExportGroup(ExportGroupType.SENSITIVE)
982978
public String getEmailAddress() {
@@ -1008,16 +1004,6 @@ public String getOccupationType() {
10081004
}
10091005

10101006
@Order(78)
1011-
@ExportTarget(caseExportTypes = {
1012-
CaseExportType.CASE_SURVEILLANCE,
1013-
CaseExportType.CASE_MANAGEMENT })
1014-
@ExportProperty(PersonDto.ARMED_FORCES_RELATION_TYPE)
1015-
@ExportGroup(ExportGroupType.PERSON)
1016-
public ArmedForcesRelationType getArmedForcesRelationType() {
1017-
return armedForcesRelationType;
1018-
}
1019-
1020-
@Order(79)
10211007
@ExportTarget(caseExportTypes = {
10221008
CaseExportType.CASE_SURVEILLANCE })
10231009
@ExportProperty(TRAVELED)
@@ -1030,7 +1016,7 @@ public void setTraveled(boolean traveled) {
10301016
this.traveled = traveled;
10311017
}
10321018

1033-
@Order(80)
1019+
@Order(79)
10341020
@ExportTarget(caseExportTypes = {
10351021
CaseExportType.CASE_SURVEILLANCE })
10361022
@ExportProperty(TRAVEL_HISTORY)
@@ -1039,7 +1025,7 @@ public String getTravelHistory() {
10391025
return travelHistory;
10401026
}
10411027

1042-
@Order(81)
1028+
@Order(80)
10431029
@ExportTarget(caseExportTypes = {
10441030
CaseExportType.CASE_SURVEILLANCE })
10451031
@ExportProperty(BURIAL_ATTENDED)
@@ -1052,7 +1038,7 @@ public void setBurialAttended(boolean burialAttended) {
10521038
this.burialAttended = burialAttended;
10531039
}
10541040

1055-
@Order(82)
1041+
@Order(81)
10561042
@ExportTarget(caseExportTypes = {
10571043
CaseExportType.CASE_SURVEILLANCE })
10581044
@ExportProperty(EpiDataDto.CONTACT_WITH_SOURCE_CASE_KNOWN)
@@ -1504,10 +1490,6 @@ public void setOccupationType(String occupationType) {
15041490
this.occupationType = occupationType;
15051491
}
15061492

1507-
public void setArmedForcesRelationType(ArmedForcesRelationType armedForcesRelationType) {
1508-
this.armedForcesRelationType = armedForcesRelationType;
1509-
}
1510-
15111493
public void setTravelHistory(String travelHistory) {
15121494
this.travelHistory = travelHistory;
15131495
}

‎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, long eventCount, 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;
@@ -530,31 +527,26 @@ public String getOccupationType() {
530527
}
531528

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

542-
@Order(63)
534+
@Order(62)
543535
public YesNoUnknown getLastCooperativeVisitSymptomatic() {
544536
return lastCooperativeVisitSymptomatic;
545537
}
546538

547-
@Order(64)
539+
@Order(63)
548540
public Date getLastCooperativeVisitDate() {
549541
return lastCooperativeVisitDate;
550542
}
551543

552-
@Order(65)
544+
@Order(64)
553545
public String getLastCooperativeVisitSymptoms() {
554546
return lastCooperativeVisitSymptoms;
555547
}
556548

557-
@Order(66)
549+
@Order(65)
558550
public boolean isTraveled() {
559551
return traveled;
560552
}
@@ -563,7 +555,7 @@ public void setTraveled(boolean traveled) {
563555
this.traveled = traveled;
564556
}
565557

566-
@Order(67)
558+
@Order(66)
567559
public String getTravelHistory() {
568560
return travelHistory;
569561
}
@@ -572,7 +564,7 @@ public void setTravelHistory(String travelHistory) {
572564
this.travelHistory = travelHistory;
573565
}
574566

575-
@Order(68)
567+
@Order(67)
576568
public boolean isBurialAttended() {
577569
return burialAttended;
578570
}
@@ -581,7 +573,7 @@ public void setBurialAttended(boolean burialAttended) {
581573
this.burialAttended = burialAttended;
582574
}
583575

584-
@Order(69)
576+
@Order(68)
585577
public YesNoUnknown getContactWithSourceCaseKnown() {
586578
return contactWithSourceCaseKnown;
587579
}
@@ -730,10 +722,6 @@ public void setOccupationType(String occupationType) {
730722
this.occupationType = occupationType;
731723
}
732724

733-
public void setArmedForcesRelationType(ArmedForcesRelationType armedForcesRelationType) {
734-
this.armedForcesRelationType = armedForcesRelationType;
735-
}
736-
737725
public void setLastCooperativeVisitSymptomatic(YesNoUnknown lastCooperativeVisitSymptomatic) {
738726
this.lastCooperativeVisitSymptomatic = lastCooperativeVisitSymptomatic;
739727
}

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

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1102,7 +1102,6 @@ public interface Captions {
11021102
String Person_approximateAge = "Person.approximateAge";
11031103
String Person_approximateAgeReferenceDate = "Person.approximateAgeReferenceDate";
11041104
String Person_approximateAgeType = "Person.approximateAgeType";
1105-
String Person_armedForcesRelationType = "Person.armedForcesRelationType";
11061105
String Person_birthdate = "Person.birthdate";
11071106
String Person_birthdateDD = "Person.birthdateDD";
11081107
String Person_birthdateMM = "Person.birthdateMM";

‎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";
@@ -256,9 +255,6 @@ public class PersonDto extends PseudonymizableDto {
256255
@SensitiveData
257256
private String occupationDetails;
258257
@SensitiveData
259-
@HideForCountriesExcept(countries = CountryHelper.COUNTRY_CODE_GERMANY)
260-
private ArmedForcesRelationType armedForcesRelationType;
261-
@SensitiveData
262258
private String generalPractitionerDetails;
263259
@SensitiveData
264260
private String passportNumber;
@@ -502,14 +498,6 @@ public void setOccupationDetails(String occupationDetails) {
502498
this.occupationDetails = occupationDetails;
503499
}
504500

505-
public ArmedForcesRelationType getArmedForcesRelationType() {
506-
return armedForcesRelationType;
507-
}
508-
509-
public void setArmedForcesRelationType(ArmedForcesRelationType armedForcesRelationType) {
510-
this.armedForcesRelationType = armedForcesRelationType;
511-
}
512-
513501
public String getMothersName() {
514502
return mothersName;
515503
}

‎sormas-api/src/main/java/de/symeda/sormas/api/utils/InfoProvider.java‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -49,7 +49,7 @@ public static synchronized InfoProvider get() {
4949
* @return
5050
*/
5151
public String getMinimumRequiredVersion() {
52-
return "1.53.0";
52+
return "1.52.0";
5353
}
5454

5555
/**

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

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1254,7 +1254,6 @@ Person.occupationFacilityType=Facility type
12541254
Person.occupationRegion=Facility region
12551255
Person.occupationType=Type of occupation
12561256
Person.other.occupationDetails=Please specify occupation
1257-
Person.armedForcesRelationType=Staff of armed forces
12581257
Person.phone=Phone number
12591258
Person.phoneOwner=Owner of phone
12601259
Person.placeOfBirthRegion=Region of birth

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

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1250,7 +1250,6 @@ Person.occupationFacilityType=Art der Einrichtung
12501250
Person.occupationRegion=Bundesland der Einrichtung
12511251
Person.occupationType=Beschäftigungsart
12521252
Person.other.occupationDetails=Bitte geben Sie Ihren Beruf an
1253-
Person.armedForcesRelationType=Zugehörigkeit zur Bundeswehr
12541253
Person.phone=Telefonnummer
12551254
Person.phoneOwner=Besitzer des Telefons
12561255
Person.placeOfBirthRegion=Geburt Bundesland

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

Lines changed: 0 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -93,11 +93,6 @@ AreaType.URBAN = Urban
9393
AreaType.RURAL = Rural
9494
AreaType.UNKNOWN = Unknown
9595

96-
ArmedForcesRelationType.UNKNOWN = Unknown
97-
ArmedForcesRelationType.NO_RELATION = No relation to armed forces
98-
ArmedForcesRelationType.CIVIL = Civil person working for/accomodated in facility of armed forces
99-
ArmedForcesRelationType.SOLDIER_OR_RELATIVE = Soldier, Relative
100-
10196
ArrivalOrDeparture.ARRIVAL = Arrival
10297
ArrivalOrDeparture.DEPARTURE = Departure
10398
ArrivalOrDeparture.UNKNOWN = Unknown

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

Lines changed: 0 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -93,11 +93,6 @@ AreaType.URBAN = Städtisch
9393
AreaType.RURAL = Ländlich
9494
AreaType.UNKNOWN = Unbekannt
9595

96-
ArmedForcesRelationType.UNKNOWN = Nicht ermittelbar
97-
ArmedForcesRelationType.NO_RELATION = Kein Bezug zur BW
98-
ArmedForcesRelationType.CIVIL = Zivilperson tätig/untergebracht in Einrichtung der BW
99-
ArmedForcesRelationType.SOLDIER_OR_RELATIVE = Soldat/BW-Angehöriger
100-
10196
ArrivalOrDeparture.ARRIVAL = Ankunft
10297
ArrivalOrDeparture.DEPARTURE = Abreise
10398
ArrivalOrDeparture.UNKNOWN = Unbekannt

0 commit comments

Comments
 (0)