Merge remote-tracking branch 'origin/development' into 3411_person-salutation

# Conflicts:
#	sormas-app/app/src/main/java/de/symeda/sormas/app/backend/common/DatabaseHelper.java
#	sormas-backend/src/main/resources/sql/sormas_schema.sql

Author: lgal

README.md

@@ -27,6 +27,8 @@ SORMAS officially supports and is tested on **Chromium-based browsers** (like Go
 
 #### Is there a ReST API documentation?
 Yes! Please download the [latest release](https://github.com/hzi-braunschweig/SORMAS-Project/releases/latest) and copy the content of /deploy/openapi/sormas-rest.yaml to an editor that generates a visual API documentation (e.g. https://editor.swagger.io/).
+<br/>
+Runtime Swagger documentation of the External Visits Resource (used by external symptom journals such as CLIMEDO or PIA) is also available at ``<<host>>/sormas-rest/visits-external/openapi.json`` or ``<<host>>/sormas-rest/visits-external/openapi.yaml``
 
 <p align="center"><img src="https://user-images.githubusercontent.com/23701005/74659600-ebb8fc00-5194-11ea-836b-a7ca9d682301.png"/></p>
 

sormas-api/src/main/java/de/symeda/sormas/api/caze/CaseIndexDetailedDto.java

@@ -30,6 +30,9 @@ public class CaseIndexDetailedDto extends CaseIndexDto {
 	public static final String LATEST_EVENT_ID = "latestEventId";
 	public static final String LATEST_EVENT_STATUS = "latestEventStatus";
 	public static final String LATEST_EVENT_TITLE = "latestEventTitle";
+	public static final String LATEST_SAMPLE_DATE_TIME = "latestSampleDateTime";
+	public static final String SAMPLE_COUNT = "sampleCount";
+	public static final String SYMPTOM_ONSET_DATE = "symptomOnsetDate";
 
 	@PersonalData
 	@SensitiveData
@@ -53,6 +56,9 @@ public class CaseIndexDetailedDto extends CaseIndexDto {
 	private String latestEventId;
 	private String latestEventTitle;
 	private EventStatus latestEventStatus;
+	private Date latestSampleDateTime;
+	private Long sampleCount;
+	private Date symptomOnsetDate;
 
 	private UserReferenceDto reportingUser;
 
@@ -66,7 +72,8 @@ public CaseIndexDetailedDto(long id, String uuid, String epidNumber, String exte
 								Integer age, ApproximateAgeType ageType, Integer birthdateDD, Integer birthdateMM, Integer birthdateYYYY, Sex sex,
 								Date quarantineTo, Float completeness, FollowUpStatus followUpStatus, Date followUpUntil, Date changeDate, Long facilityId,
 								String city, String street, String houseNumber, String additionalInformation, String postalCode, String phone,
-								String reportingUserFirstName, String reportingUserLastName, int visitCount, long eventCount) {
+								String reportingUserFirstName, String reportingUserLastName, Date symptomOnsetDate, 
+								int visitCount, long eventCount, Date latestSampleDateTime, long sampleCount) {
 
 		super(id, uuid, epidNumber, externalID, personFirstName, personLastName, disease, diseaseDetails, caseClassification, investigationStatus,
 				presentCondition, reportDate, reportingUserUuid, creationDate, regionUuid, districtUuid, districtName, communityUuid,
@@ -83,6 +90,9 @@ public CaseIndexDetailedDto(long id, String uuid, String epidNumber, String exte
 		this.phone = phone;
 		this.reportingUser = new UserReferenceDto(reportingUserUuid, reportingUserFirstName, reportingUserLastName, null);
 		this.eventCount = eventCount;
+		this.latestSampleDateTime = latestSampleDateTime;
+		this.sampleCount = sampleCount;
+		this.symptomOnsetDate = symptomOnsetDate;
 	}
 
 	public String getCity() {
@@ -144,4 +154,16 @@ public EventStatus getLatestEventStatus() {
 	public void setLatestEventStatus(EventStatus latestEventStatus) {
 		this.latestEventStatus = latestEventStatus;
 	}
+
+	public Date getLatestSampleDateTime() {
+		return latestSampleDateTime;
+	}
+
+	public Long getSampleCount() {
+		return sampleCount;
+	}
+
+	public Date getSymptomOnsetDate() {
+		return symptomOnsetDate;
+	}
 }

sormas-api/src/main/java/de/symeda/sormas/api/event/EventDto.java

@@ -36,6 +36,7 @@ public class EventDto extends PseudonymizableDto {
 
 	public static final String EVENT_STATUS = "eventStatus";
 	public static final String EVENT_INVESTIGATION_STATUS = "eventInvestigationStatus";
+	public static final String RISK_LEVEL = "riskLevel";
 	public static final String EVENT_INVESTIGATION_START_DATE = "eventInvestigationStartDate";
 	public static final String EVENT_INVESTIGATION_END_DATE = "eventInvestigationEndDate";
 	public static final String EVENT_PERSONS = "eventPersons";
@@ -53,6 +54,8 @@ public class EventDto extends PseudonymizableDto {
 	public static final String EVENT_LOCATION = "eventLocation";
 	public static final String TYPE_OF_PLACE = "typeOfPlace";
 	public static final String SRC_TYPE = "srcType";
+	public static final String SRC_INSTITUTIONAL_PARTNER_TYPE = "srcInstitutionalPartnerType";
+	public static final String SRC_INSTITUTIONAL_PARTNER_TYPE_DETAILS = "srcInstitutionalPartnerTypeDetails";
 	public static final String SRC_FIRST_NAME = "srcFirstName";
 	public static final String SRC_LAST_NAME = "srcLastName";
 	public static final String SRC_TEL_NO = "srcTelNo";
@@ -69,6 +72,7 @@ public class EventDto extends PseudonymizableDto {
 
 	@Required
 	private EventStatus eventStatus;
+	private RiskLevel riskLevel;
 	private EventInvestigationStatus eventInvestigationStatus;
 	private Date eventInvestigationStartDate;
 	private Date eventInvestigationEndDate;
@@ -86,6 +90,8 @@ public class EventDto extends PseudonymizableDto {
 	private LocationDto eventLocation;
 	private TypeOfPlace typeOfPlace;
 	private EventSourceType srcType;
+	private InstitutionalPartnerType srcInstitutionalPartnerType;
+	private String srcInstitutionalPartnerTypeDetails;
 	private String srcFirstName;
 	private String srcLastName;
 	private String srcTelNo;
@@ -122,6 +128,14 @@ public void setEventStatus(EventStatus eventStatus) {
 		this.eventStatus = eventStatus;
 	}
 
+	public RiskLevel getRiskLevel() {
+		return riskLevel;
+	}
+
+	public void setRiskLevel(RiskLevel riskLevel) {
+		this.riskLevel = riskLevel;
+	}
+
 	public EventInvestigationStatus getEventInvestigationStatus() {
 		return eventInvestigationStatus;
 	}
@@ -234,6 +248,22 @@ public void setSrcType(EventSourceType srcType) {
 		this.srcType = srcType;
 	}
 
+	public InstitutionalPartnerType getSrcInstitutionalPartnerType() {
+		return srcInstitutionalPartnerType;
+	}
+
+	public void setSrcInstitutionalPartnerType(InstitutionalPartnerType srcInstitutionalPartnerType) {
+		this.srcInstitutionalPartnerType = srcInstitutionalPartnerType;
+	}
+
+	public String getSrcInstitutionalPartnerTypeDetails() {
+		return srcInstitutionalPartnerTypeDetails;
+	}
+
+	public void setSrcInstitutionalPartnerTypeDetails(String srcInstitutionalPartnerTypeDetails) {
+		this.srcInstitutionalPartnerTypeDetails = srcInstitutionalPartnerTypeDetails;
+	}
+
 	public String getSrcFirstName() {
 		return srcFirstName;
 	}