Merge branch 'development' into feature-3418-SurvNet-Adaptations-Create-new-field-“staff-of-armed-forces”-to-case-person-and-contact-person

# Conflicts:
#	sormas-backend/src/main/resources/sql/sormas_schema.sql

Author: FredrikSchäferVitagroup

sormas-api/src/main/java/de/symeda/sormas/api/contact/ContactDto.java

@@ -55,6 +55,8 @@ public class ContactDto extends PseudonymizableDto {
 	public static final String CAZE = "caze";
 	public static final String REPORT_DATE_TIME = "reportDateTime";
 	public static final String REPORTING_USER = "reportingUser";
+	public static final String MULTI_DAY_CONTACT = "multiDayContact";
+	public static final String FIRST_CONTACT_DATE = "firstContactDate";
 	public static final String LAST_CONTACT_DATE = "lastContactDate";
 	public static final String CONTACT_IDENTIFICATION_SOURCE = "contactIdentificationSource";
 	public static final String CONTACT_IDENTIFICATION_SOURCE_DETAILS = "contactIdentificationSourceDetails";
@@ -138,6 +140,9 @@ public class ContactDto extends PseudonymizableDto {
 	private DistrictReferenceDto district;
 	private CommunityReferenceDto community;
 	@Required
+	private boolean multiDayContact;
+	private Date firstContactDate;
+	@Required
 	private Date lastContactDate;
 	@HideForCountriesExcept
 	private ContactIdentificationSource contactIdentificationSource;
@@ -320,6 +325,22 @@ public void setReportingUser(UserReferenceDto reportingUser) {
 		this.reportingUser = reportingUser;
 	}
 
+	public boolean isMultiDayContact() {
+		return multiDayContact;
+	}
+
+	public void setMultiDayContact(boolean multiDayContact) {
+		this.multiDayContact = multiDayContact;
+	}
+
+	public Date getFirstContactDate() {
+		return firstContactDate;
+	}
+
+	public void setFirstContactDate(Date firstContactDate) {
+		this.firstContactDate = firstContactDate;
+	}
+
 	public Date getLastContactDate() {
 		return lastContactDate;
 	}

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

@@ -451,6 +451,7 @@ public interface Captions {
 	String Contact_endOfQuarantineReasonDetails = "Contact.endOfQuarantineReasonDetails";
 	String Contact_epiData = "Contact.epiData";
 	String Contact_externalID = "Contact.externalID";
+	String Contact_firstContactDate = "Contact.firstContactDate";
 	String Contact_firstName = "Contact.firstName";
 	String Contact_followUpComment = "Contact.followUpComment";
 	String Contact_followUpStatus = "Contact.followUpStatus";
@@ -462,6 +463,7 @@ public interface Captions {
 	String Contact_lastName = "Contact.lastName";
 	String Contact_latestEventId = "Contact.latestEventId";
 	String Contact_latestEventTitle = "Contact.latestEventTitle";
+	String Contact_multiDayContact = "Contact.multiDayContact";
 	String Contact_numberOfVisits = "Contact.numberOfVisits";
 	String Contact_overwriteFollowUpUntil = "Contact.overwriteFollowUpUntil";
 	String Contact_person = "Contact.person";

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

@@ -23,6 +23,7 @@ public interface Validations {
 	String campaignFormDependingOnValuesMissing = "campaignFormDependingOnValuesMissing";
 	String campaignFormElementDuplicateId = "campaignFormElementDuplicateId";
 	String campaignFormElementIdRequired = "campaignFormElementIdRequired";
+	String campaignFormElementNotExisting = "campaignFormElementNotExisting";
 	String campaignFormElementTypeRequired = "campaignFormElementTypeRequired";
 	String campaignFormInvalidIdInListElements = "campaignFormInvalidIdInListElements";
 	String campaignFormTranslationCaptionRequired = "campaignFormTranslationCaptionRequired";

sormas-api/src/main/java/de/symeda/sormas/api/utils/DataHelper.java

@@ -387,4 +387,8 @@ public static String valueToString(Object value) {
 			return value.toString();
 		}
 	}
+
+	public static String sanitizeFileName(String fileName) {
+		return fileName.replaceAll("[^a-zA-Z0-9._-]", "");
+	}
 }

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

@@ -564,6 +564,7 @@ Contact.disease=Disease of source case
 Contact.district=Responsible district
 Contact.epiData=Epidemiological data
 Contact.externalID=External ID
+Contact.firstContactDate=Date of first contact
 Contact.firstName=First name of contact person
 Contact.followUpComment=Follow-up status comment
 Contact.followUpStatus=Follow-up status
@@ -573,6 +574,7 @@ Contact.lastContactDate=Date of last contact
 Contact.lastName=Last name of contact person
 Contact.latestEventId=Latest event ID
 Contact.latestEventTitle=Latest event title
+Contact.multiDayContact=Multi-day contact
 Contact.numberOfVisits=Number of visits
 Contact.person=Contact person
 Contact.quarantine=Quarantine

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

@@ -564,6 +564,7 @@ Contact.disease=Krankheit des Indexfalls
 Contact.district=Zuständige/r Landkreis/Kreisfreie Stadt
 Contact.epiData=Epidemiologische Daten
 Contact.externalID=Externe ID
+Contact.firstContactDate=Datum des ersten Kontaktes
 Contact.firstName=Vorname der Kontaktperson
 Contact.followUpComment=Nachverfolgungs-Status-Kommentar
 Contact.followUpStatus=Nachverfolgungs-Status

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

@@ -100,6 +100,7 @@ contactFollowUpUntilDate = The follow-up until date must at least be on the day
 emptyOverwrittenFollowUpUntilDate = The follow-up until date cannot be overwritten with an empty value.
 textTooLong = The text you entered is too long. Maximum allowed length is %d
 contactWithoutInfrastructureData = A contact needs either a source case or a responsible region and district.
+campaignFormElementNotExisting = Column %s does not exist in form meta definition.
 campaignFormUnsupportedType = The type %s of element %s is not supported in campaign forms.
 campaignFormUnsupportedStyle = The style %s of element %s is not supported in campaign forms.
 campaignFormDependingOnNotFound = The campaign form does not contain a field with the ID %s that was specified in the dependingOn attribute of element %s.

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

@@ -1773,6 +1773,11 @@ public void onUpgrade(SQLiteDatabase db, ConnectionSource connectionSource, int
 						+ "SELECT exposureDetailsKnown, contactWithSourceCaseKnown, wildbirds, changeDate, creationDate, id, lastOpenedDate, localChangeDate, modified, snapshot, uuid, pseudonymized "
 						+ "FROM tmp_epidata;");
 				getDao(EpiData.class).executeRaw("DROP TABLE tmp_epidata;");
+			case 247:
+				currentVersion = 247;
+
+				getDao(Contact.class).executeRaw("ALTER TABLE contacts ADD column multidaycontact boolean default false;");
+				getDao(Contact.class).executeRaw("ALTER TABLE contacts ADD column firstcontactdate timestamp;");
 
 				// ATTENTION: break should only be done after last version
 				break;

sormas-app/app/src/main/java/de/symeda/sormas/app/backend/contact/Contact.java

@@ -67,6 +67,8 @@ public class Contact extends PseudonymizableAdo {
 	public static final String DISEASE = "disease";
 	public static final String REPORT_DATE_TIME = "reportDateTime";
 	public static final String REPORTING_USER = "reportingUser";
+	public static final String MULTI_DAY_CONTACT = "multiDayContact";
+	public static final String FIRST_CONTACT_DATE = "firstContactDate";
 	public static final String LAST_CONTACT_DATE = "lastContactDate";
 	public static final String CONTACT_IDENTIFICATION_SOURCE = "contactIdentificationSource";
 	public static final String CONTACT_IDENTIFICATION_SOURCE_DETAILS = "contactIdentificationSourceDetails";
@@ -112,7 +114,11 @@ public class Contact extends PseudonymizableAdo {
 	private Disease disease;
 	@Column(length = COLUMN_LENGTH_DEFAULT)
 	private String diseaseDetails;
-	@DatabaseField(dataType = DataType.DATE_LONG, canBeNull = true)
+	@DatabaseField
+	private boolean multiDayContact;
+	@DatabaseField(dataType = DataType.DATE_LONG)
+	private Date firstContactDate;
+	@DatabaseField(dataType = DataType.DATE_LONG)
 	private Date lastContactDate;
 	@Enumerated(EnumType.STRING)
 	private ContactIdentificationSource contactIdentificationSource;
@@ -253,6 +259,22 @@ public void setReportingUser(User reportingUser) {
 		this.reportingUser = reportingUser;
 	}
 
+	public boolean isMultiDayContact() {
+		return multiDayContact;
+	}
+
+	public void setMultiDayContact(boolean multiDayContact) {
+		this.multiDayContact = multiDayContact;
+	}
+
+	public Date getFirstContactDate() {
+		return firstContactDate;
+	}
+
+	public void setFirstContactDate(Date firstContactDate) {
+		this.firstContactDate = firstContactDate;
+	}
+
 	public Date getLastContactDate() {
 		return lastContactDate;
 	}

sormas-app/app/src/main/java/de/symeda/sormas/app/backend/contact/ContactDtoHelper.java

@@ -87,6 +87,7 @@ public void fillInnerFromDto(Contact target, ContactDto source) {
 		target.setReportDateTime(source.getReportDateTime());
 		target.setContactOfficer(DatabaseHelper.getUserDao().getByReferenceDto(source.getContactOfficer()));
 
+		target.setMultiDayContact(source.isMultiDayContact());
 		target.setLastContactDate(source.getLastContactDate());
 		target.setContactIdentificationSource(source.getContactIdentificationSource());
 		target.setContactIdentificationSourceDetails(source.getContactIdentificationSourceDetails());