SORMAS-Foundation#3418 Added ArmedForcesRelationType field to Person

FredrikSchäferVitagroup · FredrikSchäferVitagroup · commit 4c4eafc83f47 · 2020-11-27T10:53:01.000+01:00
diff --git a/sormas-api/src/main/java/de/symeda/sormas/api/caze/CaseExportDto.java b/sormas-api/src/main/java/de/symeda/sormas/api/caze/CaseExportDto.java
@@ -185,6 +185,7 @@ public class CaseExportDto implements Serializable {
 	@SensitiveData
 	private String emailAddress;
 	private String occupationType;
+	private String armedForcesRelationType;
 	private String educationType;
 	private String travelHistory;
 	private boolean traveled;
@@ -260,7 +261,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, String ArmedForcesRelationType, YesNoUnknown contactWithSourceCaseKnown,
 						 //Date onsetDate,
 						 Vaccination vaccination, String vaccinationDoses, Date vaccinationDate,
 						 VaccinationInfoSource vaccinationInfoSource, YesNoUnknown postpartum, Trimester trimester,
@@ -327,6 +328,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 +973,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 +1006,16 @@ public String getOccupationType() {
 	}
 
 	@Order(78)
+	@ExportTarget(caseExportTypes = {
+		CaseExportType.CASE_SURVEILLANCE,
+		CaseExportType.CASE_MANAGEMENT })
+	@ExportProperty(PersonDto.ARMED_FORCES_RELATION_TYPE)
+	@ExportGroup(ExportGroupType.PERSON)
+	public String getArmedForcesRelationType() {
+		return armedForcesRelationType;
+	}
+
+	@Order(79)
 	@ExportTarget(caseExportTypes = {
 		CaseExportType.CASE_SURVEILLANCE })
 	@ExportProperty(TRAVELED)
@@ -1016,7 +1028,7 @@ public void setTraveled(boolean traveled) {
 		this.traveled = traveled;
 	}
 
-	@Order(79)
+	@Order(80)
 	@ExportTarget(caseExportTypes = {
 		CaseExportType.CASE_SURVEILLANCE })
 	@ExportProperty(TRAVEL_HISTORY)
@@ -1025,7 +1037,7 @@ public String getTravelHistory() {
 		return travelHistory;
 	}
 
-	@Order(80)
+	@Order(81)
 	@ExportTarget(caseExportTypes = {
 		CaseExportType.CASE_SURVEILLANCE })
 	@ExportProperty(BURIAL_ATTENDED)
@@ -1038,7 +1050,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)
diff --git a/sormas-api/src/main/java/de/symeda/sormas/api/person/ArmedForcesRelationType.java b/sormas-api/src/main/java/de/symeda/sormas/api/person/ArmedForcesRelationType.java
@@ -0,0 +1,18 @@
+package de.symeda.sormas.api.person;
+
+import de.symeda.sormas.api.i18n.I18nProperties;
+
+public enum ArmedForcesRelationType {
+
+	NOT_COLLECTED,
+	UNKNOWN,
+	NO_RELATION,
+	// working for armed forces, but not as soldier
+	CIVIL,
+	SOLDIER_OR_RELATIVE;
+
+	public String toString() {
+		return I18nProperties.getEnumCaption(this);
+	}
+
+}
diff --git a/sormas-api/src/main/java/de/symeda/sormas/api/person/PersonDto.java b/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;
 	}
diff --git a/sormas-api/src/main/java/de/symeda/sormas/api/utils/InfoProvider.java b/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";
 	}
 
 	/**
diff --git a/sormas-api/src/main/resources/captions.properties b/sormas-api/src/main/resources/captions.properties
@@ -1249,6 +1249,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
diff --git a/sormas-api/src/main/resources/captions_de-DE.properties b/sormas-api/src/main/resources/captions_de-DE.properties
@@ -1249,6 +1249,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
diff --git a/sormas-api/src/main/resources/enum.properties b/sormas-api/src/main/resources/enum.properties
@@ -93,6 +93,12 @@ AreaType.URBAN = Urban
 AreaType.RURAL = Rural
 AreaType.UNKNOWN = Unknown
 
+ArmedForcesRelationType.NOT_COLLECTED = Data not collected
+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
diff --git a/sormas-api/src/main/resources/enum_de-DE.properties b/sormas-api/src/main/resources/enum_de-DE.properties
@@ -93,6 +93,12 @@ AreaType.URBAN = Städtisch
 AreaType.RURAL = Ländlich
 AreaType.UNKNOWN = Unbekannt
 
+ArmedForcesRelationType.NOT_COLLECTED = Nicht erhoben
+ArmedForcesRelationType.UNKNOWN = Nicht ermittelbar
+ArmedForcesRelationType.NO_RELATION = Kein Bezug zur BW
+ArmedForcesRelationType.CIVIL = Zivilperson tätig/untergebrach in Einrichtung der BW
+ArmedForcesRelationType.SOLDIER_OR_RELATIVE = Soldat/BW-Angehöriger
+
 ArrivalOrDeparture.ARRIVAL = Ankunft
 ArrivalOrDeparture.DEPARTURE = Abreise
 ArrivalOrDeparture.UNKNOWN = Unbekannt
diff --git a/sormas-backend/src/main/java/de/symeda/sormas/backend/person/Person.java b/sormas-backend/src/main/java/de/symeda/sormas/backend/person/Person.java
@@ -42,6 +42,7 @@
 import de.symeda.sormas.api.Disease;
 import de.symeda.sormas.api.facility.FacilityType;
 import de.symeda.sormas.api.person.ApproximateAgeType;
+import de.symeda.sormas.api.person.ArmedForcesRelationType;
 import de.symeda.sormas.api.person.BurialConductor;
 import de.symeda.sormas.api.person.CauseOfDeath;
 import de.symeda.sormas.api.person.DeathPlaceType;
@@ -94,6 +95,7 @@ public class Person extends AbstractDomainObject {
 	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 PHONE = "phone";
 	public static final String PHONE_OWNER = "phoneOwner";
 	public static final String FATHERS_NAME = "fathersName";
@@ -165,6 +167,7 @@ public class Person extends AbstractDomainObject {
 
 	private OccupationType occupationType;
 	private String occupationDetails;
+	private ArmedForcesRelationType armedForcesRelationType;
 	private String generalPractitionerDetails;
 	private String passportNumber;
 	private String nationalHealthId;
@@ -430,6 +433,15 @@ public void setOccupationDetails(String occupationDetails) {
 		this.occupationDetails = occupationDetails;
 	}
 
+	@Enumerated(EnumType.STRING)
+	public ArmedForcesRelationType getArmedForcesRelationType() {
+		return armedForcesRelationType;
+	}
+
+	public void setArmedForcesRelationType(ArmedForcesRelationType armedForcesRelationType) {
+		this.armedForcesRelationType = armedForcesRelationType;
+	}
+
 	@Column(length = COLUMN_LENGTH_DEFAULT)
 	public String getMothersName() {
 		return mothersName;
@@ -664,4 +676,5 @@ public Set<Contact> getContacts() {
 	public String toString() {
 		return PersonDto.buildCaption(firstName, lastName);
 	}
+
 }
diff --git a/sormas-backend/src/main/java/de/symeda/sormas/backend/person/PersonFacadeEjb.java b/sormas-backend/src/main/java/de/symeda/sormas/backend/person/PersonFacadeEjb.java
@@ -547,6 +547,7 @@ public Person fillOrBuildEntity(@NotNull PersonDto source, Person target) {
 
 		target.setOccupationType(source.getOccupationType());
 		target.setOccupationDetails(source.getOccupationDetails());
+		target.setArmedForcesRelationType(source.getArmedForcesRelationType());
 
 		target.setMothersName(source.getMothersName());
 		target.setFathersName(source.getFathersName());
@@ -705,6 +706,7 @@ public static PersonDto toDto(Person source) {
 
 		target.setOccupationType(source.getOccupationType());
 		target.setOccupationDetails(source.getOccupationDetails());
+		target.setArmedForcesRelationType(source.getArmedForcesRelationType());
 
 		target.setMothersName(source.getMothersName());
 		target.setFathersName(source.getFathersName());
diff --git a/sormas-backend/src/main/resources/sql/sormas_schema.sql b/sormas-backend/src/main/resources/sql/sormas_schema.sql
@@ -5886,4 +5886,11 @@ INSERT INTO schema_version (version_number, comment) VALUES (280, 'Epi data migr
 -- 2020-10-21 Set contact with source case known for all existing cases #2946
 UPDATE epidata SET contactwithsourcecaseknown = 'YES' FROM cases WHERE cases.epidata_id = epidata.id AND (SELECT COUNT(id) FROM contact WHERE contact.resultingcase_id = cases.id) > 0;
 
-INSERT INTO schema_version (version_number, comment) VALUES (281, 'Set contact with source case known for all existing cases #2946');-- *** Insert new sql commands BEFORE this line ***
+INSERT INTO schema_version (version_number, comment) VALUES (281, 'Set contact with source case known for all existing cases #2946');
+
+ALTER TABLE person ADD COLUMN armedforcesrelationtype varchar(255);
+ALTER TABLE person_history ADD COLUMN armedforcesrelationtype varchar(255);
+
+INSERT INTO schema_version (version_number, comment) VALUES (282, 'Add column armedforcesrelationtype #3418');
+
+-- *** Insert new sql commands BEFORE this line ***
diff --git a/sormas-ui/src/main/java/de/symeda/sormas/ui/person/PersonEditForm.java b/sormas-ui/src/main/java/de/symeda/sormas/ui/person/PersonEditForm.java
@@ -145,7 +145,8 @@ public class PersonEditForm extends AbstractEditForm<PersonDto> {
 
                     loc(OCCUPATION_HEADER) +
                     divsCss(VSPACE_3,
-                            fluidRowLocs(PersonDto.OCCUPATION_TYPE, PersonDto.OCCUPATION_DETAILS),
+                            fluidRowLocs(PersonDto.OCCUPATION_TYPE, PersonDto.OCCUPATION_DETAILS) +
+                            fluidRow(oneOfTwoCol(PersonDto.ARMED_FORCES_RELATION_TYPE)),
                             fluidRowLocs(PersonDto.EDUCATION_TYPE, PersonDto.EDUCATION_DETAILS)
                     ) +
 
@@ -254,17 +255,15 @@ protected void addFields() {
 		addFields(
 			PersonDto.OCCUPATION_TYPE,
 			PersonDto.OCCUPATION_DETAILS,
+			PersonDto.ARMED_FORCES_RELATION_TYPE,
 			PersonDto.EDUCATION_TYPE,
 			PersonDto.EDUCATION_DETAILS);
 
 		TextField phoneNumber = addField(PersonDto.PHONE, TextField.class);
 		addField(PersonDto.PHONE_OWNER, TextField.class);
 		TextField emailAddress = addField(PersonDto.EMAIL_ADDRESS, TextField.class);
 
-		addFields(
-			PersonDto.PASSPORT_NUMBER,
-			PersonDto.NATIONAL_HEALTH_ID,
-			PersonDto.EXTERNAL_ID);
+		addFields(PersonDto.PASSPORT_NUMBER, PersonDto.NATIONAL_HEALTH_ID, PersonDto.EXTERNAL_ID);
 
 		addField(PersonDto.HAS_COVID_APP).addStyleName(CssStyles.FORCE_CAPTION_CHECKBOX);
 		addField(PersonDto.COVID_CODE_DELIVERED).addStyleName(CssStyles.FORCE_CAPTION_CHECKBOX);
@@ -327,7 +326,9 @@ protected void addFields() {
 		initializeVisibilitiesAndAllowedVisibilities();
 		initializeAccessAndAllowedAccesses();
 
-		if (!getField(PersonDto.OCCUPATION_TYPE).isVisible() && !getField(PersonDto.EDUCATION_TYPE).isVisible())
+		if (!getField(PersonDto.OCCUPATION_TYPE).isVisible()
+			&& !getField(PersonDto.ARMED_FORCES_RELATION_TYPE).isVisible()
+			&& !getField(PersonDto.EDUCATION_TYPE).isVisible())
 			occupationHeader.setVisible(false);
 		if (!getField(PersonDto.ADDRESS).isVisible())
 			addressHeader.setVisible(false);
@@ -409,13 +410,9 @@ protected void addFields() {
 				false,
 				I18nProperties.getValidationError(Validations.afterDate, burialDate.getCaption(), deathDate.getCaption())));
 
-		phoneNumber.addValidator(
-			new PhoneNumberValidator(
-				I18nProperties.getValidationError(Validations.validPhoneNumber, phoneNumber.getCaption())));
+		phoneNumber.addValidator(new PhoneNumberValidator(I18nProperties.getValidationError(Validations.validPhoneNumber, phoneNumber.getCaption())));
 
-		emailAddress.addValidator(
-			new EmailValidator(
-				I18nProperties.getValidationError(Validations.validEmailAddress, emailAddress.getCaption())));
+		emailAddress.addValidator(new EmailValidator(I18nProperties.getValidationError(Validations.validEmailAddress, emailAddress.getCaption())));
 
 		// Update the list of days according to the selected month and year
 		birthDateYear.addValueChangeListener(e -> {

Original file line number	Diff line number	Diff line change
`@@ -49,7 +49,7 @@ public static synchronized InfoProvider get() {`
`49`	`49`	`* @return`
`50`	`50`	`*/`
`51`	`51`	`public String getMinimumRequiredVersion() {`
`52`		`- return "1.52.0";`
	`52`	`+ return "1.53.0";`
`53`	`53`	`}`
`54`	`54`
`55`	`55`	`/**`