SORMAS-Foundation#3411 add salutation to person

Author: lgal

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

@@ -1139,6 +1139,7 @@ public interface Captions {
 	String Person_occupationRegion = "Person.occupationRegion";
 	String Person_occupationType = "Person.occupationType";
 	String Person_other_occupationDetails = "Person.other.occupationDetails";
+	String Person_otherSalutation = "Person.otherSalutation";
 	String Person_passportNumber = "Person.passportNumber";
 	String Person_phone = "Person.phone";
 	String Person_phoneOwner = "Person.phoneOwner";
@@ -1149,6 +1150,7 @@ public interface Captions {
 	String Person_placeOfBirthFacilityType = "Person.placeOfBirthFacilityType";
 	String Person_placeOfBirthRegion = "Person.placeOfBirthRegion";
 	String Person_presentCondition = "Person.presentCondition";
+	String Person_salutation = "Person.salutation";
 	String Person_sex = "Person.sex";
 	String Person_symptomJournalStatus = "Person.symptomJournalStatus";
 	String Person_transporter_occupationDetails = "Person.transporter.occupationDetails";

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

@@ -51,6 +51,9 @@ public class PersonDto extends PseudonymizableDto {
 	public static final String FIRST_NAME = "firstName";
 	public static final String LAST_NAME = "lastName";
 
+	public static final String SALUTATION = "salutation";
+	public static final String OTHER_SALUTATION = "otherSalutation";
+
 	public static final String PRESENT_CONDITION = "presentCondition";
 	public static final String BIRTH_DATE = "birthdate";
 	public static final String BIRTH_DATE_DD = "birthdateDD";
@@ -121,6 +124,12 @@ public class PersonDto extends PseudonymizableDto {
 	private String lastName;
 	@PersonalData
 	@SensitiveData
+	private Salutation salutation;
+	@PersonalData
+	@SensitiveData
+	private String otherSalutation;
+	@PersonalData
+	@SensitiveData
 	private String nickname;
 	@PersonalData
 	@SensitiveData
@@ -466,6 +475,22 @@ public void setLastName(String lastName) {
 		this.lastName = lastName;
 	}
 
+	public Salutation getSalutation() {
+		return salutation;
+	}
+
+	public void setSalutation(Salutation salutation) {
+		this.salutation = salutation;
+	}
+
+	public String getOtherSalutation() {
+		return otherSalutation;
+	}
+
+	public void setOtherSalutation(String otherSalutation) {
+		this.otherSalutation = otherSalutation;
+	}
+
 	public EducationType getEducationType() {
 		return educationType;
 	}

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

@@ -0,0 +1,32 @@
+/*
+ * SORMAS® - Surveillance Outbreak Response Management & Analysis System
+ * Copyright © 2016-2020 Helmholtz-Zentrum für Infektionsforschung GmbH (HZI)
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see <https://www.gnu.org/licenses/>.
+ */
+
+package de.symeda.sormas.api.person;
+
+import de.symeda.sormas.api.i18n.I18nProperties;
+
+public enum Salutation {
+
+	MR,
+	MRS,
+	MR_AND_MRS,
+	FAMILY,
+	GUARDIAN_OF_MINOR,
+	OTHER;
+
+	public String toString() {
+		return I18nProperties.getEnumCaption(this);
+	}
+}

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

@@ -1269,6 +1269,8 @@ Person.hasCovidApp=Has COVID app
 Person.covidCodeDelivered=COVID code was generated and delivered
 Person.externalId=External ID
 Person.symptomJournalStatus=Symptom journal status
+Person.salutation=Salutation
+Person.otherSalutation=Other salutation
 
 pointOfEntryActivePointsOfEntry=Active points of entry
 pointOfEntryArchivedPointsOfEntry=Archived points of entry

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

@@ -1269,6 +1269,8 @@ Person.hasCovidApp=Hat COVID App
 Person.covidCodeDelivered=COVID Code wurde generiert und ausgeliefert
 Person.externalId=Externe ID
 Person.symptomJournalStatus=Symptomtagebuch-Status
+Person.salutation=Anrede
+Person.otherSalutation=Anderer Anrede
 
 pointOfEntryActivePointsOfEntry=Aktive Einreiseorte
 pointOfEntryArchivedPointsOfEntry=Archivierte Einreiseorte

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

@@ -1209,3 +1209,10 @@ EndOfQuarantineReason.ASYMPTOMATIC=Asymptomatic after 10 days
 EndOfQuarantineReason.ISOLATED_AS_CASE=Isolated as Case
 EndOfQuarantineReason.LOST_TO_FOLLOWUP=Lost to follow-up
 EndOfQuarantineReason.OTHER=Other
+
+Salutation.MR=dear Sir
+Salutation.MRS=dear Madame
+Salutation.MR_AND_MRS=dear Sir and Madame
+Salutation.FAMILY=dear family
+Salutation.GUARDIAN_OF_MINOR=dear guardian of the child
+Salutation.OTHER=Other

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

@@ -1209,3 +1209,10 @@ EndOfQuarantineReason.ASYMPTOMATIC=Asymptomatisch nach 10 Tagen
 EndOfQuarantineReason.ISOLATED_AS_CASE=Als Fall isoliert
 EndOfQuarantineReason.LOST_TO_FOLLOWUP=Keine Nachverfolgung möglich
 EndOfQuarantineReason.OTHER=Sonstiges
+
+Salutation.MR=Sehr geehrter Herr
+Salutation.MRS=Sehr geehrte Frau
+Salutation.MR_AND_MRS=Sehr geehrte Dame, sehr geehrter Herr
+Salutation.FAMILY=Sehr geehrte Familie
+Salutation.GUARDIAN_OF_MINOR=Sehr geehrte Erziehungsberechtigte des Kindes
+Salutation.OTHER=Sonstiges

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 = 248;
 
 	private static DatabaseHelper instance = null;
 
@@ -1774,7 +1774,13 @@ public void onUpgrade(SQLiteDatabase db, ConnectionSource connectionSource, int
 						+ "FROM tmp_epidata;");
 				getDao(EpiData.class).executeRaw("DROP TABLE tmp_epidata;");
 
-				// ATTENTION: break should only be done after last version
+				case 247:
+					currentVersion = 247;
+
+					getDao(Person.class).executeRaw("ALTER TABLE person ADD COLUMN salutation varchar(255)");
+					getDao(Person.class).executeRaw("ALTER TABLE person ADD COLUMN otherSalutation varchar(512)");
+
+					// ATTENTION: break should only be done after last version
 				break;
 			default:
 				throw new IllegalStateException("onUpgrade() with unknown oldVersion " + oldVersion);

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

@@ -41,6 +41,7 @@
 import de.symeda.sormas.api.person.EducationType;
 import de.symeda.sormas.api.person.OccupationType;
 import de.symeda.sormas.api.person.PresentCondition;
+import de.symeda.sormas.api.person.Salutation;
 import de.symeda.sormas.api.person.Sex;
 import de.symeda.sormas.app.backend.common.PseudonymizableAdo;
 import de.symeda.sormas.app.backend.facility.Facility;
@@ -73,6 +74,10 @@ public class Person extends PseudonymizableAdo {
 	private String firstName;
 	@Column(nullable = false)
 	private String lastName;
+	@Enumerated(EnumType.STRING)
+	private Salutation salutation;
+	@Column(length = COLUMN_LENGTH_DEFAULT)
+	private String otherSalutation;
 	@Column(length = COLUMN_LENGTH_DEFAULT)
 	private String nickname;
 	@Column(length = COLUMN_LENGTH_DEFAULT)
@@ -190,6 +195,22 @@ public void setLastName(String lastName) {
 		this.lastName = lastName;
 	}
 
+	public Salutation getSalutation() {
+		return salutation;
+	}
+
+	public void setSalutation(Salutation salutation) {
+		this.salutation = salutation;
+	}
+
+	public String getOtherSalutation() {
+		return otherSalutation;
+	}
+
+	public void setOtherSalutation(String otherSalutation) {
+		this.otherSalutation = otherSalutation;
+	}
+
 	public String getNickname() {
 		return nickname;
 	}

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

@@ -68,6 +68,8 @@ public void fillInnerFromDto(Person target, PersonDto source) {
 
 		target.setFirstName(source.getFirstName());
 		target.setLastName(source.getLastName());
+		target.setSalutation(source.getSalutation());
+		target.setOtherSalutation(source.getOtherSalutation());
 		target.setNickname(source.getNickname());
 		target.setMothersMaidenName(source.getMothersMaidenName());
 		target.setSex(source.getSex());
@@ -136,6 +138,8 @@ public void fillInnerFromAdo(PersonDto target, Person source) {
 
 		target.setFirstName(source.getFirstName());
 		target.setLastName(source.getLastName());
+		target.setSalutation(source.getSalutation());
+		target.setOtherSalutation(source.getOtherSalutation());
 		target.setNickname(source.getNickname());
 		target.setMothersMaidenName(source.getMothersMaidenName());
 		target.setSex(source.getSex());