merge development

Author: Pa-Touche

.github/workflows/sormas_app_ci.yml

@@ -111,6 +111,9 @@ jobs:
         with:
           api-level: ${{ matrix.api-level }}
           arch: x86_64
+          # Could be decreased to 2048M
+          ram-size: 4096M
+          heap-size: 512M
           force-avd-creation: false
           emulator-options: -no-window -gpu swiftshader_indirect -noaudio -no-boot-anim -camera-back none
           disable-animations: false
@@ -121,6 +124,9 @@ jobs:
         with:
           api-level: ${{ matrix.api-level }}
           arch: x86_64
+          # Could be decreased to 2048M
+          ram-size: 4096M
+          heap-size: 512M
           force-avd-creation: false
           emulator-options: -no-snapshot-save -no-window -gpu swiftshader_indirect -noaudio -no-boot-anim -camera-back none
           disable-animations: true

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

@@ -94,6 +94,8 @@ public enum Disease
 	INVASIVE_MENINGOCOCCAL_INFECTION(true, true, true, false, true, 7, false, false, false, true, 1, 10),
 	GIARDIASIS(true, true, true, false, true, 14, false, false, false, true, 7, 21),
 	CRYPTOSPORIDIOSIS(true, true, true, false, true, 14, false, false, false, true, 2, 12),
+	SHIGELLOSIS(true, true, true, false, true, 14, false, false, false, true, 1, 7),
+	SALMONELLOSIS(true, true, true, false, true, 14, false, false, false, true, 1, 3),
 	OTHER(true, true, true, false, true, 21, false, false, false, false, 0, 0),
 	UNDEFINED(true, true, true, false, true, 0, false, false, false, false, 0, 0);
 

sormas-api/src/main/java/de/symeda/sormas/api/activityascase/ActivityAsCaseType.java

@@ -41,6 +41,8 @@ public enum ActivityAsCaseType {
 	@HideForCountriesExcept
 	CARED_FOR,
 	OTHER,
+	BLOOD_DONATION,
+	BONE_MARROW_DONATION,
 	UNKNOWN;
 
 	@Override

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

@@ -70,6 +70,14 @@ public class EpiDataDto extends PseudonymizableDto {
 	public static final String IMPORTED_CASE = "importedCase";
 	public static final String COUNTRY = "country";
 	public static final String OTHER_DETAILS = "otherDetails";
+	public static final String AIRPORT_WORKER = "airportWorker";
+	public static final String HEALTHCARE_PROFESSIONAL = "healthcareProfessional";
+	public static final String PLACE_OF_INFECTION = "placeOfInfection";
+	public static final String RESIDENCE_AT_ONSET = "residenceAtOnset";
+	public static final String EXPOSURE_INVESTIGATION_FROM_DATE = "exposureInvestigationFromDate";
+	public static final String EXPOSURE_INVESTIGATION_TO_DATE = "exposureInvestigationToDate";
+	public static final String ACTIVITY_AS_CASE_FROM_DATE = "activityAsCaseFromDate";
+	public static final String ACTIVITY_AS_CASE_TO_DATE = "activityAsCaseToDate";
 
 	private YesNoUnknown exposureDetailsKnown;
 	private YesNoUnknown activityAsCaseDetailsKnown;
@@ -81,7 +89,8 @@ public class EpiDataDto extends PseudonymizableDto {
 	private CaseImportedStatus caseImportedStatus;
 
 	@Diseases({
-		Disease.GIARDIASIS })
+		Disease.GIARDIASIS,
+		Disease.SALMONELLOSIS })
 	private YesNoUnknown importedCase;
 
 	@HideForCountriesExcept(countries = {
@@ -114,12 +123,14 @@ public class EpiDataDto extends PseudonymizableDto {
 
 	@Diseases({
 		Disease.GIARDIASIS,
-		Disease.CRYPTOSPORIDIOSIS })
+		Disease.CRYPTOSPORIDIOSIS,
+		Disease.MALARIA })
 	private ModeOfTransmission modeOfTransmission;
 
 	@Diseases({
 		Disease.GIARDIASIS,
-		Disease.CRYPTOSPORIDIOSIS })
+		Disease.CRYPTOSPORIDIOSIS,
+		Disease.MALARIA })
 	@Size(max = FieldConstraints.CHARACTER_LIMIT_DEFAULT, message = Validations.textTooLong)
 	private String modeOfTransmissionType;
 
@@ -133,7 +144,8 @@ public class EpiDataDto extends PseudonymizableDto {
 	private String infectionSourceText;
 
 	@Diseases({
-		Disease.GIARDIASIS })
+		Disease.GIARDIASIS,
+		Disease.SALMONELLOSIS })
 	private CountryReferenceDto country;
 
 	@Valid
@@ -143,6 +155,50 @@ public class EpiDataDto extends PseudonymizableDto {
 	private List<ActivityAsCaseDto> activitiesAsCase = new ArrayList<>();
 
 	private String otherDetails;
+	// airport worker should be applicable for all countries and diseases.
+	@Diseases
+	@HideForCountriesExcept
+	private YesNoUnknown airportWorker;
+	@Diseases({
+		Disease.MALARIA })
+	@HideForCountriesExcept(countries = {
+		CountryHelper.COUNTRY_CODE_LUXEMBOURG })
+	private YesNoUnknown healthcareProfessional;
+
+	@Diseases({
+		Disease.DENGUE })
+	@HideForCountriesExcept(countries = {
+		CountryHelper.COUNTRY_CODE_LUXEMBOURG })
+	@Size(max = 255, message = Validations.textTooLong)
+	private String placeOfInfection;
+
+	@Diseases({
+		Disease.DENGUE })
+	@HideForCountriesExcept(countries = {
+		CountryHelper.COUNTRY_CODE_LUXEMBOURG })
+	@Size(max = 255, message = Validations.textTooLong)
+	private String residenceAtOnset;
+
+	@Diseases({
+		Disease.SALMONELLOSIS })
+	@HideForCountriesExcept(countries = {
+		CountryHelper.COUNTRY_CODE_LUXEMBOURG })
+	private Date exposureInvestigationFromDate;
+	@Diseases({
+		Disease.SALMONELLOSIS })
+	@HideForCountriesExcept(countries = {
+		CountryHelper.COUNTRY_CODE_LUXEMBOURG })
+	private Date exposureInvestigationToDate;
+	@Diseases({
+		Disease.SALMONELLOSIS })
+	@HideForCountriesExcept(countries = {
+		CountryHelper.COUNTRY_CODE_LUXEMBOURG })
+	private Date activityAsCaseFromDate;
+	@Diseases({
+		Disease.SALMONELLOSIS })
+	@HideForCountriesExcept(countries = {
+		CountryHelper.COUNTRY_CODE_LUXEMBOURG })
+	private Date activityAsCaseToDate;
 
 	public YesNoUnknown getExposureDetailsKnown() {
 		return exposureDetailsKnown;
@@ -305,6 +361,88 @@ public void setOtherDetails(String otherDetails) {
 		this.otherDetails = otherDetails;
 	}
 
+	public YesNoUnknown getAirportWorker() {
+		return airportWorker;
+	}
+
+	public void setAirportWorker(YesNoUnknown airportWorker) {
+		this.airportWorker = airportWorker;
+	}
+
+	public YesNoUnknown getHealthcareProfessional() {
+		return healthcareProfessional;
+	}
+
+	public void setHealthcareProfessional(YesNoUnknown healthcareProfessional) {
+		this.healthcareProfessional = healthcareProfessional;
+	}
+
+	public String getPlaceOfInfection() {
+		return placeOfInfection;
+	}
+
+	public void setPlaceOfInfection(String placeOfInfection) {
+		this.placeOfInfection = placeOfInfection;
+	}
+
+	public String getResidenceAtOnset() {
+		return residenceAtOnset;
+	}
+
+	public void setResidenceAtOnset(String residenceAtOnset) {
+		this.residenceAtOnset = residenceAtOnset;
+	}
+
+	public Date getExposureInvestigationFromDate() {
+		return exposureInvestigationFromDate;
+	}
+
+	public void setExposureInvestigationFromDate(Date exposureInvestigationFromDate) {
+		validateDateRange(
+			exposureInvestigationFromDate,
+			this.exposureInvestigationToDate,
+			"exposureInvestigationFromDate",
+			"exposureInvestigationToDate");
+		this.exposureInvestigationFromDate = exposureInvestigationFromDate;
+	}
+
+	public Date getExposureInvestigationToDate() {
+		return exposureInvestigationToDate;
+	}
+
+	public void setExposureInvestigationToDate(Date exposureInvestigationToDate) {
+		validateDateRange(
+			this.exposureInvestigationFromDate,
+			exposureInvestigationToDate,
+			"exposureInvestigationFromDate",
+			"exposureInvestigationToDate");
+		this.exposureInvestigationToDate = exposureInvestigationToDate;
+	}
+
+	public Date getActivityAsCaseFromDate() {
+		return activityAsCaseFromDate;
+	}
+
+	public void setActivityAsCaseFromDate(Date activityAsCaseFromDate) {
+		validateDateRange(activityAsCaseFromDate, this.activityAsCaseToDate, "activityAsCaseFromDate", "activityAsCaseToDate");
+		this.activityAsCaseFromDate = activityAsCaseFromDate;
+	}
+
+	public Date getActivityAsCaseToDate() {
+		return activityAsCaseToDate;
+	}
+
+	public void setActivityAsCaseToDate(Date activityAsCaseToDate) {
+		validateDateRange(this.activityAsCaseFromDate, activityAsCaseToDate, "activityAsCaseFromDate", "activityAsCaseToDate");
+		this.activityAsCaseToDate = activityAsCaseToDate;
+	}
+
+	private static void validateDateRange(Date from, Date to, String fromName, String toName) {
+		if (from != null && to != null && from.after(to)) {
+			throw new IllegalArgumentException(fromName + " must be before or equal to " + toName);
+		}
+	}
+
 	@Override
 	public EpiDataDto clone() throws CloneNotSupportedException {
 		EpiDataDto clone = (EpiDataDto) super.clone();

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

@@ -0,0 +1,39 @@
+/*
+ * SORMAS® - Surveillance Outbreak Response Management & Analysis System
+ * Copyright © 2016-2026 Helmholtz-Zentrum für Infektionsforschung GmbH (HZI)
+ * 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.
+ */
+
+package de.symeda.sormas.api.exposure;
+
+import de.symeda.sormas.api.i18n.I18nProperties;
+
+public enum EatingOutVenue {
+
+	CANTEENS,
+	FOOD_SERVED_ON_BOARD,
+	GAS_STATIONS,
+	STREET_VENDORS,
+	FOOD_COURTS,
+	CAFES_OR_TEA_ROOMS,
+	SANDWICH_SHOPS_BAKERIES_DELICATESSENS,
+	CAFETERIAS_OR_BARS,
+	KEBAB_FALAFEL_SNACK_SHOPS,
+	BURGER_RESTAURANTS,
+	FAST_FOOD_SNACK_BARS,
+	PIZZERIAS,
+	ASIAN_RESTAURANTS,
+	HOTELS,
+	TAKEAWAY_FOOD,
+	BUFFET_STYLE_RESTAURANTS,
+	FOOD_AT_EVENTS,
+	OTHER;
+
+	@Override
+	public String toString() {
+		return I18nProperties.getEnumCaption(this);
+	}
+}

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

@@ -28,10 +28,13 @@ public enum ExposureCategory {
 	FOOD_BORNE,
 	VECTOR_BORNE,
 	VERTICAL_TRANSMISSION,
-	WATER_BORNE;
+	WATER_BORNE,
+	MEDICAL_CARE,
+	LAB,
+	OTHER;
 
 	public boolean hasNoSetting() {
-		return EnumSet.of(ANIMAL_CONTACT, FOMITE_TRANSMISSION, FOOD_BORNE).contains(this);
+		return EnumSet.of(ANIMAL_CONTACT, FOMITE_TRANSMISSION, FOOD_BORNE, MEDICAL_CARE, LAB, OTHER).contains(this);
 	}
 
 	public boolean hasNoSubSetting() {