Merge branch 'development' into feature-2890-CampaignDataByJurisdiction

# Conflicts:
#	sormas-ui/src/main/java/de/symeda/sormas/ui/campaign/campaigndata/CampaignFormDataEditForm.java

Author: barnabartha

SERVER_CUSTOMIZATION.md

@@ -31,6 +31,9 @@ The following properties are currently configurable:
 * **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.
+* **Geocoding** Properties used to integrate an external geocoding service for obtaining the geo coordinates of addresses.
+*geocodingServiceUrlTemplate* is the url for searching for address details, *${street}*, *${houseNumber}*, *${postalCode}*, and *${city}* placeholders will be replaced with the actual address fields when searching;
+*geocodingLongitudeJsonPath* and *geocodingLatitudeJsonPath* are used to obtain the longitude and latitude of the address in the result of the geocoding service request
 
 ## Importing Infrastructure Data
 When you start a SORMAS server for the first time, some default infrastructure data is generated to ensure that the server is usable and the default users can be created. It is recommended (and, unless you're working on a demo server, necessary) to archive this default data and import the official infrastructure data of the country or part of the country that you intend to use SORMAS in instead.

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

@@ -90,7 +90,11 @@ public interface ConfigFacade {
 
 	int getMapZoom();
 
-	String getGeocodingOsgtsEndpoint();
+	String getGeocodingServiceUrlTemplate();
+
+	String getGeocodingLongitudeJsonPath();
+
+	String getGeocodingLatitudeJsonPath();
 
 	SymptomJournalConfig getSymptomJournalConfig();
 

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

@@ -1,63 +1,83 @@
 package de.symeda.sormas.api.campaign.diagram;
 
 import java.io.Serializable;
+import java.util.Objects;
 
 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;
-    }
+	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;
+	}
+
+	@Override
+	public boolean equals(Object o) {
+		if (this == o)
+			return true;
+		if (o == null || getClass() != o.getClass())
+			return false;
+		CampaignDashboardElement that = (CampaignDashboardElement) o;
+		return Objects.equals(diagramId, that.diagramId)
+			&& Objects.equals(tabId, that.tabId)
+			&& Objects.equals(order, that.order)
+			&& Objects.equals(width, that.width)
+			&& Objects.equals(height, that.height);
+	}
+
+	@Override
+	public int hashCode() {
+		return Objects.hash(diagramId, tabId, order, width, height);
+	}
 }

sormas-api/src/main/java/de/symeda/sormas/api/campaign/form/CampaignFormMetaFacade.java

@@ -1,11 +1,10 @@
 package de.symeda.sormas.api.campaign.form;
 
-import javax.ejb.Remote;
 import java.io.IOException;
 import java.util.Date;
 import java.util.List;
 
-import de.symeda.sormas.api.campaign.data.CampaignFormDataDto;
+import javax.ejb.Remote;
 
 @Remote
 public interface CampaignFormMetaFacade {
@@ -28,6 +27,8 @@ CampaignFormMetaDto buildCampaignFormMetaFromJson(String formId, String language
 
 	CampaignFormMetaDto getCampaignFormMetaByUuid(String campaignFormUuid);
 
+	List<CampaignFormMetaReferenceDto> getCampaignFormMetasAsReferencesByCampaign(String uuid);
+
     List<CampaignFormMetaDto> getAllAfter(Date campaignFormMetaChangeDate);
 
 	List<String> getAllUuids();

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

@@ -139,10 +139,12 @@ public interface Captions {
 	String Campaign_creatingUser = "Campaign.creatingUser";
 	String Campaign_description = "Campaign.description";
 	String Campaign_district = "Campaign.district";
+	String Campaign_edit = "Campaign.edit";
 	String Campaign_endDate = "Campaign.endDate";
 	String Campaign_name = "Campaign.name";
 	String Campaign_region = "Campaign.region";
 	String Campaign_startDate = "Campaign.startDate";
+	String Campaign_viewForms = "Campaign.viewForms";
 	String campaignActiveCampaigns = "campaignActiveCampaigns";
 	String campaignAdditionalChart = "campaignAdditionalChart";
 	String campaignAdditionalForm = "campaignAdditionalForm";

sormas-api/src/main/resources/captions.properties

@@ -211,6 +211,8 @@ Campaign.description=Description
 Campaign.startDate=Start date
 Campaign.endDate=End date
 Campaign.creatingUser=Creating user
+Campaign.viewForms=Open
+Campaign.edit=Edit
 Campaign.area=Area
 Campaign.region=Region
 Campaign.district=District

sormas-backend/pom.xml

@@ -187,6 +187,13 @@
 			<artifactId>microprofile-config-api</artifactId>
 		</dependency>
 
+		<!-- JsonPath -->
+		<dependency>
+			<groupId>com.jayway.jsonpath</groupId>
+			<artifactId>json-path</artifactId>
+			<version>2.4.0</version>
+		</dependency>
+
 	</dependencies>
 
 	<build>

sormas-backend/src/main/java/de/symeda/sormas/backend/campaign/data/CampaignFormDataFacadeEjb.java

@@ -322,9 +322,10 @@ public List<CampaignDiagramDataDto> getDiagramData(List<CampaignDiagramSeries> d
 			final String districtFilter = district != null ? " AND " + CampaignFormData.DISTRICT + "." + District.UUID + " = '" + district.getUuid() + "'" : "";
 			final String campaignFilter = campaign != null ? " AND " + Campaign.TABLE_NAME + "." + Campaign.UUID + " = '" + campaign.getUuid() +  "'" : "";
 			final String jurisdictionGrouping =
-					(district != null ? ", " + Community.TABLE_NAME + "." + Community.UUID + ", " + Community.TABLE_NAME + "." + Community.NAME :
-					region != null ? ", " + District.TABLE_NAME + "." + District.UUID + ", " + District.TABLE_NAME + "." + District.NAME : "")
-							+ ", " + Region.TABLE_NAME + "." + Region.UUID + ", " + Region.TABLE_NAME + "." + Region.NAME;
+					district != null ? ", " + Community.TABLE_NAME + "." + Community.UUID + ", " + Community.TABLE_NAME + "." + Community.NAME :
+							region != null ? ", " + District.TABLE_NAME + "." + District.UUID + ", " + District.TABLE_NAME + "." + District.NAME : 
+									area != null ? ", " + Region.TABLE_NAME + "." + Region.UUID + ", " + Region.TABLE_NAME + "." + Region.NAME :
+											", " + Area.TABLE_NAME + "." + Area.UUID + ", " + Area.TABLE_NAME + "." + Area.NAME;
 			//@formatter:on
 
 			// SELECT
@@ -358,13 +359,15 @@ public List<CampaignDiagramDataDto> getDiagramData(List<CampaignDiagramSeries> d
 				selectBuilder.append(", null as fieldId, null as fieldCaption, count(formId) as sumValue,");
 			}
 
-			selectBuilder.append(Region.TABLE_NAME)
-				.append(".")
-				.append(Region.UUID)
-				.append(", ")
-				.append(Region.TABLE_NAME)
-				.append(".")
-				.append(Region.NAME);
+			if (district != null) {
+				appendInfrastructureSelection(selectBuilder, Community.TABLE_NAME, Community.NAME);
+			} else if (region != null) {
+				appendInfrastructureSelection(selectBuilder, District.TABLE_NAME, District.NAME);
+			} else if (area != null) {
+				appendInfrastructureSelection(selectBuilder, Region.TABLE_NAME, Region.NAME);
+			} else {
+				appendInfrastructureSelection(selectBuilder, Area.TABLE_NAME, Area.NAME);
+			}
 
 			// JOINS
 			StringBuilder joinBuilder = new StringBuilder(" LEFT JOIN ").append(CampaignFormMeta.TABLE_NAME)
@@ -494,6 +497,10 @@ public List<CampaignDiagramDataDto> getDiagramData(List<CampaignDiagramSeries> d
 		return resultData;
 	}
 
+	private void appendInfrastructureSelection(StringBuilder sb, String tableNameField, String nameField) {
+		sb.append(tableNameField).append(".").append(AbstractDomainObject.UUID).append(", ").append(tableNameField).append(".").append(nameField);
+	}
+
 	@Override
 	public long count(CampaignFormDataCriteria criteria) {
 		CriteriaBuilder cb = em.getCriteriaBuilder();

sormas-backend/src/main/java/de/symeda/sormas/backend/campaign/form/CampaignFormMetaFacadeEjb.java

@@ -143,9 +143,14 @@ public List<CampaignFormMetaDto> getByUuids(List<String> uuids) {
 		return service.getByUuids(uuids).stream().map(campaignFormMeta -> toDto(campaignFormMeta)).collect(Collectors.toList());
 	}
 
+    @Override
+    public List<CampaignFormMetaReferenceDto> getCampaignFormMetasAsReferencesByCampaign(String uuid) {
+        return service.getCampaignFormMetasAsReferencesByCampaign(uuid);
+    }
+
 	@Override
-	public void validateAllFormMetas() {
-		List<CampaignFormMeta> forms = service.getAll();
+    public void validateAllFormMetas() {
+        List<CampaignFormMeta> forms = service.getAll();
 
 		for (CampaignFormMeta form : forms) {
 			try {

sormas-backend/src/main/java/de/symeda/sormas/backend/campaign/form/CampaignFormMetaService.java

@@ -8,9 +8,11 @@
 import javax.persistence.criteria.CriteriaBuilder;
 import javax.persistence.criteria.CriteriaQuery;
 import javax.persistence.criteria.From;
+import javax.persistence.criteria.Join;
 import javax.persistence.criteria.Predicate;
 import javax.persistence.criteria.Root;
 
+import de.symeda.sormas.api.campaign.form.CampaignFormMetaReferenceDto;
 import de.symeda.sormas.backend.campaign.Campaign;
 import de.symeda.sormas.backend.common.AbstractAdoService;
 import de.symeda.sormas.backend.common.AbstractDomainObject;
@@ -52,4 +54,15 @@ public List<CampaignFormMeta> getAllAfter(Date since, User user) {
 		List<CampaignFormMeta> resultList = em.createQuery(cq).getResultList();
 		return resultList;
 	}
+
+	public List<CampaignFormMetaReferenceDto> getCampaignFormMetasAsReferencesByCampaign(String uuid) {
+		CriteriaBuilder cb = em.getCriteriaBuilder();
+		CriteriaQuery<CampaignFormMetaReferenceDto> cq = cb.createQuery(CampaignFormMetaReferenceDto.class);
+		Root<Campaign> campaignRoot = cq.from(Campaign.class);
+		Join<Campaign, CampaignFormMeta> campaignFormMetaJoin = campaignRoot.join(Campaign.CAMPAIGN_FORM_METAS);
+		Predicate filter = cb.equal(campaignRoot.get(Campaign.UUID), uuid);
+		cq = cq.where(filter);
+		cq.multiselect(campaignFormMetaJoin.get(CampaignFormMeta.UUID), campaignFormMetaJoin.get(CampaignFormMeta.FORM_NAME));
+		return em.createQuery(cq).getResultList();
+	}
 }