Merge remote-tracking branch 'origin/development' into 3360_handle-missing-uuids

Author: lgal

README.md

@@ -7,7 +7,7 @@
     />
   </a>
   <br/>
-  <a href="https://github.com/hzi-braunschweig/SORMAS-Project/blob/development/LICENSE"><img alt="License" src="https://img.shields.io/badge/license-GPL%20v3-blue"/></a> <a href="https://github.com/hzi-braunschweig/SORMAS-Project/releases/latest"><img alt="Latest Release" src="https://img.shields.io/github/v/release/hzi-braunschweig/SORMAS-Project"/></a> <img alt="Development Build Status" src="https://github.com/hzi-braunschweig/SORMAS-Project/workflows/Java%20CI%20with%20Maven/badge.svg?branch=development"/> <a href="https://gitter.im/SORMAS-Project"><img alt="Gitter" src="https://badges.gitter.im/SORMAS-Project/dev-support.svg"/></a>
+  <a href="https://github.com/hzi-braunschweig/SORMAS-Project/blob/development/LICENSE"><img alt="License" src="https://img.shields.io/badge/license-GPL%20v3-blue"/></a> <a href="https://github.com/hzi-braunschweig/SORMAS-Project/releases/latest"><img alt="Latest Release" src="https://img.shields.io/github/v/release/hzi-braunschweig/SORMAS-Project"/></a> <img alt="Development Build Status" src="https://github.com/hzi-braunschweig/SORMAS-Project/workflows/Java%20CI%20with%20Maven/badge.svg?branch=development"/> <a href="https://gitter.im/SORMAS-Project"><img alt="Gitter" src="https://badges.gitter.im/SORMAS-Project/dev-support.svg"/></a> <a href="https://twitter.com/SORMASDev"><img alt="Twitter" src="https://img.shields.io/twitter/follow/SORMASDev?label=%40SORMASDev&style=social"/></a>
 </p>
 <br/>
 
@@ -17,7 +17,7 @@
 You can give SORMAS a try on our play server at https://sormas.helmholtz-hzi.de!
 
 #### How Can I Get Involved?
-Read through our [*Contributing Readme*](CONTRIBUTING.md) and contact us at [email protected] or join our [developer chat on Gitter](https://gitter.im/SORMAS-Project) to learn how you can help to drive the development of SORMAS forward and to get development support from our core developers. SORMAS is a community-driven project, and we'd love to have you on board! If you want to contribute to the code, please strictly adhere to the [*Development Environment*](DEVELOPMENT_ENVIRONMENT.md) guide to ensure that everything is set up correctly. Please also make sure that you've read the [*Development Contributing Guidelines*](CONTRIBUTING.md#development-contributing-guidelines) before you start to develop.
+Read through our [*Contributing Readme*](CONTRIBUTING.md) and contact us at [email protected] or join our [developer chat on Gitter](https://gitter.im/SORMAS-Project) to learn how you can help to drive the development of SORMAS forward and to get development support from our core developers. SORMAS is a community-driven project, and we'd love to have you on board! If you want to contribute to the code, please strictly adhere to the [*Development Environment*](DEVELOPMENT_ENVIRONMENT.md) guide to ensure that everything is set up correctly. Please also make sure that you've read the [*Development Contributing Guidelines*](CONTRIBUTING.md#development-contributing-guidelines) before you start to develop, and either follow or regularly check our Twitter account <a href="https://twitter.com/SORMASDev" target="_blank">@SORMASDev</a> to stay up to date with our schedule, new releases, guideline changes and other announcements.
 
 #### How Can I Report a Bug or Request a Feature?
 If you want to report a **security issue**, please follow our guideline for [*Responsible Disclosure*](SECURITY.md).  

sormas-api/pom.xml

@@ -2,7 +2,7 @@
 	<parent>
 		<groupId>de.symeda.sormas</groupId>
 		<artifactId>sormas-base</artifactId>
-		<version>1.54.0-SNAPSHOT</version>
+		<version>1.55.0-SNAPSHOT</version>
 		<relativePath>../sormas-base</relativePath>
 	</parent>
 	<modelVersion>4.0.0</modelVersion>

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

@@ -36,7 +36,10 @@ public class EventActionExportDto implements Serializable {
 	private String eventTitle;
 	private String eventDesc;
 	private String eventDate;
+	private Date eventEvolutionDate;
+	private String eventEvolutionComment;
 	private EventStatus eventStatus;
+	private RiskLevel eventRiskLevel;
 	private EventInvestigationStatus eventInvestigationStatus;
 	private ActionMeasure actionMeasure;
 	private String actionTitle;
@@ -52,7 +55,10 @@ public EventActionExportDto(
 		String eventDesc,
 		Date eventStartDate,
 		Date eventEndDate,
+		Date eventEvolutionDate,
+		String eventEvolutionComment,
 		EventStatus eventStatus,
+		RiskLevel eventRiskLevel,
 		EventInvestigationStatus eventInvestigationStatus,
 		ActionMeasure actionMeasure,
 		String actionTitle,
@@ -71,7 +77,10 @@ public EventActionExportDto(
 		this.eventTitle = eventTitle;
 		this.eventDesc = eventDesc;
 		this.eventDate = EventHelper.buildEventDateString(eventStartDate, eventEndDate);
+		this.eventEvolutionDate = eventEvolutionDate;
+		this.eventEvolutionComment = eventEvolutionComment;
 		this.eventStatus = eventStatus;
+		this.eventRiskLevel = eventRiskLevel;
 		this.eventInvestigationStatus = eventInvestigationStatus;
 		this.actionMeasure = actionMeasure;
 		this.actionTitle = actionTitle;
@@ -105,46 +114,61 @@ public String getEventDate() {
 	}
 
 	@Order(4)
+	public Date getEventEvolutionDate() {
+		return eventEvolutionDate;
+	}
+
+	@Order(5)
+	public String getEventEvolutionComment() {
+		return eventEvolutionComment;
+	}
+
+	@Order(6)
 	public EventStatus getEventStatus() {
 		return eventStatus;
 	}
 
-	@Order(5)
+	@Order(7)
+	public RiskLevel getEventRiskLevel() {
+		return eventRiskLevel;
+	}
+
+	@Order(8)
 	public EventInvestigationStatus getEventInvestigationStatus() {
 		return eventInvestigationStatus;
 	}
 
-	@Order(6)
+	@Order(9)
 	public ActionMeasure getActionMeasure() {
 		return actionMeasure;
 	}
 
-	@Order(7)
+	@Order(10)
 	public String getActionTitle() {
 		return actionTitle;
 	}
 
-	@Order(8)
+	@Order(11)
 	public Date getActionCreationDate() {
 		return actionCreationDate;
 	}
 
-	@Order(9)
+	@Order(12)
 	public Date getActionChangeDate() {
 		return actionChangeDate;
 	}
 
-	@Order(10)
+	@Order(13)
 	public ActionStatus getActionStatus() {
 		return actionStatus;
 	}
 
-	@Order(11)
+	@Order(14)
 	public ActionPriority getActionPriority() {
 		return actionPriority;
 	}
 
-	@Order(12)
+	@Order(15)
 	public UserReferenceDto getActionLastModifiedBy() {
 		return actionLastModifiedBy;
 	}

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

@@ -36,7 +36,9 @@ public class EventActionIndexDto implements Serializable {
 	public static final String EVENT_START_DATE = "eventStartDate";
 	public static final String EVENT_END_DATE = "eventEndDate";
 	public static final String EVENT_STATUS = "eventStatus";
+	public static final String EVENT_RISK_LEVEL = "eventRiskLevel";
 	public static final String EVENT_INVESTIGATION_STATUS = "eventInvestigationStatus";
+	public static final String EVENT_EVOLUTION_DATE = "eventEvolutionDate";
 	public static final String ACTION_TITLE = "actionTitle";
 	public static final String ACTION_CREATION_DATE = "actionCreationDate";
 	public static final String ACTION_CHANGE_DATE = "actionChangeDate";
@@ -50,7 +52,9 @@ public class EventActionIndexDto implements Serializable {
 	private Date eventStartDate;
 	private Date eventEndDate;
 	private EventStatus eventStatus;
+	private RiskLevel eventRiskLevel;
 	private EventInvestigationStatus eventInvestigationStatus;
+	private Date eventEvolutionDate;
 	private String actionTitle;
 	private Date actionCreationDate;
 	private Date actionChangeDate;
@@ -65,8 +69,10 @@ public EventActionIndexDto(
 		Date eventStartDate,
 		Date eventEndDate,
 		EventStatus eventStatus,
+		RiskLevel eventRiskLevel,
 		EventInvestigationStatus eventInvestigationStatus,
 		ActionMeasure actionMeasure,
+		Date eventEvolutionDate,
 		String actionTitle,
 		Date actionCreationDate,
 		Date actionChangeDate,
@@ -84,8 +90,11 @@ public EventActionIndexDto(
 		this.eventStartDate = eventStartDate;
 		this.eventEndDate = eventEndDate;
 		this.eventStatus = eventStatus;
+		this.eventRiskLevel = eventRiskLevel;
 		this.eventInvestigationStatus = eventInvestigationStatus;
 		this.actionTitle = EventHelper.buildEventActionTitleString(actionMeasure, actionTitle);
+		this.eventEvolutionDate = eventEvolutionDate;
+		this.actionTitle = actionTitle;
 		this.actionCreationDate = actionCreationDate;
 		this.actionChangeDate = actionChangeDate;
 		this.actionStatus = actionStatus;
@@ -134,6 +143,14 @@ public void setEventStatus(EventStatus eventStatus) {
 		this.eventStatus = eventStatus;
 	}
 
+	public RiskLevel getEventRiskLevel() {
+		return eventRiskLevel;
+	}
+
+	public void setEventRiskLevel(RiskLevel eventRiskLevel) {
+		this.eventRiskLevel = eventRiskLevel;
+	}
+
 	public EventInvestigationStatus getEventInvestigationStatus() {
 		return eventInvestigationStatus;
 	}
@@ -142,6 +159,14 @@ public void setEventInvestigationStatus(EventInvestigationStatus eventInvestigat
 		this.eventInvestigationStatus = eventInvestigationStatus;
 	}
 
+	public Date getEventEvolutionDate() {
+		return eventEvolutionDate;
+	}
+
+	public void setEventEvolutionDate(Date eventEvolutionDate) {
+		this.eventEvolutionDate = eventEvolutionDate;
+	}
+
 	public String getActionTitle() {
 		return actionTitle;
 	}

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

@@ -45,11 +45,13 @@ public class EventCriteria extends BaseCriteria implements Serializable {
 	public static final String SURVEILLANCE_OFFICER = "surveillanceOfficer";
 	public static final String FREE_TEXT = "freeText";
 	public static final String EVENT_STATUS = "eventStatus";
+	public static final String RISK_LEVEL = "riskLevel";
 	public static final String EVENT_INVESTIGATION_STATUS = "eventInvestigationStatus";
 	public static final String DISTRICT = "district";
 	public static final String REGION = "region";
 
 	private EventStatus eventStatus;
+	private RiskLevel riskLevel;
 	private EventInvestigationStatus eventInvestigationStatus;
 	private Disease disease;
 	private UserRole reportingUserRole;
@@ -63,6 +65,9 @@ public class EventCriteria extends BaseCriteria implements Serializable {
 	private Date eventDateFrom;
 	private Date eventDateTo;
 	private DateFilterOption dateFilterOption = DateFilterOption.DATE;
+	private Date eventEvolutionDateFrom;
+	private Date eventEvolutionDateTo;
+	private DateFilterOption evolutionDateFilterOption = DateFilterOption.DATE;
 	private UserReferenceDto surveillanceOfficer;
 	private String freeText;
 	private EventSourceType srcType;
@@ -95,6 +100,19 @@ public void setEventStatus(EventStatus eventStatus) {
 		this.eventStatus = eventStatus;
 	}
 
+	public RiskLevel getRiskLevel() {
+		return riskLevel;
+	}
+
+	public EventCriteria riskLevel(RiskLevel riskLevel) {
+		this.riskLevel = riskLevel;
+		return this;
+	}
+
+	public void setRiskLevel(RiskLevel riskLevel) {
+		this.riskLevel = riskLevel;
+	}
+
 	public EventInvestigationStatus getEventInvestigationStatus() {
 		return eventInvestigationStatus;
 	}
@@ -268,6 +286,40 @@ public DateFilterOption getDateFilterOption() {
 		return dateFilterOption;
 	}
 
+	public EventCriteria eventEvolutionDateBetween(Date eventEvolutionDateFrom, Date eventEvolutionDateTo, DateFilterOption evolutionDateFilterOption) {
+		this.eventEvolutionDateFrom = eventEvolutionDateFrom;
+		this.eventEvolutionDateTo = eventEvolutionDateTo;
+		this.evolutionDateFilterOption = evolutionDateFilterOption;
+		return this;
+	}
+
+	public EventCriteria eventEvolutionDateFrom(Date eventEvolutionDateFrom) {
+		this.eventEvolutionDateFrom = eventEvolutionDateFrom;
+		return this;
+	}
+
+	public Date getEventEvolutionDateFrom() {
+		return eventEvolutionDateFrom;
+	}
+
+	public EventCriteria eventEvolutionDateTo(Date eventEvolutionDateTo) {
+		this.eventEvolutionDateTo = eventEvolutionDateTo;
+		return this;
+	}
+
+	public Date getEventEvolutionDateTo() {
+		return eventEvolutionDateTo;
+	}
+
+	public EventCriteria evolutionDateFilterOption(DateFilterOption evolutionDateFilterOption) {
+		this.evolutionDateFilterOption = evolutionDateFilterOption;
+		return this;
+	}
+
+	public DateFilterOption getEvolutionDateFilterOption() {
+		return evolutionDateFilterOption;
+	}
+
 	public EventCriteria surveillanceOfficer(UserReferenceDto surveillanceOfficer) {
 		this.surveillanceOfficer = surveillanceOfficer;
 		return this;
@@ -311,6 +363,11 @@ public void setTypeOfPlace(TypeOfPlace typeOfPlace) {
 		this.typeOfPlace = typeOfPlace;
 	}
 
+	public EventCriteria typeOfPlace(TypeOfPlace typeOfPlace) {
+		setTypeOfPlace(typeOfPlace);
+		return this;
+	}
+
 	public ActionStatus getActionStatus() {
 		return actionStatus;
 	}
@@ -336,6 +393,9 @@ public EventCriteria dateBetween(DateType dateType, Date dateFrom, Date dateTo,
 		case EVENT:
 			eventDateBetween(dateFrom, dateTo, dateFilterOption);
 			break;
+		case EVENT_SIGNAL_EVOLUTION:
+			eventEvolutionDateBetween(dateFrom, dateTo, dateFilterOption);
+			break;
 		case ACTION:
 			actionChangeDateBetween(dateFrom, dateTo, dateFilterOption);
 			break;
@@ -384,6 +444,7 @@ public DateFilterOption getActionChangeDateFilterOption() {
 
 	public enum DateType {
 		EVENT,
+		EVENT_SIGNAL_EVOLUTION,
 		ACTION,
 	}
 

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

@@ -52,6 +52,8 @@ public class EventDto extends PseudonymizableDto {
 	public static final String MULTI_DAY_EVENT = "multiDayEvent";
 	public static final String REPORT_DATE_TIME = "reportDateTime";
 	public static final String REPORTING_USER = "reportingUser";
+	public static final String EVOLUTION_DATE = "evolutionDate";
+	public static final String EVOLUTION_COMMENT = "evolutionComment";
 	public static final String EVENT_LOCATION = "eventLocation";
 	public static final String TYPE_OF_PLACE = "typeOfPlace";
 	public static final String MEANS_OF_TRANSPORT = "meansOfTransport";
@@ -98,6 +100,8 @@ public class EventDto extends PseudonymizableDto {
 	private Date reportDateTime;
 	@Required
 	private UserReferenceDto reportingUser;
+	private Date evolutionDate;
+	private String evolutionComment;
 	private LocationDto eventLocation;
 	private TypeOfPlace typeOfPlace;
 	private MeansOfTransport meansOfTransport;
@@ -259,6 +263,22 @@ public void setReportingUser(UserReferenceDto reportingUser) {
 		this.reportingUser = reportingUser;
 	}
 
+	public Date getEvolutionDate() {
+		return evolutionDate;
+	}
+
+	public void setEvolutionDate(Date evolutionDate) {
+		this.evolutionDate = evolutionDate;
+	}
+
+	public String getEvolutionComment() {
+		return evolutionComment;
+	}
+
+	public void setEvolutionComment(String evolutionComment) {
+		this.evolutionComment = evolutionComment;
+	}
+
 	public TypeOfPlace getTypeOfPlace() {
 		return typeOfPlace;
 	}