SORMAS-Foundation#3418 Added new field to export

Author: FredrikSchäferVitagroup

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,7 +186,7 @@ public class CaseExportDto implements Serializable {
 	@SensitiveData
 	private String emailAddress;
 	private String occupationType;
-	private String armedForcesRelationType;
+	private ArmedForcesRelationType armedForcesRelationType;
 	private String educationType;
 	private String travelHistory;
 	private boolean traveled;
@@ -261,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, String ArmedForcesRelationType, YesNoUnknown contactWithSourceCaseKnown,
+						 OccupationType occupationType, String occupationDetails, ArmedForcesRelationType ArmedForcesRelationType, YesNoUnknown contactWithSourceCaseKnown,
 						 //Date onsetDate,
 						 Vaccination vaccination, String vaccinationDoses, Date vaccinationDate,
 						 VaccinationInfoSource vaccinationInfoSource, YesNoUnknown postpartum, Trimester trimester,
@@ -278,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;
@@ -1011,7 +1013,7 @@ public String getOccupationType() {
 		CaseExportType.CASE_MANAGEMENT })
 	@ExportProperty(PersonDto.ARMED_FORCES_RELATION_TYPE)
 	@ExportGroup(ExportGroupType.PERSON)
-	public String getArmedForcesRelationType() {
+	public ArmedForcesRelationType getArmedForcesRelationType() {
 		return armedForcesRelationType;
 	}
 
@@ -1502,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

@@ -1097,6 +1097,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-backend/src/main/java/de/symeda/sormas/backend/caze/CaseFacadeEjb.java

@@ -568,7 +568,7 @@ public List<CaseExportDto> getExportList(
 				joins.getPerson().get(Person.EMAIL_ADDRESS),
 				joins.getPerson().get(Person.EDUCATION_TYPE),
 				joins.getPerson().get(Person.EDUCATION_DETAILS), joins.getPerson().get(Person.OCCUPATION_TYPE),
-				joins.getPerson().get(Person.OCCUPATION_DETAILS), joins.getEpiData().get(EpiData.CONTACT_WITH_SOURCE_CASE_KNOWN), 
+				joins.getPerson().get(Person.OCCUPATION_DETAILS), joins.getPerson().get(Person.ARMED_FORCES_RELATION_TYPE), joins.getEpiData().get(EpiData.CONTACT_WITH_SOURCE_CASE_KNOWN), 
 				caseRoot.get(Case.VACCINATION), caseRoot.get(Case.VACCINATION_DOSES), caseRoot.get(Case.VACCINATION_DATE), 
 				caseRoot.get(Case.VACCINATION_INFO_SOURCE), caseRoot.get(Case.POSTPARTUM), caseRoot.get(Case.TRIMESTER),
 				eventCountSq,

sormas-backend/src/main/java/de/symeda/sormas/backend/contact/ContactFacadeEjb.java

@@ -485,6 +485,7 @@ public List<ContactExportDto> getExportList(ContactCriteria contactCriteria, int
 					joins.getPerson().get(Person.EMAIL_ADDRESS),
 					joins.getPerson().get(Person.OCCUPATION_TYPE),
 					joins.getPerson().get(Person.OCCUPATION_DETAILS),
+					joins.getPerson().get(Person.ARMED_FORCES_RELATION_TYPE),
 					joins.getRegion().get(Region.NAME),
 					joins.getDistrict().get(District.NAME),
 					joins.getCommunity().get(Community.NAME),