Merge branch 'development' into 2537_import-template-information

Author: vidi42

.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

@@ -40,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/ConfigFacade.java

@@ -96,6 +96,8 @@ public interface ConfigFacade {
 
 	String getSymptomJournalSecret();
 
+	String getPatientDiaryUrl();
+
 	void validateExternalUrls();
 
 	Sormas2SormasConfig getSormas2SormasConfig();

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/caze/CaseCriteria.java

@@ -49,6 +49,7 @@ public class CaseCriteria extends BaseCriteria implements Cloneable {
 	public static final String EXCLUDE_SHARED_CASES = "excludeSharedCases";
 	public static final String WITHOUT_RESPONSIBLE_OFFICER = "withoutResponsibleOfficer";
 	public static final String WITH_EXTENDED_QUARANTINE = "withExtendedQuarantine";
+	public static final String WITH_REDUCED_QUARANTINE = "withReducedQuarantine";
 	public static final String CREATION_DATE_FROM = "creationDateFrom";
 	public static final String CREATION_DATE_TO = "creationDateTo";
 	public static final String NAME_UUID_EPID_NUMBER_LIKE = "nameUuidEpidNumberLike";
@@ -88,6 +89,7 @@ public class CaseCriteria extends BaseCriteria implements Cloneable {
 	private Boolean mustHaveCaseManagementData;
 	private Boolean withoutResponsibleOfficer;
 	private Boolean withExtendedQuarantine;
+	private Boolean withReducedQuarantine;
 	private Boolean deleted = Boolean.FALSE;
 	private String nameUuidEpidNumberLike;
 	private String reportingUserLike;
@@ -290,6 +292,14 @@ public void setWithExtendedQuarantine(Boolean withExtendedQuarantine) {
 		this.withExtendedQuarantine = withExtendedQuarantine;
 	}
 
+	public Boolean getWithReducedQuarantine() {
+		return withReducedQuarantine;
+	}
+
+	public void setWithReducedQuarantine(Boolean withReducedQuarantine) {
+		this.withReducedQuarantine = withReducedQuarantine;
+	}
+
 	public CaseClassification getCaseClassification() {
 		return caseClassification;
 	}

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

@@ -133,6 +133,7 @@ public class CaseDataDto extends PseudonymizableDto {
 	public static final String QUARANTINE_HOME_SUPPLY_ENSURED = "quarantineHomeSupplyEnsured";
 	public static final String QUARANTINE_HOME_SUPPLY_ENSURED_COMMENT = "quarantineHomeSupplyEnsuredComment";
 	public static final String QUARANTINE_EXTENDED = "quarantineExtended";
+	public static final String QUARANTINE_REDUCED = "quarantineReduced";
 	public static final String QUARANTINE_OFFICIAL_ORDER_SENT = "quarantineOfficialOrderSent";
 	public static final String QUARANTINE_OFFICIAL_ORDER_SENT_DATE = "quarantineOfficialOrderSentDate";
 	public static final String REPORTING_TYPE = "reportingType";
@@ -372,6 +373,7 @@ public class CaseDataDto extends PseudonymizableDto {
 	@SensitiveData
 	private String quarantineHomeSupplyEnsuredComment;
 	private boolean quarantineExtended;
+	private boolean quarantineReduced;
 	@HideForCountriesExcept(countries = {
 		"de",
 		"ch" })
@@ -1064,6 +1066,14 @@ public void setQuarantineExtended(boolean quarantineExtended) {
 		this.quarantineExtended = quarantineExtended;
 	}
 
+	public boolean isQuarantineReduced() {
+		return quarantineReduced;
+	}
+
+	public void setQuarantineReduced(boolean quarantineReduced) {
+		this.quarantineReduced = quarantineReduced;
+	}
+
 	public boolean isQuarantineOfficialOrderSent() {
 		return quarantineOfficialOrderSent;
 	}