Merge remote-tracking branch 'origin/development' into 3610_BAG-export-rest

Author: lgal

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

@@ -42,6 +42,7 @@
 import de.symeda.sormas.api.location.LocationDto;
 import de.symeda.sormas.api.person.ApproximateAgeType;
 import de.symeda.sormas.api.person.ApproximateAgeType.ApproximateAgeHelper;
+import de.symeda.sormas.api.person.ArmedForcesRelationType;
 import de.symeda.sormas.api.person.BurialConductor;
 import de.symeda.sormas.api.person.EducationType;
 import de.symeda.sormas.api.person.OccupationType;
@@ -185,6 +186,7 @@ public class CaseExportDto implements Serializable {
 	@SensitiveData
 	private String emailAddress;
 	private String occupationType;
+	private ArmedForcesRelationType armedForcesRelationType;
 	private String educationType;
 	private String travelHistory;
 	private boolean traveled;
@@ -260,7 +262,7 @@ public CaseExportDto(long id, long personId, long personAddressId, long epiDataI
 						 String addressRegion, String addressDistrict, String addressCommunity, String city, String street, String houseNumber, String additionalInformation, String postalCode,
 						 String facility, String facilityUuid, String facilityDetails,
 						 String phone, String phoneOwner, String emailAddress, EducationType educationType, String educationDetails,
-						 OccupationType occupationType, String occupationDetails, YesNoUnknown contactWithSourceCaseKnown,
+						 OccupationType occupationType, String occupationDetails, ArmedForcesRelationType ArmedForcesRelationType, YesNoUnknown contactWithSourceCaseKnown,
 						 //Date onsetDate,
 						 Vaccination vaccination, String vaccinationDoses, Date vaccinationDate,
 						 VaccinationInfoSource vaccinationInfoSource, YesNoUnknown postpartum, Trimester trimester,
@@ -277,6 +279,7 @@ public CaseExportDto(long id, long personId, long personAddressId, long epiDataI
 		this.healthConditionsId = healthConditionsId;
 		this.uuid = uuid;
 		this.epidNumber = epidNumber;
+		this.armedForcesRelationType = ArmedForcesRelationType;
 		this.diseaseFormatted = DiseaseHelper.toString(disease, diseaseDetails);
 		this.disease = disease;
 		this.firstName = firstName;
@@ -327,6 +330,7 @@ public CaseExportDto(long id, long personId, long personAddressId, long epiDataI
 		this.emailAddress = emailAddress;
 		this.educationType = PersonHelper.buildEducationString(educationType, educationDetails);
 		this.occupationType = PersonHelper.buildOccupationString(occupationType, occupationDetails);
+		this.armedForcesRelationType = armedForcesRelationType;
 		this.contactWithSourceCaseKnown = contactWithSourceCaseKnown;
 //		this.onsetDate = onsetDate;
 		this.vaccination = vaccination;
@@ -971,8 +975,8 @@ public String getPhone() {
 
 	@Order(75)
 	@ExportTarget(caseExportTypes = {
-			CaseExportType.CASE_SURVEILLANCE,
-			CaseExportType.CASE_MANAGEMENT })
+		CaseExportType.CASE_SURVEILLANCE,
+		CaseExportType.CASE_MANAGEMENT })
 	@ExportProperty(PersonDto.EMAIL_ADDRESS)
 	@ExportGroup(ExportGroupType.SENSITIVE)
 	public String getEmailAddress() {
@@ -1004,6 +1008,16 @@ public String getOccupationType() {
 	}
 
 	@Order(78)
+	@ExportTarget(caseExportTypes = {
+		CaseExportType.CASE_SURVEILLANCE,
+		CaseExportType.CASE_MANAGEMENT })
+	@ExportProperty(PersonDto.ARMED_FORCES_RELATION_TYPE)
+	@ExportGroup(ExportGroupType.PERSON)
+	public ArmedForcesRelationType getArmedForcesRelationType() {
+		return armedForcesRelationType;
+	}
+
+	@Order(79)
 	@ExportTarget(caseExportTypes = {
 		CaseExportType.CASE_SURVEILLANCE })
 	@ExportProperty(TRAVELED)
@@ -1016,7 +1030,7 @@ public void setTraveled(boolean traveled) {
 		this.traveled = traveled;
 	}
 
-	@Order(79)
+	@Order(80)
 	@ExportTarget(caseExportTypes = {
 		CaseExportType.CASE_SURVEILLANCE })
 	@ExportProperty(TRAVEL_HISTORY)
@@ -1025,7 +1039,7 @@ public String getTravelHistory() {
 		return travelHistory;
 	}
 
-	@Order(80)
+	@Order(81)
 	@ExportTarget(caseExportTypes = {
 		CaseExportType.CASE_SURVEILLANCE })
 	@ExportProperty(BURIAL_ATTENDED)
@@ -1038,7 +1052,7 @@ public void setBurialAttended(boolean burialAttended) {
 		this.burialAttended = burialAttended;
 	}
 
-	@Order(81)
+	@Order(82)
 	@ExportTarget(caseExportTypes = {
 		CaseExportType.CASE_SURVEILLANCE })
 	@ExportProperty(EpiDataDto.CONTACT_WITH_SOURCE_CASE_KNOWN)
@@ -1490,6 +1504,10 @@ public void setOccupationType(String occupationType) {
 		this.occupationType = occupationType;
 	}
 
+	public void setArmedForcesRelationType(ArmedForcesRelationType armedForcesRelationType) {
+		this.armedForcesRelationType = armedForcesRelationType;
+	}
+
 	public void setTravelHistory(String travelHistory) {
 		this.travelHistory = travelHistory;
 	}

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

@@ -28,6 +28,7 @@
 import de.symeda.sormas.api.facility.FacilityHelper;
 import de.symeda.sormas.api.person.ApproximateAgeType;
 import de.symeda.sormas.api.person.ApproximateAgeType.ApproximateAgeHelper;
+import de.symeda.sormas.api.person.ArmedForcesRelationType;
 import de.symeda.sormas.api.person.OccupationType;
 import de.symeda.sormas.api.person.PersonHelper;
 import de.symeda.sormas.api.person.PresentCondition;
@@ -104,6 +105,7 @@ public class ContactExportDto implements Serializable {
 	@SensitiveData
 	private String emailAddress;
 	private String occupationType;
+	private ArmedForcesRelationType armedForcesRelationType;
 	private int numberOfVisits;
 	private YesNoUnknown lastCooperativeVisitSymptomatic;
 	private Date lastCooperativeVisitDate;
@@ -154,7 +156,7 @@ public ContactExportDto(long id, long personId, String uuid, String sourceCaseUu
 							PresentCondition presentCondition, Date deathDate,
 							String addressRegion, String addressDistrict, String addressCommunity, String city, String street, String houseNumber, String additionalInformation, String postalCode,
 							String facility, String facilityUuid, String facilityDetails,
-							String phone, String phoneOwner, String emailAddress, OccupationType occupationType, String occupationDetails,
+							String phone, String phoneOwner, String emailAddress, OccupationType occupationType, String occupationDetails, ArmedForcesRelationType armedForcesRelationType,
 							String region, String district, String community,
 							long epiDataId, YesNoUnknown contactWithSourceCaseKnown, YesNoUnknown returningTraveler, long eventCount, String externalID,							
 							String reportingUserUuid, String regionUuid, String districtUuid, String communityUuid,
@@ -212,6 +214,7 @@ public ContactExportDto(long id, long personId, String uuid, String sourceCaseUu
 		this.phone = PersonHelper.buildPhoneString(phone, phoneOwner);
 		this.emailAddress = emailAddress;
 		this.occupationType = PersonHelper.buildOccupationString(occupationType, occupationDetails);
+		this.armedForcesRelationType = armedForcesRelationType;
 		this.region = region;
 		this.district = district;
 		this.community = community;
@@ -527,26 +530,31 @@ public String getOccupationType() {
 	}
 
 	@Order(61)
+	public ArmedForcesRelationType getArmedForcesRelationType() {
+		return armedForcesRelationType;
+	}
+
+	@Order(62)
 	public int getNumberOfVisits() {
 		return numberOfVisits;
 	}
 
-	@Order(62)
+	@Order(63)
 	public YesNoUnknown getLastCooperativeVisitSymptomatic() {
 		return lastCooperativeVisitSymptomatic;
 	}
 
-	@Order(63)
+	@Order(64)
 	public Date getLastCooperativeVisitDate() {
 		return lastCooperativeVisitDate;
 	}
 
-	@Order(64)
+	@Order(65)
 	public String getLastCooperativeVisitSymptoms() {
 		return lastCooperativeVisitSymptoms;
 	}
 
-	@Order(65)
+	@Order(66)
 	public boolean isTraveled() {
 		return traveled;
 	}
@@ -555,7 +563,7 @@ public void setTraveled(boolean traveled) {
 		this.traveled = traveled;
 	}
 
-	@Order(66)
+	@Order(67)
 	public String getTravelHistory() {
 		return travelHistory;
 	}
@@ -564,7 +572,7 @@ public void setTravelHistory(String travelHistory) {
 		this.travelHistory = travelHistory;
 	}
 
-	@Order(67)
+	@Order(68)
 	public boolean isBurialAttended() {
 		return burialAttended;
 	}
@@ -573,7 +581,7 @@ public void setBurialAttended(boolean burialAttended) {
 		this.burialAttended = burialAttended;
 	}
 
-	@Order(68)
+	@Order(69)
 	public YesNoUnknown getContactWithSourceCaseKnown() {
 		return contactWithSourceCaseKnown;
 	}
@@ -722,6 +730,10 @@ public void setOccupationType(String occupationType) {
 		this.occupationType = occupationType;
 	}
 
+	public void setArmedForcesRelationType(ArmedForcesRelationType armedForcesRelationType) {
+		this.armedForcesRelationType = armedForcesRelationType;
+	}
+
 	public void setLastCooperativeVisitSymptomatic(YesNoUnknown lastCooperativeVisitSymptomatic) {
 		this.lastCooperativeVisitSymptomatic = lastCooperativeVisitSymptomatic;
 	}

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

@@ -1102,6 +1102,7 @@ public interface Captions {
 	String Person_approximateAge = "Person.approximateAge";
 	String Person_approximateAgeReferenceDate = "Person.approximateAgeReferenceDate";
 	String Person_approximateAgeType = "Person.approximateAgeType";
+	String Person_armedForcesRelationType = "Person.armedForcesRelationType";
 	String Person_birthdate = "Person.birthdate";
 	String Person_birthdateDD = "Person.birthdateDD";
 	String Person_birthdateMM = "Person.birthdateMM";

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

@@ -0,0 +1,17 @@
+package de.symeda.sormas.api.person;
+
+import de.symeda.sormas.api.i18n.I18nProperties;
+
+public enum ArmedForcesRelationType {
+
+	UNKNOWN,
+	NO_RELATION,
+	// working for armed forces, but not as soldier
+	CIVIL,
+	SOLDIER_OR_RELATIVE;
+
+	public String toString() {
+		return I18nProperties.getEnumCaption(this);
+	}
+
+}

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

@@ -83,6 +83,7 @@ public class PersonDto extends PseudonymizableDto {
 	public static final String EDUCATION_DETAILS = "educationDetails";
 	public static final String OCCUPATION_TYPE = "occupationType";
 	public static final String OCCUPATION_DETAILS = "occupationDetails";
+	public static final String ARMED_FORCES_RELATION_TYPE = "armedForcesRelationType";
 
 	public static final String FATHERS_NAME = "fathersName";
 	public static final String MOTHERS_NAME = "mothersName";
@@ -255,6 +256,9 @@ public class PersonDto extends PseudonymizableDto {
 	@SensitiveData
 	private String occupationDetails;
 	@SensitiveData
+	@HideForCountriesExcept(countries = CountryHelper.COUNTRY_CODE_GERMANY)
+	private ArmedForcesRelationType armedForcesRelationType;
+	@SensitiveData
 	private String generalPractitionerDetails;
 	@SensitiveData
 	private String passportNumber;
@@ -498,6 +502,14 @@ public void setOccupationDetails(String occupationDetails) {
 		this.occupationDetails = occupationDetails;
 	}
 
+	public ArmedForcesRelationType getArmedForcesRelationType() {
+		return armedForcesRelationType;
+	}
+
+	public void setArmedForcesRelationType(ArmedForcesRelationType armedForcesRelationType) {
+		this.armedForcesRelationType = armedForcesRelationType;
+	}
+
 	public String getMothersName() {
 		return mothersName;
 	}

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

@@ -49,7 +49,7 @@ public static synchronized InfoProvider get() {
 	 * @return
 	 */
 	public String getMinimumRequiredVersion() {
-		return "1.52.0";
+		return "1.53.0";
 	}
 
 	/**

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

@@ -1254,6 +1254,7 @@ Person.occupationFacilityType=Facility type
 Person.occupationRegion=Facility region
 Person.occupationType=Type of occupation
 Person.other.occupationDetails=Please specify occupation
+Person.armedForcesRelationType=Staff of armed forces
 Person.phone=Phone number
 Person.phoneOwner=Owner of phone
 Person.placeOfBirthRegion=Region of birth

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

@@ -1250,6 +1250,7 @@ Person.occupationFacilityType=Art der Einrichtung
 Person.occupationRegion=Bundesland der Einrichtung
 Person.occupationType=Beschäftigungsart
 Person.other.occupationDetails=Bitte geben Sie Ihren Beruf an
+Person.armedForcesRelationType=Zugehörigkeit zur Bundeswehr
 Person.phone=Telefonnummer
 Person.phoneOwner=Besitzer des Telefons
 Person.placeOfBirthRegion=Geburt Bundesland

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

@@ -93,6 +93,11 @@ AreaType.URBAN = Urban
 AreaType.RURAL = Rural
 AreaType.UNKNOWN = Unknown
 
+ArmedForcesRelationType.UNKNOWN = Unknown
+ArmedForcesRelationType.NO_RELATION = No relation to armed forces
+ArmedForcesRelationType.CIVIL = Civil person working for/accomodated in facility of armed forces
+ArmedForcesRelationType.SOLDIER_OR_RELATIVE = Soldier, Relative
+
 ArrivalOrDeparture.ARRIVAL = Arrival
 ArrivalOrDeparture.DEPARTURE = Departure
 ArrivalOrDeparture.UNKNOWN = Unknown

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

@@ -93,6 +93,11 @@ AreaType.URBAN = Städtisch
 AreaType.RURAL = Ländlich
 AreaType.UNKNOWN = Unbekannt
 
+ArmedForcesRelationType.UNKNOWN = Nicht ermittelbar
+ArmedForcesRelationType.NO_RELATION = Kein Bezug zur BW
+ArmedForcesRelationType.CIVIL = Zivilperson tätig/untergebracht in Einrichtung der BW
+ArmedForcesRelationType.SOLDIER_OR_RELATIVE = Soldat/BW-Angehöriger
+
 ArrivalOrDeparture.ARRIVAL = Ankunft
 ArrivalOrDeparture.DEPARTURE = Abreise
 ArrivalOrDeparture.UNKNOWN = Unbekannt