SORMAS-Foundation#3413 rename names of other guardians field in the mobile app

Author: lgal

sormas-app/app/src/main/java/de/symeda/sormas/app/backend/common/DatabaseHelper.java

@@ -1794,7 +1794,7 @@ public void onUpgrade(SQLiteDatabase db, ConnectionSource connectionSource, int
 			case 250:
 				currentVersion = 248;
 
-				getDao(Person.class).executeRaw("ALTER TABLE person ADD column nameOfOtherGuardians varchar(512);");
+				getDao(Person.class).executeRaw("ALTER TABLE person ADD column namesOfOtherGuardians varchar(512);");
 
 				// ATTENTION: break should only be done after last version
 				break;

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

@@ -83,7 +83,7 @@ public class Person extends PseudonymizableAdo {
 	@Column(length = COLUMN_LENGTH_DEFAULT)
 	private String fathersName;
 	@Column(length = COLUMN_LENGTH_DEFAULT)
-	private String nameOfOtherGuardians;
+	private String namesOfOtherGuardians;
 	@Column
 	private Integer birthdateDD;
 	@Column
@@ -441,12 +441,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 Region getPlaceOfBirthRegion() {

sormas-app/app/src/main/java/de/symeda/sormas/app/backend/person/PersonDtoHelper.java

@@ -103,7 +103,7 @@ public void fillInnerFromDto(Person target, PersonDto source) {
 		target.setCauseOfDeathDetails(source.getCauseOfDeathDetails());
 		target.setMothersName(source.getMothersName());
 		target.setFathersName(source.getFathersName());
-		target.setNameOfOtherGuardians(source.getNameOfOtherGuardians());
+		target.setNamesOfOtherGuardians(source.getNamesOfOtherGuardians());
 		target.setPlaceOfBirthRegion(DatabaseHelper.getRegionDao().getByReferenceDto(source.getPlaceOfBirthRegion()));
 		target.setPlaceOfBirthDistrict(DatabaseHelper.getDistrictDao().getByReferenceDto(source.getPlaceOfBirthDistrict()));
 		target.setPlaceOfBirthCommunity(DatabaseHelper.getCommunityDao().getByReferenceDto(source.getPlaceOfBirthCommunity()));
@@ -174,7 +174,7 @@ public void fillInnerFromAdo(PersonDto target, Person source) {
 
 		target.setMothersName(source.getMothersName());
 		target.setFathersName(source.getFathersName());
-		target.setNameOfOtherGuardians(source.getNameOfOtherGuardians());
+		target.setNamesOfOtherGuardians(source.getNamesOfOtherGuardians());
 
 		if (source.getPlaceOfBirthRegion() != null) {
 			target.setPlaceOfBirthRegion(

sormas-app/app/src/main/res/layout/fragment_person_edit_layout.xml

@@ -484,17 +484,17 @@
 
                 <de.symeda.sormas.app.component.controls.ControlTextEditField
                     android:id="@+id/person_fathersName"
-                    android:nextFocusForward="@+id/person_nameOfOtherGuardians"
+                    android:nextFocusForward="@+id/person_namesOfOtherGuardians"
                     app:value="@={data.fathersName}"
                     app:imeOptions="actionNext"
                     style="@style/ControlSecondOfTwoColumnsStyle" />
 
             </LinearLayout>
 
             <de.symeda.sormas.app.component.controls.ControlTextEditField
-                android:id="@+id/person_nameOfOtherGuardians"
+                android:id="@+id/person_namesOfOtherGuardians"
                 android:nextFocusForward="@+id/person_phone"
-                app:value="@={data.nameOfOtherGuardians}"
+                app:value="@={data.namesOfOtherGuardians}"
                 app:imeOptions="actionNext"
                 style="@style/ControlSingleColumnStyle" />
 

sormas-app/app/src/main/res/layout/fragment_person_read_layout.xml

@@ -371,8 +371,8 @@
             </LinearLayout>
 
             <de.symeda.sormas.app.component.controls.ControlTextReadField
-                android:id="@+id/person_nameOfOtherGuardians"
-                app:value="@{data.nameOfOtherGuardians}"
+                android:id="@+id/person_namesOfOtherGuardians"
+                app:value="@{data.namesOfOtherGuardians}"
                 style="@style/ControlSingleColumnStyle" />
 
             <LinearLayout