Merge branch 'development' into feature-3418-SurvNet-Adaptations-Create-new-field-“staff-of-armed-forces”-to-case-person-and-contact-person

Author: FredrikSchäferVitagroup

sormas-api/pom.xml

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

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

@@ -20,16 +20,16 @@
 
 package de.symeda.sormas.api.campaign.data;
 
+import java.util.Date;
+import java.util.List;
+
+import javax.ejb.Remote;
+
 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;
 
-import javax.ejb.Remote;
-
-import java.util.Date;
-import java.util.List;
-
 @Remote
 public interface CampaignFormDataFacade {
 
@@ -53,6 +53,11 @@ public interface CampaignFormDataFacade {
 
 	List<CampaignDiagramDataDto> getDiagramData(List<CampaignDiagramSeries> diagramSeries, CampaignDiagramCriteria campaignDiagramCriteria);
 
+	List<CampaignDiagramDataDto> getDiagramDataByAgeGroup(
+		CampaignDiagramSeries diagramSeriesTotal,
+		CampaignDiagramSeries diagramSeries,
+		CampaignDiagramCriteria campaignDiagramCriteria);
+
 	List<String> getAllActiveUuids();
 
 	List<CampaignFormDataDto> getAllActiveAfter(Date date);

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

@@ -14,6 +14,53 @@ public class CampaignDiagramDataDto implements Serializable {
 	private Object groupingKey;
 	private String groupingCaption;
 	private String stack;
+	private boolean hasAgeGroupData;
+
+	public CampaignDiagramDataDto(String fieldCaption, Number valueSum, Object groupingKey, String groupingCaption, String fieldId, String formId) {
+		this.fieldCaption = fieldCaption;
+		this.valueSum = valueSum;
+		this.groupingKey = groupingKey;
+		this.groupingCaption = groupingCaption;
+		this.fieldId = fieldId;
+		this.formId = formId;
+	}
+
+	public CampaignDiagramDataDto(
+		String fieldCaption,
+		Number valueSum,
+		Object groupingKey,
+		String groupingCaption,
+		String fieldId,
+		String formId,
+		boolean hasAgeGroupData,
+		String stack) {
+		this.fieldCaption = fieldCaption;
+		this.valueSum = valueSum;
+		this.groupingKey = groupingKey;
+		this.groupingCaption = groupingCaption;
+		this.fieldId = fieldId;
+		this.formId = formId;
+		this.hasAgeGroupData = hasAgeGroupData;
+		this.stack = stack;
+	}
+
+	public CampaignDiagramDataDto(
+		String fieldCaption,
+		Number valueSum,
+		Object groupingKey,
+		String groupingCaption,
+		String fieldId,
+		String formId,
+		boolean hasAgeGroupData) {
+		this.fieldCaption = fieldCaption;
+		this.valueSum = valueSum;
+		this.groupingKey = groupingKey;
+		this.groupingCaption = groupingCaption;
+		this.fieldId = fieldId;
+		this.formId = formId;
+		this.hasAgeGroupData = hasAgeGroupData;
+
+	}
 
 	public CampaignDiagramDataDto(
 		String formMetaUuid,
@@ -97,4 +144,12 @@ public String getStack() {
 	public void setStack(String stack) {
 		this.stack = stack;
 	}
+
+	public boolean getHasAgeGroupData() {
+		return hasAgeGroupData;
+	}
+
+	public void setHasAgeGroupData(boolean hasAgeGroupData) {
+		this.hasAgeGroupData = hasAgeGroupData;
+	}
 }

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

@@ -3,6 +3,8 @@
 import java.io.Serializable;
 import java.util.Objects;
 
+import de.symeda.sormas.api.AgeGroup;
+
 public class CampaignDiagramSeries implements Serializable {
 
 	private static final long serialVersionUID = 1420672609912364060L;
@@ -11,6 +13,7 @@ public class CampaignDiagramSeries implements Serializable {
 	private String formId;
 	private String referenceValue;
 	private String stack;
+	private AgeGroup populationGroup;
 
 	public CampaignDiagramSeries() {
 	}
@@ -64,11 +67,20 @@ public boolean equals(Object o) {
 		return Objects.equals(fieldId, that.fieldId)
 			&& Objects.equals(formId, that.formId)
 			&& Objects.equals(referenceValue, that.referenceValue)
-			&& Objects.equals(stack, that.stack);
+			&& Objects.equals(stack, that.stack)
+			&& Objects.equals(populationGroup, that.populationGroup);
+	}
+
+	public AgeGroup getPopulationGroup() {
+		return populationGroup;
+	}
+
+	public void setPopulationGroup(AgeGroup populationGroup) {
+		this.populationGroup = populationGroup;
 	}
 
 	@Override
 	public int hashCode() {
-		return Objects.hash(fieldId, formId, referenceValue, stack);
+		return Objects.hash(fieldId, formId, referenceValue, stack, populationGroup);
 	}
 }

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

@@ -174,10 +174,13 @@ public interface Strings {
 	String errorEntityOutdated = "errorEntityOutdated";
 	String errorFieldValidationFailed = "errorFieldValidationFailed";
 	String errorFileNotFound = "errorFileNotFound";
+	String errorFormIdPopulationAgeGroup = "errorFormIdPopulationAgeGroup";
 	String errorIllegalFilename = "errorIllegalFilename";
 	String errorIntegerFieldValidationFailed = "errorIntegerFieldValidationFailed";
 	String errorInvalidValue = "errorInvalidValue";
 	String errorNoAccessToWeb = "errorNoAccessToWeb";
+	String errorNoPopulationDataFound = "errorNoPopulationDataFound";
+	String errorNoPopulationDataLocations = "errorNoPopulationDataLocations";
 	String errorNotRequiredRights = "errorNotRequiredRights";
 	String errorOccurred = "errorOccurred";
 	String errorProblemOccurred = "errorProblemOccurred";
@@ -784,6 +787,10 @@ public interface Strings {
 	String on = "on";
 	String or = "or";
 	String pleaseSpecify = "pleaseSpecify";
+	String populationDataByArea = "populationDataByArea";
+	String populationDataByCommunity = "populationDataByCommunity";
+	String populationDataByDistrict = "populationDataByDistrict";
+	String populationDataByRegion = "populationDataByRegion";
 	String previousPeriod = "previousPeriod";
 	String promptActionDateFrom = "promptActionDateFrom";
 	String promptActionDateTo = "promptActionDateTo";

sormas-api/src/main/java/de/symeda/sormas/api/sormastosormas/SormasToSormasValidationException.java

@@ -25,6 +25,11 @@ public SormasToSormasValidationException(Map<String, ValidationErrors> errors) {
 		this.errors = errors;
 	}
 
+	public SormasToSormasValidationException(Map<String, ValidationErrors> errors, Throwable cause) {
+		super("Validation error", cause);
+		this.errors = errors;
+	}
+
 	public Map<String, ValidationErrors> getErrors() {
 		return errors;
 	}

sormas-api/src/main/resources/doc/SORMAS_Data_Dictionary.xlsx

@@ -251,7 +251,9 @@ errorReadingDocument = Error reading document '%s'
 errorProcessingTemplate = Error processing template '%s'
 errorSormasToSormasNotEditable = Readonly data can not be shared.
 errorCampaignDiagramTotalsCalculationError = At least part of the percentage values for the diagram '%s' could not be calculated. Please check the diagram definitions for errors.
-
+errorNoPopulationDataLocations=No population data was found for the following locations : %s
+errorNoPopulationDataFound=There is no population data available. Switching to absolute data view
+errorFormIdPopulationAgeGroup=Both "Form Id" and "Population Age Group" options are set 
 # headings
 headingAccessDenied = Access denied
 headingAdditionalTests = Additional tests
@@ -575,6 +577,10 @@ infoCreateNewSampleDiscardsChanges = Creating a new sample will discard all unsa
 infoCreateNewSampleDiscardsChangesEventParticipant = Creating a new sample will discard all unsaved changes made to this event participant
 infoUsageOfEditableCampaignGrids = You can edit the campaign data and dashboard definitions by clicking inside one of the cells in the grid, and you can reorder the dashboard elements by dragging and dropping the grid rows
 infoSaveOfTask = Saving this task will discard any unsaved changes made to the case.
+populationDataByArea = Population data by Area
+populationDataByRegion = Population data by Region
+populationDataByCommunity = No population data available for communities
+populationDataByDistrict = Population data by District
 infoExposureInvestigation = <i>Please document ALL relevant direct exposures (e.g. attended gatherings, travels, animal contacts, etc.) during the incubation period:</i>
 infoEpiDataFieldsHint = <i>Please indicate if any of the following is relevant for the patient during the incubation period:</i>
 infoEpiDataSourceCaseContacts = <i>Please indicate ALL contacts with potential source cases during the incubation period:</i>

sormas-api/src/main/resources/doc/SORMAS_User_Rights.xlsx

@@ -3,7 +3,7 @@
 	<parent>
 		<artifactId>sormas-base</artifactId>
 		<groupId>de.symeda.sormas</groupId>
-		<version>1.52.0-SNAPSHOT</version>
+		<version>1.53.0-SNAPSHOT</version>
 		<relativePath>../sormas-base</relativePath>
 	</parent>
 	<modelVersion>4.0.0</modelVersion>
@@ -29,7 +29,6 @@
 			<plugin>
 				<groupId>org.fortasoft</groupId>
 				<artifactId>gradle-maven-plugin</artifactId>
-				<version>1.0.8</version>
 
 				<configuration>
 					<gradleVersion>${gradle.version}</gradleVersion>