Merge branch 'development' of https://github.com/hzi-braunschweig/SORMAS-Project into development

Author: MateStrysewske

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

@@ -106,6 +106,7 @@ public interface Strings {
 	String confirmationReduceQuarantine = "confirmationReduceQuarantine";
 	String confirmationRemoveUserAsOfficer = "confirmationRemoveUserAsOfficer";
 	String confirmationUpdateCompleteness = "confirmationUpdateCompleteness";
+	String confirmNetworkDiagramTooManyContacts = "confirmNetworkDiagramTooManyContacts";
 	String day = "day";
 	String DiseaseNetworkDiagram_Classification_HEALTHY = "DiseaseNetworkDiagram.Classification.HEALTHY";
 	String DiseaseNetworkDiagram_heading = "DiseaseNetworkDiagram.heading";
@@ -308,6 +309,7 @@ public interface Strings {
 	String headingMissingDateFilter = "headingMissingDateFilter";
 	String headingMissingEpiWeekFilter = "headingMissingEpiWeekFilter";
 	String headingMyTasks = "headingMyTasks";
+	String headingNetworkDiagramTooManyContacts = "headingNetworkDiagramTooManyContacts";
 	String headingNewCases = "headingNewCases";
 	String headingNewEvents = "headingNewEvents";
 	String headingNewPassword = "headingNewPassword";
@@ -756,6 +758,7 @@ public interface Strings {
 	String unsavedChanges_warningMessage = "unsavedChanges.warningMessage";
 	String unsavedChanges_warningTitle = "unsavedChanges.warningTitle";
 	String until = "until";
+	String warningNetworkDiagramTooManyContacts = "warningNetworkDiagramTooManyContacts";
 	String week = "week";
 	String weekShort = "weekShort";
 	String year = "year";

sormas-api/src/main/java/de/symeda/sormas/api/visualization/VisualizationFacade.java

@@ -18,6 +18,7 @@
 package de.symeda.sormas.api.visualization;
 
 import java.util.Collection;
+import java.util.Date;
 
 import javax.ejb.Remote;
 
@@ -29,5 +30,13 @@
 @Remote
 public interface VisualizationFacade {
 
-	String buildTransmissionChainJson(RegionReferenceDto region, DistrictReferenceDto district, Collection<Disease> diseases, Language language);
+	String buildTransmissionChainJson(
+		Date fromDate,
+		Date toDate,
+		RegionReferenceDto region,
+		DistrictReferenceDto district,
+		Collection<Disease> diseases,
+		Language language);
+
+	Long getContactCount(Date fromDate, Date toDate, RegionReferenceDto region, DistrictReferenceDto district, Collection<Disease> diseases);
 }

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

@@ -804,3 +804,7 @@ unsavedChanges.warningTitle = Confirm navigation
 unsavedChanges.warningMessage = You have unsaved changes on this form.
 unsavedChanges.discard = Discard changes
 unsavedChanges.save = Save changes
+
+headingNetworkDiagramTooManyContacts = Too many contacts
+warningNetworkDiagramTooManyContacts = There are %d contacts and it is possible that your browser will freeze while displaying the diagram.<br/>Please choose a smaller time window.
+confirmNetworkDiagramTooManyContacts = Do you really want to update the diagram?

sormas-backend/src/main/java/de/symeda/sormas/backend/visualization/VisualizationFacadeEjb.java

@@ -29,6 +29,7 @@
 import java.util.Arrays;
 import java.util.Collection;
 import java.util.Collections;
+import java.util.Date;
 import java.util.HashMap;
 import java.util.Map;
 import java.util.Optional;
@@ -46,6 +47,7 @@
 import javax.persistence.criteria.CriteriaQuery;
 import javax.persistence.criteria.Join;
 import javax.persistence.criteria.JoinType;
+import javax.persistence.criteria.Predicate;
 import javax.persistence.criteria.Root;
 
 import org.apache.commons.io.FileUtils;
@@ -79,7 +81,7 @@
 public class VisualizationFacadeEjb implements VisualizationFacade {
 
 	static final String SORMAS_DATA_POOL_JNDI = "jdbc/sormasDataPool";
-	
+
 	//	private static final String TRANSMISSION_CHAIN_SCRIPT = "transmission_chain.r";
 	private static final String TRANSMISSION_CHAIN_SCRIPT = "transform_contact.R";
 	private static final String[] REQUIRED_SCRIPTS = {
@@ -98,6 +100,8 @@ public class VisualizationFacadeEjb implements VisualizationFacade {
 
 	@Override
 	public String buildTransmissionChainJson(
+		Date fromDate,
+		Date toDate,
 		RegionReferenceDto region,
 		DistrictReferenceDto district,
 		Collection<Disease> diseases,
@@ -109,7 +113,7 @@ public String buildTransmissionChainJson(
 		}
 		Path tempBasePath = new File(configFacade.getTempFilesPath()).toPath();
 
-		Collection<Long> contactIds = getContactIds(region, district, diseases);
+		Collection<Long> contactIds = getContactIds(fromDate, toDate, region, district, diseases);
 
 		if (contactIds.isEmpty()) {
 			return null;
@@ -121,31 +125,65 @@ public String buildTransmissionChainJson(
 		return buildTransmissionChainJson(rExecutable, tempBasePath, domainXmlPath, contactIds, language);
 	}
 
-	private Collection<Long> getContactIds(RegionReferenceDto region, DistrictReferenceDto district, Collection<Disease> diseases) {
+	@Override
+	public Long getContactCount(Date fromDate, Date toDate, RegionReferenceDto region, DistrictReferenceDto district, Collection<Disease> diseases) {
 
 		CriteriaBuilder cb = em.getCriteriaBuilder();
 		CriteriaQuery<Long> cq = cb.createQuery(Long.class);
 		Root<Contact> root = cq.from(Contact.class);
-		Join<Contact, Case> caze = root.join(Contact.CAZE, JoinType.LEFT);
 
-		cq.where(
-			AbstractAdoService.and(
-				cb,
-				contactService.createUserFilter(cb, cq, root),
-				contactService.createActiveContactsFilter(cb, root),
-				contactService.createDefaultFilter(cb, root),
-				cb.notEqual(root.get(Contact.CONTACT_CLASSIFICATION), ContactClassification.NO_CONTACT),
-				cb.or(
-					cb.isNull(caze),
-					cb.and(caseService.createDefaultFilter(cb, caze), cb.notEqual(caze.get(Case.CASE_CLASSIFICATION), CaseClassification.NO_CASE))),
-				root.get(Contact.DISEASE).in(diseases),
-				region == null ? null : cb.equal(root.join(Contact.REGION).get(Region.UUID), region.getUuid()),
-				district == null ? null : cb.equal(root.join(Contact.DISTRICT).get(District.UUID), district.getUuid())));
+		cq.where(buildContactFilters(cb, cq, root, fromDate, toDate, region, district, diseases));
+
+		cq.select(cb.count(root.get(AbstractDomainObject.ID)));
+
+		return em.createQuery(cq).getSingleResult();
+	}
+
+	private Collection<Long> getContactIds(
+		Date fromDate,
+		Date toDate,
+		RegionReferenceDto region,
+		DistrictReferenceDto district,
+		Collection<Disease> diseases) {
+
+		CriteriaBuilder cb = em.getCriteriaBuilder();
+		CriteriaQuery<Long> cq = cb.createQuery(Long.class);
+		Root<Contact> root = cq.from(Contact.class);
+
+		cq.where(buildContactFilters(cb, cq, root, fromDate, toDate, region, district, diseases));
 
 		cq.select(root.get(AbstractDomainObject.ID));
+
 		return em.createQuery(cq).getResultList();
 	}
 
+	private Predicate buildContactFilters(
+		CriteriaBuilder cb,
+		CriteriaQuery<Long> cq,
+		Root<Contact> root,
+		Date fromDate,
+		Date toDate,
+		RegionReferenceDto region,
+		DistrictReferenceDto district,
+		Collection<Disease> diseases) {
+		Join<Contact, Case> caze = root.join(Contact.CAZE, JoinType.LEFT);
+
+		return AbstractAdoService.and(
+			cb,
+			contactService.createUserFilter(cb, cq, root),
+			contactService.createActiveContactsFilter(cb, root),
+			contactService.createDefaultFilter(cb, root),
+			cb.notEqual(root.get(Contact.CONTACT_CLASSIFICATION), ContactClassification.NO_CONTACT),
+			cb.or(
+				cb.isNull(caze),
+				cb.and(caseService.createDefaultFilter(cb, caze), cb.notEqual(caze.get(Case.CASE_CLASSIFICATION), CaseClassification.NO_CASE))),
+			fromDate == null ? null : cb.greaterThanOrEqualTo(root.get(Contact.REPORT_DATE_TIME), fromDate),
+			toDate == null ? null : cb.lessThanOrEqualTo(root.get(Contact.REPORT_DATE_TIME), toDate),
+			root.get(Contact.DISEASE).in(diseases),
+			region == null ? null : cb.equal(root.join(Contact.REGION).get(Region.UUID), region.getUuid()),
+			district == null ? null : cb.equal(root.join(Contact.DISTRICT).get(District.UUID), district.getUuid()));
+	}
+
 	enum EnvParam {
 
 		DB_USER("user"),

sormas-backend/src/main/resources/visualisation/transform_contact.R

@@ -65,7 +65,7 @@ if (idContString == "") idContString = "NULL"
 #query all relevant contacts
 sql_edge = "select distinct cs.person_id case_pid, ct.person_id contact_pid,
 	'ContactProximity.' || ct.contactproximity as contactproximity, 'ContactStatus.' || ct.contactstatus as contactstatus
-from public.contact ct 
+from public.contact ct
 	join public.cases cs on ct.caze_id = cs.id
 where ct.id in (%s)"
 
@@ -80,7 +80,7 @@ sql_node = "with clean_ct as (
 clean_cs as (
 	select *
 	from public.cases
-	where deleted = FALSE 
+	where deleted = FALSE
 		and caseclassification != 'NO_CASE'
 ),
 node as (
@@ -92,7 +92,7 @@ node as (
 union
 	--caze
 	select distinct p.id, cs.reportdate, cs.uuid, cs.caseclassification
-	from clean_ct ct 
+	from clean_ct ct
 		join public.cases cs on ct.caze_id = cs.id
 		join public.person p on cs.person_id = p.id
 )

sormas-ui/src/main/java/de/symeda/sormas/ui/dashboard/AbstractDashboardView.java

@@ -77,6 +77,7 @@ protected AbstractDashboardView(String viewName) {
 		dashboardLayout.setStyleName("crud-main-layout");
 
 		addComponent(dashboardLayout);
+		setExpandRatio(dashboardLayout, 1);
 	}
 
 	protected void navigateToDashboardView(Property.ValueChangeEvent e) {

sormas-ui/src/main/java/de/symeda/sormas/ui/dashboard/DashboardFilterLayout.java

@@ -20,15 +20,10 @@
 import java.util.Date;
 import java.util.HashSet;
 import java.util.Set;
-import java.util.function.Consumer;
-import java.util.stream.Stream;
 
-import com.vaadin.event.ShortcutAction;
-import com.vaadin.ui.CustomLayout;
-import com.vaadin.v7.ui.Field;
-import de.symeda.sormas.ui.utils.FieldHelper;
 import org.vaadin.hene.popupbutton.PopupButton;
 
+import com.vaadin.event.ShortcutAction;
 import com.vaadin.icons.VaadinIcons;
 import com.vaadin.server.Page;
 import com.vaadin.shared.ui.ContentMode;
@@ -95,7 +90,6 @@ public class DashboardFilterLayout extends HorizontalLayout {
 	private HorizontalLayout customDateFilterLayout;
 
 	private Runnable dateFilterChangeCallback;
-	private Consumer<Boolean> diseaseFilterChangeCallback;
 
 	public DashboardFilterLayout(AbstractDashboardView dashboardView, DashboardDataProvider dashboardDataProvider) {
 		this.dashboardView = dashboardView;
@@ -159,9 +153,6 @@ private void createDiseaseFilter() {
 			diseaseFilter.addItems(FacadeProvider.getDiseaseConfigurationFacade().getAllDiseases(true, true, true).toArray());
 		}
 		diseaseFilter.addValueChangeListener(e -> {
-			if (diseaseFilterChangeCallback != null) {
-				diseaseFilterChangeCallback.accept(diseaseFilter.getValue() != null);
-			}
 			dashboardDataProvider.setDisease((Disease) diseaseFilter.getValue());
 		});
 		addComponent(diseaseFilter);
@@ -552,14 +543,6 @@ public void setDateFilterChangeCallback(Runnable dateFilterChangeCallback) {
 		this.dateFilterChangeCallback = dateFilterChangeCallback;
 	}
 
-	public Consumer<Boolean> getDiseaseFilterChangeCallback() {
-		return diseaseFilterChangeCallback;
-	}
-
-	public void setDiseaseFilterChangeCallback(Consumer<Boolean> diseaseFilterChangeCallback) {
-		this.diseaseFilterChangeCallback = diseaseFilterChangeCallback;
-	}
-
 	public boolean hasDiseaseSelected() {
 		return diseaseFilter.getValue() != null;
 	}

sormas-ui/src/main/java/de/symeda/sormas/ui/dashboard/campaigns/CampaignDashboardDiagramComponent.java

@@ -9,14 +9,15 @@
 import java.util.function.Function;
 import java.util.stream.Collectors;
 
-import com.vaadin.ui.CssLayout;
+import com.vaadin.ui.VerticalLayout;
 
 import de.symeda.sormas.api.campaign.diagram.CampaignDiagramDataDto;
 import de.symeda.sormas.api.campaign.diagram.CampaignDiagramDefinitionDto;
 import de.symeda.sormas.api.campaign.diagram.CampaignDiagramSeries;
 import de.symeda.sormas.ui.highcharts.HighChart;
 
-public class CampaignDashboardDiagramComponent extends CssLayout {
+@SuppressWarnings("serial")
+public class CampaignDashboardDiagramComponent extends VerticalLayout {
 
 	private CampaignDiagramDefinitionDto diagramDefinition;
 
@@ -32,8 +33,10 @@ public CampaignDashboardDiagramComponent(CampaignDiagramDefinitionDto diagramDef
 
 		campaignColumnChart = new HighChart();
 
+		setSizeFull();
 		campaignColumnChart.setSizeFull();
 
+		setMargin(false);
 		addComponent(campaignColumnChart);
 //		setExpandRatio(campaignColumnChart, 1);
 
@@ -64,8 +67,6 @@ private void buildDiagramChart(String title) {
 		hcjs.append("var options = {"
 				+ "chart:{ "
 				+ " type: 'column', "
-				+ " width: $(\"#container\").height(), "
-				+ " height: $(\"#container\").width(), "
 				+ " backgroundColor: 'transparent', "
 				+ " borderRadius: '1', "
 				+ " borderWidth: '1', "
@@ -78,7 +79,7 @@ private void buildDiagramChart(String title) {
 				+ "},"
 				+ "legend: { backgroundColor: 'transparent', margin: 30 },"
 				+ "colors: ['#4472C4', '#ED7D31', '#A5A5A5', '#FFC000', '#5B9BD5', '#70AD47', '#FF0000', '#6691C4','#ffba08','#519e8a','#ed254e','#39a0ed','#FF8C00','#344055','#D36135','#82d173'],"
-				+ "title:{ text: '" + title + "'},");
+				+ "title:{ text: '" + title + "', style: { fontSize: '15px' } },");
 		//@formatter:on
 
 		Map<String, Long> stackMap = diagramDefinition.getCampaignDiagramSeriesList()