Merge remote-tracking branch 'origin/development' into 3409_prohibition-to-work-fields

# Conflicts:
#	sormas-app/app/src/main/java/de/symeda/sormas/app/contact/edit/ContactValidator.java
#	sormas-backend/src/main/resources/sql/sormas_schema.sql

Author: lgal

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/CampaignPhase.java

@@ -0,0 +1,18 @@
+package de.symeda.sormas.api.campaign;
+
+import de.symeda.sormas.api.IntegerRange;
+import de.symeda.sormas.api.i18n.I18nProperties;
+
+/**
+ * Not used yet
+ */
+public enum CampaignPhase {
+
+	PRE,
+	INTRA,
+	POST;
+
+	public String toString() {
+		return I18nProperties.getEnumCaption(this);
+	}
+}

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

@@ -15,22 +15,24 @@
 
 package de.symeda.sormas.api.campaign.data;
 
+import java.io.Serializable;
+import java.util.Date;
+
 import de.symeda.sormas.api.BaseCriteria;
 import de.symeda.sormas.api.campaign.CampaignReferenceDto;
 import de.symeda.sormas.api.campaign.form.CampaignFormMetaReferenceDto;
 import de.symeda.sormas.api.region.CommunityReferenceDto;
 import de.symeda.sormas.api.region.DistrictReferenceDto;
 import de.symeda.sormas.api.region.RegionReferenceDto;
 
-import java.io.Serializable;
-
 public class CampaignFormDataCriteria extends BaseCriteria implements Serializable {
 
 	public static final String CAMPAIGN = "campaign";
 	public static final String CAMPAIGN_FORM_META = "campaignFormMeta";
 	public static final String REGION = "region";
 	public static final String DISTRICT = "district";
 	public static final String COMMUNITY = "community";
+	public static final String FORM_DATE = "formDate";
 
 	private static final long serialVersionUID = 8124072093160133408L;
 
@@ -39,6 +41,7 @@ public class CampaignFormDataCriteria extends BaseCriteria implements Serializab
 	private RegionReferenceDto region;
 	private DistrictReferenceDto district;
 	private CommunityReferenceDto community;
+	private Date formDate;
 
 	public CampaignReferenceDto getCampaign() {
 		return campaign;
@@ -104,4 +107,17 @@ public CampaignFormDataCriteria community(CommunityReferenceDto community) {
 		this.community = community;
 		return this;
 	}
+
+	public Date getFormDate() {
+		return formDate;
+	}
+
+	public void setFormDate(Date formDate) {
+		this.formDate = formDate;
+	}
+
+	public CampaignFormDataCriteria formDate(Date formDate) {
+		this.formDate = formDate;
+		return this;
+	}
 }

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

@@ -45,6 +45,7 @@ public class CampaignFormDataDto extends EntityDto {
 	public static final String REGION = "region";
 	public static final String DISTRICT = "district";
 	public static final String COMMUNITY = "community";
+	public static final String CREATING_USER = "creatingUser";
 
 	private List<CampaignFormDataEntry> formValues;
 	private CampaignReferenceDto campaign;
@@ -144,5 +145,4 @@ public void setCreatingUser(UserReferenceDto creatingUser) {
 		this.creatingUser = creatingUser;
 	}
 
-
 }

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

@@ -18,12 +18,13 @@
 import java.io.Serializable;
 import java.util.Collection;
 import java.util.Iterator;
-import java.util.List;
+import java.util.Objects;
 
 import de.symeda.sormas.api.i18n.I18nProperties;
 import de.symeda.sormas.api.i18n.Strings;
+import de.symeda.sormas.api.utils.JsonDataEntry;
 
-public class CampaignFormDataEntry implements Serializable {
+public class CampaignFormDataEntry implements Serializable, JsonDataEntry {
 
 	private static final long serialVersionUID = -3096020120349257398L;
 
@@ -58,22 +59,6 @@ public void setValue(Object value) {
 		this.value = value;
 	}
 
-	// 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() {
 		if (value == null) {
@@ -97,4 +82,23 @@ public static void removeNullValueEntries(Collection<CampaignFormDataEntry> entr
 			}
 		}
 	}
+
+	/**
+	 * Needed. Otherwise hibernate will persist whenever loading,
+	 * because hibernate types creates new instances that aren't equal.
+	 */
+	@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) && Objects.equals(value, that.value);
+	}
+
+	@Override
+	public int hashCode() {
+		return Objects.hash(id, value);
+	}
 }

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 {
 
@@ -49,11 +49,20 @@ public interface CampaignFormDataFacade {
 
 	List<CampaignFormDataIndexDto> getIndexList(CampaignFormDataCriteria criteria, Integer first, Integer max, List<SortProperty> sortProperties);
 
+	CampaignFormDataDto getExistingData(CampaignFormDataCriteria criteria);
+
 	long count(CampaignFormDataCriteria criteria);
 
 	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);
+
+	void overwriteCampaignFormData(CampaignFormDataDto existingData, CampaignFormDataDto newData);
 }

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

@@ -1,6 +1,7 @@
 package de.symeda.sormas.api.campaign.diagram;
 
 import java.io.Serializable;
+import java.util.Objects;
 
 public class CampaignDashboardElement implements Serializable {
 
@@ -81,4 +82,26 @@ public Integer getHeight() {
 	public void setHeight(Integer height) {
 		this.height = height;
 	}
+
+	/**
+	 * Needed. Otherwise hibernate will persist whenever loading,
+	 * because hibernate types creates new instances that aren't equal.
+	 */
+	@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(subTabId, that.subTabId) &&
+				Objects.equals(order, that.order) &&
+				Objects.equals(width, that.width) &&
+				Objects.equals(height, that.height);
+	}
+
+	@Override
+	public int hashCode() {
+		return Objects.hash(diagramId, tabId, subTabId, order, width, height);
+	}
 }

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() {
 	}
@@ -54,6 +57,10 @@ public void setStack(String stack) {
 		this.stack = stack;
 	}
 
+	/**
+	 * Needed. Otherwise hibernate will persist whenever loading,
+	 * because hibernate types creates new instances that aren't equal.
+	 */
 	@Override
 	public boolean equals(Object o) {
 		if (this == o)
@@ -64,11 +71,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/campaign/form/CampaignFormElement.java

@@ -1,6 +1,8 @@
 package de.symeda.sormas.api.campaign.form;
 
 import java.io.Serializable;
+import java.util.Arrays;
+import java.util.Objects;
 
 public class CampaignFormElement implements Serializable {
 
@@ -110,4 +112,30 @@ public boolean isImportant() {
 	public void setImportant(boolean important) {
 		this.important = important;
 	}
+
+	/**
+	 * Needed. Otherwise hibernate will persist whenever loading,
+	 * because hibernate types creates new instances that aren't equal.
+	 */
+	@Override
+	public boolean equals(Object o) {
+		if (this == o) return true;
+		if (o == null || getClass() != o.getClass()) return false;
+		CampaignFormElement that = (CampaignFormElement) o;
+		return important == that.important &&
+				Objects.equals(type, that.type) &&
+				Objects.equals(id, that.id) &&
+				Objects.equals(caption, that.caption) &&
+				Arrays.equals(styles, that.styles) &&
+				Objects.equals(dependingOn, that.dependingOn) &&
+				Arrays.equals(dependingOnValues, that.dependingOnValues);
+	}
+
+	@Override
+	public int hashCode() {
+		int result = Objects.hash(type, id, caption, dependingOn, important);
+		result = 31 * result + Arrays.hashCode(styles);
+		result = 31 * result + Arrays.hashCode(dependingOnValues);
+		return result;
+	}
 }