Merge branch 'development' into bugfix-3622-archived-campaigns-cause-errors

Author: Martin Wahnschaffe

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

@@ -19,6 +19,7 @@
 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;
@@ -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,22 @@ 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/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/CampaignDiagramSeries.java

@@ -57,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)

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;
+	}
 }

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

@@ -1,6 +1,7 @@
 package de.symeda.sormas.api.campaign.form;
 
 import java.io.Serializable;
+import java.util.Objects;
 
 public class CampaignFormTranslation implements Serializable {
 
@@ -24,4 +25,22 @@ public String getCaption() {
 	public void setCaption(String caption) {
 		this.caption = caption;
 	}
+
+	/**
+	 * 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;
+		CampaignFormTranslation that = (CampaignFormTranslation) o;
+		return Objects.equals(elementId, that.elementId) &&
+				Objects.equals(caption, that.caption);
+	}
+
+	@Override
+	public int hashCode() {
+		return Objects.hash(elementId, caption);
+	}
 }

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

@@ -2,6 +2,7 @@
 
 import java.io.Serializable;
 import java.util.List;
+import java.util.Objects;
 
 public class CampaignFormTranslations implements Serializable {
 
@@ -25,4 +26,22 @@ public List<CampaignFormTranslation> getTranslations() {
 	public void setTranslations(List<CampaignFormTranslation> translations) {
 		this.translations = translations;
 	}
+
+	/**
+	 * 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;
+		CampaignFormTranslations that = (CampaignFormTranslations) o;
+		return Objects.equals(languageCode, that.languageCode) &&
+				Objects.equals(translations, that.translations);
+	}
+
+	@Override
+	public int hashCode() {
+		return Objects.hash(languageCode, translations);
+	}
 }

sormas-api/src/main/java/de/symeda/sormas/api/feature/FeatureType.java

@@ -36,7 +36,8 @@ public enum FeatureType {
 	CASE_FOLLOWUP(true, false, null),
 	TASK_NOTIFICATIONS(true, true, null),
 	OTHER_NOTIFICATIONS(true, true, null),
-	DOCUMENTS(true, false, null);
+	DOCUMENTS(true, false, null),
+	OUTBREAKS(true, true, null);
 
 	/**
 	 * Server feature means that the feature only needs to be configured once per server since they define the way the system

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

@@ -163,8 +163,10 @@ public interface Captions {
 	String CampaignFormData_area = "CampaignFormData.area";
 	String CampaignFormData_campaign = "CampaignFormData.campaign";
 	String CampaignFormData_campaignFormMeta = "CampaignFormData.campaignFormMeta";
+	String CampaignFormData_edit = "CampaignFormData.edit";
 	String CampaignFormData_formDate = "CampaignFormData.formDate";
 	String campaignNewCampaign = "campaignNewCampaign";
+	String campaignSearch = "campaignSearch";
 	String campaignValidateForms = "campaignValidateForms";
 	String caseActiveCases = "caseActiveCases";
 	String caseAllCases = "caseAllCases";

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

@@ -26,6 +26,7 @@ public interface Validations {
 	String campaignFormElementNotExisting = "campaignFormElementNotExisting";
 	String campaignFormElementTypeRequired = "campaignFormElementTypeRequired";
 	String campaignFormInvalidIdInListElements = "campaignFormInvalidIdInListElements";
+	String campaignFormMetaValidationUnexpectedError = "campaignFormMetaValidationUnexpectedError";
 	String campaignFormTranslationCaptionRequired = "campaignFormTranslationCaptionRequired";
 	String campaignFormTranslationIdInvalid = "campaignFormTranslationIdInvalid";
 	String campaignFormTranslationIdRequired = "campaignFormTranslationIdRequired";