Integrated Giardiasis and Cryptosporidiosis diseases into sormas

sormas-api/src/main/java/de/symeda/sormas/api/Disease.java

@@ -88,6 +88,8 @@ public enum Disease
 	FHA(true, false, false, true, false, 0, true, false, false),
 	INVASIVE_PNEUMOCOCCAL_INFECTION(true, true, true, false, false, 0, false, false, false),
 	INVASIVE_MENINGOCOCCAL_INFECTION(true, true, true, false, true, 7, false, false, false),
+	GIARDIASIS(true, true, true, false, true, 14, false, false, false),
+	CRYPTOSPORIDIOSIS(true, true, true, false, true, 14, false, false, false),
 	OTHER(true, true, true, false, true, 21, false, false, false),
 	UNDEFINED(true, true, true, false, true, 0, false, false, false);
 

sormas-api/src/main/java/de/symeda/sormas/api/caze/CaseDataDto.java

@@ -364,7 +364,9 @@ public class CaseDataDto extends SormasToSormasShareableDto implements IsCase {
 	@SensitiveData
 	@Diseases(value = {
 		Disease.INVASIVE_MENINGOCOCCAL_INFECTION,
-		Disease.INVASIVE_PNEUMOCOCCAL_INFECTION}, hide = true)
+		Disease.INVASIVE_PNEUMOCOCCAL_INFECTION,
+		Disease.GIARDIASIS,
+		Disease.CRYPTOSPORIDIOSIS }, hide = true)
 	private HealthConditionsDto healthConditions;
 	private YesNoUnknown pregnant;
 	@Diseases({
@@ -1840,8 +1842,6 @@ public void setOtherDiagnosticCriteria(String otherDiagnosticCriteria) {
 		this.otherDiagnosticCriteria = otherDiagnosticCriteria;
 	}
 
-
-
 	@JsonIgnore
 	public String i18nPrefix() {
 		return I18N_PREFIX;

sormas-api/src/main/java/de/symeda/sormas/api/epidata/EpiDataDto.java

@@ -21,17 +21,21 @@
 import java.util.List;
 
 import javax.validation.Valid;
+import javax.validation.constraints.Size;
 
 import de.symeda.sormas.api.CountryHelper;
 import de.symeda.sormas.api.Disease;
 import de.symeda.sormas.api.ImportIgnore;
 import de.symeda.sormas.api.activityascase.ActivityAsCaseDto;
 import de.symeda.sormas.api.exposure.ExposureDto;
+import de.symeda.sormas.api.exposure.InfectionSource;
+import de.symeda.sormas.api.exposure.ModeOfTransmission;
 import de.symeda.sormas.api.feature.FeatureType;
-import de.symeda.sormas.api.location.LocationDto;
+import de.symeda.sormas.api.i18n.Validations;
 import de.symeda.sormas.api.utils.DataHelper;
 import de.symeda.sormas.api.utils.DependingOnFeatureType;
 import de.symeda.sormas.api.utils.Diseases;
+import de.symeda.sormas.api.utils.FieldConstraints;
 import de.symeda.sormas.api.utils.HideForCountriesExcept;
 import de.symeda.sormas.api.utils.YesNoUnknown;
 import de.symeda.sormas.api.utils.pseudonymization.PseudonymizableDto;
@@ -57,29 +61,37 @@ public class EpiDataDto extends PseudonymizableDto {
 	public static final String CLUSTER_TYPE = "clusterType";
 	public static final String CLUSTER_TYPE_TEXT = "clusterTypeText";
 	public static final String CLUSTER_RELATED = "clusterRelated";
+	public static final String MODE_OF_TRANSMISSION = "modeOfTransmission";
+	public static final String MODE_OF_TRANSMISSION_TYPE = "modeOfTransmissionType";
+	public static final String INFECTION_SOURCE = "infectionSource";
+	public static final String INFECTION_SOURCE_TEXT = "infectionSourceText";
 
 	private YesNoUnknown exposureDetailsKnown;
 	private YesNoUnknown activityAsCaseDetailsKnown;
 	private YesNoUnknown contactWithSourceCaseKnown;
 	private YesNoUnknown highTransmissionRiskArea;
 	private YesNoUnknown largeOutbreaksArea;
 	@Diseases({
-			Disease.MEASLES})
-	@HideForCountriesExcept(countries = {CountryHelper.COUNTRY_CODE_LUXEMBOURG})
+		Disease.MEASLES,
+		Disease.GIARDIASIS })
 	private CaseImportedStatus caseImportedStatus;
+
+	@HideForCountriesExcept(countries = {
+		CountryHelper.COUNTRY_CODE_LUXEMBOURG })
 	@Diseases({
-			Disease.MEASLES})
-	@HideForCountriesExcept(countries = {CountryHelper.COUNTRY_CODE_LUXEMBOURG})
+		Disease.MEASLES })
 	private ClusterType clusterType;
 
+	@HideForCountriesExcept(countries = {
+		CountryHelper.COUNTRY_CODE_LUXEMBOURG })
 	@Diseases({
-			Disease.MEASLES})
-	@HideForCountriesExcept(countries = {CountryHelper.COUNTRY_CODE_LUXEMBOURG})
+		Disease.MEASLES })
 	private boolean clusterRelated;
 
-	@HideForCountriesExcept(countries = {CountryHelper.COUNTRY_CODE_LUXEMBOURG})
+	@HideForCountriesExcept(countries = {
+		CountryHelper.COUNTRY_CODE_LUXEMBOURG })
 	@Diseases({
-			Disease.MEASLES})
+		Disease.MEASLES })
 	private String clusterTypeText;
 
 	@Diseases({
@@ -92,6 +104,26 @@ public class EpiDataDto extends PseudonymizableDto {
 		Disease.OTHER })
 	private YesNoUnknown areaInfectedAnimals;
 
+	@Diseases({
+		Disease.GIARDIASIS,
+		Disease.CRYPTOSPORIDIOSIS })
+	private ModeOfTransmission modeOfTransmission;
+
+	@Diseases({
+		Disease.GIARDIASIS,
+		Disease.CRYPTOSPORIDIOSIS })
+	@Size(max = FieldConstraints.CHARACTER_LIMIT_DEFAULT, message = Validations.textTooLong)
+	private String modeOfTransmissionType;
+
+	@Diseases({
+		Disease.GIARDIASIS,
+		Disease.CRYPTOSPORIDIOSIS })
+	private InfectionSource infectionSource;
+	@Diseases({
+		Disease.GIARDIASIS,
+		Disease.CRYPTOSPORIDIOSIS })
+	private String infectionSourceText;
+
 	@Valid
 	private List<ExposureDto> exposures = new ArrayList<>();
 
@@ -203,6 +235,38 @@ public void setClusterRelated(boolean clusterRelated) {
 		this.clusterRelated = clusterRelated;
 	}
 
+	public InfectionSource getInfectionSource() {
+		return infectionSource;
+	}
+
+	public void setInfectionSource(InfectionSource infectionSource) {
+		this.infectionSource = infectionSource;
+	}
+
+	public String getInfectionSourceText() {
+		return infectionSourceText;
+	}
+
+	public void setInfectionSourceText(String infectionSourceText) {
+		this.infectionSourceText = infectionSourceText;
+	}
+
+	public ModeOfTransmission getModeOfTransmission() {
+		return modeOfTransmission;
+	}
+
+	public void setModeOfTransmission(ModeOfTransmission modeOfTransmission) {
+		this.modeOfTransmission = modeOfTransmission;
+	}
+
+	public String getModeOfTransmissionType() {
+		return modeOfTransmissionType;
+	}
+
+	public void setModeOfTransmissionType(String modeOfTransmissionType) {
+		this.modeOfTransmissionType = modeOfTransmissionType;
+	}
+
 	@Override
 	public EpiDataDto clone() throws CloneNotSupportedException {
 		EpiDataDto clone = (EpiDataDto) super.clone();

sormas-api/src/main/java/de/symeda/sormas/api/exposure/AnimalLocation.java

@@ -0,0 +1,32 @@
+/*
+ * SORMAS® - Surveillance Outbreak Response Management & Analysis System
+ * Copyright © 2016-2026 SORMAS Foundation gGmbH
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see <https://www.gnu.org/licenses/>.
+ */
+package de.symeda.sormas.api.exposure;
+
+import de.symeda.sormas.api.i18n.I18nProperties;
+
+public enum AnimalLocation {
+
+	ZOO,
+	FARM,
+	PARK,
+	FOREST,
+	OTHER;
+
+	@Override
+	public String toString() {
+		return I18nProperties.getEnumCaption(this);
+	}
+
+}