SORMAS-Foundation#3418 Added new field to App

Author: FredrikSchäferVitagroup

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

@@ -96,7 +96,7 @@ 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.CIVIL = Zivilperson tätig/untergebracht in Einrichtung der BW
 ArmedForcesRelationType.SOLDIER_OR_RELATIVE = Soldat/BW-Angehöriger
 
 ArrivalOrDeparture.ARRIVAL = Ankunft

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

@@ -152,7 +152,7 @@ public class DatabaseHelper extends OrmLiteSqliteOpenHelper {
 	public static final String DATABASE_NAME = "sormas.db";
 	// any time you make changes to your database objects, you may have to increase the database version
 
-	public static final int DATABASE_VERSION = 247;
+	public static final int DATABASE_VERSION = 249;
 
 	private static DatabaseHelper instance = null;
 
@@ -1778,6 +1778,10 @@ public void onUpgrade(SQLiteDatabase db, ConnectionSource connectionSource, int
 
 				getDao(Contact.class).executeRaw("ALTER TABLE contacts ADD column multidaycontact boolean default false;");
 				getDao(Contact.class).executeRaw("ALTER TABLE contacts ADD column firstcontactdate timestamp;");
+			case 248:
+				currentVersion = 248;
+
+				getDao(Person.class).executeRaw("ALTER TABLE person ADD COLUMN armedForcesRelationType varchar(255);");
 
 				// ATTENTION: break should only be done after last version
 				break;

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

@@ -35,6 +35,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;
@@ -156,6 +157,8 @@ public class Person extends PseudonymizableAdo {
 	private OccupationType occupationType;
 	@Column(length = COLUMN_LENGTH_DEFAULT)
 	private String occupationDetails;
+	@Enumerated
+	private ArmedForcesRelationType armedForcesRelationType;
 
 	@Column(length = COLUMN_LENGTH_DEFAULT)
 	private String generalPractitionerDetails;
@@ -352,6 +355,14 @@ public void setOccupationDetails(String occupationDetails) {
 		this.occupationDetails = occupationDetails;
 	}
 
+	public ArmedForcesRelationType getArmedForcesRelationType() {
+		return armedForcesRelationType;
+	}
+
+	public void setArmedForcesRelationType(ArmedForcesRelationType armedForcesRelationType) {
+		this.armedForcesRelationType = armedForcesRelationType;
+	}
+
 	public CauseOfDeath getCauseOfDeath() {
 		return causeOfDeath;
 	}
@@ -532,7 +543,12 @@ public void setAddresses(List<Location> addresses) {
 		this.addresses = addresses;
 	}
 
-	public String getExternalId() { return externalId; }
+	public String getExternalId() {
+		return externalId;
+	}
+
+	public void setExternalId(String externalId) {
+		this.externalId = externalId;
+	}
 
-	public void setExternalId(String externalId) { this.externalId = externalId; }
 }

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

@@ -92,6 +92,7 @@ public void fillInnerFromDto(Person target, PersonDto source) {
 
 		target.setOccupationType(source.getOccupationType());
 		target.setOccupationDetails(source.getOccupationDetails());
+		target.setArmedForcesRelationType(source.getArmedForcesRelationType());
 		target.setDeathPlaceType(source.getDeathPlaceType());
 		target.setDeathPlaceDescription(source.getDeathPlaceDescription());
 		target.setBurialDate(source.getBurialDate());
@@ -168,6 +169,7 @@ public void fillInnerFromAdo(PersonDto target, Person source) {
 
 		target.setOccupationType(source.getOccupationType());
 		target.setOccupationDetails(source.getOccupationDetails());
+		target.setArmedForcesRelationType(source.getArmedForcesRelationType());
 
 		target.setMothersName(source.getMothersName());
 		target.setFathersName(source.getFathersName());

sormas-app/app/src/main/java/de/symeda/sormas/app/person/edit/PersonEditFragment.java

@@ -36,6 +36,7 @@
 import de.symeda.sormas.api.i18n.I18nProperties;
 import de.symeda.sormas.api.location.LocationDto;
 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;
@@ -189,6 +190,7 @@ public static void setUpLayoutBinding(
 		contentBinding.personDeathPlaceType.initializeSpinner(deathPlaceTypeList);
 		contentBinding.personBurialConductor.initializeSpinner(burialConductorList);
 		contentBinding.personOccupationType.initializeSpinner(DataUtils.getEnumItems(OccupationType.class, true, countryVisibilityChecker));
+		contentBinding.personArmedForcesRelationType.initializeSpinner(DataUtils.getEnumItems(ArmedForcesRelationType.class, true));
 		contentBinding.personEducationType.initializeSpinner(DataUtils.getEnumItems(EducationType.class, true));
 		contentBinding.personPresentCondition.initializeSpinner(DataUtils.getEnumItems(PresentCondition.class, true));
 

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

@@ -27,6 +27,7 @@
     <data>
         <import type="de.symeda.sormas.api.person.PresentCondition" />
         <import type="de.symeda.sormas.api.person.OccupationType" />
+        <import type="de.symeda.sormas.api.person.ArmedForcesRelationType" />
         <import type="de.symeda.sormas.api.person.EducationType" />
         <import type="de.symeda.sormas.api.person.CauseOfDeath" />
         <import type="de.symeda.sormas.api.utils.YesNoUnknown" />
@@ -434,6 +435,19 @@
 
             </LinearLayout>
 
+
+        <LinearLayout
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:orientation="horizontal">
+
+                <de.symeda.sormas.app.component.controls.ControlSpinnerField
+                    android:id="@+id/person_armedForcesRelationType"
+                    app:value="@={data.armedForcesRelationType}"
+                    style="@style/ControlSingleColumnStyle" />
+
+        </LinearLayout>
+
             <ImageView style="@style/FullHorizontalDividerStyle"/>
 
             <LinearLayout

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

@@ -329,6 +329,11 @@
                 app:valueFormat="@string/two_strings_with_hyphen_format"
                 style="@style/ControlSingleColumnStyle" />
 
+            <de.symeda.sormas.app.component.controls.ControlTextReadField
+                android:id="@+id/person_armedForcesRelationType"
+                app:value="@{data.armedForcesRelationType}"
+                style="@style/ControlSingleColumnStyle" />
+
             <ImageView style="@style/FullHorizontalDividerStyle"/>
 
             <LinearLayout