SORMAS-Foundation#3413 rename nameOfOtherGuardians to namesOfOtherGuardians

Author: lgal

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

@@ -1133,7 +1133,7 @@ public interface Captions {
 	String Person_matchingCase = "Person.matchingCase";
 	String Person_mothersMaidenName = "Person.mothersMaidenName";
 	String Person_mothersName = "Person.mothersName";
-	String Person_nameOfOtherGuardians = "Person.nameOfOtherGuardians";
+	String Person_namesOfOtherGuardians = "Person.namesOfOtherGuardians";
 	String Person_nationalHealthId = "Person.nationalHealthId";
 	String Person_nickname = "Person.nickname";
 	String Person_occupationCommunity = "Person.occupationCommunity";

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

@@ -86,7 +86,7 @@ public class PersonDto extends PseudonymizableDto {
 
 	public static final String FATHERS_NAME = "fathersName";
 	public static final String MOTHERS_NAME = "mothersName";
-	public static final String NAME_OF_OTHER_GUARDIANS = "nameOfOtherGuardians";
+	public static final String NAMES_OF_OTHER_GUARDIANS = "namesOfOtherGuardians";
 	public static final String PLACE_OF_BIRTH_REGION = "placeOfBirthRegion";
 	public static final String PLACE_OF_BIRTH_DISTRICT = "placeOfBirthDistrict";
 	public static final String PLACE_OF_BIRTH_COMMUNITY = "placeOfBirthCommunity";
@@ -135,7 +135,7 @@ public class PersonDto extends PseudonymizableDto {
 	@PersonalData
 	@SensitiveData
 	@HideForCountriesExcept
-	private String nameOfOtherGuardians;
+	private String namesOfOtherGuardians;
 	@Outbreaks
 	private Sex sex;
 	@Outbreaks
@@ -519,12 +519,12 @@ public void setFathersName(String fathersName) {
 		this.fathersName = fathersName;
 	}
 
-	public String getNameOfOtherGuardians() {
-		return nameOfOtherGuardians;
+	public String getNamesOfOtherGuardians() {
+		return namesOfOtherGuardians;
 	}
 
-	public void setNameOfOtherGuardians(String nameOfOtherGuardians) {
-		this.nameOfOtherGuardians = nameOfOtherGuardians;
+	public void setNamesOfOtherGuardians(String namesOfOtherGuardians) {
+		this.namesOfOtherGuardians = namesOfOtherGuardians;
 	}
 
 	public RegionReferenceDto getPlaceOfBirthRegion() {

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

@@ -1238,7 +1238,7 @@ Person.districtName=District
 Person.educationType=Education
 Person.educationDetails=Details
 Person.fathersName=Father's name
-Person.nameOfOtherGuardians=Name of other guardians
+Person.namesOfOtherGuardians=Names of other guardians
 Person.gestationAgeAtBirth=Gestation age at birth (weeks)
 Person.healthcare.occupationDetails=Position
 Person.lastDisease=Last disease

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

@@ -1234,7 +1234,7 @@ Person.districtName=Landkreis/Kreisfreie Stadt
 Person.educationType=Bildung
 Person.educationDetails=Details
 Person.fathersName=Name des Vaters
-Person.nameOfOtherGuardians=Andere/r Erziehungsberechtigte/r
+Person.namesOfOtherGuardians=Andere/r Erziehungsberechtigte/r
 Person.gestationAgeAtBirth=Gestationsalter bei der Geburt (Wochen)
 Person.healthcare.occupationDetails=Position
 Person.lastDisease=Letzte Krankheit

sormas-backend/src/main/java/de/symeda/sormas/backend/person/Person.java

@@ -126,7 +126,7 @@ public class Person extends AbstractDomainObject {
 	private String mothersName;
 	private String mothersMaidenName;
 	private String fathersName;
-	private String nameOfOtherGuardians;
+	private String namesOfOtherGuardians;
 
 	private Integer approximateAge;
 	private ApproximateAgeType approximateAgeType;
@@ -450,12 +450,12 @@ public void setFathersName(String fathersName) {
 	}
 
 	@Column(length = COLUMN_LENGTH_DEFAULT)
-	public String getNameOfOtherGuardians() {
-		return nameOfOtherGuardians;
+	public String getNamesOfOtherGuardians() {
+		return namesOfOtherGuardians;
 	}
 
-	public void setNameOfOtherGuardians(String otherGuardiansName) {
-		this.nameOfOtherGuardians = otherGuardiansName;
+	public void setNamesOfOtherGuardians(String namesOfOtherGuardians) {
+		this.namesOfOtherGuardians = namesOfOtherGuardians;
 	}
 
 	@ManyToOne(cascade = {})

sormas-backend/src/main/java/de/symeda/sormas/backend/person/PersonFacadeEjb.java

@@ -549,7 +549,7 @@ public Person fillOrBuildEntity(@NotNull PersonDto source, Person target) {
 
 		target.setMothersName(source.getMothersName());
 		target.setFathersName(source.getFathersName());
-		target.setNameOfOtherGuardians(source.getNameOfOtherGuardians());
+		target.setNamesOfOtherGuardians(source.getNamesOfOtherGuardians());
 		target.setPlaceOfBirthRegion(regionService.getByReferenceDto(source.getPlaceOfBirthRegion()));
 		target.setPlaceOfBirthDistrict(districtService.getByReferenceDto(source.getPlaceOfBirthDistrict()));
 		target.setPlaceOfBirthCommunity(communityService.getByReferenceDto(source.getPlaceOfBirthCommunity()));
@@ -708,7 +708,7 @@ public static PersonDto toDto(Person source) {
 
 		target.setMothersName(source.getMothersName());
 		target.setFathersName(source.getFathersName());
-		target.setNameOfOtherGuardians(source.getNameOfOtherGuardians());
+		target.setNamesOfOtherGuardians(source.getNamesOfOtherGuardians());
 		target.setPlaceOfBirthRegion(RegionFacadeEjb.toReferenceDto(source.getPlaceOfBirthRegion()));
 		target.setPlaceOfBirthDistrict(DistrictFacadeEjb.toReferenceDto(source.getPlaceOfBirthDistrict()));
 		target.setPlaceOfBirthCommunity(CommunityFacadeEjb.toReferenceDto(source.getPlaceOfBirthCommunity()));

sormas-backend/src/main/resources/sql/sormas_schema.sql

@@ -5896,10 +5896,10 @@ INSERT INTO schema_version (version_number, comment) VALUES (282, 'Add date of f
 
 -- 2020-12-03 SurvNet Adaptations - Create new field “name of guardians” for persons #3413
 ALTER TABLE person
-    ADD COLUMN nameOfOtherGuardians varchar(512);
+    ADD COLUMN namesOfOtherGuardians varchar(512);
 
 ALTER TABLE person_history
-    ADD COLUMN nameOfOtherGuardians varchar(512);
+    ADD COLUMN namesOfOtherGuardians varchar(512);
 
 INSERT INTO schema_version (version_number, comment) VALUES (283, 'SurvNet Adaptations - Create new field “name of guardians” for persons #3413');
 

sormas-ui/src/main/java/de/symeda/sormas/ui/person/PersonEditForm.java

@@ -160,7 +160,7 @@ public class PersonEditForm extends AbstractEditForm<PersonDto> {
                             VSPACE_3,
                             fluidRowLocs(PersonDto.NICKNAME, PersonDto.MOTHERS_MAIDEN_NAME) +
                                     fluidRowLocs(PersonDto.MOTHERS_NAME, PersonDto.FATHERS_NAME) +
-                                    fluidRowLocs(PersonDto.NAME_OF_OTHER_GUARDIANS) +
+                                    fluidRowLocs(PersonDto.NAMES_OF_OTHER_GUARDIANS) +
                                     fluidRowLocs(PersonDto.PHONE, PersonDto.PHONE_OWNER) +
                                     fluidRowLocs(PersonDto.EMAIL_ADDRESS, "") +
                                     loc(PersonDto.GENERAL_PRACTITIONER_DETAILS));
@@ -204,7 +204,7 @@ protected void addFields() {
 		addField(PersonDto.NICKNAME, TextField.class);
 		addField(PersonDto.MOTHERS_MAIDEN_NAME, TextField.class);
 		addFields(PersonDto.MOTHERS_NAME, PersonDto.FATHERS_NAME);
-		addFields(PersonDto.NAME_OF_OTHER_GUARDIANS);
+		addFields(PersonDto.NAMES_OF_OTHER_GUARDIANS);
 		ComboBox presentCondition = addField(PersonDto.PRESENT_CONDITION, ComboBox.class);
 		birthDateDay = addField(PersonDto.BIRTH_DATE_DD, ComboBox.class);
 		// @TODO: Done for nullselection Bug, fixed in Vaadin 7.7.3