Merge branch 'development' into feature-3253-SendSMSToCases

Author: barnabartha

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/i18n/Captions.java

@@ -157,6 +157,7 @@ public interface Captions {
 	String campaignDashboardChartHeight = "campaignDashboardChartHeight";
 	String campaignDashboardChartWidth = "campaignDashboardChartWidth";
 	String campaignDashboardOrder = "campaignDashboardOrder";
+	String campaignDashboardSubTabName = "campaignDashboardSubTabName";
 	String campaignDashboardTabName = "campaignDashboardTabName";
 	String CampaignFormData_area = "CampaignFormData.area";
 	String CampaignFormData_campaign = "CampaignFormData.campaign";

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

@@ -17,6 +17,8 @@ public interface Validations {
 	String campaignDashboardChartIdDoesNotExist = "campaignDashboardChartIdDoesNotExist";
 	String campaignDashboardChartPercentage = "campaignDashboardChartPercentage";
 	String campaignDashboardChartValueNull = "campaignDashboardChartValueNull";
+	String campaignDashboardDataFormValueDuplicate = "campaignDashboardDataFormValueDuplicate";
+	String campaignDashboardDataFormValueNull = "campaignDashboardDataFormValueNull";
 	String campaignFormDependingOnNotFound = "campaignFormDependingOnNotFound";
 	String campaignFormDependingOnValuesMissing = "campaignFormDependingOnValuesMissing";
 	String campaignFormElementDuplicateId = "campaignFormElementDuplicateId";

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

@@ -201,6 +201,7 @@ campaignAdditionalForm=Add form
 campaignAdditionalChart=Add chart
 campaignDashboardChart=Campaign data chart
 campaignDashboardTabName=Tab name
+campaignDashboardSubTabName=Sub-tab name
 campaignDashboardChartWidth=Width in %
 campaignDashboardChartHeight=Height in %
 campaignDashboardOrder=Order

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

@@ -112,6 +112,8 @@ campaignFormTranslationLanguageCodeRequired = All translations must specify a la
 campaignFormElementDuplicateId = Field IDs need to be unique, but the campaign form contains at least two fields with ID %s.
 errorsInForm = There are errors in the form you tried to save. Please check the fields highlighted in red and make sure to only enter valid values.
 campaignFormInvalidIdInListElements = The ID %s in the campaign form list definition is not associated to any element of the form.
+campaignDashboardDataFormValueNull = Campaign dashboard data form element is missing!
+campaignDashboardDataFormValueDuplicate = Campaign dashboard data form element must be unique!
 campaignDashboardChartPercentage = Value must be a number that is multiple of 5!
 campaignDashboardChartValueNull = Campaign dashboard elements %s of campaign %s are missing!
 campaignDashboardChartIdDoesNotExist = Diagram %s from campaign %s does not exist!

sormas-backend/src/main/java/de/symeda/sormas/backend/campaign/CampaignFacadeEjb.java

@@ -5,7 +5,9 @@
 import java.util.Collections;
 import java.util.Comparator;
 import java.util.Date;
+import java.util.HashMap;
 import java.util.List;
+import java.util.Map;
 import java.util.Set;
 import java.util.stream.Collectors;
 
@@ -200,9 +202,12 @@ public void validate(CampaignReferenceDto campaignReferenceDto) {
 		validate(getByUuid(campaignReferenceDto.getUuid()));
 	}
 
-	private void validate(CampaignDto campaignDto) {
+	protected void validate(CampaignDto campaignDto) {
 		final List<CampaignDashboardElement> campaignDashboardElements = campaignDto.getCampaignDashboardElements();
 		if (campaignDashboardElements != null) {
+
+			final Map<String, Boolean> oneSubTabIsNotNullOrEmptyMap = new HashMap<>();
+
 			for (CampaignDashboardElement cde : campaignDashboardElements) {
 				final String diagramId = cde.getDiagramId();
 				if (diagramId == null) {
@@ -212,8 +217,8 @@ private void validate(CampaignDto campaignDto) {
 							CampaignDashboardElement.DIAGRAM_ID,
 							campaignDto.getName()));
 				} else if (!campaignDiagramDefinitionFacade.exists(diagramId)) {
-						throw new ValidationRuntimeException(
-							I18nProperties.getValidationError(Validations.campaignDashboardChartIdDoesNotExist, diagramId, campaignDto.getName()));
+					throw new ValidationRuntimeException(
+						I18nProperties.getValidationError(Validations.campaignDashboardChartIdDoesNotExist, diagramId, campaignDto.getName()));
 				}
 
 				if (cde.getTabId() == null) {
@@ -222,6 +227,26 @@ private void validate(CampaignDto campaignDto) {
 							.getValidationError(Validations.campaignDashboardChartValueNull, CampaignDashboardElement.TAB_ID, campaignDto.getName()));
 				}
 
+				if (cde.getSubTabId() == null || cde.getSubTabId().isEmpty()) {
+					if (oneSubTabIsNotNullOrEmptyMap.containsKey(cde.getTabId()) && oneSubTabIsNotNullOrEmptyMap.get(cde.getTabId())) {
+						throw new ValidationRuntimeException(
+							I18nProperties.getValidationError(
+								Validations.campaignDashboardChartValueNull,
+								CampaignDashboardElement.SUB_TAB_ID,
+								campaignDto.getName()));
+					}
+					oneSubTabIsNotNullOrEmptyMap.put(cde.getTabId(), false);
+				} else {
+					if (oneSubTabIsNotNullOrEmptyMap.containsKey(cde.getTabId()) && !oneSubTabIsNotNullOrEmptyMap.get(cde.getTabId())) {
+						throw new ValidationRuntimeException(
+							I18nProperties.getValidationError(
+								Validations.campaignDashboardChartValueNull,
+								CampaignDashboardElement.SUB_TAB_ID,
+								campaignDto.getName()));
+					}
+					oneSubTabIsNotNullOrEmptyMap.put(cde.getTabId(), true);
+				}
+
 				if (cde.getOrder() == null) {
 					throw new ValidationRuntimeException(
 						I18nProperties
@@ -239,8 +264,17 @@ private void validate(CampaignDto campaignDto) {
 						I18nProperties
 							.getValidationError(Validations.campaignDashboardChartValueNull, CampaignDashboardElement.WIDTH, campaignDto.getName()));
 				}
-
 			}
+
+			campaignDto.getCampaignFormMetas().forEach(campaignFormMetaReferenceDto -> {
+				if (campaignFormMetaReferenceDto == null || campaignFormMetaReferenceDto.getUuid() == null) {
+					throw new ValidationRuntimeException(
+						I18nProperties.getValidationError(
+							Validations.campaignDashboardDataFormValueNull,
+							CampaignDto.CAMPAIGN_FORM_METAS,
+							campaignDto.getName()));
+				}
+			});
 		}
 	}
 
@@ -292,6 +326,9 @@ public List<CampaignDashboardElement> getCampaignDashboardElements(String campai
 			if (cde.getTabId() == null) {
 				cde.setTabId(StringUtils.EMPTY);
 			}
+			if (cde.getSubTabId() == null) {
+				cde.setSubTabId(StringUtils.EMPTY);
+			}
 			if (cde.getOrder() == null) {
 				cde.setOrder(0);
 			}

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

@@ -63,6 +63,8 @@ public Predicate createCriteriaFilter(CampaignFormDataCriteria criteria, Criteri
 
 		if (criteria.getCampaign() != null) {
 			filter = and(cb, filter, cb.equal(campaignJoin.get(Campaign.UUID), criteria.getCampaign().getUuid()));
+		} else {
+			filter = and(cb, filter, cb.or(cb.equal(campaignJoin.get(Campaign.ARCHIVED), false), cb.isNull(campaignJoin.get(Campaign.ARCHIVED))));
 		}
 		if (criteria.getCampaignFormMeta() != null) {
 			filter = and(cb, filter, cb.equal(campaignFormJoin.get(CampaignFormMeta.UUID), criteria.getCampaignFormMeta().getUuid()));

sormas-backend/src/test/java/de/symeda/sormas/backend/TestDataCreator.java

@@ -37,6 +37,8 @@
 import de.symeda.sormas.api.campaign.CampaignReferenceDto;
 import de.symeda.sormas.api.campaign.data.CampaignFormDataDto;
 import de.symeda.sormas.api.campaign.data.CampaignFormDataEntry;
+import de.symeda.sormas.api.campaign.diagram.CampaignDiagramDefinitionDto;
+import de.symeda.sormas.api.campaign.diagram.DiagramType;
 import de.symeda.sormas.api.campaign.form.CampaignFormMetaDto;
 import de.symeda.sormas.api.campaign.form.CampaignFormMetaReferenceDto;
 import de.symeda.sormas.api.caze.CaseClassification;
@@ -975,6 +977,15 @@ public CampaignDto createCampaign(UserDto user) {
 		return campaign;
 	}
 
+	public CampaignDiagramDefinitionDto createCampaignDiagramDefinition(String diagramId, String diagramCaption){
+		CampaignDiagramDefinitionDto campaignDiagramDefinition = CampaignDiagramDefinitionDto.build();
+		campaignDiagramDefinition.setDiagramType(DiagramType.COLUMN);
+		campaignDiagramDefinition.setDiagramId(diagramId);
+		campaignDiagramDefinition.setDiagramCaption(diagramCaption);
+
+		return campaignDiagramDefinition;
+	}
+
 	public CampaignFormMetaDto createCampaignForm(CampaignDto campaign) throws IOException {
 
 		CampaignFormMetaDto campaignForm;