SORMAS-Foundation#3753 Add the signal evolution date in the event file and in the event directory (SORMAS-Foundation#4001)

* Add signalEvolutionDate field in the Event model SORMAS-Foundation#3753

* Management of the signalEvolutionDate field into Event forms SORMAS-Foundation#3753

* Management of signalEvolutionDate column, filter and exports into the Events and Actions directories SORMAS-Foundation#3753

Author: aponcon-atolcd

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

@@ -36,6 +36,8 @@ public class EventActionExportDto implements Serializable {
 	private String eventTitle;
 	private String eventDesc;
 	private String eventDate;
+	private Date eventEvolutionDate;
+	private String eventEvolutionComment;
 	private EventStatus eventStatus;
 	private EventInvestigationStatus eventInvestigationStatus;
 	private ActionMeasure actionMeasure;
@@ -52,6 +54,8 @@ public EventActionExportDto(
 		String eventDesc,
 		Date eventStartDate,
 		Date eventEndDate,
+		Date eventEvolutionDate,
+		String eventEvolutionComment,
 		EventStatus eventStatus,
 		EventInvestigationStatus eventInvestigationStatus,
 		ActionMeasure actionMeasure,
@@ -71,6 +75,8 @@ public EventActionExportDto(
 		this.eventTitle = eventTitle;
 		this.eventDesc = eventDesc;
 		this.eventDate = EventHelper.buildEventDateString(eventStartDate, eventEndDate);
+		this.eventEvolutionDate = eventEvolutionDate;
+		this.eventEvolutionComment = eventEvolutionComment;
 		this.eventStatus = eventStatus;
 		this.eventInvestigationStatus = eventInvestigationStatus;
 		this.actionMeasure = actionMeasure;
@@ -105,46 +111,56 @@ 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 EventInvestigationStatus getEventInvestigationStatus() {
 		return eventInvestigationStatus;
 	}
 
-	@Order(6)
+	@Order(8)
 	public ActionMeasure getActionMeasure() {
 		return actionMeasure;
 	}
 
-	@Order(7)
+	@Order(9)
 	public String getActionTitle() {
 		return actionTitle;
 	}
 
-	@Order(8)
+	@Order(10)
 	public Date getActionCreationDate() {
 		return actionCreationDate;
 	}
 
-	@Order(9)
+	@Order(11)
 	public Date getActionChangeDate() {
 		return actionChangeDate;
 	}
 
-	@Order(10)
+	@Order(12)
 	public ActionStatus getActionStatus() {
 		return actionStatus;
 	}
 
-	@Order(11)
+	@Order(13)
 	public ActionPriority getActionPriority() {
 		return actionPriority;
 	}
 
-	@Order(12)
+	@Order(14)
 	public UserReferenceDto getActionLastModifiedBy() {
 		return actionLastModifiedBy;
 	}

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

@@ -37,6 +37,7 @@ public class EventActionIndexDto implements Serializable {
 	public static final String EVENT_END_DATE = "eventEndDate";
 	public static final String EVENT_STATUS = "eventStatus";
 	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";
@@ -51,6 +52,7 @@ public class EventActionIndexDto implements Serializable {
 	private Date eventEndDate;
 	private EventStatus eventStatus;
 	private EventInvestigationStatus eventInvestigationStatus;
+	private Date eventEvolutionDate;
 	private String actionTitle;
 	private Date actionCreationDate;
 	private Date actionChangeDate;
@@ -67,6 +69,7 @@ public EventActionIndexDto(
 		EventStatus eventStatus,
 		EventInvestigationStatus eventInvestigationStatus,
 		ActionMeasure actionMeasure,
+		Date eventEvolutionDate,
 		String actionTitle,
 		Date actionCreationDate,
 		Date actionChangeDate,
@@ -86,6 +89,8 @@ public EventActionIndexDto(
 		this.eventStatus = eventStatus;
 		this.eventInvestigationStatus = eventInvestigationStatus;
 		this.actionTitle = EventHelper.buildEventActionTitleString(actionMeasure, actionTitle);
+		this.eventEvolutionDate = eventEvolutionDate;
+		this.actionTitle = actionTitle;
 		this.actionCreationDate = actionCreationDate;
 		this.actionChangeDate = actionChangeDate;
 		this.actionStatus = actionStatus;
@@ -142,6 +147,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

@@ -63,6 +63,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;
@@ -268,6 +271,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;
@@ -341,6 +378,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;
@@ -389,6 +429,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;
 	}