Merge branch 'development' into feature-2746-Person_address_refinement_Part_2

Author: MateStrysewske

.gitignore

@@ -23,3 +23,6 @@ deploy
 /sormas-app/java_pid21052.hprof
 bin
 /sormas-base/setup/setup.log
+/sormas-cargoserver/.env
+/sormas-cargoserver/custom.env
+/sormas-cargoserver/custom.properties

.travis.yml

@@ -2,5 +2,8 @@ language: java
 jdk:
   - openjdk8 # FIXME remove after transition period (#2617)
   - openjdk11
-before_install: cd sormas-base
-install: mvn test -B -Dorg.slf4j.simpleLogger.log.org.apache.maven.cli.transfer.Slf4jMavenTransferListener=warn
+before_install:
+  - cd sormas-base
+install: skip
+script:
+  - mvn install -B -Dorg.slf4j.simpleLogger.log.org.apache.maven.cli.transfer.Slf4jMavenTransferListener=warn

DEVELOPMENT_ENVIRONMENT.md

@@ -2,7 +2,8 @@
 # SORMAS Development Environment
 
 ## Server
-- Install [your local server](SERVER_SETUP.md).
+- Install [your local server](SERVER_SETUP.md)
+- Or install your local development server using [maven cargo](sormas-cargoserver/README.md)
 - Alternatively [SERVER_DEV_SETUP.md](SERVER_DEV_SETUP.md) could be used (at this time not recommended)
 
 ## Git

README.md

@@ -25,6 +25,9 @@ Please [create a new issue](https://github.com/hzi-braunschweig/SORMAS-Project/i
 #### Which Browsers and Android Versions Are Supported?
 SORMAS officially supports and is tested on **Chromium-based browsers** (like Google Chrome) and **Mozilla Firefox**, and all Android versions starting from **Android 7.0** (Nougat). In principle, SORMAS should be usable with all web browsers that are supported by Vaadin 8 (Chrome, Firefox, Safari, Edge, Internet Explorer 11; see https://vaadin.com/faq).
 
+#### 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/).
+
 <p align="center"><img src="https://user-images.githubusercontent.com/23701005/74659600-ebb8fc00-5194-11ea-836b-a7ca9d682301.png"/></p>
 
 ## Project Structure
@@ -37,6 +40,8 @@ The project consists of the following modules:
 - **sormas-ear:** The ear needed to build the application
 - **sormas-rest:** The REST interface; see [`sormas-rest/README.md`](sormas-rest/README.md)
 - **sormas-ui:** The web application
+- **sormas-base/dependencies:** dependencies to be deployed with the payara server
+- **sormas-cargoserver:** setup for a local dev server using maven-cargo
 
 ## Server Management
 

sormas-api/src/main/java/de/symeda/sormas/api/campaign/CampaignFacade.java

@@ -1,5 +1,6 @@
 package de.symeda.sormas.api.campaign;
 
+import de.symeda.sormas.api.campaign.diagram.CampaignDashboardElement;
 import de.symeda.sormas.api.utils.SortProperty;
 
 import javax.ejb.Remote;
@@ -12,16 +13,19 @@ public interface CampaignFacade {
 
 	List<CampaignReferenceDto> getAllCampaignsAsReference();
 
+	CampaignReferenceDto getLastStartedCampaign();
+
 	long count(CampaignCriteria campaignCriteria);
 
 	CampaignDto saveCampaign(CampaignDto dto);
 
 	CampaignDto getByUuid(String uuid);
 
+	List<CampaignDashboardElement> getCampaignDashboardElements(String campaignUuid);
+
 	boolean isArchived(String uuid);
 
 	void deleteCampaign(String uuid);
 
 	void archiveOrDearchiveCampaign(String campaignUuid, boolean archive);
-
 }

sormas-api/src/main/java/de/symeda/sormas/api/campaign/diagram/CampaignDashboardElement.java

@@ -0,0 +1,63 @@
+package de.symeda.sormas.api.campaign.diagram;
+
+import java.io.Serializable;
+
+public class CampaignDashboardElement implements Serializable {
+
+    private String diagramId;
+    private String tabId;
+    private Integer order;
+    private Integer width;
+    private Integer height;
+
+    public CampaignDashboardElement() {
+    }
+
+    public CampaignDashboardElement(String diagramId, String tabId, Integer order, Integer width, Integer height) {
+        this.diagramId = diagramId;
+        this.tabId = tabId;
+        this.order = order;
+        this.width = width;
+        this.height = height;
+    }
+
+    public String getDiagramId() {
+        return diagramId;
+    }
+
+    public void setDiagramId(String diagramId) {
+        this.diagramId = diagramId;
+    }
+
+    public String getTabId() {
+        return tabId;
+    }
+
+    public void setTabId(String tabId) {
+        this.tabId = tabId;
+    }
+
+    public Integer getOrder() {
+        return order;
+    }
+
+    public void setOrder(Integer order) {
+        this.order = order;
+    }
+
+    public Integer getWidth() {
+        return width;
+    }
+
+    public void setWidth(Integer width) {
+        this.width = width;
+    }
+
+    public Integer getHeight() {
+        return height;
+    }
+
+    public void setHeight(Integer height) {
+        this.height = height;
+    }
+}

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_PERSONS = "eventPersons";
+	public static final String PARTICIPANTS_COUNT = "participantCount";
 	public static final String EVENT_ACTIONS = "eventActions";
 	public static final String EXTERNAL_ID = "externalId";
 	public static final String EVENT_DESC = "eventDesc";

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

@@ -29,6 +29,7 @@ public class EventExportDto implements Serializable {
 	private String uuid;
 	private String externalId;
 	private EventStatus eventStatus;
+	private int participantsCount;
 	private Disease disease;
 	private String diseaseDetails;
 	private Date startDate;
@@ -58,6 +59,7 @@ public EventExportDto(
 		String uuid,
 		String externalId,
 		EventStatus eventStatus,
+		int participantsCount,
 		Disease disease,
 		String diseaseDetails,
 		Date startDate,
@@ -88,6 +90,7 @@ public EventExportDto(
 		this.uuid = uuid;
 		this.externalId = externalId;
 		this.eventStatus = eventStatus;
+		this.participantsCount = participantsCount;
 		this.disease = disease;
 		this.diseaseDetails = diseaseDetails;
 		this.startDate = startDate;
@@ -306,6 +309,15 @@ public void setReportDateTime(Date reportDateTime) {
 		this.reportDateTime = reportDateTime;
 	}
 
+	@Order(25)
+	public int getParticipantsCount() {
+		return participantsCount;
+	}
+
+	public void setParticipantsCount(int participantsCount) {
+		this.participantsCount = participantsCount;
+	}
+
 	public EventJurisdictionDto getJurisdiction() {
 		return jurisdiction;
 	}

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

@@ -32,6 +32,7 @@ public class EventIndexDto implements WithJurisdiction<EventJurisdictionDto>, Se
 
 	public static final String UUID = "uuid";
 	public static final String EVENT_STATUS = "eventStatus";
+	public static final String PARTICIPANT_COUNT = "participantCount";
 	public static final String DISEASE = "disease";
 	public static final String DISEASE_DETAILS = "diseaseDetails";
 	public static final String START_DATE = "startDate";
@@ -46,6 +47,7 @@ public class EventIndexDto implements WithJurisdiction<EventJurisdictionDto>, Se
 
 	private String uuid;
 	private EventStatus eventStatus;
+	private int participantCount;
 	private Disease disease;
 	private String diseaseDetails;
 	private Date startDate;
@@ -64,6 +66,7 @@ public class EventIndexDto implements WithJurisdiction<EventJurisdictionDto>, Se
 	public EventIndexDto(
 		String uuid,
 		EventStatus eventStatus,
+		Integer participantCount,
 		Disease disease,
 		String diseaseDetails,
 		Date startDate,
@@ -105,6 +108,7 @@ public EventIndexDto(
 		this.srcMediaName = srcMediaName;
 		this.reportDateTime = reportDateTime;
 		this.jurisdiction = new EventJurisdictionDto(reportingUserUuid, surveillanceOfficerUuid, regionUuid, districtUuid, communityUuid);
+		this.participantCount = participantCount;
 	}
 
 	public String getUuid() {
@@ -223,6 +227,14 @@ public void setReportDateTime(Date reportDateTime) {
 		this.reportDateTime = reportDateTime;
 	}
 
+	public int getParticipantCount() {
+		return participantCount;
+	}
+
+	public void setParticipantCount(int participantCount) {
+		this.participantCount = participantCount;
+	}
+
 	public EventReferenceDto toReference() {
 		return new EventReferenceDto(getUuid(), getDisease(), getDiseaseDetails(), getEventStatus(), getStartDate());
 	}

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

@@ -753,6 +753,7 @@ public interface Captions {
 	String Event_multiDayEvent = "Event.multiDayEvent";
 	String Event_nosocomial = "Event.nosocomial";
 	String Event_numberOfPendingTasks = "Event.numberOfPendingTasks";
+	String Event_participantCount = "Event.participantCount";
 	String Event_reportDateTime = "Event.reportDateTime";
 	String Event_reportingUser = "Event.reportingUser";
 	String Event_srcEmail = "Event.srcEmail";