Merge branch 'development' into feature-2562-Person_address_refinement

Author: ChristopherRiedel

SERVER_CUSTOMIZATION.md

@@ -27,7 +27,7 @@ The following properties are currently configurable:
 * **Name similarity threshold** *(namesimilaritythreshold)*: This is used when comparing cases or contacts to find duplicates in the system, either in retrospection or during creation or import. The higher the value, the more restrictive the algorithm, i.e. less potential duplicates will be found. It is suggested to play around with this setting to see which value works for your country and language.
 * **Dev mode** *(devmode)*: Enabling developer mode will give you access to a tab in the Configuration menu that allows admins to create dummy cases and contacts to quickly fill the database. This is only meant to be used on development or demo systems and should be left disabled for production servers.
 * **Infrastructure sync threshold** *(infrastructuresyncthreshold)*: Synchronizing infrastructure data to mobile apps (e.g. regions or health facilities) is done in chunks to avoid connection timeouts. If you expect your users to have very bad internet connection, lowering this threshold could make it easier for them to synchronize this data.
-* **Archiving thresholds** *(daysAfterCaseGetsArchived and daysAfterEventGetsArchived)*: The number of days without any changes after which cases/events are automatically archived (i.e. they will no longer be displayed in the normal directories, but still count towards statistics or counts on the dashboard and can still be viewed by users with the respective user right).
+* **Archiving thresholds** *(daysAfterCaseGetsArchived and daysAfterEventGetsArchived)*: The number of days without any changes after which cases/events are automatically archived (i.e. they will no longer be displayed in the normal directories, but still count towards statistics or counts on the dashboard and can still be viewed by users with the respective user right). If set to 0, automatic archiving is disabled.
 * **Rscript executable** *(rscript.executable)*: The location of the Rscript executable. If you've installed Rscript on your server and specify the path here (the default should work for Linux systems as long as you've used the default install path), network diagrams for transmission chains will be shown in the web app.
 * **Symptom journal interface**: Properties used to connect to an external symptom journal service. *interface.symptomjournal.url* is the URL to the website that SORMAS should connect to; *interface.symptomjournal.authurl* is the URL used to authenticate SORMAS at the external service; *interface.symptomjournal.clientid* and *interface.symptomjournal.secret* are the credentials used for the authentication process.
 * **Custom branding**: Properties used to apply a custom branding to SORMAS that overrides its name and default logo. Using these properties also alters the sidebar and adds another customizable area to it. If you want to use this feature, set *custombranding* to true. *custombranding.name* is the name that you want to use, *custombranding.logo.path* is the path to the logo that should be used.

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

@@ -17,12 +17,17 @@
  *******************************************************************************/
 package de.symeda.sormas.api;
 
+import javax.naming.InitialContext;
+import javax.naming.NamingException;
+
 import de.symeda.sormas.api.action.ActionFacade;
 import de.symeda.sormas.api.campaign.CampaignFacade;
 import de.symeda.sormas.api.campaign.data.CampaignFormDataFacade;
+import de.symeda.sormas.api.campaign.diagram.CampaignDiagramDefinitionFacade;
 import de.symeda.sormas.api.campaign.form.CampaignFormMetaFacade;
 import de.symeda.sormas.api.caze.CaseFacade;
 import de.symeda.sormas.api.caze.CaseStatisticsFacade;
+import de.symeda.sormas.api.caze.caseimport.CaseImportFacade;
 import de.symeda.sormas.api.caze.classification.CaseClassificationFacade;
 import de.symeda.sormas.api.caze.maternalhistory.MaternalHistoryFacade;
 import de.symeda.sormas.api.clinicalcourse.ClinicalCourseFacade;
@@ -64,9 +69,6 @@
 import de.symeda.sormas.api.visit.VisitFacade;
 import de.symeda.sormas.api.visualization.VisualizationFacade;
 
-import javax.naming.InitialContext;
-import javax.naming.NamingException;
-
 public class FacadeProvider {
 
 	private static final String JNDI_PREFIX = "java:global/sormas-ear/sormas-backend/";
@@ -99,6 +101,10 @@ public static CaseStatisticsFacade getCaseStatisticsFacade() {
 		return get().lookupEjbRemote(CaseStatisticsFacade.class);
 	}
 
+	public static CaseImportFacade getCaseImportFacade() {
+		return get().lookupEjbRemote(CaseImportFacade.class);
+	}
+
 	public static ContactFacade getContactFacade() {
 		return get().lookupEjbRemote(ContactFacade.class);
 	}
@@ -267,6 +273,10 @@ public static CampaignFacade getCampaignFacade() {
 		return get().lookupEjbRemote(CampaignFacade.class);
 	}
 
+	public static CampaignDiagramDefinitionFacade getCampaignDiagramDefinitionFacade() {
+		return get().lookupEjbRemote(CampaignDiagramDefinitionFacade.class);
+	}
+
 	public static CampaignFormMetaFacade getCampaignFormMetaFacade() {
 		return get().lookupEjbRemote(CampaignFormMetaFacade.class);
 	}

sormas-api/src/main/java/de/symeda/sormas/api/campaign/data/CampaignFormDataEntry.java

@@ -15,16 +15,18 @@
 
 package de.symeda.sormas.api.campaign.data;
 
+import java.io.Serializable;
+
 import de.symeda.sormas.api.i18n.I18nProperties;
 import de.symeda.sormas.api.i18n.Strings;
 
-import java.io.Serializable;
-import java.util.Objects;
-
 public class CampaignFormDataEntry implements Serializable {
 
 	private static final long serialVersionUID = -3096020120349257398L;
 
+	public static final String ID = "id";
+	public static final String VALUE = "value";
+
 	private String id;
 	private Object value;
 
@@ -53,20 +55,21 @@ public void setValue(Object value) {
 		this.value = value;
 	}
 
-	@Override
-	public boolean equals(Object o) {
-		if (this == o)
-			return true;
-		if (o == null || getClass() != o.getClass())
-			return false;
-		CampaignFormDataEntry that = (CampaignFormDataEntry) o;
-		return Objects.equals(id, that.id);
-	}
-
-	@Override
-	public int hashCode() {
-		return Objects.hash(id);
-	}
+	// does not make sense. Leads to hibernate not persisting any changes in value
+//	@Override
+//	public boolean equals(Object o) {
+//		if (this == o)
+//			return true;
+//		if (o == null || getClass() != o.getClass())
+//			return false;
+//		CampaignFormDataEntry that = (CampaignFormDataEntry) o;
+//		return Objects.equals(id, that.id);
+//	}
+//
+//	@Override
+//	public int hashCode() {
+//		return Objects.hash(id);
+//	}
 
 	@Override
 	public String toString() {
@@ -80,5 +83,4 @@ public String toString() {
 
 		return value.toString();
 	}
-
 }

sormas-api/src/main/java/de/symeda/sormas/api/campaign/data/CampaignFormDataFacade.java

@@ -20,10 +20,14 @@
 
 package de.symeda.sormas.api.campaign.data;
 
-import de.symeda.sormas.api.utils.SortProperty;
+import java.util.List;
 
 import javax.ejb.Remote;
-import java.util.List;
+
+import de.symeda.sormas.api.campaign.diagram.CampaignDiagramCriteria;
+import de.symeda.sormas.api.campaign.diagram.CampaignDiagramDataDto;
+import de.symeda.sormas.api.campaign.diagram.CampaignDiagramSeries;
+import de.symeda.sormas.api.utils.SortProperty;
 
 @Remote
 public interface CampaignFormDataFacade {
@@ -45,4 +49,6 @@ public interface CampaignFormDataFacade {
 	List<CampaignFormDataIndexDto> getIndexList(CampaignFormDataCriteria criteria, Integer first, Integer max, List<SortProperty> sortProperties);
 
 	long count(CampaignFormDataCriteria criteria);
+
+	List<CampaignDiagramDataDto> getDiagramData(List<CampaignDiagramSeries> diagramSeriesList, CampaignDiagramCriteria campaignDiagramCriteria);
 }

sormas-api/src/main/java/de/symeda/sormas/api/campaign/data/CampaignFormDataIndexDto.java

@@ -36,8 +36,7 @@ public class CampaignFormDataIndexDto implements Serializable, Cloneable {
 	private String uuid;
 	private String campaign;
 	private String form;
-	private String formValues;
-	private List<CampaignFormDataEntry> formValuesList;
+	private List<CampaignFormDataEntry> formValues;
 	private String region;
 	private String district;
 	private String community;
@@ -47,15 +46,15 @@ public CampaignFormDataIndexDto(
 		String uuid,
 		String campaign,
 		String form,
-		String formValues,
+		Object formValues,
 		String region,
 		String district,
 		String community,
 		Date formDate) {
 		this.uuid = uuid;
 		this.campaign = campaign;
 		this.form = form;
-		this.formValues = formValues;
+		this.formValues = (List<CampaignFormDataEntry>) formValues;
 		this.region = region;
 		this.district = district;
 		this.community = community;
@@ -86,11 +85,11 @@ public void setForm(String form) {
 		this.form = form;
 	}
 
-	public String getFormValues() {
+	public List<CampaignFormDataEntry> getFormValues() {
 		return formValues;
 	}
 
-	public void setFormValues(String formValues) {
+	public void setFormValues(List<CampaignFormDataEntry> formValues) {
 		this.formValues = formValues;
 	}
 
@@ -125,13 +124,4 @@ public Date getFormDate() {
 	public void setFormDate(Date formDate) {
 		this.formDate = formDate;
 	}
-
-	public List<CampaignFormDataEntry> getFormValuesList() {
-		return formValuesList;
-	}
-
-	public void setFormValuesList(List<CampaignFormDataEntry> formValuesList) {
-		this.formValuesList = formValuesList;
-	}
-
 }

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

@@ -0,0 +1,56 @@
+package de.symeda.sormas.api.campaign.diagram;
+
+import java.io.Serializable;
+
+import de.symeda.sormas.api.BaseCriteria;
+import de.symeda.sormas.api.campaign.CampaignReferenceDto;
+import de.symeda.sormas.api.region.AreaReferenceDto;
+import de.symeda.sormas.api.region.DistrictReferenceDto;
+import de.symeda.sormas.api.region.RegionReferenceDto;
+
+public class CampaignDiagramCriteria extends BaseCriteria implements Serializable {
+
+	private CampaignReferenceDto campaign;
+	private AreaReferenceDto area;
+	private RegionReferenceDto region;
+	private DistrictReferenceDto district;
+
+	public CampaignDiagramCriteria(CampaignReferenceDto campaign, AreaReferenceDto area, RegionReferenceDto region, DistrictReferenceDto district) {
+		this.campaign = campaign;
+		this.area = area;
+		this.region = region;
+		this.district = district;
+	}
+
+	public CampaignReferenceDto getCampaign() {
+		return campaign;
+	}
+
+	public void setCampaign(CampaignReferenceDto campaign) {
+		this.campaign = campaign;
+	}
+
+	public AreaReferenceDto getArea() {
+		return area;
+	}
+
+	public void setArea(AreaReferenceDto area) {
+		this.area = area;
+	}
+
+	public RegionReferenceDto getRegion() {
+		return region;
+	}
+
+	public void setRegion(RegionReferenceDto region) {
+		this.region = region;
+	}
+
+	public DistrictReferenceDto getDistrict() {
+		return district;
+	}
+
+	public void setDistrict(DistrictReferenceDto district) {
+		this.district = district;
+	}
+}

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

@@ -0,0 +1,82 @@
+package de.symeda.sormas.api.campaign.diagram;
+
+import java.io.Serializable;
+
+public class CampaignDiagramDataDto implements Serializable {
+
+	private static final long serialVersionUID = -8813972727008846360L;
+
+	private String formMetaUuid;
+	private String formId;
+	private String fieldId;
+	private String fieldCaption;
+	private Object valueSum;
+	private Object groupingKey;
+	private String groupingCaption;
+
+	public CampaignDiagramDataDto(String formMetaUuid, String formId, String fieldId, Object valueSum, Object groupingKey, String groupingCaption) {
+		this.formMetaUuid = formMetaUuid;
+		this.formId = formId;
+		this.fieldId = fieldId;
+		this.valueSum = valueSum;
+		this.groupingKey = groupingKey;
+		this.groupingCaption = groupingCaption;
+
+	}
+
+	public String getFormMetaUuid() {
+		return formMetaUuid;
+	}
+
+	public void setFormMetaUuid(String formMetaUuid) {
+		this.formMetaUuid = formMetaUuid;
+	}
+
+	public String getFormId() {
+		return formId;
+	}
+
+	public void setFormId(String formId) {
+		this.formId = formId;
+	}
+
+	public String getFieldId() {
+		return fieldId;
+	}
+
+	public void setFieldId(String fieldId) {
+		this.fieldId = fieldId;
+	}
+
+	public String getFieldCaption() {
+		return fieldCaption;
+	}
+
+	public void setFieldCaption(String fieldCaption) {
+		this.fieldCaption = fieldCaption;
+	}
+
+	public Object getValueSum() {
+		return valueSum;
+	}
+
+	public void setValueSum(Object valueSum) {
+		this.valueSum = valueSum;
+	}
+
+	public Object getGroupingKey() {
+		return groupingKey;
+	}
+
+	public void setGroupingKey(Object groupingKey) {
+		this.groupingKey = groupingKey;
+	}
+
+	public String getGroupingCaption() {
+		return groupingCaption;
+	}
+
+	public void setGroupingCaption(String groupingCaption) {
+		this.groupingCaption = groupingCaption;
+	}
+}

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

@@ -7,6 +7,7 @@
 public class CampaignDiagramDefinitionDto extends EntityDto {
 
 	private String diagramId;
+	private String diagramCaption;
 	private DiagramType diagramType;
 	private List<CampaignDiagramSeries> campaignDiagramSeriesList;
 
@@ -18,6 +19,14 @@ public void setDiagramId(String diagramId) {
 		this.diagramId = diagramId;
 	}
 
+	public String getDiagramCaption() {
+		return diagramCaption;
+	}
+
+	public void setDiagramCaption(String diagramCaption) {
+		this.diagramCaption = diagramCaption;
+	}
+
 	public DiagramType getDiagramType() {
 		return diagramType;
 	}

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

@@ -9,5 +9,7 @@ public interface CampaignDiagramDefinitionFacade {
 
 	CampaignDiagramDefinitionDto save(CampaignDiagramDefinitionDto campaignDiagramDefinitionDto);
 
+	List<CampaignDiagramDefinitionDto> getAll();
+
 	List<CampaignDiagramDefinitionDto> getByUuids(List<String> uuids);
 }