Merge remote-tracking branch 'remotes/origin/development' into 2975_BAG-export-contacts

Author: lgal

SERVER_CUSTOMIZATION.md

@@ -19,7 +19,7 @@ The following properties are currently configurable:
 * **EPID prefix** `country.epidprefix`: SORMAS automatically generates EPID numbers for new cases. This is the prefix your country is using for all of these numbers. Most of the time it will be some sort of country code and should be three characters long.
 * **Country center/zoom** `country.center.latitude`, `country.center.longitude` and `map.zoom`: These are the geo coordinates of the geographical center of the country or region you're using SORMAS in. Used to set the initial location of the maps used in dashboards and statistics.
 * **App URL** `app.url`: The directory on your server where the mobile .apk file is stored that is used to automatically update the Android app after a new release. You should be able to copy the example given in the properties file and only have to replace the SERVER-NAME placeholder.
-* **File paths** `temp.path`, `generated.path` and `custom.path`: The folders that SORMAS stores files in, either temporarily during case export or permanently like import templates. Files in temp.path are automatically deleted at midnight. Files in custom.path can be used to customize the login page, e.g. to provide default logins for demo servers or add additional contributors to the right sidebar.
+* **File paths** `documents.path`, `temp.path`, `generated.path` and `custom.path`: The folders that SORMAS stores files in, either temporarily during case export or permanently like import templates or documents. Files in temp.path are automatically deleted at midnight. Files in custom.path can be used to customize the login page, e.g. to provide default logins for demo servers or add additional contributors to the right sidebar.
 * **Automatic case classification** `feature.automaticcaseclassification`: Determines whether SORMAS automatically classifies cases based on a number of criteria that are defined in the code.
 * **Email settings** `email.sender.address` and `email.sender.name`: The email address and sender name that should be used when SORMAS is sending out emails, e.g. to notify users about specific events.
 * **SMS settings** `sms.sender.name, sms.auth.key and sms.auth.secret`: Besides emails, SORMAS also supports sending automatic SMS to users at the same time (e.g. when a case has been classified as confirmed). The SMS provider SORMAS is using is the Vonage SMS API (https://www.vonage.com/communications-apis/sms/). If you have an account there, you can use your key and secret here to enable sending out SMS. Leaving these properties empty will disable this feature.
@@ -87,3 +87,4 @@ The following features are currently configurable:
 * **Area Infrastructure** `INFRASTRUCTURE_TYPE_AREA`: Enables an additional infrastructure level above region that is called area by default. Currently only used in the campaigns module.
 * **Case Follow-Up** `CASE_FOLLOWUP`: Enables the contact follow-up module for cases as well to allow a more detailed daily documentation of symptoms.
 * **Line Listing** `LINE_LISTING`: Whether or not using line listing for case entry is enabled in the specified jurisdiction for the specified disease. Configurable from the UI, no database interaction needed.
+* **Documents** `DOCUMENTS`: Enables document storage.

sormas-api/pom.xml

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

sormas-api/src/main/java/de/symeda/sormas/api/ConfigFacade.java

@@ -1,20 +1,17 @@
-/*******************************************************************************
+/*
  * SORMAS® - Surveillance Outbreak Response Management & Analysis System
- * Copyright © 2016-2018 Helmholtz-Zentrum für Infektionsforschung GmbH (HZI)
- *
+ * Copyright © 2016-2020 Helmholtz-Zentrum für Infektionsforschung GmbH (HZI)
  * This program is free software: you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
  * the Free Software Foundation, either version 3 of the License, or
  * (at your option) any later version.
- *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
  * GNU General Public License for more details.
- *
  * You should have received a copy of the GNU General Public License
  * along with this program. If not, see <https://www.gnu.org/licenses/>.
- *******************************************************************************/
+ */
 package de.symeda.sormas.api;
 
 import javax.ejb.Remote;
@@ -50,6 +47,8 @@ public interface ConfigFacade {
 
 	String getSmsAuthSecret();
 
+	String getDocumentFilesPath();
+
 	String getTempFilesPath();
 
 	String getGeneratedFilesPath();
@@ -113,4 +112,7 @@ public interface ConfigFacade {
 	boolean isExternalJournalActive();
 
 	int getDashboardMapMarkerLimit();
+
+	boolean isSmsServiceSetUp();
+
 }

sormas-api/src/main/java/de/symeda/sormas/api/FacadeProvider.java

@@ -1,20 +1,17 @@
-/*******************************************************************************
+/*
  * SORMAS® - Surveillance Outbreak Response Management & Analysis System
- * Copyright © 2016-2018 Helmholtz-Zentrum für Infektionsforschung GmbH (HZI)
- *
+ * Copyright © 2016-2020 Helmholtz-Zentrum für Infektionsforschung GmbH (HZI)
  * This program is free software: you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
  * the Free Software Foundation, either version 3 of the License, or
  * (at your option) any later version.
- *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
  * GNU General Public License for more details.
- *
  * You should have received a copy of the GNU General Public License
  * along with this program. If not, see <https://www.gnu.org/licenses/>.
- *******************************************************************************/
+ */
 package de.symeda.sormas.api;
 
 import javax.naming.InitialContext;
@@ -37,6 +34,7 @@
 import de.symeda.sormas.api.disease.DiseaseConfigurationFacade;
 import de.symeda.sormas.api.disease.DiseaseFacade;
 import de.symeda.sormas.api.docgeneneration.QuarantineOrderFacade;
+import de.symeda.sormas.api.document.DocumentFacade;
 import de.symeda.sormas.api.epidata.EpiDataFacade;
 import de.symeda.sormas.api.event.EventFacade;
 import de.symeda.sormas.api.event.EventParticipantFacade;
@@ -54,6 +52,7 @@
 import de.symeda.sormas.api.person.PersonFacade;
 import de.symeda.sormas.api.region.AreaFacade;
 import de.symeda.sormas.api.region.CommunityFacade;
+import de.symeda.sormas.api.region.CountryFacade;
 import de.symeda.sormas.api.region.DistrictFacade;
 import de.symeda.sormas.api.region.GeoShapeProvider;
 import de.symeda.sormas.api.region.RegionFacade;
@@ -158,6 +157,9 @@ public static FacilityFacade getFacilityFacade() {
 		return get().lookupEjbRemote(FacilityFacade.class);
 	}
 
+	public static CountryFacade getCountryFacade() {
+		return get().lookupEjbRemote(CountryFacade.class);
+	}
 	public static RegionFacade getRegionFacade() {
 		return get().lookupEjbRemote(RegionFacade.class);
 	}
@@ -310,11 +312,15 @@ public static QuarantineOrderFacade getQuarantineOrderFacade() {
 		return get().lookupEjbRemote(QuarantineOrderFacade.class);
 	}
 
-  public static ExternalJournalFacade getExternalJournalFacade() {
+	public static ExternalJournalFacade getExternalJournalFacade() {
 		return get().lookupEjbRemote(ExternalJournalFacade.class);
-  }
+	}
+
+	public static DocumentFacade getDocumentFacade() {
+		return get().lookupEjbRemote(DocumentFacade.class);
+	}
 
-  @SuppressWarnings("unchecked")
+	@SuppressWarnings("unchecked")
 	public <P> P lookupEjbRemote(Class<P> clazz) {
 		try {
 			return (P) get().ic.lookup(buildJndiLookupName(clazz));

sormas-api/src/main/java/de/symeda/sormas/api/ReferenceDto.java

@@ -17,6 +17,8 @@
  *******************************************************************************/
 package de.symeda.sormas.api;
 
+import de.symeda.sormas.api.utils.Required;
+
 import java.io.Serializable;
 
 import org.apache.commons.lang3.ObjectUtils;
@@ -26,6 +28,7 @@ public abstract class ReferenceDto implements Serializable, HasUuid, Comparable<
 
 	public static final String CAPTION = "caption";
 
+	@Required
 	private String uuid;
 	private String caption;
 

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

@@ -21,6 +21,7 @@ public class CampaignDto extends EntityDto {
 	public static final String START_DATE = "startDate";
 	public static final String END_DATE = "endDate";
 	public static final String CREATING_USER = "creatingUser";
+	public static final String CAMPAIGN_FORM_METAS = "campaignFormMetas";
 
 	private String name;
 	private String description;

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

@@ -1,18 +1,19 @@
 package de.symeda.sormas.api.campaign.diagram;
 
 import java.io.Serializable;
-import java.util.Objects;
 
 public class CampaignDashboardElement implements Serializable {
 
 	public static String DIAGRAM_ID = "diagramId";
 	public static String TAB_ID = "tabId";
+	public static String SUB_TAB_ID = "subTabId";
 	public static String ORDER = "order";
 	public static String WIDTH = "width";
 	public static String HEIGHT = "height";
 
 	private String diagramId;
 	private String tabId;
+	private String subTabId;
 	private Integer order;
 	private Integer width;
 	private Integer height;
@@ -28,6 +29,11 @@ public CampaignDashboardElement(String diagramId, String tabId, Integer order, I
 		this.height = height;
 	}
 
+	public CampaignDashboardElement(String diagramId, String tabId, String subTabId, Integer order, Integer width, Integer height) {
+		this(diagramId, tabId, order, width, height);
+		this.subTabId = subTabId;
+	}
+
 	public String getDiagramId() {
 		return diagramId;
 	}
@@ -44,6 +50,14 @@ public void setTabId(String tabId) {
 		this.tabId = tabId;
 	}
 
+	public String getSubTabId() {
+		return subTabId;
+	}
+
+	public void setSubTabId(String subTabId) {
+		this.subTabId = subTabId;
+	}
+
 	public Integer getOrder() {
 		return order;
 	}

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

@@ -1,6 +1,8 @@
 package de.symeda.sormas.api.campaign.diagram;
 
 import de.symeda.sormas.api.EntityDto;
+import de.symeda.sormas.api.campaign.CampaignDto;
+import de.symeda.sormas.api.utils.DataHelper;
 
 import java.util.List;
 
@@ -13,6 +15,12 @@ public class CampaignDiagramDefinitionDto extends EntityDto {
 	private List<CampaignDiagramSeries> campaignSeriesTotal;
 	private boolean percentageDefault;
 
+	public static CampaignDiagramDefinitionDto build() {
+		CampaignDiagramDefinitionDto campaignDiagramDefinition = new CampaignDiagramDefinitionDto();
+		campaignDiagramDefinition.setUuid(DataHelper.createUuid());
+		return campaignDiagramDefinition;
+	}
+
 	public String getDiagramId() {
 		return diagramId;
 	}

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

@@ -24,13 +24,23 @@ public enum CaseClassification
 	implements
 	StatisticsGroupingKey {
 
-	NOT_CLASSIFIED,
-	SUSPECT,
-	PROBABLE,
-	CONFIRMED,
-	CONFIRMED_NO_SYMPTOMS,
-	CONFIRMED_UNKNOWN_SYMPTOMS,
-	NO_CASE;
+	NOT_CLASSIFIED(1),
+	SUSPECT(2),
+	PROBABLE(3),
+	CONFIRMED(6),
+	CONFIRMED_NO_SYMPTOMS(4),
+	CONFIRMED_UNKNOWN_SYMPTOMS(5),
+	NO_CASE(0);
+
+	/**
+	 * Severity of the case classification; confirmed has the highest severity in terms of the classification process
+	 * while no_case has the lowest.
+	 */
+	private final int severity;
+
+	CaseClassification(int severity) {
+		this.severity = severity;
+	}
 
 	public String getName() {
 		return this.name();
@@ -57,4 +67,8 @@ public int keyCompareTo(StatisticsGroupingKey o) {
 
 		return this.toString().compareTo(o.toString());
 	}
+
+	public int getSeverity() {
+		return severity;
+	}
 }

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

@@ -46,7 +46,6 @@ public class CaseCriteria extends BaseCriteria implements Cloneable {
 	public static final String MUST_HAVE_NO_GEO_COORDINATES = "mustHaveNoGeoCoordinates";
 	public static final String MUST_BE_PORT_HEALTH_CASE_WITHOUT_FACILITY = "mustBePortHealthCaseWithoutFacility";
 	public static final String MUST_HAVE_CASE_MANAGEMENT_DATA = "mustHaveCaseManagementData";
-	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";
@@ -102,7 +101,6 @@ public class CaseCriteria extends BaseCriteria implements Cloneable {
 	private EntityRelevanceStatus relevanceStatus;
 	private String sourceCaseInfoLike;
 	private Date quarantineTo;
-	public Boolean excludeSharedCases;
 	private Integer birthdateYYYY;
 	private Integer birthdateMM;
 	private Integer birthdateDD;
@@ -472,14 +470,6 @@ public void setQuarantineTo(Date quarantineTo) {
 		this.quarantineTo = quarantineTo;
 	}
 
-	public Boolean getExcludeSharedCases() {
-		return excludeSharedCases;
-	}
-
-	public void setExcludeSharedCases(Boolean excludeSharedCases) {
-		this.excludeSharedCases = excludeSharedCases;
-	}
-
 	public Integer getBirthdateYYYY() {
 		return birthdateYYYY;
 	}